diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 09135068f..000000000
--- a/.editorconfig
+++ /dev/null
@@ -1,358 +0,0 @@
-root = true
-
-[*]
-# charset = utf-8
-# end_of_line = lf
-# indent_size = 4
-# indent_style = space
-# insert_final_newline = false
-# max_line_length = 100
-# tab_width = 4
-# ij_continuation_indent_size = 8
-# ij_formatter_off_tag = @formatter:off
-# ij_formatter_on_tag = @formatter:on
-# ij_formatter_tags_enabled = false
-# ij_smart_tabs = false
-# ij_wrap_on_typing = false
-
-[*.java]
-# ij_java_align_consecutive_assignments = false
-# ij_java_align_consecutive_variable_declarations = false
-# ij_java_align_group_field_declarations = false
-# ij_java_align_multiline_annotation_parameters = false
-# ij_java_align_multiline_array_initializer_expression = false
-# ij_java_align_multiline_assignment = false
-# ij_java_align_multiline_binary_operation = false
-# ij_java_align_multiline_chained_methods = false
-# ij_java_align_multiline_extends_list = false
-# ij_java_align_multiline_for = true
-# ij_java_align_multiline_method_parentheses = false
-# ij_java_align_multiline_parameters = true
-# ij_java_align_multiline_parameters_in_calls = false
-# ij_java_align_multiline_parenthesized_expression = false
-# ij_java_align_multiline_resources = true
-# ij_java_align_multiline_ternary_operation = false
-# ij_java_align_multiline_text_blocks = false
-# ij_java_align_multiline_throws_list = false
-# ij_java_align_subsequent_simple_methods = false
-# ij_java_align_throws_keyword = false
-# ij_java_annotation_parameter_wrap = off
-# ij_java_array_initializer_new_line_after_left_brace = false
-# ij_java_array_initializer_right_brace_on_new_line = false
-# ij_java_array_initializer_wrap = off
-# ij_java_assert_statement_colon_on_next_line = false
-# ij_java_assert_statement_wrap = off
-# ij_java_assignment_wrap = off
-# ij_java_binary_operation_sign_on_next_line = false
-# ij_java_binary_operation_wrap = off
-# ij_java_blank_lines_after_anonymous_class_header = 0
-# ij_java_blank_lines_after_class_header = 0
-# ij_java_blank_lines_after_imports = 1
-# ij_java_blank_lines_after_package = 1
-# ij_java_blank_lines_around_class = 1
-# ij_java_blank_lines_around_field = 0
-# ij_java_blank_lines_around_field_in_interface = 0
-# ij_java_blank_lines_around_initializer = 1
-# ij_java_blank_lines_around_method = 1
-# ij_java_blank_lines_around_method_in_interface = 1
-# ij_java_blank_lines_before_class_end = 0
-# ij_java_blank_lines_before_imports = 1
-# ij_java_blank_lines_before_method_body = 0
-# ij_java_blank_lines_before_package = 0
-# ij_java_block_brace_style = end_of_line
-# ij_java_block_comment_at_first_column = true
-# ij_java_call_parameters_new_line_after_left_paren = false
-# ij_java_call_parameters_right_paren_on_new_line = false
-# ij_java_call_parameters_wrap = off
-# ij_java_case_statement_on_separate_line = true
-# ij_java_catch_on_new_line = false
-# ij_java_class_annotation_wrap = split_into_lines
-# ij_java_class_brace_style = end_of_line
-# ij_java_class_count_to_use_import_on_demand = 99
-# ij_java_class_names_in_javadoc = 1
-# ij_java_do_not_indent_top_level_class_members = false
-# ij_java_do_not_wrap_after_single_annotation = false
-# ij_java_do_while_brace_force = never
-# ij_java_doc_add_blank_line_after_description = true
-# ij_java_doc_add_blank_line_after_param_comments = false
-# ij_java_doc_add_blank_line_after_return = false
-# ij_java_doc_add_p_tag_on_empty_lines = true
-# ij_java_doc_align_exception_comments = true
-# ij_java_doc_align_param_comments = true
-# ij_java_doc_do_not_wrap_if_one_line = false
-# ij_java_doc_enable_formatting = true
-# ij_java_doc_enable_leading_asterisks = true
-# ij_java_doc_indent_on_continuation = false
-# ij_java_doc_keep_empty_lines = true
-# ij_java_doc_keep_empty_parameter_tag = true
-# ij_java_doc_keep_empty_return_tag = true
-# ij_java_doc_keep_empty_throws_tag = true
-# ij_java_doc_keep_invalid_tags = true
-# ij_java_doc_param_description_on_new_line = false
-# ij_java_doc_preserve_line_breaks = false
-# ij_java_doc_use_throws_not_exception_tag = true
-# ij_java_else_on_new_line = false
-# ij_java_enum_constants_wrap = off
-# ij_java_extends_keyword_wrap = off
-# ij_java_extends_list_wrap = off
-# ij_java_field_annotation_wrap = split_into_lines
-# ij_java_finally_on_new_line = false
-# ij_java_for_brace_force = never
-# ij_java_for_statement_new_line_after_left_paren = false
-# ij_java_for_statement_right_paren_on_new_line = false
-# ij_java_for_statement_wrap = off
-# ij_java_generate_final_locals = false
-# ij_java_generate_final_parameters = false
-# ij_java_if_brace_force = never
-# ij_java_imports_layout = android.**,|,androidx.**,|,com.**,|,junit.**,|,net.**,|,org.**,|,java.**,|,javax.**,|,*,|,$*,|
-# ij_java_indent_case_from_switch = true
-# ij_java_insert_inner_class_imports = false
-# ij_java_insert_override_annotation = true
-# ij_java_keep_blank_lines_before_right_brace = 2
-# ij_java_keep_blank_lines_between_package_declaration_and_header = 2
-# ij_java_keep_blank_lines_in_code = 2
-# ij_java_keep_blank_lines_in_declarations = 2
-# ij_java_keep_control_statement_in_one_line = true
-# ij_java_keep_first_column_comment = true
-# ij_java_keep_indents_on_empty_lines = false
-# ij_java_keep_line_breaks = true
-# ij_java_keep_multiple_expressions_in_one_line = false
-# ij_java_keep_simple_blocks_in_one_line = false
-# ij_java_keep_simple_classes_in_one_line = false
-# ij_java_keep_simple_lambdas_in_one_line = false
-# ij_java_keep_simple_methods_in_one_line = false
-# ij_java_label_indent_absolute = false
-# ij_java_label_indent_size = 0
-# ij_java_lambda_brace_style = end_of_line
-# ij_java_layout_static_imports_separately = true
-# ij_java_line_comment_add_space = false
-# ij_java_line_comment_at_first_column = true
-# ij_java_method_annotation_wrap = split_into_lines
-# ij_java_method_brace_style = end_of_line
-# ij_java_method_call_chain_wrap = off
-# ij_java_method_parameters_new_line_after_left_paren = false
-# ij_java_method_parameters_right_paren_on_new_line = false
-# ij_java_method_parameters_wrap = off
-# ij_java_modifier_list_wrap = false
-# ij_java_names_count_to_use_import_on_demand = 99
-# ij_java_parameter_annotation_wrap = off
-# ij_java_parentheses_expression_new_line_after_left_paren = false
-# ij_java_parentheses_expression_right_paren_on_new_line = false
-# ij_java_place_assignment_sign_on_next_line = false
-# ij_java_prefer_longer_names = true
-# ij_java_prefer_parameters_wrap = false
-# ij_java_repeat_synchronized = true
-# ij_java_replace_instanceof_and_cast = false
-# ij_java_replace_null_check = true
-# ij_java_replace_sum_lambda_with_method_ref = true
-# ij_java_resource_list_new_line_after_left_paren = false
-# ij_java_resource_list_right_paren_on_new_line = false
-# ij_java_resource_list_wrap = off
-# ij_java_space_after_closing_angle_bracket_in_type_argument = false
-# ij_java_space_after_colon = true
-# ij_java_space_after_comma = true
-# ij_java_space_after_comma_in_type_arguments = true
-# ij_java_space_after_for_semicolon = true
-# ij_java_space_after_quest = true
-# ij_java_space_after_type_cast = true
-# ij_java_space_before_annotation_array_initializer_left_brace = false
-# ij_java_space_before_annotation_parameter_list = false
-# ij_java_space_before_array_initializer_left_brace = false
-# ij_java_space_before_catch_keyword = true
-# ij_java_space_before_catch_left_brace = true
-# ij_java_space_before_catch_parentheses = true
-# ij_java_space_before_class_left_brace = true
-# ij_java_space_before_colon = true
-# ij_java_space_before_colon_in_foreach = true
-# ij_java_space_before_comma = false
-# ij_java_space_before_do_left_brace = true
-# ij_java_space_before_else_keyword = true
-# ij_java_space_before_else_left_brace = true
-# ij_java_space_before_finally_keyword = true
-# ij_java_space_before_finally_left_brace = true
-# ij_java_space_before_for_left_brace = true
-# ij_java_space_before_for_parentheses = true
-# ij_java_space_before_for_semicolon = false
-# ij_java_space_before_if_left_brace = true
-# ij_java_space_before_if_parentheses = true
-# ij_java_space_before_method_call_parentheses = false
-# ij_java_space_before_method_left_brace = true
-# ij_java_space_before_method_parentheses = false
-# ij_java_space_before_opening_angle_bracket_in_type_parameter = false
-# ij_java_space_before_quest = true
-# ij_java_space_before_switch_left_brace = true
-# ij_java_space_before_switch_parentheses = true
-# ij_java_space_before_synchronized_left_brace = true
-# ij_java_space_before_synchronized_parentheses = true
-# ij_java_space_before_try_left_brace = true
-# ij_java_space_before_try_parentheses = true
-# ij_java_space_before_type_parameter_list = false
-# ij_java_space_before_while_keyword = true
-# ij_java_space_before_while_left_brace = true
-# ij_java_space_before_while_parentheses = true
-# ij_java_space_inside_one_line_enum_braces = false
-# ij_java_space_within_empty_array_initializer_braces = false
-# ij_java_space_within_empty_method_call_parentheses = false
-# ij_java_space_within_empty_method_parentheses = false
-# ij_java_spaces_around_additive_operators = true
-# ij_java_spaces_around_assignment_operators = true
-# ij_java_spaces_around_bitwise_operators = true
-# ij_java_spaces_around_equality_operators = true
-# ij_java_spaces_around_lambda_arrow = true
-# ij_java_spaces_around_logical_operators = true
-# ij_java_spaces_around_method_ref_dbl_colon = false
-# ij_java_spaces_around_multiplicative_operators = true
-# ij_java_spaces_around_relational_operators = true
-# ij_java_spaces_around_shift_operators = true
-# ij_java_spaces_around_type_bounds_in_type_parameters = true
-# ij_java_spaces_around_unary_operator = false
-# ij_java_spaces_within_angle_brackets = false
-# ij_java_spaces_within_annotation_parentheses = false
-# ij_java_spaces_within_array_initializer_braces = false
-# ij_java_spaces_within_braces = false
-# ij_java_spaces_within_brackets = false
-# ij_java_spaces_within_cast_parentheses = false
-# ij_java_spaces_within_catch_parentheses = false
-# ij_java_spaces_within_for_parentheses = false
-# ij_java_spaces_within_if_parentheses = false
-# ij_java_spaces_within_method_call_parentheses = false
-# ij_java_spaces_within_method_parentheses = false
-# ij_java_spaces_within_parentheses = false
-# ij_java_spaces_within_switch_parentheses = false
-# ij_java_spaces_within_synchronized_parentheses = false
-# ij_java_spaces_within_try_parentheses = false
-# ij_java_spaces_within_while_parentheses = false
-# ij_java_special_else_if_treatment = true
-# ij_java_subclass_name_suffix = Impl
-# ij_java_ternary_operation_signs_on_next_line = false
-# ij_java_ternary_operation_wrap = off
-# ij_java_test_name_suffix = Test
-# ij_java_throws_keyword_wrap = off
-# ij_java_throws_list_wrap = off
-# ij_java_use_external_annotations = false
-# ij_java_use_fq_class_names = false
-# ij_java_use_relative_indents = false
-# ij_java_use_single_class_imports = true
-# ij_java_variable_annotation_wrap = off
-# ij_java_visibility = public
-# ij_java_while_brace_force = never
-# ij_java_while_on_new_line = false
-# ij_java_wrap_comments = false
-# ij_java_wrap_first_method_in_call_chain = false
-# ij_java_wrap_long_lines = false
-
-[{*.htm,*.shtm,*.sht,*.shtml,*.html}]
-# ij_html_add_new_line_before_tags = body,div,p,form,h1,h2,h3
-# ij_html_align_attributes = true
-# ij_html_align_text = false
-# ij_html_attribute_wrap = normal
-# ij_html_block_comment_at_first_column = true
-# ij_html_do_not_align_children_of_min_lines = 0
-# ij_html_do_not_break_if_inline_tags = title,h1,h2,h3,h4,h5,h6,p
-# ij_html_do_not_indent_children_of_tags = html,body,thead,tbody,tfoot
-# ij_html_enforce_quotes = false
-# ij_html_inline_tags = a,abbr,acronym,b,basefont,bdo,big,br,cite,cite,code,dfn,em,font,i,img,input,kbd,label,q,s,samp,select,small,span,strike,strong,sub,sup,textarea,tt,u,var
-# ij_html_keep_blank_lines = 2
-# ij_html_keep_indents_on_empty_lines = false
-# ij_html_keep_line_breaks = true
-# ij_html_keep_line_breaks_in_text = true
-# ij_html_keep_whitespaces = false
-# ij_html_keep_whitespaces_inside = span,pre,textarea
-# ij_html_line_comment_at_first_column = true
-# ij_html_new_line_after_last_attribute = never
-# ij_html_new_line_before_first_attribute = never
-# ij_html_quote_style = double
-# ij_html_remove_new_line_before_tags = br
-# ij_html_space_after_tag_name = false
-# ij_html_space_around_equality_in_attribute = false
-# ij_html_space_inside_empty_tag = false
-# ij_html_text_wrap = normal
-
-[{*.jhm,*.xslt,*.rng,*.xsl,*.xsd,*.ant,*.tld,*.fxml,*.wsdl,*.jrxml,*.xml,*.jnlp,*.xul}]
-# ij_continuation_indent_size = 4
-# ij_xml_block_comment_at_first_column = true
-# ij_xml_keep_indents_on_empty_lines = false
-# ij_xml_line_comment_at_first_column = true
-# ij_xml_use_custom_settings = true
-# ij_continuation_indent_size = 4
-# ij_xml_block_comment_at_first_column = true
-# ij_xml_keep_indents_on_empty_lines = false
-# ij_xml_line_comment_at_first_column = true
-# ij_xml_use_custom_settings = true
-
-[{*.kt,*.kts}]
-# ij_kotlin_align_in_columns_case_branch = false
-# ij_kotlin_align_multiline_binary_operation = false
-# ij_kotlin_align_multiline_extends_list = false
-# ij_kotlin_align_multiline_method_parentheses = false
-# ij_kotlin_align_multiline_parameters = true
-# ij_kotlin_align_multiline_parameters_in_calls = false
-# ij_kotlin_assignment_wrap = normal
-# ij_kotlin_blank_lines_after_class_header = 0
-# ij_kotlin_blank_lines_around_block_when_branches = 0
-# ij_kotlin_block_comment_at_first_column = true
-# ij_kotlin_call_parameters_new_line_after_left_paren = true
-# ij_kotlin_call_parameters_right_paren_on_new_line = true
-# ij_kotlin_call_parameters_wrap = on_every_item
-# ij_kotlin_catch_on_new_line = false
-# ij_kotlin_class_annotation_wrap = split_into_lines
-# ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
-# ij_kotlin_continuation_indent_for_chained_calls = false
-# ij_kotlin_continuation_indent_for_expression_bodies = false
-# ij_kotlin_continuation_indent_in_argument_lists = false
-# ij_kotlin_continuation_indent_in_elvis = false
-# ij_kotlin_continuation_indent_in_if_conditions = false
-# ij_kotlin_continuation_indent_in_parameter_lists = false
-# ij_kotlin_continuation_indent_in_supertype_lists = false
-# ij_kotlin_else_on_new_line = false
-# ij_kotlin_enum_constants_wrap = off
-# ij_kotlin_extends_list_wrap = normal
-# ij_kotlin_field_annotation_wrap = split_into_lines
-# ij_kotlin_finally_on_new_line = false
-# ij_kotlin_if_rparen_on_new_line = true
-# ij_kotlin_import_nested_classes = false
-# ij_kotlin_insert_whitespaces_in_simple_one_line_method = true
-# ij_kotlin_keep_blank_lines_before_right_brace = 2
-# ij_kotlin_keep_blank_lines_in_code = 2
-# ij_kotlin_keep_blank_lines_in_declarations = 2
-# ij_kotlin_keep_first_column_comment = true
-# ij_kotlin_keep_indents_on_empty_lines = false
-# ij_kotlin_keep_line_breaks = true
-# ij_kotlin_lbrace_on_next_line = false
-# ij_kotlin_line_comment_add_space = false
-# ij_kotlin_line_comment_at_first_column = true
-# ij_kotlin_method_annotation_wrap = split_into_lines
-# ij_kotlin_method_call_chain_wrap = normal
-# ij_kotlin_method_parameters_new_line_after_left_paren = true
-# ij_kotlin_method_parameters_right_paren_on_new_line = true
-# ij_kotlin_method_parameters_wrap = on_every_item
-# ij_kotlin_name_count_to_use_star_import = 5
-# ij_kotlin_name_count_to_use_star_import_for_members = 3
-# ij_kotlin_parameter_annotation_wrap = off
-# ij_kotlin_space_after_comma = true
-# ij_kotlin_space_after_extend_colon = true
-# ij_kotlin_space_after_type_colon = true
-# ij_kotlin_space_before_catch_parentheses = true
-# ij_kotlin_space_before_comma = false
-# ij_kotlin_space_before_extend_colon = true
-# ij_kotlin_space_before_for_parentheses = true
-# ij_kotlin_space_before_if_parentheses = true
-# ij_kotlin_space_before_lambda_arrow = true
-# ij_kotlin_space_before_type_colon = false
-# ij_kotlin_space_before_when_parentheses = true
-# ij_kotlin_space_before_while_parentheses = true
-# ij_kotlin_spaces_around_additive_operators = true
-# ij_kotlin_spaces_around_assignment_operators = true
-# ij_kotlin_spaces_around_equality_operators = true
-# ij_kotlin_spaces_around_function_type_arrow = true
-# ij_kotlin_spaces_around_logical_operators = true
-# ij_kotlin_spaces_around_multiplicative_operators = true
-# ij_kotlin_spaces_around_range = false
-# ij_kotlin_spaces_around_relational_operators = true
-# ij_kotlin_spaces_around_unary_operator = false
-# ij_kotlin_spaces_around_when_arrow = true
-# ij_kotlin_variable_annotation_wrap = off
-# ij_kotlin_while_on_new_line = false
-# ij_kotlin_wrap_elvis_expressions = 1
-# ij_kotlin_wrap_expression_body_functions = 1
-# ij_kotlin_wrap_first_method_in_call_chain = false
diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 411c07777..000000000
--- a/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-* text=auto eol=lf
-
-*.bat text eol=crlf
-*.jar binary
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 3ee2b591b..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve. Please write in English only.
-title: ''
-labels: bug
-assignees: ''
-
----
-
-<!--
-    Don't report bugs that are already in the issue list of Retro Music: https://github.com/h4h13/RetroMusicPlayer/issues
-
-    [ ] Yes
--->
-
-**Have you read the [FAQ](https://github.com/RetroMusicPlayer/RetroMusicPlayer/blob/master/FAQ.md)?**
-[Yes/No]
-
-**Has the bug already been reported? Please search in GitHub issue tab before creating an issue.**
-[Yes/No]
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**How To Reproduce**
-Steps to reproduce the behavior:
-1.  
-2. 
-3. 
-4. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Crash log**
-If the app is crashing, add a crash log
-<details>
-  <summary>Click to view logs</summary>
-PASTE YOUR LOGS HERE.
-</details>
-
-**Device info:**
- - Device: [e.g. OnePlus 7]
- - Android version: [e.g. Android 9]
- - App version [e.g. 3.5.300_0517]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 0f15789f4..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project. Please write in English only.
-title: ''
-labels: enhancement
-assignees: ''
-
----
-
-<!--
-    Don't report bugs that are already in the issue list of Retro Music: https://github.com/h4h13/RetroMusicPlayer/issues
-
-    [ ] Yes
--->
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/stale.yml b/.github/stale.yml
new file mode 100644
index 000000000..ad3996c5a
--- /dev/null
+++ b/.github/stale.yml
@@ -0,0 +1,61 @@
+# Configuration for probot-stale - https://github.com/probot/stale
+
+# Number of days of inactivity before an Issue or Pull Request becomes stale
+daysUntilStale: 60
+
+# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
+# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
+daysUntilClose: 7
+
+# Only issues or pull requests with all of these labels are check if stale. Defaults to `[]` (disabled)
+onlyLabels: []
+
+# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
+exemptLabels:
+  - pinned
+  - security
+  - "[Status] Maybe Later"
+
+# Set to true to ignore issues in a project (defaults to false)
+exemptProjects: false
+
+# Set to true to ignore issues in a milestone (defaults to false)
+exemptMilestones: false
+
+# Set to true to ignore issues with an assignee (defaults to false)
+exemptAssignees: false
+
+# Label to use when marking as stale
+staleLabel: stale
+
+# Comment to post when marking as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+
+# Comment to post when removing the stale label.
+# unmarkComment: >
+#   Your comment here.
+
+# Comment to post when closing a stale Issue or Pull Request.
+# closeComment: >
+#   Your comment here.
+
+# Limit the number of actions per hour, from 1-30. Default is 30
+limitPerRun: 30
+
+# Limit to only `issues` or `pulls`
+# only: issues
+
+# Optionally, specify configuration settings that are specific to just 'issues' or 'pulls':
+# pulls:
+#   daysUntilStale: 30
+#   markComment: >
+#     This pull request has been automatically marked as stale because it has not had
+#     recent activity. It will be closed if no further activity occurs. Thank you
+#     for your contributions.
+
+# issues:
+#   exemptLabels:
+#     - confirmed
\ No newline at end of file
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
deleted file mode 100644
index e450294c1..000000000
--- a/.github/workflows/android.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-name: Android CI
-
-on:
-  push:
-    branches: [ dev ]
-  pull_request:
-    branches: [ dev ]
-
-jobs:
-  check:
-    runs-on: ubuntu-latest
-    timeout-minutes: 10
-    steps:
-      - uses: actions/checkout@v3
-      - uses: gradle/wrapper-validation-action@v1
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'zulu'
-          java-version: 17
-      - uses: gradle/gradle-build-action@v2
-      - name: Lint Android
-        run: ./gradlew lint
-
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-java@v3
-        with:
-          java-version: '17'
-          distribution: 'zulu'
-      - uses: gradle/gradle-build-action@v2
-      - name: Build
-        run: ./gradlew app:assemble
diff --git a/.gitignore b/.gitignore
index 6a32941f0..4d995e375 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,4 +38,7 @@ obj/
 captures
 app/normal/release/
 /models/
-/app/release/
+
+app/font/
+app/src/debug/
+app/src/font/
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 2775d78f3..000000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Contributing
-
-## Using the issue tracker
-The [issue tracker](https://github.com/RetroMusicPlayer/RetroMusicPlayer/issues) is the preferred channel for bug reports, feature requests and submitting pull requests, but please follow these rules:
-
-* Please **do not** derail or troll issues. Keep the discussion on topic and respect the opinions of others.
-
-* Please **do not** post comments consisting solely of "+1" or "👍". Use [GitHub's "reactions" feature](https://github.com/blog/2119-add-reactions-to-pull-requests-issues-and-comments) instead.
-
-* Please **do not** write [enhancement]/[bug]/[feature request] or similar stuff in the title of issues, as there are labels for that purpose that will be added by devs or collaborators.
-
-## Bug reports
-A bug is a _demonstrable problem_. Good bug reports are extremely helpful, so thanks!
-
-Guidelines for bug reports:
-
-* Use the GitHub issue search, check if the issue has already been reported both in the open issues and in the closed ones, if there are some missing details, add them in issue comments, without creating a new one
-* Check if the issue has been fixed — try to reproduce it using the latest available build
-* Isolate the problem — ideally create a reproducible scenario and a live example
-* Do not report multiple bugs in a single ticket, otherwise it will be confusing.
-
-A good bug report shouldn't leave others needing to chase you up for more information. Please try to be as detailed as possible in your report.
-
-
-## Feature requests
-Feature requests are welcome, please make sure to be as detailed as possible and use screenshots, videos, GIFs, to demonstrate it better, if possible.
-
-
-## Pull requests
-**Please ask first** before embarking on any significant pull request (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that developers might not want to merge into the project. To avoid that, you can join the official [Telegram group](https://t.me/retromusicapp) or open an issue.
-
-## License
-By contributing your code, you agree to license your contribution under the [GNU General Public License](https://github.com/RetroMusicPlayer/RetroMusicPlayer/blob/master/LICENSE.md). 
-
-Please note we have a code of conduct, please follow it in all your interactions with the project.
diff --git a/FAQ.md b/FAQ.md
index 8223a2c7a..946daca81 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,157 +1,45 @@
-## **Q: How do I get the beta version of Retro Music?**
+#### Q: How do I get the beta version of Retro Music?
 You can opt-in for the beta build by clicking on this link: https://play.google.com/apps/testing/code.name.monkey.retromusic
 
-___
+#### Q: How do I use offline synced lyrics?
+- STEP 1: Look for a song that doesn't have lyrics.
+- STEP 2: Search the web for the lyrics of your desired song (you either have to find a ".lrc" file or lyrics with timestamps for example "[00:04:02] Some lyrics text"). If you find a lyrics file that's great or find lyrics with timestamps you have to create a ".lrc" file. 
+- STEP 3: Now you have to rename the file you created in this way: <song_name> - <artist_name>.lrc or for better matching copy the <song_name> and the <artist_name> from the tag editor and then rename the file.
+- STEP 4: You have to copy or move the file into a location on the SD Card: whatever_sdcard/RetroMusic/lyrics/ and paste inside your ".lrc" file in there.
 
-## **Q: How to restore my purchases?**
-Make sure to switch and use your account in the Play Store app through which you purchased before installing Retro Music. The Google account used to install the app is also used to purchase/restore the pro license.
+#### Q: Why isn't the artist's image downloading?
+Last.fm has disabled the download of artist's images for the time being, whether functionality for this will be restored in future is uncertain.
 
-If you've already installed the app, remove all other accounts except the one from which you purchased premium, and then restore the purchase.
-
-___
-
-## Q: **How do I use offline synced lyrics?**
-There are three methods for adding offline synced lyrics in Retro Music.
-
-### ***Method 1:-***
-#### STEP 1: 
-Find the time-stamped lyrics for your songs that don't have lyrics already. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example.
-#### STEP 2: 
-Copy these time-stamped lyrics.
-#### STEP 3: 
-Open retro music and head to the song synced lyrics editor.
-#### STEP 4: 
-Paste the lyrics there normally and exit the editor
-#### STEP 5: 
-Open lyrics and you should see your time-stamped lyrics there.
-
-### ***Method 2:-***
-#### STEP 1: 
-Download the time-stamped lyrics for your songs that don't have lyrics already. You can find ".lrc" files for popular songs at either of the websites given below. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example.
-#### STEP 2: 
-A ".lrc" is like a text file that contains the time-stamped lyrics for example, "[00:04:02] Some lyrics text". Save your time-stamped lyrics are ".lrc" file.
-#### STEP 3: 
-Now you have to rename the file you created in this way: <song_name> - <artist_name>.lrc or for better matching copy the <song_name> and the <artist_name> from the tag editor and then rename the file.
-### STEP 4: 
-Now paste the LRC files to the following path: /sdcard/Retromusic/lyrics/
-Here sdcard is your internal storage.
-
-### ***Method 3:- (Requires third-party app)***
-#### STEP 1:
-Download automatag or autotagger from Play Store.
-#### STEP 2:
-Find the time-stamped lyrics for your songs that don't have lyrics already. You can find ".lrc" files for popular songs at either of the websites given below. A time-stamped lyric looks like this, "[00:04:02] Some lyrics text" for example.
-#### STEP 3:
-Find your song to edit and paste the synced lyrics. 
-> These apps add those synced lyrics in the music file itself instead of creating a ".lrc file for it."
-
-**Lyrics Website Links:**
-- https://www.lyricsify.com/
-- https://www.syair.info
-
-**Some Important Notes:**
-- If you want to skip to a particular timestamp, simply scroll to the time stamp from where you want to start and a 'Play' icon will appear left to the particular stamp. Tap on the play button to play from there.
-- When you save lyrics by pasting lyrics in lyrics editor, close the lyrics and open again for lyrics to show.
-- For those who are having difficulty in making the synced lyrics work, we have a short tutorial video on it. Hope this helps you. {[Link in the note or here](https://youtu.be/1oIOTGWhNMY)}
-
-___
-
-## **Q: How do I change the theme?**
+#### Q: How do I change the theme?
 Settings -> Look and feel -> Select your theme.
-___
 
-## **Q: Equalizer is very laggy and unstable or I am getting a "No equalizer found" error. Why?**
-- The Retro music in-built equalizer was removed updates ago so the only equalizer you will have by your OEM or Android native equalizer which isn't made by us and have no control over them. So you can report those issues to your OEM so that they can provide a fix in the next updates.
-
-- If you are seeing "No Equalizer Found" in your device, this means your device doesn't have a stock equalizer "MusicFx" Equalizer. You can try using this one. It's made by AEX ROM developers.
-
-https://drive.google.com/file/d/1_1bpsn6roeEyElGKikbU39lVKUH8O3xp/view?**usp=drivesdk
-
-___
-
-## **Q: Why aren't last added songs showing?**
+#### Q: Why aren't last added songs showing?
 Settings -> Other -> Last added playlist interval -> Select an option from the list.
-___
 
-## **Q: How do I enable fullscreen lock screen controls?**
+#### Q: How do I enable fullscreen lockscreen controls?
 Settings -> Personalize -> Fullscreen controls -> Enable (this will only be visible when songs are playing from Retro Music).
-___
 
-## **Q: Why are my gallery or random pictures showing up as album art?**
+#### Q: Why are gallery or random pictures showing up as album art?
 Settings -> Images -> Ignore media store covers -> Enable
-___
 
-## **Q: Which file types are supported?**
+#### Q: Which file types are supported?
 Retro Music uses the native media player that comes with your Android phone, so as long as a file type is supported by your phone, it's supported by Retro Music.
-___
 
-## **Q: Why is my device slowing down when I'm using the app?**
+#### Q: Why is my device slowing down when I'm using the app?
 Retro Music is image intensive, it keeps images in the cache for quick loading.
-___
 
-## **Q: The title "Retro Music" is showing on the top of the app, how can I fix this?** 
+#### Q: The title "Retro Music" is showing on the top of the app, how can i fix this? 
 Clear the app's cache and data.
-___
 
-## **Q: My app is crashing, how do I fix this?** (Sorry, settings have changed internally) 
-Please try to clear the data of the app. If it doesn't work, reinstalling fresh from the play store should help.
-___
+##### Q: My app is crashing, how do i fix this? (Sorry, settings have changed internally) 
+Reinstalling the app should fix this issue. 
 
-## **Q: Why has all the text gone white/disappeared?** 
+##### Q: Why has all the text gone white/dissapeared? 
 Change the theme to Black or Dark and change it back to what you had before.
-___
 
-## **Q: Why some of my songs are not showing in my library?**
-- Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs that should start appearing in the library.
+##### Q: Why some of my songs are not showing in my library?
+Try checking up if those songs are not less than 30 seconds, if so head to settings -> other -> filter song duration. Put this to zero and see the songs should start appearimg in the library.
+If this doesn't work out for you, re-scanning the media folder should help and subsquently rebooting the device to refresh media store.
 
-- If this doesn't work out for you, re-scanning the media folder should help and subsequently rebooting the device to refresh the media store.
-
-- At last, resort, If nothing worked and your audio files are stored in SD card. Try moving them to internal memory then back to SD card.
-
-___
-
-## **Q: Why does my library shows song files twice or no song at all?**
-If you are seeing duplication of songs in the library or no songs at all, then it's because of the Media Store issue which got affected by some other app. 
-
-***To fix this:***
-1. Head to your device settings
-
-1. Open up "Apps & notifications" (This name depends from ROM to ROM)
-
-1. Find the 'Media storage' app and clear storage (both data and cache) of it.
-
-1. Then open the Retro Music app and manually scan your music from your storage. 
-
-1. Reboot the device to refresh the media store (Not sure if this is necessary)
-
-**NOTE:** Don't panic when you will open Retro Music and see "Zero" songs there in the library. It's because you cleared Media Store which is responsible for recognising files on your device.
-___
-
-## **Q: I can't find the folder menu anymore after the latest update?**
-Head to settings -> personalise. And select folders from "library categories". If there is no option of folders, tap on reset and select folders.
-___
-
-## **Q: After updating the app to the latest version, the font got removed. Why?**
-- Retro Music's font has now been replaced with system font, which means the default font your system uses will be used by Retro Music too. It fixes all font-related issues you used to face/are facing in the app. 
-
-- With the recent Retro Music v5 release, we have a built-in optional font "Manrope font" which you can toggle from Settings > Look & Feel > Toggle "Use manrope font".
-
-- If you think the font looks ugly, then you just need to change the default font from your Android settings (or use any Magisk module). If you can't, there's nothing we can do about it.
-___
-
-## **Q: How to export playlist?**
-- ***From Retro Music:***
-
-Head to the playlists tab > tap on the three-dot menu on the playlist you want to export > save as a file.
-
-- ***From Other Music Players:***
-
-In your built-in music player, there should be an option to save that playlist as a file. Save them and import them from the file manager by opening it into retro music.
-
-> Note that such playlist must be of your offline music only since retro music is an offline music player, not an online music player. So if your playlist is of online music, it can't be opened on other offline players nor can be exported
-___
-
-## **Q: How to restore/import playlist?**
-Retro Music will automatically detect any playlist file when that playlist file is stored in internal storage/Playlist. However, if it doesn't, just open any "File manager" and open that playlist file with Retro Music.
-
-For restoring playlists successfully, the location of songs must be the same in both the "Playlist" file and in your storage. For example, If your music is in "Internal storage/Music" and the playlist file has songs location "Internal storage/Songs". Then it will not be going to work since both these locations are different.
\ No newline at end of file
+##### Q: Why my playlist/playlist songs keep disappearing?
+Playlist/Playlist songs disappearing is based on android media store system. Save those playlist as file(Tap on three dot menu next to available playlist and save as file) and it should get fixed.
diff --git a/README.md b/README.md
index ca4bd8b1b..632a710f2 100644
--- a/README.md
+++ b/README.md
@@ -1,97 +1,36 @@
-# Metro
+# Retro Music Player
 
-Material Design music player for Android music lovers
+[![License: GPL v3](https://img.shields.io/badge/License-GPL%20v3-blue.svg)](https://github.com/h4h13/RetroMusicPlayer/blob/master/LICENSE.txt)
 
-## Downloads
+**Android Material Design music player**
 
-[<img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
-     alt="Get it on F-Droid"
-     height="80">](https://f-droid.org/en/packages/io.github.muntashirakon.Music/)
+Retro Music is an open source, local music player for Android.
 
-## Differences between Metro and [RetroMusicPlayer](https://github.com/h4h13/RetroMusicPlayer)
-- Google Play libraries removed (fully libre)
-- Pro features available for free
-- Fully offline (INTERNET permission removed)
-- Bug fixes
-- Minor differences in UI
+#### Features
 
-## 📱 Screenshots
-### App Themes
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg" width="200"/> | <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg" width="200"/> |
-|:---:|:---:|:---:|
-|Clearly white| Kinda dark | Just black|
+- Local playback only (based on the MediaStore)
+- Sleep timer
+- Folder browser
+- Home screen widgets
+- Themes (Just Black, Kinda Dark, Clearly White)
+- Now playing themes
+- Volume controls
+- Blacklist
+- Album artist support
 
-### Player screen
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg" width="200"/>| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg" width="200"/>|
-|:---:|:---:|:---:|:---:|:---:|
-| Home | Songs | Albums | Artists | Settings |
+#### Download
 
-### Synced lyrics screen (Over Cover)
-| <img src="screenshots/synced_over_light.jpg" width="200"/>| <img src="screenshots/synced_over_dark.jpg" width="200"/>| <img src="screenshots/synced_over_black.jpg" width="200"/>|
-|:---:|:---:|:---:|
-| Synced Over Cover light | Synced Over Cover dark | Synced Over Cover black |
+<a href='https://play.google.com/store/apps/details?id=code.name.monkey.retromusic&hl=en&pcampaignid=MKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img width="250" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png'/></a>
 
-### Synced lyrics screen (Replace Cover)
-| <img src="screenshots/synced_replace_light.jpg" width="200"/>| <img src="screenshots/synced_replace_dark.jpg" width="200"/>| <img src="screenshots/synced_replace_black.jpg" width="200"/>|
-|:---:|:---:|:---:|
-| Synced Replace Cover light | Synced Replace Cover dark | Synced Replace Cover black |
-
-### 10+ Now playing themes
-| <img src="fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg" width="200"/>	|<img src="screenshots/fit.jpg" width="200"/>|   <img src="screenshots/flat.jpg" width="200"/>  	|    <img src="screenshots/color.jpg" width="200"/> 	|     <img src="screenshots/material.jpg" width="200"/>	|
-|:-----:	|:-----:	|:-----:	|:-----:	|:-----:	|
-| Normal 	| Fit 	| Flat 	| Color 	| Material 	|
-
-| <img src="screenshots/classic.jpg" width="200"/>	|<img src="screenshots/adaptive.jpg" width="200"/>|   <img src="screenshots/blur.jpg" width="200"/>  	|    <img src="screenshots/tiny.jpg" width="200"/> 	|     <img src="screenshots/peek.jpg" width="200"/>	|
-|:-----:	|:-----:	|:-----:	|:-----:	|:-----:	|
-| Classic 	| Adaptive 	| Blur 	| Tiny 	| Peek 	|
-
-## 🧭 Navigation never made easier 
-Self-explanatory interface without overloaded menus.
-
-## 🎨 Colorful
-You can choose between three different main themes: Clearly White, Kinda
-Dark and Just Black for AMOLED displays. Select your favorite accent
-color from a color palette.
-
-## 🏠 Home
-Where you can view your recently/top played artists, albums and
-favorite songs. No other music player has this feature.
-
-## 📦 Included Features
--  Base 3 themes (Clearly White, Kinda Dark and Just Black)
--  Choose from 10+ now playing themes
--  Driving Mode
--  Headset/Bluetooth support
--  Music duration filter
--  Android auto support
--  Wallpaper accent picker on Android 8.1+
--  Material You support on Android 12+
--  Monet themed icon support on Android 13+
--  Folder support - Play songs by folder
--  Gapless playback
--  Volume controls
--  Carousel effect for album covers
--  Home screen widgets
--  Lock screen playback controls
--  Lyrics screen (download and sync with music)
--  Sleep timer
--  Easy drag to sort playlist & play queue
--  Tag editor
--  Create, edit and import playlists
--  Playing queue with reorder
--  User profile
--  30+ languages support
--  Browse and play your music by songs, albums, artists, playlists and
-  genre
--  Smart Auto Playlists - Recently played, most played and history
--  Build your playlist on the go
-
-We are trying our best to bring you the best user experience. The app is regularly being updated for bug fixes and new features.
-
-## 🗂️ License
-
-Metro is released under the GNU General Public License v3.0
-(GPLv3), which can be found [here](LICENSE.md)
+#### Translations
+Help us translate the app to your language [here](http://monkeycodeapp.oneskyapp.com/collaboration/project?id=238534).
 
 
-> Please note: Metro is an offline music player app. It doesn't support music downloading or online music streaming.
+#### License
+
+Retro Music Player is released under the GNU General Public License v3.0 (GPLv3), which can be found here: [License](LICENSE.md)
+
+#### FAQ [Here](FAQ.md)
+
+#### Change-Log and Release [Here](https://github.com/h4h13/RetroMusicPlayer/releases)
+
diff --git a/app/build.gradle b/app/build.gradle
index cb394ecda..e795a8050 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,30 +1,40 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
-apply plugin: "androidx.navigation.safeargs.kotlin"
-apply plugin: 'kotlin-parcelize'
-apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-kapt'
 
 android {
-    compileSdk 33
-    namespace "code.name.monkey.retromusic"
-
+    compileSdkVersion 28
     defaultConfig {
-        minSdk 21
-        targetSdk 33
+        minSdkVersion 21
+        targetSdkVersion 28
 
+        renderscriptTargetApi 28 //must match target sdk and build tools
         vectorDrawables.useSupportLibrary = true
 
-        applicationId 'io.github.muntashirakon.Music'
-        versionCode 10603
-        versionName '6.1.0'
+        applicationId "code.name.monkey.retromusic"
+        versionCode 394
+        versionName '3.4.850'
 
         multiDexEnabled true
+
+        buildConfigField("String", "GOOGLE_PLAY_LICENSING_KEY", "\"${getProperty(getProperties('../public.properties'), 'GOOGLE_PLAY_LICENSE_KEY')}\"")
+    }
+    signingConfigs {
+        release {
+            Properties properties = getProperties('/Users/hemanths/Desktop/KeepSafe/retro.properties')
+            storeFile file(getProperty(properties, 'storeFile'))
+            keyAlias getProperty(properties, 'keyAlias')
+            storePassword getProperty(properties, 'storePassword')
+            keyPassword getProperty(properties, 'keyPassword')
+        }
     }
     buildTypes {
         release {
-            shrinkResources true
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
         debug {
             applicationIdSuffix '.debug'
@@ -32,101 +42,131 @@ android {
         }
     }
 
-    buildFeatures {
-        viewBinding true
-    }
-    packagingOptions {
-        resources {
-            excludes += ['META-INF/LICENSE', 'META-INF/NOTICE', 'META-INF/java.properties']
+
+    flavorDimensions "default"
+
+    productFlavors {
+        normal {
+            versionCode defaultConfig.versionCode + 10000
+            versionName defaultConfig.versionName + "_" + getDate()
+            dimension "default"
+        }
+        font {
+            versionCode defaultConfig.versionCode + 10000
+            versionName defaultConfig.versionName + "_" + getDate()
+            dimension "default"
         }
     }
-    lint {
-        abortOnError true
-        warning 'ImpliedQuantity', 'Instantiatable', 'MissingQuantity', 'MissingTranslation'
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/rxjava.properties'
+    }
+    lintOptions {
+        disable 'MissingTranslation'
+        disable 'InvalidPackage'
+        abortOnError false
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility '1.8'
+        targetCompatibility '1.8'
     }
-    kotlinOptions {
-        jvmTarget = "1.8"
-    }
-    dependenciesInfo {
-        includeInApk = false
-        includeInBundle = false
-    }
-    configurations.configureEach {
+    buildToolsVersion = '29.0.2'
+
+    configurations.all {
         resolutionStrategy.force 'com.google.code.findbugs:jsr305:1.3.9'
     }
+    androidExtensions {
+        experimental = true
+    }
+    kapt {
+        generateStubs = true
+    }
+
+}
+
+def getProperties(String fileName) {
+    final Properties properties = new Properties()
+    def file = file(fileName)
+    if (file.exists()) {
+        file.withInputStream { stream -> properties.load(stream) }
+    }
+    return properties
+}
+
+static def getProperty(Properties properties, String name) {
+    return properties.getProperty(name) ?: "$name missing"
+}
+
+static def getDate() {
+    new Date().format('MMdd')
 }
 
 
 dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':appthemehelper')
+    implementation 'androidx.multidex:multidex:2.0.1'
+    implementation 'androidx.fragment:fragment:1.2.0-rc02'
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.recyclerview:recyclerview:1.1.0-rc01'
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation 'androidx.annotation:annotation:1.6.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation "androidx.preference:preference-ktx:$preference_version"
-    implementation "androidx.core:core-ktx:$core_version"
+    implementation "androidx.cardview:cardview:1.0.0"
+    implementation "androidx.palette:palette:1.0.0"
+    implementation 'androidx.annotation:annotation:1.1.0'
+    implementation 'androidx.preference:preference:1.1.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.core:core-ktx:1.1.0'
 
-    implementation 'androidx.mediarouter:mediarouter:1.3.1'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    implementation 'com.google.android.play:core:1.6.4'
 
-    implementation "androidx.navigation:navigation-runtime-ktx:$navigation_version"
-    implementation "androidx.navigation:navigation-fragment-ktx:$navigation_version"
-    implementation "androidx.navigation:navigation-ui-ktx:$navigation_version"
+    implementation 'com.squareup.retrofit2:retrofit:2.6.2'
+    implementation 'com.squareup.retrofit2:converter-gson:2.6.2'
+    implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.2'
+    implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
 
-    def room_version = '2.5.1'
-    implementation "androidx.room:room-runtime:$room_version"
-    implementation "androidx.room:room-ktx:$room_version"
-    ksp "androidx.room:room-compiler:$room_version"
+    implementation 'com.afollestad.material-dialogs:core:3.1.1'
+    implementation 'com.afollestad.material-dialogs:input:3.1.1'
+    implementation 'com.afollestad.material-dialogs:color:3.1.1'
+    implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.1'
+    implementation 'com.afollestad:material-cab:0.1.12'
 
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
-    implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
 
-    implementation "androidx.core:core-splashscreen:1.0.0"
+    implementation 'com.github.bumptech.glide:glide:3.8.0'
+    implementation 'com.github.bumptech.glide:okhttp3-integration:1.5.0'
 
-    implementation "com.google.android.material:material:$mdc_version"
+    implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
+    implementation 'io.reactivex.rxjava2:rxjava:2.2.9'
 
-    def retrofit_version = '2.9.0'
-    implementation "com.squareup.retrofit2:retrofit:$retrofit_version"
-    implementation "com.squareup.retrofit2:converter-gson:$retrofit_version"
+    implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') {
+        transitive = true
+    }
 
-    def material_dialog_version = "3.3.0"
-    implementation "com.afollestad.material-dialogs:core:$material_dialog_version"
-    implementation "com.afollestad.material-dialogs:input:$material_dialog_version"
-    implementation "com.afollestad.material-dialogs:color:$material_dialog_version"
+    /*UI Library*/
+    implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
 
-    implementation 'com.afollestad:material-cab:2.0.1'
 
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1"
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.1.1"
 
-    def koin_version = '3.4.0'
-    implementation "io.insert-koin:koin-core:$koin_version"
-    implementation "io.insert-koin:koin-android:$koin_version"
 
-    def glide_version = '4.15.1'
-    implementation "com.github.bumptech.glide:glide:$glide_version"
-    ksp "com.github.bumptech.glide:ksp:$glide_version"
+    implementation 'org.eclipse.mylyn.github:org.eclipse.egit.github.core:3.4.0.201406110918-r'
 
-    implementation 'com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:1.0.0'
+    implementation 'com.github.ksoichiro:android-observablescrollview:1.6.0'
+    implementation 'com.github.kabouzeid:recyclerview-fastscroll:1.9-kmod'
 
-    implementation 'com.github.bosphere.android-fadingedgelayout:fadingedgelayout:1.0.0'
+    implementation 'com.github.AdrienPoupa:jaudiotagger:2.2.3'
 
-    implementation 'net.yslibrary.keyboardvisibilityevent:keyboardvisibilityevent:3.0.0-RC3'
-    implementation 'com.github.jetradarmobile:android-snowfall:1.2.1'
-
-    implementation "dev.chrisbanes.insetter:insetter:0.6.1"
-
-    implementation 'com.github.Adonai:jaudiotagger:2.3.15'
+    implementation 'com.anjlab.android.iab.v3:library:1.1.0'
     implementation 'com.r0adkll:slidableactivity:2.1.0'
-    implementation 'com.heinrichreimersoftware:material-intro:2.0.0'
-    implementation 'com.github.dhaval2404:imagepicker:2.1'
-    implementation 'me.zhanghai.android.fastscroll:library:1.2.0'
-    implementation 'cat.ereza:customactivityoncrash:2.4.0'
-    implementation 'me.tankery.lib:circularSeekBar:1.4.2'
+    implementation 'com.heinrichreimersoftware:material-intro:1.6'
+
+    implementation 'com.google.dagger:dagger:2.23.1'
+    kapt 'com.google.dagger:dagger-compiler:2.23.1'
+
+
 }
\ No newline at end of file
diff --git a/app/libs/juniversalchardet-1.0.3.jar b/app/libs/juniversalchardet-1.0.3.jar
new file mode 100644
index 000000000..1af703fec
Binary files /dev/null and b/app/libs/juniversalchardet-1.0.3.jar differ
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index c9f1d0067..9eec68241 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -16,9 +16,9 @@
 #   public *;
 #}
 
-# Preserve the line number information for
+# Uncomment this to preserve the line number information for
 # debugging stack traces.
--keepattributes SourceFile,LineNumberTable
+#-keepattributes SourceFile,LineNumberTable
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
@@ -26,46 +26,45 @@
 
 -dontwarn java.lang.invoke.*
 -dontwarn **$$Lambda$*
--dontwarn javax.annotation.**
 
 # RetroFit
 -dontwarn retrofit.**
 -keep class retrofit.** { *; }
+-keepattributes Signature
+-keepattributes Exceptions
+-dontwarn javax.annotation.**
 
 # Glide
 -keep public class * implements com.bumptech.glide.module.GlideModule
--keep class * extends com.bumptech.glide.module.AppGlideModule {
- <init>(...);
-}
--keep public enum com.bumptech.glide.load.ImageHeaderParser$** {
-  **[] $VALUES;
-  public *;
-}
--keep class com.bumptech.glide.load.data.ParcelFileDescriptorRewinder$InternalRewinder {
-  *** rewind();
+-keep public enum com.bumptech.glide.load.resource.bitmap.ImageHeaderParser$** {
+    **[] $VALUES;
+    public *;
 }
 
-# OkHttp
--keepattributes Signature
--keepattributes *Annotation*
--keep interface com.squareup.okhttp3.** { *; }
--dontwarn com.squareup.okhttp3.**
+-keep class !android.support.v7.internal.view.menu.**,** {*;}
 
-#-dontwarn
-#-ignorewarnings
+-dontwarn
+-ignorewarnings
 
-#Jaudiotagger
--dontwarn org.jaudiotagger.**
--dontwarn org.jcodec.**
--keep class org.jaudiotagger.** { *; }
--keep class org.jcodec.** { *; }
+# ------- FastScrollRecycleView START -------
+-keep class com.simplecityapps.recyclerview_fastscroll.views.FastScrollPopup { *; }
+# ------- FastScrollRecycleView END -------
 
--keepclassmembers enum * { *; }
--keepattributes *Annotation*, Signature, Exception
--keepnames class androidx.navigation.fragment.NavHostFragment
--keep class * extends androidx.fragment.app.Fragment{}
--keepnames class * extends android.os.Parcelable
--keepnames class * extends java.io.Serializable
--keep class code.name.monkey.retromusic.network.model.** { *; }
--keep class code.name.monkey.retromusic.model.** { *; }
--keep class com.google.android.material.bottomsheet.** { *; }
\ No newline at end of file
+-keep public class android.support.design.widget.BottomNavigationView { *; }
+-keep public class android.support.design.internal.BottomNavigationMenuView { *; }
+-keep public class android.support.design.internal.BottomNavigationPresenter { *; }
+-keep public class android.support.design.internal.BottomNavigationItemView { *; }
+
+#-dontwarn android.support.v8.renderscript.*
+#-keepclassmembers class android.support.v8.renderscript.RenderScript {
+#  native *** rsn*(...);
+#  native *** n*(...);
+#}
+
+#-keep class org.jaudiotagger.** { *; }
+
+#For cast
+-keep class code.name.monkey.retromusic.cast.CastOptionsProvider { *; }
+-keep class android.support.** { *; }
+-keep class com.google.** { *; }
+-keep class java.nio.file.** { *; }
\ No newline at end of file
diff --git a/app/src/debug/res/font/bold.ttf b/app/src/debug/res/font/bold.ttf
deleted file mode 100644
index 96619df92..000000000
Binary files a/app/src/debug/res/font/bold.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/google_sans_bold.ttf b/app/src/debug/res/font/google_sans_bold.ttf
deleted file mode 100644
index 80497666e..000000000
Binary files a/app/src/debug/res/font/google_sans_bold.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/google_sans_medium.ttf b/app/src/debug/res/font/google_sans_medium.ttf
deleted file mode 100644
index 1543660da..000000000
Binary files a/app/src/debug/res/font/google_sans_medium.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/google_sans_regular.ttf b/app/src/debug/res/font/google_sans_regular.ttf
deleted file mode 100644
index ab605f9e2..000000000
Binary files a/app/src/debug/res/font/google_sans_regular.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/medium.ttf b/app/src/debug/res/font/medium.ttf
deleted file mode 100644
index fd818d6f5..000000000
Binary files a/app/src/debug/res/font/medium.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/regular.ttf b/app/src/debug/res/font/regular.ttf
deleted file mode 100644
index e2c69c3fb..000000000
Binary files a/app/src/debug/res/font/regular.ttf and /dev/null differ
diff --git a/app/src/debug/res/font/sans.xml b/app/src/debug/res/font/sans.xml
deleted file mode 100644
index 7bbc8513b..000000000
--- a/app/src/debug/res/font/sans.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
-    <font
-        android:font="@font/google_sans_regular"
-        android:fontWeight="400" />
-    <font
-        android:font="@font/google_sans_medium"
-        android:fontWeight="600" />
-    <font
-        android:font="@font/google_sans_bold"
-        android:fontWeight="700" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/debug/res/values/bools.xml b/app/src/debug/res/values/bools.xml
deleted file mode 100644
index 7d3f0ee62..000000000
--- a/app/src/debug/res/values/bools.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="md3_available">true</bool>
-    <bool name="allowBackup">false</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/debug/res/values/donottranslate.xml b/app/src/debug/res/values/donottranslate.xml
deleted file mode 100644
index 79e559838..000000000
--- a/app/src/debug/res/values/donottranslate.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name" translatable="false">Metro Debug</string>
-</resources>
\ No newline at end of file
diff --git a/app/src/debug/res/values/styles.xml b/app/src/debug/res/values/styles.xml
deleted file mode 100644
index f3761b219..000000000
--- a/app/src/debug/res/values/styles.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="TextViewNormal" parent="">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewNormalCompress" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="android:textSize">14sp</item>
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewHeadline4.Compress" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="fontFamily">@font/sans</item>
-        <item name="android:textSize">32sp</item>
-    </style>
-
-    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewButton" parent="TextAppearance.MaterialComponents.Button">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
-        <item name="fontFamily">@font/sans</item>
-    </style>
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Button" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textAppearance">@style/TextViewButton</item>
-        <item name="fontFamily">@font/sans</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:padding">0dp</item>
-    </style>
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.MaterialComponents.Body.Text">
-        <item name="android:textAppearance">@style/TextViewBody1</item>
-        <item name="fontFamily">@font/sans</item>
-        <item name="android:paddingTop">16dp</item>
-    </style>
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.MaterialComponents.Title.Text">
-        <item name="android:textAppearance">@style/TextViewHeadline6</item>
-        <item name="android:textStyle">bold</item>
-        <item name="fontFamily">@font/sans</item>
-        <item name="android:padding">16dp</item>
-    </style>
-
-    <style name="ToolbarTextAppearanceNormal">
-        <item name="android:textStyle">bold</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:textAppearance">@style/TextViewHeadline6</item>
-        <item name="fontFamily">@font/sans</item>
-        <item name="android:textSize">20sp</item>
-        <item name="android:letterSpacing">0.0125</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
-    <style name="circleImageView" parent="ShapeAppearance.MaterialComponents">
-        <item name="cornerSize">40dp</item>
-    </style>
-
-    <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:textSize">13sp</item>
-        <item name="fontFamily">@font/sans</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 14fbaaab7..2941835c5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,57 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    package="code.name.monkey.retromusic"
-    android:installLocation="auto">
+    package="code.name.monkey.retromusic">
 
-    <uses-permission
-        android:name="android.permission.BLUETOOTH"
-        android:maxSdkVersion="30" />
-    <uses-permission android:name="android.permission.DISABLE_KEYGUARD" />
-    <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission
-        android:name="android.permission.READ_EXTERNAL_STORAGE"
-        android:maxSdkVersion="32" />
-    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
-    <uses-permission
-        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
-        android:maxSdkVersion="29" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission
-        android:name="android.permission.WRITE_SETTINGS"
+    <uses-permission android:name="android.permission.WRITE_SETTINGS"
         tools:ignore="ProtectedPermissions" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission
-        android:name="android.permission.BLUETOOTH_CONNECT"
-        android:usesPermissionFlags="neverForLocation"
-        tools:targetApi="s" />
+    <uses-permission android:name="com.android.vending.BILLING" />
+
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
 
     <application
         android:name=".App"
-        android:allowBackup="@bool/allowBackup"
-        android:appCategory="audio"
-        android:configChanges="locale|layoutDirection"
-        android:enableOnBackInvokedCallback="true"
+        android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:localeConfig="@xml/locales_config"
-        android:requestLegacyExternalStorage="true"
-        android:restoreAnyVersion="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.RetroMusic.FollowSystem"
-        android:usesCleartextTraffic="true"
-        tools:ignore="UnusedAttribute">
+        android:usesCleartextTraffic="false"
+        tools:ignore="AllowBackup,GoogleAppIndexingWarning"
+        tools:targetApi="m">
         <activity
             android:name=".activities.MainActivity"
-            android:exported="true"
-            android:launchMode="singleTop"
-            android:theme="@style/Theme.RetroMusic.SplashScreen">
+            android:theme="@style/SplashTheme"
+            android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MUSIC_PLAYER" />
@@ -62,6 +41,7 @@
             </intent-filter>
             <intent-filter>
                 <action android:name="android.media.action.MEDIA_PLAY_FROM_SEARCH" />
+
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
             <intent-filter>
@@ -121,54 +101,31 @@
                 <data android:mimeType="vnd.android.cursor.dir/audio" />
             </intent-filter>
         </activity>
+        <activity android:name=".activities.AlbumDetailsActivity" />
+        <activity android:name=".activities.ArtistDetailActivity" />
+        <activity android:name=".activities.PlaylistDetailActivity" />
+        <activity android:name=".activities.PlayingQueueActivity" />
+        <activity android:name=".activities.AboutActivity" />
         <activity android:name=".activities.tageditor.AlbumTagEditorActivity" />
         <activity android:name=".activities.tageditor.SongTagEditorActivity" />
+        <activity android:name=".activities.SettingsActivity" />
+        <activity android:name=".activities.LyricsActivity" />
+        <activity android:name=".activities.UserInfoActivity" />
+        <activity android:name=".activities.SupportDevelopmentActivity" />
+        <activity android:name=".activities.GenreDetailsActivity" />
         <activity android:name=".activities.LicenseActivity" />
+        <activity android:name=".activities.PurchaseActivity" />
+        <activity android:name=".activities.WhatsNewActivity" />
         <activity android:name=".activities.bugreport.BugReportActivity" />
-        <activity android:name=".activities.ShareInstagramStory" />
-        <activity android:name=".activities.DriveModeActivity" />
-        <activity android:name=".activities.PermissionActivity" />
+
+        <activity
+            android:name=".activities.SearchActivity"
+            android:windowSoftInputMode="stateVisible" />
+
         <activity
             android:name=".activities.LockScreenActivity"
-            android:excludeFromRecents="true"
-            android:launchMode="singleTask"
+            android:noHistory="true"
             android:showOnLockScreen="true" />
-        <activity
-            android:name=".fragments.backup.RestoreActivity"
-            android:excludeFromRecents="false"
-            android:exported="true"
-            android:label="@string/restore"
-            android:theme="@style/Theme.RetroMusic.Dialog">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:mimeType="application/octet-stream" />
-                <data android:mimeType="application/x-zip-compressed" />
-                <data android:mimeType="application/zip" />
-
-                <data android:scheme="file" />
-                <data android:scheme="content" />
-                <data android:mimeType="*/*" />
-                <!--
-                    Work around Android's ugly primitive PatternMatcher
-                    implementation that can't cope with finding a . early in
-                    the path unless it's explicitly matched.
-                -->
-                <data android:host="*" />
-                <data android:pathPattern=".*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.rmbak" />
-                <data android:pathPattern=".*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\..*\\.rmbak" />
-            </intent-filter>
-        </activity>
 
         <activity
             android:name=".appshortcuts.AppShortcutLauncherActivity"
@@ -179,13 +136,16 @@
             android:name=".activities.saf.SAFGuideActivity"
             android:theme="@style/Theme.Intro" />
 
-        <activity
-            android:name=".activities.ErrorActivity"
-            android:exported="true">
-            <intent-filter>
-                <action android:name="cat.ereza.customactivityoncrash.RESTART" />
-            </intent-filter>
-        </activity>
+        <provider
+            android:name=".misc.GenericFileProvider"
+            android:authorities="${applicationId}.provider"
+            android:exported="false"
+            android:grantUriPermissions="true">
+            <meta-data
+                android:name="android.support.FILE_PROVIDER_PATHS"
+                android:resource="@xml/provider_paths" />
+        </provider>
+
 
         <provider
             android:name="androidx.core.content.FileProvider"
@@ -197,17 +157,13 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
-        <receiver
-            android:name=".service.MediaButtonIntentReceiver"
-            android:exported="true">
+        <receiver android:name=".service.MediaButtonIntentReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.MEDIA_BUTTON" />
             </intent-filter>
         </receiver>
 
-        <receiver
-            android:name=".appwidgets.BootReceiver"
-            android:exported="true">
+        <receiver android:name=".appwidgets.BootReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
@@ -216,7 +172,7 @@
 
         <receiver
             android:name=".appwidgets.AppWidgetBig"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/app_widget_big_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -229,7 +185,7 @@
 
         <receiver
             android:name=".appwidgets.AppWidgetClassic"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/app_widget_classic_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -241,7 +197,7 @@
         </receiver>
         <receiver
             android:name=".appwidgets.AppWidgetSmall"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/app_widget_small_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -253,7 +209,7 @@
         </receiver>
         <receiver
             android:name=".appwidgets.AppWidgetText"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/app_widget_text_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -265,7 +221,7 @@
         </receiver>
         <receiver
             android:name=".appwidgets.AppWidgetCard"
-            android:exported="true"
+            android:exported="false"
             android:label="@string/app_widget_card_name">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -275,36 +231,13 @@
                 android:name="android.appwidget.provider"
                 android:resource="@xml/app_widget_card_info" />
         </receiver>
-        <receiver
-            android:name=".appwidgets.AppWidgetMD3"
-            android:exported="true"
-            android:label="@string/app_widget_md3_name">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_md3_info" />
-        </receiver>
-        <receiver
-            android:name=".appwidgets.AppWidgetCircle"
-            android:exported="true"
-            android:label="@string/app_widget_circle_name">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/app_widget_circle_info" />
-        </receiver>
 
         <service
             android:name=".service.MusicService"
+            android:enabled="true"
             android:exported="true"
-            android:foregroundServiceType="mediaPlayback"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            tools:ignore="ExportedService">
             <intent-filter>
                 <action android:name="android.media.browse.MediaBrowserService" />
             </intent-filter>
@@ -318,33 +251,15 @@
             android:name="com.lge.support.SPLIT_WINDOW"
             android:value="true" />
 
-        <!-- Android Auto -->
         <meta-data
-            android:name="com.google.android.gms.car.application"
-            android:resource="@xml/automotive_app_desc" />
-        <meta-data
-            android:name="com.google.android.gms.car.application.theme"
-            android:resource="@style/CarTheme" />
-        <meta-data
-            android:name="com.google.android.gms.car.notification.SmallIcon"
-            android:resource="@drawable/ic_notification" />
+            android:name="code.name.monkey.retromusic.glide.RetroMusicGlideModule"
+            android:value="GlideModule" />
 
-        <!-- For auto-storage of locale on Android 12 and lower -->
-        <service
-            android:name="androidx.appcompat.app.AppLocalesMetadataHolderService"
-            android:enabled="false"
-            android:exported="false">
-            <meta-data
-                android:name="autoStoreLocales"
-                android:value="true" />
-        </service>
+        <meta-data
+            android:name="com.bumptech.glide.integration.okhttp3.OkHttpGlideModule"
+            android:value="GlideModule" />
+        <meta-data
+            android:name="com.android.vending.splits.required"
+            android:value="true" />
     </application>
-
-    <!--
-    This is not that important, it's just here so that we can query equalizer package
-    and check if it's present on A11+ because of Package visibility restrictions.
-    -->
-    <queries>
-        <package android:name="com.android.musicfx" />
-    </queries>
 </manifest>
diff --git a/app/src/main/assets/contributors.json b/app/src/main/assets/contributors.json
new file mode 100644
index 000000000..e84023c32
--- /dev/null
+++ b/app/src/main/assets/contributors.json
@@ -0,0 +1,32 @@
+[
+  {
+    "name": "Hemanth Savarala",
+    "summary": "Lead developer",
+    "link": "https://github.com/h4h13",
+    "profile_image": "https://i.imgur.com/AoVs9oj.jpg"
+  },
+  {
+    "name": "Lennart Glamann",
+    "summary": "Designer",
+    "link": "https://t.me/FlixbusLennart",
+    "profile_image": "https://i.imgur.com/Q5Nsx1R.jpg"
+  },
+  {
+    "name": "Gaming Inc.",
+    "summary": "Telegram group maintainer",
+    "link": "https://www.gaminginc.tk/",
+    "profile_image": "https://i.imgur.com/pfvN7d9.png"
+  },
+  {
+    "name": "Milind Goel",
+    "summary": "Github & Telegram maintainer",
+    "link": "https://t.me/MilindGoel15",
+    "profile_image": "https://i.imgur.com/Bz4De21_d.jpg"
+  },
+  {
+    "name": "Abilas Sathiya",
+    "summary": "Design & Suggestions",
+    "link": "https://t.me/@abs2606",
+    "profile_image": "https://i.imgur.com/MUyEWlx.jpg"
+  }
+]
\ No newline at end of file
diff --git a/app/src/main/assets/images/daksh.png b/app/src/main/assets/images/daksh.png
deleted file mode 100644
index 737f9066c..000000000
Binary files a/app/src/main/assets/images/daksh.png and /dev/null differ
diff --git a/app/src/main/assets/images/haythem.jpg b/app/src/main/assets/images/haythem.jpg
deleted file mode 100644
index c74527f1d..000000000
Binary files a/app/src/main/assets/images/haythem.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/hemanth.jpg b/app/src/main/assets/images/hemanth.jpg
deleted file mode 100644
index b8f5e7805..000000000
Binary files a/app/src/main/assets/images/hemanth.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/lenny.jpg b/app/src/main/assets/images/lenny.jpg
deleted file mode 100644
index 7f8025f08..000000000
Binary files a/app/src/main/assets/images/lenny.jpg and /dev/null differ
diff --git a/app/src/main/assets/images/milind.png b/app/src/main/assets/images/milind.png
deleted file mode 100644
index bbf9b8278..000000000
Binary files a/app/src/main/assets/images/milind.png and /dev/null differ
diff --git a/app/src/main/assets/images/pratham.jpg b/app/src/main/assets/images/pratham.jpg
deleted file mode 100644
index 7f05ad9d5..000000000
Binary files a/app/src/main/assets/images/pratham.jpg and /dev/null differ
diff --git a/app/src/main/assets/index.html b/app/src/main/assets/index.html
new file mode 100644
index 000000000..4d858fba4
--- /dev/null
+++ b/app/src/main/assets/index.html
@@ -0,0 +1,68 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <style type="text/css" media="screen">
+
+    * {
+    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><b><a href="https://github.com/kabouzeid/Phonograph" title="Phonograph"> Phonograph</a></b> by
+    Karim Abou Zeid</p>
+<p><b><a href="https://github.com/AdrienPoupa/VinylMusicPlayer" title="VinylMusicPlayer">
+    VinylMusicPlayer</a></b> by Adrien Poupa</p>
+<p><b><a href="https://github.com/ReactiveX/RxAndroid" title="RxJava"> RxJava</a></b> by RxJava
+    authors</p>
+<p><b><a href="https://github.com/afollestad" title="Material Dialogs"> Material Dialogs and Cab</a></b>
+    by Aidan Michael Follestad</p>
+<p><b><a href="https://github.com/umano/AndroidSlidingUpPanel" title="Android Sliding Up Panel">
+    Android Sliding Up Panel</a></b>by The Umano Team</p>
+<p><b><a href="http://developer.android.com/tools/support-library/index.html"
+         title="AOSP Support Libraries"> AOSP Support Libraries</a></b>by AOSP contributors</p>
+<p><b><a href="https://github.com/bumptech/glide" title="Glide"> Glide</a></b> by Sam Judd</p>
+<p><b><a href="https://github.com/square/retrofit" title="Retrofit"> Retrofit</a></b> by Square team
+</p>
+<p><b><a href="https://github.com/afollestad/material-cab" title="Material Contextual Action Bar">
+    Material Contextual Action Bar</a></b> by Aidan Michael Follestad</p>
+<p><b><a href="http://square.github.io/okhttp/" title="OkHttp"> OkHttp</a></b> by Square team</p>
+<p><b><a href="https://github.com/hdodenhof/CircleImageView" title="CircleImageView">
+    CircleImageView</a></b> by Henning Dodenhof</p>
+<p><b><a href="https://github.com/DreaminginCodeZH/MaterialProgressBar" title="MaterialProgressBar">
+    MaterialProgressBar</a></b> by Zhang Hai</p>
+<p><b><a href="https://github.com/anjlab/android-inapp-billing-v3"
+         title="Android In-App Billing v3 Library"> Android In-App Billing v3 Library</a></b> by
+    Henning Dodenhof</p>
+<p><b><a href="https://github.com/h6ah4i/android-advancedrecyclerview"
+         title="Advanced RecyclerView"> Advanced RecyclerView</a></b> by Haruki Hasegawa</p>
+<p><b><a href="https://github.com/ksoichiro/Android-ObservableScrollView"
+         title="Android-ObservableScrollView"> Android-ObservableScrollView</a></b> by Soichiro
+    Kashima</p>
+<p><b><a href="http://www.cufonfonts.com/es/font/14289/circular-std-book" title="Font used"> Font
+    used(CIRCULAR STD BOOK FONT)</a></b> by NIELSON CAETANO</p>
+<p><b><a href="https://materialdesignicons.com" title="Icons"> Icons</a></b> by Austin Andrews</p>
+<p><b><a href="https://www.techjuice.pk" title="City wallpaper"> Material Design City Wallpaper</a></b>
+</p>
+</body>
+
+</html>
diff --git a/app/src/main/assets/license.html b/app/src/main/assets/license.html
deleted file mode 100644
index 2fd8ba5ed..000000000
--- a/app/src/main/assets/license.html
+++ /dev/null
@@ -1,76 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-    <meta charset="utf-8">
-    <meta content="IE=edge" http-equiv="X-UA-Compatible">
-    <style media="screen" 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><b><a href="https://github.com/kabouzeid/Phonograph" title="Phonograph"> Phonograph</a></b> by
-    Karim Abou Zeid</p>
-<p><b><a href="http://developer.android.com/tools/support-library/index.html"
-         title="AOSP Support Libraries">AOSP Support Libraries</a></b> by AOSP contributors</p>
-<p><b><a href="https://github.com/bumptech/glide" title="Glide"> Glide</a></b> by Sam Judd</p>
-<p><b><a href="https://github.com/square/retrofit" title="Retrofit"> Retrofit</a></b> by Square team
-</p>
-<p><b><a href="http://square.github.io/okhttp/" title="OkHttp"> OkHttp</a></b> by Square team</p>
-<p><b><a href="https://github.com/InsertKoinIO/koin"
-         title="Koin">Koin</a></b> by Arnaud Giuliani</p>
-<p><b><a href="https://github.com/afollestad" title="Material Dialogs"> Material Dialogs and Cab</a></b>
-    by Aidan Michael Follestad</p>
-<p><b><a href="https://github.com/afollestad/material-cab" title="Material Contextual Action Bar">
-    Material Contextual Action Bar</a></b> by Aidan Michael Follestad</p>
-<p><b><a href="https://github.com/h6ah4i/android-advancedrecyclerview"
-         title="Advanced RecyclerView"> Advanced RecyclerView</a></b> by Haruki Hasegawa</p>
-<p><b><a href="https://github.com/Ereza/CustomActivityOnCrash"
-         title="Custom Activity on Crash">Custom Activity on Crash</a></b> by Eduard Ereza Martínez
-</p>
-<p><b><a href="https://github.com/NanoHttpd/nanohttpd"
-         title="NanoHttpd">NanoHttpd</a></b> by NanoHttpd Team</p>
-<p><b><a href="https://github.com/tankery/CircularSeekBar"
-         title="Circular Seekbar">Circular Seekbar</a></b> by Tankery</p>
-<p><b><a href="https://github.com/Kaned1as/jaudiotagger"
-         title="jAudioTagger">jAudioTagger</a></b> by Kanedias</p>
-<p><b><a href="https://github.com/zhanghai/AndroidFastScroll"
-         title="Android Fast Scroll">Android Fast Scroll</a></b> by Zhang Hai</p>
-<p><b><a href="https://github.com/Dhaval2404/ImagePicker"
-         title="Image Picker">Image Picker</a></b> by Dhaval Patel</p>
-<p><b><a href="https://github.com/heinrichreimer/material-intro"
-         title="Material Intro">Material Intro</a></b> by Jan Heinrich Reimer</p>
-<p><b><a href="https://github.com/r0adkll/Slidr"
-         title="Slidr">Slidr</a></b> by Drew Heavner</p>
-<p><b><a href="https://github.com/bosphere/Android-FadingEdgeLayout"
-         title="FadingEdgeLayout">FadingEdgeLayout</a></b> by bosphere</p>
-<p><b><a href="https://github.com/yshrsmz/KeyboardVisibilityEvent"
-         title="KeyboardVisibilityEvent">KeyboardVisibilityEvent</a></b> by Yasuhiro SHIMIZU</p>
-<p><b><a href="https://github.com/JetradarMobile/android-snowfall"
-         title="android-snowfall">android-snowfall</a></b> by Jetradar Mobile</p>
-<p><b><a href="https://github.com/chrisbanes/insetter"
-         title="Insetter">Insetter</a></b> by Chris Banes</p>
-<p><b><a href="https://materialdesignicons.com" title="Icons"> Icons</a></b> by Austin Andrews</p>
-<p><b><a href="https://www.techjuice.pk" title="City wallpaper"> Material Design City Wallpaper</a></b>
-</p>
-</body>
-</html>
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index b6b1c411a..dc00d3156 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1,466 +1 @@
-<html>
-
-<head>
-    <style type="text/css">
-        * {
-            word-wrap: break-word;
-        }
-
-        div {
-            margin: 20px 10px;
-            padding: 10px;
-            border-radius: 10px;
-            box-shadow: 0px 0px 10px rgba(0, 0, 0, 0.2);
-        }
-
-        h2 {
-            margin-block-end: 0rem;
-            margin-block-start: 0rem;
-            display: inline-block;
-            vertical-align: center;
-        }
-
-        li {
-            font-size: 0.85rem;
-            padding: 0.5rem 0;
-        }
-
-        ul {
-            padding-left: 1.5rem;
-            margin-top: 0rem;
-            margin-bottom: 0rem;
-        }
-
-        p {
-            font-size: 0.8rem;
-        }
-
-        span {
-            font-size: 0.7rem;
-        }
-
-        h5 {
-            margin-block-start: 0;
-            margin-block-end: 0.5rem;
-        }
-
-        h3 {
-            margin: 10px 0px;
-            font-size: 1rem;
-        }
-
-        .tag {
-            border-radius: 5px;
-            margin-left: 10px;
-            padding: 5px;
-            display: inline-block;
-            vertical-align: top;
-        }
-
-        {style-placeholder}
-    </style>
-</head>
-
-<body>
-
-<div>
-    <h5>March 30, 2023</h5>
-    <h2>v6.1.0</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>App now targets Android 13, support for Granular media permissions, Photo picker, Per-app language preferences & Predictive back gesture</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed playlist reordering crash</li>
-        <li>Other minor bugs fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>March 13, 2023</h5>
-    <h2>v6.0.4</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Minor redesign in Playlist details screen</li>
-        <li>Updated translations</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed file popup menu actions in Folders tab</li>
-        <li>Fixed playlist image loading</li>
-        <li>Fixed blurry album art in Android 13</li>
-        <li>Minor bug fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>July 10, 2022</h5>
-    <h2>v6.0.3<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Migrated icons to Material symbols</li>
-    </ul>
-</div>
-<div>
-    <h5>June 21, 2022</h5>
-    <h2>v6.0.2<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Minor bug fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>June 13, 2022</h5>
-    <h2>v6.0.1<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed ChromeCast crash</li>
-        <li>Fixed Slider crashes</li>
-        <li>Fixed storage related crashes on Android 10</li>
-        <li>Fixed CrossFade not working Fade Audio is not working</li>
-    </ul>
-</div>
-<div>
-    <h5>June 7, 2022</h5>
-    <h2>v6.0.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Better Cast</li>
-        <li>Mini player in settings screen</li>
-        <li>Changed Seekbar with Sliders</li>
-        <li>Added NavigationRailView for Landscape</li>
-        <li>Show remaining time in Sleep timer dialog</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Top/Recent Artists/Albums not updating (Wrong sort order)</li>
-        <li>Fixed all Blacklist related crashes</li>
-        <li>Fix restart button not working in crash activity</li>
-    </ul>
-</div>
-<div>
-    <h5>May 25, 2022</h5>
-    <h2>v5.8.5</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Display song images along in the artist and album details pages</li>
-        <li>Removed the Internet permissions and all the associated features</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed crashing occurs during changing screen orientation</li>
-    </ul>
-</div>
-<div>
-    <h5>May 13, 2022</h5>
-    <h2>v5.8.4</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added a toggle to enable/disable swipe down to dismiss mini player</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Playback speed and pitch not working when CrossFade is enabled</li>
-        <li>Fixed crash when adding folders to blacklist</li>
-        <li>Fix bugs in MD3 theme</li>
-    </ul>
-</div>
-<div>
-    <h5>May 07, 2022</h5>
-    <h2>v5.8.3</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added a new MD3 now playing theme</li>
-        <li>Swipe down to dismiss Mini player</li>
-        <li>Add support for Just Black with Material You</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed sharing of files from SD Card</li>
-        <li>Fix ChromeCast crash and bugs</li>
-        <li>Fix Audio Crossfade</li>
-        <li>Tried to fix incorrect song data in notification</li>
-    </ul>
-</div>
-<div>
-    <h5>April 8, 2022</h5>
-    <h2>v5.8.0</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Updated translations</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Classic Notification crash</li>
-        <li>Fixed crash when clicking on Playlist in the Search Tab</li>
-        <li>Fixed settings change not reflecting immediately</li>
-        <li>Fixed shuffle</li>
-        <li>Fixed Song duration not visible in Card & Blur card themes</li>
-        <li>Fixed some Album skip styles</li>
-        <li>Minor bug fixes & UI improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>March 13, 2022</h5>
-    <h2>v5.7.3</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added adaptive color in Material now playing theme</li>
-        <li>Added an option to share crash report</li>
-        <li>Added options to clear, pause history</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Adapt Wallpaper accent for better readability</li>
-        <li>Optimized search</li>
-        <li>Made sleep timer precise</li>
-    </ul>
-</div>
-<div>
-    <h5>February 13, 2022</h5>
-    <h2>v5.7.2<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Animated splash screen on Android 12 devices</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed crash when removing song from Playing queue</li>
-        <li>Fixed lyrics editing crash</li>
-        <li>Fixed shuffle button not working</li>
-        <li>Fixed crash on song deletion</li>
-    </ul>
-</div>
-<div>
-    <h5>February 1, 2022</h5>
-    <h2>v5.7.1<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added option to disable changing song by swiping anywhere on the now playing screen</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Playlist save on A11+</li>
-        <li>Fixed Just Black theme</li>
-        <li>Fixed some UI issues</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Improvements to search</li>
-    </ul>
-</div>
-<div>
-    <h5>January 25, 2022</h5>
-    <h2>v5.7.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added Android Auto</li>
-        <li>Added accent color extraction on Android 8.1+ devices</li>
-        <li>Added new Circle widget</li>
-        <li>Added Collapsing appbar to library tabs with an option to switch back to simple appbar
-        </li>
-        <li>Added Search tab</li>
-        <li>Added option to use circular play button</li>
-        <li>Added lyrics editing on A11+ devices again</li>
-        <li>Added Long Press to forward, rewind current song</li>
-        <li>Added ability to set Playback speed and pitch</li>
-        <li>Added option to show lyrics over Cover</li>
-        <li>Added option to keep screen on when showing lyrics</li>
-        <li>Added option to switch to Manrope font</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Gapless Playback</li>
-        <li>Fixed Shuffle FAB going behind Mini Player</li>
-        <li>Fixed crashes on Pre-marshmallow devices</li>
-        <li>Blacklisted songs can't be played after opening from outside the app</li>
-        <li>Fixed various small bugs and some minor improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>January 1, 2021</h5>
-    <h2>v5.6.1</h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed artist covers not updating and showing album cover images.</li>
-        <li>Fixed FAB's not visible (Shuffle, Save, etc.)</li>
-        <li>Fixed a crash when a Song is deleted in Artist Details</li>
-        <li>Fixed Snowfall effect</li>
-        <li>Fixed empty notification when queue is cleared</li>
-    </ul>
-</div>
-<div>
-    <h5>December 25, 2021</h5>
-    <h2>v5.6.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added Artwork editing for songs</li>
-        <li>Circle theme has album art now</li>
-        <li>Upgraded tag editor library, we should support reading tags of more formats now e.g.
-            opus.
-        </li>
-        <li>Added Snowfall effect</li>
-        <li>Crossfade effect for background when Song is changed for Blur, Blur card themes</li>
-        <li>Album art is hidden when Show lyrics is enabled</li>
-        <li>Added fastscroll in Playlists tab</li>
-        <li>Added Chooser to choose what to restore</li>
-        <li>Hide BottomNavigation when only one tab is selected in Library Categories(This was
-            already there but when changing screens it was getting visible)
-        </li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Ringtone crash</li>
-        <li>Fixed blank album cover bug</li>
-        <li>Fixed bottom navigation visible in Playing Queue</li>
-        <li>Fixed lockscreen dragging glitch</li>
-        <li>Fixed incorrect colors when no cover art is available</li>
-        <li>Fixed favorite not updating when song is changed</li>
-        <li>Fixed playlist not getting created & playlist creation crash with same name</li>
-        <li>Fixed a bug in "Plain" Now playing theme where onClick event is consumed by the views
-            behind the bottom sheet
-        </li>
-    </ul>
-</div>
-<div>
-    <h5>December 6, 2021</h5>
-    <h2>v5.4.2<span class="tag"><i>Beta</i></span></h2>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Bug Fixes</li>
-    </ul>
-</div>
-<div>
-    <h5>December 1, 2021</h5>
-    <h2>v5.4.1<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added file selection from system file picker for restore</li>
-        <li>Added Grid size selection for Playlists</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Enable Material You by default on Android 12</li>
-        <li>Reworked Grid Style saving</li>
-        <li>Improved Playlist preview images</li>
-        <li>UI improvements</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Fixed File deletion on Android 10</li>
-        <li>Fixed Sleep Timer crash</li>
-        <li>Fixed Bottom Toolbar not clickable in now playing when Shuffle is clicked</li>
-        <li>Fixed Album Artist sort order</li>
-        <li>Fixed a crash when clicking the "Clear All" button in the Blacklist folder selection
-        </li>
-        <li>Fixed Continuous crashes on A12 when the song ends</li>
-        <li>Fixed New Music Mix multiple clicks crash</li>
-    </ul>
-</div>
-<div>
-    <h5>November 22, 2021</h5>
-    <h2>v5.4.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li><b>Material You</b></li>
-        <li>Going Edge-to-Edge</li>
-        <li>Added Backup & restore</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Improved Animations</li>
-        <li>Improved Crossfade</li>
-    </ul>
-</div>
-<div>
-    <h5>September 06, 2021</h5>
-    <h2>v5.0.0</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added ability to Remember last tab</li>
-        <li>Added Whitelisting songs</li>
-        <li>You can now browse SDCard from Folders Tab</li>
-    </ul>
-</div>
-<div>
-    <h5>August 22, 2021</h5>
-    <h2>v4.4.0<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added Crossfade</li>
-        <li>Multi-select in Album and Artist Details</li>
-        <li>Albums now show Album Artists instead of artist of first song</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Playlist Preview Images</li>
-    </ul>
-</div>
-<div>
-    <h5>August 11, 2021</h5>
-    <h2>v4.2.30<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Revamped Playlist Tab</li>
-        <li>Revamped Genres Tab</li>
-        <li>Added support for embedded Synced Lyrics</li>
-        <li>Added animated icons</li>
-    </ul>
-    <h3>Fixed</h3>
-    <ul>
-        <li>Fixed Language Switching</li>
-        <li>Fixed some reported bugs</li>
-    </ul>
-</div>
-<div>
-    <h5>July 18, 2021</h5>
-    <h2>v4.2.020<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Added ChromeCast Support</li>
-        <li>Added Lyrics Editor for Normal and Synced Lyrics</li>
-        <li>Added Ripple Animation for Color Theme</li>
-        <li>Added Drag to seek in Tiny Theme</li>
-        <li>Added Playlist Order</li>
-        <li>Added Search Filters</li>
-        <li>Added Audio Fade</li>
-        <li>Synced Lyrics in all Themes</li>
-        <li>Swipe anywhere to change song</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Fixed Navigate by Album Artist</li>
-        <li>Changed New Music Mix Actions</li>
-        <li>Improved Animations</li>
-        <li>And some minor bug fixes and improvements</li>
-    </ul>
-</div>
-<div>
-    <h5>October 12, 2020</h5>
-    <h2>v4.0.10</h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Re-built from scratch using MVVM Architecture and JetPack Components</li>
-        <li>New Material Design icon</li>
-        <li>Implemented a custom database for playlists</li>
-        <li>Added new Material Design motions</li>
-        <li>Bug fixes & performance improvements</li>
-        <li>Revamped Home tab UI</li>
-        <li>Android 11 support</li>
-        <li>And more!</li>
-    </ul>
-</div>
-<div>
-    <h5>April 30, 2020</h5>
-    <h2>v3.5.110<span class="tag"><i>Beta</i></span></h2>
-    <h3>What's New</h3>
-    <ul>
-        <li>Changed profile form image to icon</li>
-        <li>New what's new screen</li>
-        <li>Added In-App language changer, where you can select language</li>
-    </ul>
-    <h3>Improved</h3>
-    <ul>
-        <li>Improved loading of Songs, Albums, Artists, Genres, Playlists</li>
-    </ul>
-</div>
-</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>
<h4>v3.4.850</h4>
<ul>
    <li>Added current playing tab options for Bottom Navigation View</li>
    <li>Added search in genre</li>
    <li>Fix bugs & crashes</li>
</ul>
<h4>v3.4.800</h4>
<ul>
    <li>Improved dark theme colors and Follow system theme</li>
    <li>Rounded rectangle ripple for BottomNavigationView</li>
    <li>Follow sleep timer dialog checkbox color as accent</li>
    <li>Added song list selection for Album and Artist details</li>
    <li>Fixed Toolbar popup text color when selecting songs</li>
</ul>
<h4>v3.4.700</h4>
<ul>
    <li>Added splash screen(for app loading time)</li>
    <li>Updated dark theme colors</li>
    <li>Added circular progress view</li>
    <li>Hiding year if not showing</li>
</ul>
<h4>v3.4.600</h4>
<ul>
    <li>Fix notification layout height</li>
    <li>Fix folder list last item not showing</li>
    <li>Added auto hide/ show controls according to first and last item</li>
</ul>
<h4>v3.4.500</h4>
<ul>
    <li>Added peak theme</li>
    <li>Added app rating dialog</li>
    <li>Fix song name scrolling in now playing themes if it's long</li>
    <li>Fix playing queue last item hiding FAB</li>
    <li>Added desaturated color option for dark mode</li>
    <li>Fix slow search loading</li>
    <li>Fix last added slow loading</li>
    <li>Fix home banner toolbar corner</li>
    <li>Fix home crashing when switching between two tabs</li>
    <li>Fix remaining time in playing queue</li>
    <li>Fix font not applied for some components</li>
    <li>Fix crashing on album details sorting</li>
    <li>Fixed lot of internal bugs</li>
    <li>Fix dialog expand</li>
    <li>Fix list card color</li>
    <li>Removed SlidingUpPanel to replace with BottomSheet</li>
    <li>Removed color theme as per material design guidelines</li>
    <li>Removed classic theme(We're bringing back)</li>
    <li>Replace line switch to Material Switch in settings</li>
    <li>Performance improved</li>
    <li>Updated internal libraries</li>
    <li>Updated translation</li>
    <li>Limiting the use of Theme engine for making use of system colors</li>
    <li>Change home icon from the user icon</li>
    <li>Corrected all toolbar with elevation when scrolling</li>
</ul>
<h4>v3.3.200</h4>
<ul>
    <li>Fix fullscreen bottom tabs icons squash</li>
    <li>Improved tiny theme colors</li>
    <li>Android auto support</li>
    <li>New notification icon</li>
    <li>Favorite icon in mini player</li>
</ul>
<h4>v.3.3.100</h4>
<ul>
    <li>Improved Now playing controls alignment</li>
    <li>Lot internal changes to improve performance</li>
    <li>Fix playlist adding crash</li>
    <li>Fix color corrections</li>
    <li>Fix file editing crash</li>
</ul>
<h4>v3.3.000</h4>
<ul>
    <li>SD card support for deleting and editing</li>
</ul>
<h4>v3.2.240</h4>
<ul>
    <li>Improved options dialog with selected color and title icon</li>
    <li>Fix dialog color on dark theme</li>
</ul>
<h4>v3.2.220</h4>
<ul>
    <li>Fix Notification SeekBar position (Need Android Q test)</li>
    <li>Rolled back settings tint icons</li>
    <li>Changed preference category title style according Android Q</li>
    <li>Fix tabs options not working</li>
</ul>
<h4>v3.2.203</h4>
<ul>
    <li>Carousel effect improved</li>
    <li>Settings icons are now tint accent color</li>
    <li>Settings title, back arrow and icons are now tint accent color</li>
    <li>Equalizer is removed</li>
    <li>Fix keyboard not popping on Search</li>
    <li>Curated the main options</li>
    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>
    <li>Edit text input handles are colored</li>
</ul>
<h4>v3.2.135</h4>
<ul>
    <li>Fix crashing on sharing song</li>
</ul>
<h4>v3.2.125</h4>
<ul>
    <li>Fix crashing on selecting profile picture</li>
    <li>Semi transparent color fix(s) on now playing themes</li>
</ul>
<h4>v3.2.120</h4>
<ul>
    <li>Fix crashing on choosing a theme</li>
    <li>Fix color theme selection without pro enabled</li>
    <li>Fix icon tint some places</li>
</ul>
<h4>v3.2.105</h4>
<ul>
    <li>Fix color notifications</li>
</ul>
<h4>v3.2.100</h4>
<ul>
    <li>Fix crashing on Sleep timer</li>
    <li>Toolbar elevation removed added stroke instead</li>
    <li>Show empty indication for home</li>
</ul>
<h4>v3.2.000</h4>
<ul>
    <li>Implemented Artist image loading all thanks to <a
            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>
    <li>Fixed buttons in Genre details</li>
    <li>Fixed color buttons in Album and Artist details screen</li>
</ul>
<h4>v3.1.900</h4>
<ul>
    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist
        Details etc.
    </li>
    <li>Home toolbar is semi transparent in Banner mode</li>
    <li>Added new Buy Retro Music pro in settings</li>
    <li>Improved dark color in Dark theme</li>
</ul>
<h4>v3.1.850</h4>
<ul>
    <li>Toolbar will be clickable for Search</li>

</ul>
<h4>v3.1.800</h4>
<ul>
    <li>Search bar CardView background</li>
    <li>Improve volume zero</li>
    <li>Now playing and Album theme picker rollback to dialog</li>
    <li>Fix sharing app link</li>
    <li>Fix scanning dialog</li>
    <li>Added settings icons for options</li>
</ul>
<h4>v3.1.700</h4>
<ul>
    <li>Cleaned internal code</li>
    <li>Removed full screen option</li>
    <li>Added Toolbar elevation</li>
    <li>To access menu either tap on Toolbar or Hamburger icon</li>
    <li>Fix back button not working on playing queue</li>
    <li>Fix crashing on What's New screen</li>
    <li>Fix lyrics dialog</li>
    <li>Changed toggles to line icons</li>
    <li>Fix crashing on artist list for number format error</li>
    <li>Fix blacklist dialog crashing</li>
    <li>Rearranged icons and main menu access</li>
    <li>Fix some crashes when device is locked or background</li>
    <li>Folder screen have main options access</li>
    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>
    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li>
</ul>
<h4>v3.1.400</h4>
<ul>
    <li>Removed sync lyrics for Android 5</li>
    <li>Fix Seek-bar color in settings</li>
    <li>Added keyboard to popup on search</li>
    <li>Added keyboard to popup on search</li>
    <li>Improved lock-screen behavior and UI</li>
    <li>Improved text appearance</li>
    <li>Fix bio text not showing in settings</li>
    <li>Fix not showing slider(blur, filter song) amount in settings</li>
    <li>Fix setting ringtone</li>
    <li>Fix file sharing crash</li>
    <li>Fix some crashes</li>
    <li>Fix playlist icon on small devices</li>
    <li>Fix empty lyrics text color</li>
    <li>Fix album cover background purple color in color theme</li>
</ul>
<h4>v3.1.300</h4>
<ul>
    <li>Fix rename playlist text color</li>
    <li>Fix same album showing in details page</li>
    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>
    <li>Improved home sections loading</li>
    <li>Removed library options which are duplicated (it's available from profile menu)</li>
    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>
    <li>Replaced home with for you</li>
    <li>Fixed profile image not loading in about</li>
    <li>Improved selecting user profile image</li>
    <li>Added bio to enter custom message</li>
    <li>Improved some UI screens</li>
</ul>

<p>If you see entire app white or dark or black select same theme in settings to fix </p>
<p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a>
</p>
<p style="line-height:150%">*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/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
index aa6e4ae9a..af146924b 100644
Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png
index 7e7647db5..ff0f8b9ff 100644
Binary files a/app/src/main/ic_launcher-web.png and b/app/src/main/ic_launcher-web.png differ
diff --git a/app/src/main/java/code/name/monkey/retromusic/App.kt b/app/src/main/java/code/name/monkey/retromusic/App.kt
index 93dfe4d96..35479e7ec 100644
--- a/app/src/main/java/code/name/monkey/retromusic/App.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/App.kt
@@ -1,67 +1,74 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic
 
-import android.app.Application
-import androidx.preference.PreferenceManager
-import cat.ereza.customactivityoncrash.config.CaocConfig
+import android.widget.Toast
+import androidx.multidex.MultiDexApplication
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.activities.ErrorActivity
-import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.helper.WallpaperAccentManager
-import org.koin.android.ext.koin.androidContext
-import org.koin.core.context.startKoin
+import code.name.monkey.retromusic.dagger.DaggerMusicComponent
+import code.name.monkey.retromusic.dagger.MusicComponent
+import code.name.monkey.retromusic.dagger.module.AppModule
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.TransactionDetails
 
-class App : Application() {
 
-    private val wallpaperAccentManager = WallpaperAccentManager(this)
+class App : MultiDexApplication() {
+
+    lateinit var billingProcessor: BillingProcessor
 
     override fun onCreate() {
+       /* if (MissingSplitsManagerFactory.create(this).disableAppIfMissingRequiredSplits()) {
+            return
+        }*/
         super.onCreate()
         instance = this
+        musicComponent = DaggerMusicComponent.builder()
+                .appModule(AppModule(this))
+                .build()
 
-        startKoin {
-            androidContext(this@App)
-            modules(appModules)
-        }
         // default theme
         if (!ThemeStore.isConfigured(this, 3)) {
             ThemeStore.editTheme(this)
-                .accentColorRes(code.name.monkey.appthemehelper.R.color.md_deep_purple_A200)
-                .coloredNavigationBar(true)
-                .commit()
+                    .accentColorRes(R.color.md_deep_purple_A200)
+                    .coloredNavigationBar(true)
+                    .commit()
         }
-        wallpaperAccentManager.init()
 
         if (VersionUtils.hasNougatMR())
             DynamicShortcutManager(this).initDynamicShortcuts()
 
-        // setting Error activity
-        CaocConfig.Builder.create().errorActivity(ErrorActivity::class.java)
-            .restartActivity(MainActivity::class.java).apply()
+        // automatically restores purchases
+        billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY,
+                object : BillingProcessor.IBillingHandler {
+                    override fun onProductPurchased(productId: String, details: TransactionDetails?) {}
 
-        // Set Default values for now playing preferences
-        // This will reduce startup time for now playing settings fragment as Preference listener of AbsSlidingMusicPanelActivity won't be called
-        PreferenceManager.setDefaultValues(this, R.xml.pref_now_playing_screen, false)
+                    override fun onPurchaseHistoryRestored() {
+                        Toast.makeText(this@App, R.string.restored_previous_purchase_please_restart, Toast.LENGTH_LONG).show();
+                    }
+
+                    override fun onBillingError(errorCode: Int, error: Throwable?) {}
+
+                    override fun onBillingInitialized() {}
+                })
     }
 
     override fun onTerminate() {
         super.onTerminate()
-        wallpaperAccentManager.release()
+        billingProcessor.release()
     }
 
     companion object {
@@ -70,5 +77,14 @@ class App : Application() {
         fun getContext(): App {
             return instance!!
         }
+
+        fun isProVersion(): Boolean {
+            return BuildConfig.DEBUG || instance?.billingProcessor!!.isPurchased(PRO_VERSION_PRODUCT_ID)
+        }
+
+        lateinit var musicComponent: MusicComponent
+
+        const val PRO_VERSION_PRODUCT_ID = "pro_version"
+
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/Constants.kt b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
index 31032f62b..6c04105ca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/Constants.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/Constants.kt
@@ -1,154 +1,51 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic
 
 import android.provider.BaseColumns
 import android.provider.MediaStore
 
 object Constants {
-    const val TRANSLATE = "https://crowdin.com/project/retromusicplayer"
-    const val GITHUB_PROJECT = "https://github.com/MuntashirAkon/Metro"
-    const val TELEGRAM_CHANGE_LOG = "https://t.me/AppManagerChannel"
+
+    const val RATE_ON_GOOGLE_PLAY = "https://play.google.com/store/apps/details?id=code.name.monkey.retromusic"
+    const val TRANSLATE = "http://monkeycodeapp.oneskyapp.com/collaboration/project?id=238534"
+    const val GITHUB_PROJECT = "https://github.com/h4h13/RetroMusicPlayer"
+    const val TELEGRAM_CHANGE_LOG = "https://t.me/retromusiclog"
     const val USER_PROFILE = "profile.jpg"
     const val USER_BANNER = "banner.jpg"
-    const val FAQ_LINK = "https://github.com/MuntashirAkon/Metro/blob/master/FAQ.md"
+    const val APP_INSTAGRAM_LINK = "https://www.instagram.com/retromusicapp/"
+    const val APP_TELEGRAM_LINK = "https://t.me/retromusicapp/"
+    const val APP_TWITTER_LINK = "https://twitter.com/retromusicapp"
+    const val FAQ_LINK = "https://github.com/h4h13/RetroMusicPlayer/blob/master/FAQ.md"
+    const val PINTEREST = "https://in.pinterest.com/retromusicapp/"
 
-    const val IS_MUSIC =
-        MediaStore.Audio.AudioColumns.IS_MUSIC + "=1" + " AND " + MediaStore.Audio.AudioColumns.TITLE + " != ''"
+    const val BASE_SELECTION = MediaStore.Audio.AudioColumns.IS_MUSIC + "=1" + " AND " + MediaStore.Audio.AudioColumns.TITLE + " != ''"
 
-    const val DATA = "_data"
-
-    @Suppress("Deprecation")
-    val baseProjection = arrayOf(
-        BaseColumns._ID, // 0
-        MediaStore.Audio.AudioColumns.TITLE, // 1
-        MediaStore.Audio.AudioColumns.TRACK, // 2
-        MediaStore.Audio.AudioColumns.YEAR, // 3
-        MediaStore.Audio.AudioColumns.DURATION, // 4
-        DATA, // 5
-        MediaStore.Audio.AudioColumns.DATE_MODIFIED, // 6
-        MediaStore.Audio.AudioColumns.ALBUM_ID, // 7
-        MediaStore.Audio.AudioColumns.ALBUM, // 8
-        MediaStore.Audio.AudioColumns.ARTIST_ID, // 9
-        MediaStore.Audio.AudioColumns.ARTIST, // 10
-        MediaStore.Audio.AudioColumns.COMPOSER, // 11
-        ALBUM_ARTIST // 12
-    )
+    val baseProjection = arrayOf(BaseColumns._ID, // 0
+            MediaStore.Audio.AudioColumns.TITLE, // 1
+            MediaStore.Audio.AudioColumns.TRACK, // 2
+            MediaStore.Audio.AudioColumns.YEAR, // 3
+            MediaStore.Audio.AudioColumns.DURATION, // 4
+            MediaStore.Audio.AudioColumns.DATA, // 5
+            MediaStore.Audio.AudioColumns.DATE_MODIFIED, // 6
+            MediaStore.Audio.AudioColumns.ALBUM_ID, // 7
+            MediaStore.Audio.AudioColumns.ALBUM, // 8
+            MediaStore.Audio.AudioColumns.ARTIST_ID, // 9
+            MediaStore.Audio.AudioColumns.ARTIST,// 10
+            MediaStore.Audio.AudioColumns.COMPOSER)// 11
     const val NUMBER_OF_TOP_TRACKS = 99
-}
 
-const val EXTRA_PLAYLIST_TYPE = "type"
-const val EXTRA_GENRE = "extra_genre"
-const val EXTRA_PLAYLIST = "extra_playlist"
-const val EXTRA_PLAYLIST_ID = "extra_playlist_id"
-const val EXTRA_ALBUM_ID = "extra_album_id"
-const val EXTRA_ARTIST_ID = "extra_artist_id"
-const val EXTRA_SONG = "extra_songs"
-const val EXTRA_PLAYLISTS = "extra_playlists"
-const val LIBRARY_CATEGORIES = "library_categories"
-const val EXTRA_SONG_INFO = "extra_song_info"
-const val DESATURATED_COLOR = "desaturated_color"
-const val BLACK_THEME = "black_theme"
-const val KEEP_SCREEN_ON = "keep_screen_on"
-const val TOGGLE_HOME_BANNER = "toggle_home_banner"
-const val NOW_PLAYING_SCREEN_ID = "now_playing_screen_id"
-const val CAROUSEL_EFFECT = "carousel_effect"
-const val COLORED_NOTIFICATION = "colored_notification"
-const val CLASSIC_NOTIFICATION = "classic_notification"
-const val GAP_LESS_PLAYBACK = "gapless_playback"
-const val ALBUM_ART_ON_LOCK_SCREEN = "album_art_on_lock_screen"
-const val BLURRED_ALBUM_ART = "blurred_album_art"
-const val NEW_BLUR_AMOUNT = "new_blur_amount"
-const val TOGGLE_HEADSET = "toggle_headset"
-const val GENERAL_THEME = "general_theme"
-const val ACCENT_COLOR = "accent_color"
-const val SHOULD_COLOR_APP_SHORTCUTS = "should_color_app_shortcuts"
-const val CIRCULAR_ALBUM_ART = "circular_album_art"
-const val USER_NAME = "user_name"
-const val TOGGLE_FULL_SCREEN = "toggle_full_screen"
-const val TOGGLE_VOLUME = "toggle_volume"
-const val ADAPTIVE_COLOR_APP = "adaptive_color_app"
-const val HOME_ARTIST_GRID_STYLE = "home_artist_grid_style"
-const val HOME_ALBUM_GRID_STYLE = "home_album_grid_style"
-const val TOGGLE_ADD_CONTROLS = "toggle_add_controls"
-const val ALBUM_COVER_STYLE = "album_cover_style_id"
-const val ALBUM_COVER_TRANSFORM = "album_cover_transform"
-const val TAB_TEXT_MODE = "tab_text_mode"
-const val LANGUAGE_NAME = "language_name"
-const val LOCALE_AUTO_STORE_ENABLED = "locale_auto_store_enabled"
-const val SLEEP_TIMER_FINISH_SONG = "sleep_timer_finish_song"
-const val ALBUM_GRID_STYLE = "album_grid_style_home"
-const val ARTIST_GRID_STYLE = "artist_grid_style_home"
-const val SAF_SDCARD_URI = "saf_sdcard_uri"
-const val SONG_SORT_ORDER = "song_sort_order"
-const val SONG_GRID_SIZE = "song_grid_size"
-const val GENRE_SORT_ORDER = "genre_sort_order"
-const val BLUETOOTH_PLAYBACK = "bluetooth_playback"
-const val INITIALIZED_BLACKLIST = "initialized_blacklist"
-const val ARTIST_SORT_ORDER = "artist_sort_order"
-const val ARTIST_ALBUM_SORT_ORDER = "artist_album_sort_order"
-const val ALBUM_SORT_ORDER = "album_sort_order"
-const val PLAYLIST_SORT_ORDER = "playlist_sort_order"
-const val ALBUM_SONG_SORT_ORDER = "album_song_sort_order"
-const val ARTIST_SONG_SORT_ORDER = "artist_song_sort_order"
-const val ALBUM_GRID_SIZE = "album_grid_size"
-const val ALBUM_GRID_SIZE_LAND = "album_grid_size_land"
-const val SONG_GRID_SIZE_LAND = "song_grid_size_land"
-const val ARTIST_GRID_SIZE = "artist_grid_size"
-const val ARTIST_GRID_SIZE_LAND = "artist_grid_size_land"
-const val PLAYLIST_GRID_SIZE = "playlist_grid_size"
-const val PLAYLIST_GRID_SIZE_LAND = "playlist_grid_size_land"
-const val COLORED_APP_SHORTCUTS = "colored_app_shortcuts"
-const val LAST_ADDED_CUTOFF = "last_added_interval"
-const val LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value"
-const val NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time"
-const val IGNORE_MEDIA_STORE_ARTWORK = "ignore_media_store_artwork"
-const val LAST_CHANGELOG_VERSION = "last_changelog_version"
-const val START_DIRECTORY = "start_directory"
-const val RECENTLY_PLAYED_CUTOFF = "recently_played_interval"
-const val LOCK_SCREEN = "lock_screen"
-const val ALBUM_ARTISTS_ONLY = "album_artists_only"
-const val ALBUM_ARTIST = "album_artist"
-const val ALBUM_DETAIL_SONG_SORT_ORDER = "album_detail_song_sort_order"
-const val ARTIST_DETAIL_SONG_SORT_ORDER = "artist_detail_song_sort_order"
-const val LYRICS_OPTIONS = "lyrics_tab_position"
-const val CHOOSE_EQUALIZER = "choose_equalizer"
-const val EQUALIZER = "equalizer"
-const val SONG_GRID_STYLE = "song_grid_style"
-const val PAUSE_ON_ZERO_VOLUME = "pause_on_zero_volume"
-const val FILTER_SONG = "filter_song"
-const val EXPAND_NOW_PLAYING_PANEL = "expand_now_playing_panel"
-const val EXTRA_ARTIST_NAME = "extra_artist_name"
-const val TOGGLE_SUGGESTIONS = "toggle_suggestions"
-const val AUDIO_FADE_DURATION = "audio_fade_duration"
-const val CROSS_FADE_DURATION = "cross_fade_duration"
-const val SHOW_LYRICS = "show_lyrics"
-const val REMEMBER_LAST_TAB = "remember_last_tab"
-const val LAST_USED_TAB = "last_used_tab"
-const val WHITELIST_MUSIC = "whitelist_music"
-const val MATERIAL_YOU = "material_you"
-const val SNOWFALL = "snowfall"
-const val LYRICS_TYPE = "lyrics_type"
-const val PLAYBACK_SPEED = "playback_speed"
-const val PLAYBACK_PITCH = "playback_pitch"
-const val CUSTOM_FONT = "custom_font"
-const val APPBAR_MODE = "appbar_mode"
-const val WALLPAPER_ACCENT = "wallpaper_accent"
-const val SCREEN_ON_LYRICS = "screen_on_lyrics"
-const val CIRCLE_PLAY_BUTTON = "circle_play_button"
-const val SWIPE_ANYWHERE_NOW_PLAYING = "swipe_anywhere_now_playing"
-const val PAUSE_HISTORY = "pause_history"
-const val MANAGE_AUDIO_FOCUS = "manage_audio_focus"
-const val SWIPE_DOWN_DISMISS = "swipe_to_dismiss"
\ No newline at end of file
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt b/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt
deleted file mode 100644
index 4f1273a03..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/HomeSection.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic
-
-import androidx.annotation.IntDef
-
-@IntDef(
-    RECENT_ALBUMS,
-    TOP_ALBUMS,
-    RECENT_ARTISTS,
-    TOP_ARTISTS,
-    SUGGESTIONS,
-    FAVOURITES,
-    GENRES,
-    PLAYLISTS
-)
-@Retention(AnnotationRetention.SOURCE)
-annotation class HomeSection
-
-const val RECENT_ALBUMS = 3
-const val TOP_ALBUMS = 1
-const val RECENT_ARTISTS = 2
-const val TOP_ARTISTS = 0
-const val SUGGESTIONS = 5
-const val FAVOURITES = 4
-const val GENRES = 6
-const val PLAYLISTS = 7
-const val HISTORY_PLAYLIST = 8
-const val LAST_ADDED_PLAYLIST = 9
-const val TOP_PLAYED_PLAYLIST = 10
diff --git a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt b/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
deleted file mode 100644
index d88f8a760..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/MainModule.kt
+++ /dev/null
@@ -1,156 +0,0 @@
-package code.name.monkey.retromusic
-
-import androidx.room.Room
-import code.name.monkey.retromusic.auto.AutoMusicProvider
-import code.name.monkey.retromusic.db.MIGRATION_23_24
-import code.name.monkey.retromusic.db.RetroDatabase
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.albums.AlbumDetailsViewModel
-import code.name.monkey.retromusic.fragments.artists.ArtistDetailsViewModel
-import code.name.monkey.retromusic.fragments.genres.GenreDetailsViewModel
-import code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsViewModel
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.repository.*
-import org.koin.android.ext.koin.androidContext
-import org.koin.androidx.viewmodel.dsl.viewModel
-import org.koin.dsl.bind
-import org.koin.dsl.module
-
-private val roomModule = module {
-
-    single {
-        Room.databaseBuilder(androidContext(), RetroDatabase::class.java, "playlist.db")
-            .addMigrations(MIGRATION_23_24)
-            .build()
-    }
-
-    factory {
-        get<RetroDatabase>().playlistDao()
-    }
-
-    factory {
-        get<RetroDatabase>().playCountDao()
-    }
-
-    factory {
-        get<RetroDatabase>().historyDao()
-    }
-
-    single {
-        RealRoomRepository(get(), get(), get())
-    } bind RoomRepository::class
-}
-private val autoModule = module {
-    single {
-        AutoMusicProvider(
-            androidContext(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get()
-        )
-    }
-}
-private val mainModule = module {
-    single {
-        androidContext().contentResolver
-    }
-}
-private val dataModule = module {
-    single {
-        RealRepository(
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-            get(),
-        )
-    } bind Repository::class
-
-    single {
-        RealSongRepository(get())
-    } bind SongRepository::class
-
-    single {
-        RealGenreRepository(get(), get())
-    } bind GenreRepository::class
-
-    single {
-        RealAlbumRepository(get())
-    } bind AlbumRepository::class
-
-    single {
-        RealArtistRepository(get(), get())
-    } bind ArtistRepository::class
-
-    single {
-        RealPlaylistRepository(get())
-    } bind PlaylistRepository::class
-
-    single {
-        RealTopPlayedRepository(get(), get(), get(), get())
-    } bind TopPlayedRepository::class
-
-    single {
-        RealLastAddedRepository(
-            get(),
-            get(),
-            get()
-        )
-    } bind LastAddedRepository::class
-
-    single {
-        RealSearchRepository(
-            get(),
-            get(),
-            get(),
-            get(),
-            get()
-        )
-    }
-}
-
-private val viewModules = module {
-
-    viewModel {
-        LibraryViewModel(get())
-    }
-
-    viewModel { (albumId: Long) ->
-        AlbumDetailsViewModel(
-            get(),
-            albumId
-        )
-    }
-
-    viewModel { (artistId: Long?, artistName: String?) ->
-        ArtistDetailsViewModel(
-            get(),
-            artistId,
-            artistName
-        )
-    }
-
-    viewModel { (playlistId: Long) ->
-        PlaylistDetailsViewModel(
-            get(),
-            playlistId
-        )
-    }
-
-    viewModel { (genre: Genre) ->
-        GenreDetailsViewModel(
-            get(),
-            genre
-        )
-    }
-}
-
-val appModules = listOf(mainModule, dataModule, autoModule, viewModules, roomModule)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/Result.kt b/app/src/main/java/code/name/monkey/retromusic/Result.kt
new file mode 100644
index 000000000..f2f00f8b9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/Result.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic
+
+/**
+ * Created by hemanths on 2019-10-23.
+ */
+
+sealed class Result<out T : Any> {
+    class Success<out T : Any>(val data: T) : Result<T>()
+    class Error(val exception: Throwable) : Result<Nothing>()
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
new file mode 100644
index 000000000..7fa5f9790
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
@@ -0,0 +1,174 @@
+package code.name.monkey.retromusic.activities
+
+import android.content.Intent
+import android.content.pm.PackageManager
+import android.net.Uri
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import androidx.core.app.ShareCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
+import code.name.monkey.retromusic.Constants.APP_INSTAGRAM_LINK
+import code.name.monkey.retromusic.Constants.APP_TELEGRAM_LINK
+import code.name.monkey.retromusic.Constants.APP_TWITTER_LINK
+import code.name.monkey.retromusic.Constants.FAQ_LINK
+import code.name.monkey.retromusic.Constants.GITHUB_PROJECT
+import code.name.monkey.retromusic.Constants.PINTEREST
+import code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY
+import code.name.monkey.retromusic.Constants.TELEGRAM_CHANGE_LOG
+import code.name.monkey.retromusic.Constants.TRANSLATE
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.adapter.ContributorAdapter
+import code.name.monkey.retromusic.extensions.surfaceColor
+import code.name.monkey.retromusic.model.Contributor
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
+import com.google.gson.Gson
+import com.google.gson.reflect.TypeToken
+import kotlinx.android.synthetic.main.activity_about.*
+import kotlinx.android.synthetic.main.card_credit.*
+import kotlinx.android.synthetic.main.card_other.*
+import kotlinx.android.synthetic.main.card_retro_info.*
+import kotlinx.android.synthetic.main.card_social.*
+import java.io.IOException
+import java.nio.charset.StandardCharsets
+
+class AboutActivity : AbsBaseActivity(), View.OnClickListener {
+
+    private val assetJsonData: String?
+        get() {
+            val json: String
+            try {
+                val inputStream = assets.open("contributors.json")
+                val size = inputStream.available()
+                val buffer = ByteArray(size)
+                inputStream.read(buffer)
+                inputStream.close()
+                json = String(buffer, StandardCharsets.UTF_8)
+            } catch (ex: IOException) {
+                ex.printStackTrace()
+                return null
+            }
+
+            return json
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_about)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setLightNavigationBar(true)
+
+
+        loadContributors()
+        setSupportActionBar(toolbar)
+        toolbar.apply {
+            setBackgroundColor(surfaceColor(context))
+            setNavigationOnClickListener { onBackPressed() }
+            ToolbarContentTintHelper.colorBackButton(toolbar)
+        }
+        version.setSummary(getAppVersion())
+        setUpView()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun openUrl(url: String) {
+        val i = Intent(Intent.ACTION_VIEW)
+        i.data = Uri.parse(url)
+        i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+        startActivity(i)
+    }
+
+    private fun setUpView() {
+        appGithub.setOnClickListener(this)
+        faqLink.setOnClickListener(this)
+        telegramLink.setOnClickListener(this)
+        appRate.setOnClickListener(this)
+        appTranslation.setOnClickListener(this)
+        appShare.setOnClickListener(this)
+        donateLink.setOnClickListener(this)
+        instagramLink.setOnClickListener(this)
+        twitterLink.setOnClickListener(this)
+        changelog.setOnClickListener(this)
+        openSource.setOnClickListener(this)
+        pinterestLink.setOnClickListener(this)
+        bugReportLink.setOnClickListener(this)
+
+    }
+
+    override fun onClick(view: View) {
+        when (view.id) {
+            R.id.pinterestLink -> openUrl(PINTEREST)
+            R.id.faqLink -> openUrl(FAQ_LINK)
+            R.id.telegramLink -> openUrl(APP_TELEGRAM_LINK)
+            R.id.appGithub -> openUrl(GITHUB_PROJECT)
+            R.id.appTranslation -> openUrl(TRANSLATE)
+            R.id.appRate -> openUrl(RATE_ON_GOOGLE_PLAY)
+            R.id.appShare -> shareApp()
+            R.id.donateLink -> NavigationUtil.goToSupportDevelopment(this)
+            R.id.instagramLink -> openUrl(APP_INSTAGRAM_LINK)
+            R.id.twitterLink -> openUrl(APP_TWITTER_LINK)
+            R.id.changelog -> showChangeLogOptions()
+            R.id.openSource -> NavigationUtil.goToOpenSource(this)
+            R.id.bugReportLink -> NavigationUtil.bugReport(this)
+        }
+    }
+
+    private fun showChangeLogOptions() {
+        MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            cornerRadius(PreferenceUtil.getInstance(this@AboutActivity).dialogCorner)
+            listItems(items = listOf("Telegram Channel", "App")) { _, position, _ ->
+                if (position == 0) {
+                    openUrl(TELEGRAM_CHANGE_LOG)
+                } else {
+                    NavigationUtil.gotoWhatNews(this@AboutActivity)
+                }
+            }
+        }
+    }
+
+    private fun getAppVersion(): String {
+        return try {
+            val packageInfo = packageManager.getPackageInfo(packageName, 0)
+            packageInfo.versionName
+        } catch (e: PackageManager.NameNotFoundException) {
+            e.printStackTrace()
+            "0.0.0"
+        }
+    }
+
+    private fun shareApp() {
+        ShareCompat.IntentBuilder.from(this).setType("text/plain")
+                .setChooserTitle(R.string.share_app)
+                .setText(String.format(getString(R.string.app_share), packageName)).startChooser()
+    }
+
+    private fun loadContributors() {
+        val data = assetJsonData
+        val type = object : TypeToken<List<Contributor>>() {
+
+        }.type
+        val contributors = Gson().fromJson<List<Contributor>>(data, type)
+
+        val contributorAdapter = ContributorAdapter(contributors)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        recyclerView.itemAnimator = DefaultItemAnimator()
+        recyclerView.adapter = contributorAdapter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
new file mode 100644
index 000000000..14bad2579
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AlbumDetailsActivity.kt
@@ -0,0 +1,306 @@
+package code.name.monkey.retromusic.activities
+
+import android.app.ActivityOptions
+import android.content.Intent
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.SubMenu
+import android.view.View
+import android.widget.ImageView
+import androidx.core.app.ActivityCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.album.album.HorizontalAlbumAdapter
+import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
+import code.name.monkey.retromusic.extensions.ripAlpha
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsView
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.afollestad.materialcab.MaterialCab
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.activity_album.*
+import kotlinx.android.synthetic.main.activity_album_content.*
+import java.util.*
+import javax.inject.Inject
+import android.util.Pair as UtilPair
+
+
+class AlbumDetailsActivity : AbsSlidingMusicPanelActivity(), AlbumDetailsView, CabHolder {
+    override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
+        cab?.let {
+            if (it.isActive) it.finish()
+        }
+        cab = MaterialCab(this, R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface)))
+                .start(callback)
+        return cab as MaterialCab
+    }
+
+    private lateinit var simpleSongAdapter: SimpleSongAdapter
+    private lateinit var album: Album
+    private lateinit var artistImage: ImageView
+    private var cab: MaterialCab? = null
+    private val savedSortOrder: String
+        get() = PreferenceUtil.getInstance(this).albumDetailSongSortOrder
+
+    override fun createContentView(): View {
+        return wrapSlidingMusicPanel(R.layout.activity_album)
+    }
+
+    @Inject
+    lateinit var albumDetailsPresenter: AlbumDetailsPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        toggleBottomNavigationView(true)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+
+        ActivityCompat.postponeEnterTransition(this)
+
+        App.musicComponent.inject(this)
+        artistImage = findViewById(R.id.artistImage)
+
+        setupRecyclerView()
+
+        artistImage.setOnClickListener {
+            val artistPairs = ActivityOptions.makeSceneTransitionAnimation(this, UtilPair.create(artistImage, getString(R.string.transition_artist_image)))
+            NavigationUtil.goToArtistOptions(this, album.artistId, artistPairs)
+        }
+        playAction.apply {
+            setOnClickListener { MusicPlayerRemote.openQueue(album.songs!!, 0, true) }
+        }
+        shuffleAction.apply {
+            setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(album.songs!!, true) }
+        }
+
+
+        albumDetailsPresenter.attachView(this)
+
+        if (intent.extras!!.containsKey(EXTRA_ALBUM_ID)) {
+            intent.extras?.getInt(EXTRA_ALBUM_ID)?.let { albumDetailsPresenter.loadAlbum(it) }
+        } else {
+            finish()
+        }
+    }
+
+    private fun setupRecyclerView() {
+        simpleSongAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song, this)
+        recyclerView.apply {
+            layoutManager = LinearLayoutManager(this@AlbumDetailsActivity)
+            itemAnimator = DefaultItemAnimator()
+            isNestedScrollingEnabled = false
+            adapter = simpleSongAdapter
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        albumDetailsPresenter.detachView()
+    }
+
+    override fun complete() {
+        ActivityCompat.startPostponedEnterTransition(this)
+    }
+
+    override fun album(album: Album) {
+
+        if (album.songs!!.isEmpty()) {
+            finish()
+            return
+        }
+        this.album = album
+
+        albumTitle.text = album.title
+        if (MusicUtil.getYearString(album.year) == "-") {
+            albumText.text = String.format("%s • %s", album.artistName, MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)))
+        } else {
+            albumText.text = String.format("%s • %s • %s", album.artistName, MusicUtil.getYearString(album.year), MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, album.songs)))
+        }
+        loadAlbumCover()
+        simpleSongAdapter.swapDataSet(album.songs)
+        albumDetailsPresenter.loadMore(album.artistId)
+    }
+
+    override fun moreAlbums(albums: ArrayList<Album>) {
+        moreTitle.show()
+        moreRecyclerView.show()
+        moreTitle.text = String.format(getString(R.string.label_more_from), album.artistName)
+
+        val albumAdapter = HorizontalAlbumAdapter(this, albums, false, null)
+        moreRecyclerView.layoutManager = GridLayoutManager(
+                this,
+                1,
+                GridLayoutManager.HORIZONTAL,
+                false
+        )
+        moreRecyclerView.adapter = albumAdapter
+    }
+
+    override fun loadArtistImage(artist: Artist) {
+        ArtistGlideRequest.Builder.from(Glide.with(this), artist).generatePalette(this).build()
+                .dontAnimate().dontTransform().into(object : RetroMusicColoredTarget(artistImage) {
+                    override fun onColorReady(color: Int) {
+
+                    }
+                })
+
+    }
+
+    private fun loadAlbumCover() {
+        SongGlideRequest.Builder.from(Glide.with(this), album.safeGetFirstSong())
+                .checkIgnoreMediaStore(this).generatePalette(this).build().dontAnimate().dontTransform()
+                .into(object : RetroMusicColoredTarget(image) {
+                    override fun onColorReady(color: Int) {
+                        setColors(color)
+                    }
+                })
+    }
+
+    private fun setColors(color: Int) {
+        val themeColor = if (PreferenceUtil.getInstance(this).adaptiveColor) color.ripAlpha()
+        else ThemeStore.accentColor(this)
+
+        songTitle.setTextColor(themeColor)
+        moreTitle.setTextColor(themeColor)
+
+        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
+            color.ripAlpha()
+        else
+            ATHUtil.resolveColor(this, R.attr.colorSurface)
+
+        MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
+        MaterialUtil.setTint(button = playAction, color = buttonColor)
+
+        val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
+        //status_bar.setBackgroundColor(toolbarColor)
+        toolbar.setBackgroundColor(toolbarColor)
+        setSupportActionBar(toolbar)
+        supportActionBar?.title = null
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_album_detail, menu)
+        val sortOrder = menu.findItem(R.id.action_sort_order)
+        setUpSortOrderMenu(sortOrder.subMenu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return handleSortOrderMenuItem(item)
+    }
+
+    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
+        var sortOrder: String? = null
+        val songs = simpleSongAdapter.dataSet
+        when (item.itemId) {
+            R.id.action_play_next -> {
+                MusicPlayerRemote.playNext(songs)
+                return true
+            }
+            R.id.action_add_to_current_playing -> {
+                MusicPlayerRemote.enqueue(songs)
+                return true
+            }
+            R.id.action_add_to_playlist -> {
+                AddToPlaylistDialog.create(songs).show(supportFragmentManager, "ADD_PLAYLIST")
+                return true
+            }
+            R.id.action_delete_from_device -> {
+                DeleteSongsDialog.create(songs).show(supportFragmentManager, "DELETE_SONGS")
+                return true
+            }
+            android.R.id.home -> {
+                super.onBackPressed()
+                return true
+            }
+            R.id.action_tag_editor -> {
+                val intent = Intent(this, AlbumTagEditorActivity::class.java)
+                intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id)
+                val options = ActivityOptions.makeSceneTransitionAnimation(this, image, getString(R.string.transition_album_art))
+                startActivityForResult(intent, TAG_EDITOR_REQUEST, options.toBundle())
+                return true
+            }
+            /*Sort*/
+            R.id.action_sort_order_title -> sortOrder = AlbumSongSortOrder.SONG_A_Z
+            R.id.action_sort_order_title_desc -> sortOrder = AlbumSongSortOrder.SONG_Z_A
+            R.id.action_sort_order_track_list -> sortOrder = AlbumSongSortOrder.SONG_TRACK_LIST
+            R.id.action_sort_order_artist_song_duration -> sortOrder = AlbumSongSortOrder.SONG_DURATION
+        }
+        if (sortOrder != null) {
+            item.isChecked = true
+            setSaveSortOrder(sortOrder)
+        }
+        return true
+    }
+
+    private fun setUpSortOrderMenu(sortOrder: SubMenu) {
+        when (savedSortOrder) {
+            AlbumSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked = true
+            AlbumSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true
+            AlbumSongSortOrder.SONG_TRACK_LIST -> sortOrder.findItem(R.id.action_sort_order_track_list).isChecked = true
+            AlbumSongSortOrder.SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_artist_song_duration).isChecked = true
+        }
+    }
+
+    private fun setSaveSortOrder(sortOrder: String?) {
+        PreferenceUtil.getInstance(this).albumDetailSongSortOrder = sortOrder
+        reload()
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        reload()
+    }
+
+    private fun reload() {
+        if (intent.extras!!.containsKey(EXTRA_ALBUM_ID)) {
+            intent.extras?.getInt(EXTRA_ALBUM_ID)?.let { albumDetailsPresenter.loadAlbum(it) }
+        } else {
+            finish()
+        }
+    }
+
+    override fun onBackPressed() {
+        if (cab != null && cab!!.isActive) {
+            cab?.finish()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    companion object {
+
+        const val EXTRA_ALBUM_ID = "extra_album_id"
+        private const val TAG_EDITOR_REQUEST = 2001
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
new file mode 100755
index 000000000..f9b917225
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/ArtistDetailActivity.kt
@@ -0,0 +1,321 @@
+package code.name.monkey.retromusic.activities
+
+import android.app.Activity
+import android.content.Intent
+import android.os.Build
+import android.os.Bundle
+import android.text.Html
+import android.text.Spanned
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.album.album.AlbumAdapter
+import code.name.monkey.retromusic.album.album.HorizontalAlbumAdapter
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
+import code.name.monkey.retromusic.extensions.ripAlpha
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsView
+import code.name.monkey.retromusic.rest.model.LastFmArtist
+import code.name.monkey.retromusic.util.*
+import com.afollestad.materialcab.MaterialCab
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.activity_artist_content.*
+import kotlinx.android.synthetic.main.activity_artist_details.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
+
+class ArtistDetailActivity : AbsSlidingMusicPanelActivity(), ArtistDetailsView, CabHolder {
+    override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
+        cab?.let {
+            if (it.isActive) it.finish()
+        }
+        cab = MaterialCab(this, R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface)))
+                .start(callback)
+        return cab as MaterialCab
+    }
+
+    private var cab: MaterialCab? = null
+    private var biography: Spanned? = null
+    private lateinit var artist: Artist
+    private lateinit var songAdapter: SimpleSongAdapter
+    private lateinit var albumAdapter: AlbumAdapter
+    private var forceDownload: Boolean = false
+
+    override fun createContentView(): View {
+        return wrapSlidingMusicPanel(R.layout.activity_artist_details)
+    }
+
+    @Inject
+    lateinit var artistDetailsPresenter: ArtistDetailsPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        toggleBottomNavigationView(true)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+
+        ActivityCompat.postponeEnterTransition(this)
+
+        setUpViews()
+
+        playAction.apply {
+            setOnClickListener { MusicPlayerRemote.openQueue(artist.songs, 0, true) }
+        }
+        shuffleAction.apply {
+            setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(artist.songs, true) }
+        }
+
+        biographyText.setOnClickListener {
+            if (biographyText.maxLines == 4) {
+                biographyText.maxLines = Integer.MAX_VALUE
+            } else {
+                biographyText.maxLines = 4
+            }
+        }
+
+        App.musicComponent.inject(this)
+        artistDetailsPresenter.attachView(this)
+
+        if (intent.extras!!.containsKey(EXTRA_ARTIST_ID)) {
+            intent.extras?.getInt(EXTRA_ARTIST_ID)?.let { artistDetailsPresenter.loadArtist(it) }
+        } else {
+            finish()
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        artistDetailsPresenter.detachView()
+    }
+
+    private fun setUpViews() {
+        setupRecyclerView()
+        setupContainerHeight()
+    }
+
+    private fun setupContainerHeight() {
+        imageContainer?.let {
+            val params = it.layoutParams
+            params.width = DensityUtil.getScreenHeight(this) / 2
+            it.layoutParams = params
+        }
+    }
+
+    private fun setupRecyclerView() {
+        albumAdapter = HorizontalAlbumAdapter(this, ArrayList(), false, null)
+        albumRecyclerView.apply {
+            itemAnimator = DefaultItemAnimator()
+            layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false)
+            adapter = albumAdapter
+        }
+        songAdapter = SimpleSongAdapter(this, ArrayList(), R.layout.item_song, this)
+        recyclerView.apply {
+            itemAnimator = DefaultItemAnimator()
+            layoutManager = LinearLayoutManager(this.context)
+            adapter = songAdapter
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            REQUEST_CODE_SELECT_IMAGE -> if (resultCode == Activity.RESULT_OK) {
+                data?.data?.let {
+                    CustomArtistImageUtil.getInstance(this).setCustomArtistImage(artist, it)
+                }
+            }
+            else -> if (resultCode == Activity.RESULT_OK) {
+                reload()
+            }
+        }
+    }
+
+    override fun showEmptyView() {
+
+    }
+
+    override fun complete() {
+        ActivityCompat.startPostponedEnterTransition(this)
+    }
+
+    override fun artist(artist: Artist) {
+        if (artist.songCount <= 0) {
+            finish()
+        }
+        this.artist = artist
+        loadArtistImage()
+
+        if (RetroUtil.isAllowedToDownloadMetadata(this)) {
+            loadBiography(artist.name)
+        }
+        artistTitle.text = artist.name
+        text.text = String.format(
+                "%s • %s",
+                MusicUtil.getArtistInfoString(this, artist),
+                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(this, artist.songs))
+        )
+
+        songAdapter.swapDataSet(artist.songs)
+        albumAdapter.swapDataSet(artist.albums!!)
+    }
+
+    private fun loadBiography(
+            name: String, lang: String? = Locale.getDefault().language
+    ) {
+        biography = null
+        this.lang = lang
+        artistDetailsPresenter.loadBiography(name, lang, null)
+    }
+
+    override fun artistInfo(lastFmArtist: LastFmArtist?) {
+        if (lastFmArtist != null && lastFmArtist.artist != null) {
+            val bioContent = lastFmArtist.artist.bio.content
+            if (bioContent != null && bioContent.trim { it <= ' ' }.isNotEmpty()) {
+                biographyText.visibility = View.VISIBLE
+                biographyTitle.visibility = View.VISIBLE
+                biography = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    Html.fromHtml(bioContent, Html.FROM_HTML_MODE_LEGACY)
+                } else {
+                    Html.fromHtml(bioContent)
+                }
+                biographyText.text = biography
+            }
+        }
+
+        // If the "lang" parameter is set and no biography is given, retry with default language
+        if (biography == null && lang != null) {
+            loadBiography(artist.name, null)
+        }
+    }
+
+    private var lang: String? = null
+
+    private fun loadArtistImage() {
+        ArtistGlideRequest.Builder.from(Glide.with(this), artist).generatePalette(this).build()
+                .dontAnimate().into(object : RetroMusicColoredTarget(artistImage) {
+                    override fun onColorReady(color: Int) {
+                        setColors(color)
+                    }
+                })
+    }
+
+    private fun setColors(color: Int) {
+        val textColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
+            color.ripAlpha()
+        else
+            ThemeStore.accentColor(this)
+
+        albumTitle.setTextColor(textColor)
+        songTitle.setTextColor(textColor)
+        biographyTitle.setTextColor(textColor)
+
+        val buttonColor = if (PreferenceUtil.getInstance(this).adaptiveColor)
+            color.ripAlpha()
+        else
+            ATHUtil.resolveColor(this, R.attr.colorSurface)
+
+        MaterialUtil.setTint(button = shuffleAction, color = buttonColor)
+        MaterialUtil.setTint(button = playAction, color = buttonColor)
+
+        val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
+        //status_bar.setBackgroundColor(toolbarColor)
+        toolbar.setBackgroundColor(toolbarColor)
+        setSupportActionBar(toolbar)
+        supportActionBar?.title = null
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return handleSortOrderMenuItem(item)
+    }
+
+    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
+        val songs = artist.songs
+        when (item.itemId) {
+            android.R.id.home -> {
+                super.onBackPressed()
+                return true
+            }
+            R.id.action_play_next -> {
+                MusicPlayerRemote.playNext(songs)
+                return true
+            }
+            R.id.action_add_to_current_playing -> {
+                MusicPlayerRemote.enqueue(songs)
+                return true
+            }
+            R.id.action_add_to_playlist -> {
+                AddToPlaylistDialog.create(songs).show(supportFragmentManager, "ADD_PLAYLIST")
+                return true
+            }
+            R.id.action_set_artist_image -> {
+                val intent = Intent(Intent.ACTION_GET_CONTENT)
+                intent.type = "image/*"
+                startActivityForResult(Intent.createChooser(intent, getString(R.string.pick_from_local_storage)), REQUEST_CODE_SELECT_IMAGE)
+                return true
+            }
+            R.id.action_reset_artist_image -> {
+                Toast.makeText(this@ArtistDetailActivity, resources.getString(R.string.updating), Toast.LENGTH_SHORT).show()
+                CustomArtistImageUtil.getInstance(this@ArtistDetailActivity).resetCustomArtistImage(artist)
+                forceDownload = true
+                return true
+            }
+        }
+        return true
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_artist_detail, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        reload()
+    }
+
+    private fun reload() {
+        if (intent.extras!!.containsKey(EXTRA_ARTIST_ID)) {
+            intent.extras?.getInt(EXTRA_ARTIST_ID)?.let { artistDetailsPresenter.loadArtist(it) }
+        } else {
+            finish()
+        }
+    }
+
+    override fun onBackPressed() {
+        if (cab != null && cab!!.isActive) {
+            cab?.finish()
+        } else {
+            super.onBackPressed()
+        }
+    }
+
+    companion object {
+
+        const val EXTRA_ARTIST_ID = "extra_artist_id"
+        const val REQUEST_CODE_SELECT_IMAGE = 9003
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt
deleted file mode 100644
index af3890d22..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/DriveModeActivity.kt
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.activities
-
-import android.content.Intent
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.os.Bundle
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityDriveModeBinding
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import com.bumptech.glide.Glide
-import com.google.android.material.slider.Slider
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.android.ext.android.inject
-
-
-/**
- * Created by hemanths on 2020-02-02.
- */
-
-class DriveModeActivity : AbsMusicServiceActivity(), Callback {
-
-    private lateinit var binding: ActivityDriveModeBinding
-    private var lastPlaybackControlsColor: Int = Color.GRAY
-    private var lastDisabledPlaybackControlsColor: Int = Color.GRAY
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-    private val repository: RealRepository by inject()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityDriveModeBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setUpMusicControllers()
-
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-        lastPlaybackControlsColor = accentColor()
-        binding.close.setOnClickListener {
-            onBackPressedDispatcher.onBackPressed()
-        }
-        binding.repeatButton.drawAboveSystemBars()
-    }
-
-    private fun setUpMusicControllers() {
-        setUpPlayPauseFab()
-        setUpPrevNext()
-        setUpRepeatButton()
-        setUpShuffleButton()
-        setUpProgressSlider()
-        setupFavouriteToggle()
-    }
-
-    private fun setupFavouriteToggle() {
-        binding.songFavourite.setOnClickListener {
-            toggleFavorite(MusicPlayerRemote.currentSong)
-        }
-    }
-
-    private fun toggleFavorite(song: Song) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val playlist = repository.favoritePlaylist()
-            val songEntity = song.toSongEntity(playlist.playListId)
-            val isFavorite = repository.isSongFavorite(song.id)
-            if (isFavorite) {
-                repository.removeSongFromPlaylist(songEntity)
-            } else {
-                repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
-            }
-            sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
-        }
-    }
-
-    private fun updateFavorite() {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val isFavorite: Boolean =
-                repository.isSongFavorite(MusicPlayerRemote.currentSong.id)
-            withContext(Dispatchers.Main) {
-                binding.songFavourite.setImageResource(if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border)
-            }
-        }
-    }
-
-    private fun setUpProgressSlider() {
-        binding.progressSlider.addOnChangeListener { _: Slider, progress: Float, fromUser: Boolean ->
-            if (fromUser) {
-                MusicPlayerRemote.seekTo(progress.toInt())
-                onUpdateProgressViews(
-                    MusicPlayerRemote.songProgressMillis,
-                    MusicPlayerRemote.songDurationMillis
-                )
-            }
-        }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        progressViewUpdateHelper.stop()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    private fun setUpPrevNext() {
-        binding.nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
-        binding.previousButton.setOnClickListener { MusicPlayerRemote.back() }
-    }
-
-    private fun setUpShuffleButton() {
-        binding.shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
-    }
-
-    private fun setUpRepeatButton() {
-        binding.repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
-    }
-
-    private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-    }
-
-    override fun onRepeatModeChanged() {
-        super.onRepeatModeChanged()
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        super.onShuffleModeChanged()
-        updateShuffleState()
-    }
-
-    override fun onPlayStateChanged() {
-        super.onPlayStateChanged()
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updatePlayPauseDrawableState()
-        updateSong()
-        updateRepeatState()
-        updateShuffleState()
-        updateFavorite()
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
-        } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow)
-        }
-    }
-
-    fun updateShuffleState() {
-        when (MusicPlayerRemote.shuffleMode) {
-            MusicService.SHUFFLE_MODE_SHUFFLE -> binding.shuffleButton.setColorFilter(
-                lastPlaybackControlsColor,
-                PorterDuff.Mode.SRC_IN
-            )
-
-            else -> binding.shuffleButton.setColorFilter(
-                lastDisabledPlaybackControlsColor,
-                PorterDuff.Mode.SRC_IN
-            )
-        }
-    }
-
-    private fun updateRepeatState() {
-        when (MusicPlayerRemote.repeatMode) {
-            MusicService.REPEAT_MODE_NONE -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.repeatButton.setColorFilter(
-                    lastDisabledPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_ALL -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_THIS -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat_one)
-                binding.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-        }
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-        updateFavorite()
-    }
-
-    override fun onFavoriteStateChanged() {
-        super.onFavoriteStateChanged()
-        updateFavorite()
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-
-        binding.songTitle.text = song.title
-        binding.songText.text = song.artistName
-
-        Glide.with(this)
-            .load(RetroGlideExtension.getSongModel(song))
-            .songCoverOptions(song)
-            .transform(BlurTransformation.Builder(this).build())
-            .into(binding.image)
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.progressSlider.run {
-            valueTo = total.toFloat()
-            value = progress.toFloat().coerceIn(valueFrom, valueTo)
-        }
-
-        binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
-        binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
deleted file mode 100644
index 6823b80f8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ErrorActivity.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package code.name.monkey.retromusic.activities
-
-import android.os.Bundle
-import android.widget.Button
-import android.widget.ImageView
-import androidx.appcompat.app.AppCompatActivity
-import cat.ereza.customactivityoncrash.CustomActivityOnCrash
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.FileUtils.createFile
-import code.name.monkey.retromusic.util.Share.shareFile
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.text.DateFormat
-import java.text.SimpleDateFormat
-import java.util.*
-
-class ErrorActivity : AppCompatActivity() {
-    private val dayFormat: DateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.getDefault())
-    private val reportPrefix = "bug_report-"
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(cat.ereza.customactivityoncrash.R.layout.customactivityoncrash_default_error_activity)
-
-        val restartButton =
-            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_restart_button)
-
-        val config = CustomActivityOnCrash.getConfigFromIntent(intent)
-        if (config == null) {
-            finish()
-            return
-        }
-        restartButton.setText(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_restart_app)
-        restartButton.setOnClickListener {
-            CustomActivityOnCrash.restartApplication(
-                this@ErrorActivity,
-                config
-            )
-        }
-        val moreInfoButton =
-            findViewById<Button>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_more_info_button)
-
-        moreInfoButton.setOnClickListener { //We retrieve all the error data and show it
-            MaterialAlertDialogBuilder(this@ErrorActivity)
-                .setTitle(cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_title)
-                .setMessage(
-                    CustomActivityOnCrash.getAllErrorDetailsFromIntent(
-                        this@ErrorActivity,
-                        intent
-                    )
-                )
-                .setPositiveButton(
-                    cat.ereza.customactivityoncrash.R.string.customactivityoncrash_error_activity_error_details_close,
-                    null
-                )
-                .setNeutralButton(
-                    R.string.customactivityoncrash_error_activity_error_details_share
-                ) { _, _ ->
-
-                    val bugReport = createFile(
-                        context = this,
-                        "Bug Report",
-                        "$reportPrefix${dayFormat.format(Date())}",
-                        CustomActivityOnCrash.getAllErrorDetailsFromIntent(
-                            this@ErrorActivity,
-                            intent
-                        ), ".txt"
-                    )
-                    shareFile(this, bugReport, "text/*")
-                }
-                .show()
-        }
-        val errorActivityDrawableId = config.errorDrawable
-        val errorImageView =
-            findViewById<ImageView>(cat.ereza.customactivityoncrash.R.id.customactivityoncrash_error_activity_image)
-        if (errorActivityDrawableId != null) {
-            errorImageView.setImageResource(
-                errorActivityDrawableId
-            )
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
new file mode 100644
index 000000000..6d3ca8091
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/GenreDetailsActivity.kt
@@ -0,0 +1,151 @@
+package code.name.monkey.retromusic.activities
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsView
+import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import com.afollestad.materialcab.MaterialCab
+import kotlinx.android.synthetic.main.activity_playlist_detail.*
+import java.util.*
+import javax.inject.Inject
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+
+class GenreDetailsActivity : AbsSlidingMusicPanelActivity(), CabHolder, GenreDetailsView {
+
+    @Inject
+    lateinit var genreDetailsPresenter: GenreDetailsPresenter
+
+    private lateinit var genre: Genre
+    private lateinit var songAdapter: ShuffleButtonSongAdapter
+    private var cab: MaterialCab? = null
+
+    private fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
+    private fun checkIsEmpty() {
+        emptyEmoji.text = getEmojiByUnicode(0x1F631)
+        empty?.visibility = if (songAdapter.itemCount == 0) View.VISIBLE else View.GONE
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+        toggleBottomNavigationView(true)
+
+        if (intent.extras != null) {
+            genre = intent?.extras?.getParcelable(EXTRA_GENRE_ID)!!
+        } else {
+            finish()
+        }
+
+        setUpToolBar()
+        setupRecyclerView()
+
+        App.musicComponent.inject(this)
+        genreDetailsPresenter.attachView(this)
+
+    }
+
+    private fun setUpToolBar() {
+        applyToolbar(toolbar)
+        title = genre.name
+    }
+
+    override fun onResume() {
+        super.onResume()
+        genreDetailsPresenter.loadGenreSongs(genre.id)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        genreDetailsPresenter.detachView()
+    }
+
+    override fun createContentView(): View {
+        return wrapSlidingMusicPanel(R.layout.activity_playlist_detail)
+    }
+
+    override fun showEmptyView() {
+
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_genre_detail, menu)
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+        }
+        return GenreMenuHelper.handleMenuClick(this, genre, item)
+    }
+
+    private fun setupRecyclerView() {
+        ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView)
+        songAdapter = ShuffleButtonSongAdapter(this, ArrayList(), R.layout.item_list, false, this)
+        recyclerView.apply {
+            itemAnimator = DefaultItemAnimator()
+            layoutManager = LinearLayoutManager(this@GenreDetailsActivity)
+            adapter = songAdapter
+        }
+        songAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                checkIsEmpty()
+            }
+        })
+    }
+
+    override fun songs(songs: ArrayList<Song>) {
+        songAdapter.swapDataSet(songs)
+    }
+
+    override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
+        if (cab != null && cab!!.isActive) cab!!.finish()
+        cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes).setCloseDrawableRes(R.drawable.ic_close_white_24dp).setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface))).start(callback)
+        return cab!!
+    }
+
+    override fun onBackPressed() {
+        if (cab != null && cab!!.isActive) cab!!.finish()
+        else {
+            recyclerView!!.stopScroll()
+            super.onBackPressed()
+        }
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        genreDetailsPresenter.loadGenreSongs(genre.id)
+    }
+
+    companion object {
+        const val EXTRA_GENRE_ID = "extra_genre_id"
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java
new file mode 100644
index 000000000..00e742ac2
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.activities;
+
+import android.graphics.Color;
+import android.os.Bundle;
+import android.view.MenuItem;
+import android.webkit.WebView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.Toolbar;
+
+import org.jetbrains.annotations.Nullable;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.appthemehelper.util.ColorUtil;
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
+
+import static code.name.monkey.appthemehelper.util.ATHUtil.INSTANCE;
+
+/**
+ * Created by hemanths on 2019-09-27.
+ */
+public class LicenseActivity extends AbsBaseActivity {
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        if (item.getItemId() == android.R.id.home) {
+            onBackPressed();
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    private String colorToCSS(int color) {
+        return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color)); // on API 29, WebView doesn't load with hex colors
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setDrawUnderStatusBar();
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_license);
+        setStatusbarColorAuto();
+        setNavigationbarColorAuto();
+        setLightNavigationBar(true);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(toolbar);
+        ToolbarContentTintHelper.colorBackButton(toolbar);
+        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorSurface));
+        WebView webView = findViewById(R.id.license);
+        try {
+            StringBuilder buf = new StringBuilder();
+            InputStream json = getAssets().open("index.html");
+            BufferedReader in = new BufferedReader(new InputStreamReader(json, StandardCharsets.UTF_8));
+            String str;
+            while ((str = in.readLine()) != null)
+                buf.append(str);
+            in.close();
+
+            // Inject color values for WebView body background and links
+            final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
+            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this, android.R.attr.windowBackground, Color.parseColor(isDark ? "#424242" : "#ffffff")));
+            final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
+            final String changeLog = buf.toString()
+                    .replace("{style-placeholder}",
+                            String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
+                    .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this)))
+                    .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))));
+
+            webView.loadData(changeLog, "text/html", "UTF-8");
+        } catch (Throwable e) {
+            webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
+        }
+
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
deleted file mode 100644
index e41352dae..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LicenseActivity.kt
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.activities
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.MenuItem
-import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
-import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.databinding.ActivityLicenseBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.surfaceColor
-import java.io.BufferedReader
-import java.io.InputStreamReader
-import java.nio.charset.StandardCharsets
-
-/** Created by hemanths on 2019-09-27.  */
-class LicenseActivity : AbsThemeActivity() {
-    private lateinit var binding: ActivityLicenseBinding
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityLicenseBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setSupportActionBar(binding.toolbar)
-        ToolbarContentTintHelper.colorBackButton(binding.toolbar)
-        try {
-            val buf = StringBuilder()
-            val json = assets.open("license.html")
-            BufferedReader(InputStreamReader(json, StandardCharsets.UTF_8)).use { br ->
-                var str: String?
-                while (br.readLine().also { str = it } != null) {
-                    buf.append(str)
-                }
-            }
-
-            // Inject color values for WebView body background and links
-            val isDark = isWindowBackgroundDark(this)
-            val backgroundColor = colorToCSS(
-                surfaceColor(Color.parseColor(if (isDark) "#424242" else "#ffffff"))
-            )
-            val contentColor = colorToCSS(Color.parseColor(if (isDark) "#ffffff" else "#000000"))
-            val changeLog = buf.toString()
-                .replace(
-                    "{style-placeholder}", String.format(
-                        "body { background-color: %s; color: %s; }", backgroundColor, contentColor
-                    )
-                )
-                .replace("{link-color}", colorToCSS(accentColor()))
-                .replace(
-                    "{link-color-active}",
-                    colorToCSS(
-                        lightenColor(accentColor())
-                    )
-                )
-            binding.license.loadData(changeLog, "text/html", "UTF-8")
-        } catch (e: Throwable) {
-            binding.license.loadData(
-                "<h1>Unable to load</h1><p>" + e.localizedMessage + "</p>", "text/html", "UTF-8"
-            )
-        }
-        binding.license.drawAboveSystemBars()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    private fun colorToCSS(color: Int): String {
-        return String.format(
-            "rgb(%d, %d, %d)",
-            Color.red(color),
-            Color.green(color),
-            Color.blue(color)
-        ) // on API 29, WebView doesn't load with hex colors
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
index 3ac219871..3f0dffbd3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LockScreenActivity.kt
@@ -1,121 +1,96 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities
 
 import android.app.KeyguardManager
+import android.content.Context
+import android.os.Build
 import android.os.Bundle
+import android.view.View
 import android.view.WindowManager
-import androidx.core.content.getSystemService
-import code.name.monkey.appthemehelper.util.VersionUtils
+import androidx.core.view.ViewCompat
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityLockScreenBinding
-import code.name.monkey.retromusic.extensions.hideStatusBar
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import com.bumptech.glide.Glide
 import com.r0adkll.slidr.Slidr
 import com.r0adkll.slidr.model.SlidrConfig
 import com.r0adkll.slidr.model.SlidrListener
 import com.r0adkll.slidr.model.SlidrPosition
+import kotlinx.android.synthetic.main.activity_lock_screen.*
 
 class LockScreenActivity : AbsMusicServiceActivity() {
-    private lateinit var binding: ActivityLockScreenBinding
-    private var fragment: LockScreenControlsFragment? = null
+	private var fragment: LockScreenPlayerControlsFragment? = null
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        lockScreenInit()
-        binding = ActivityLockScreenBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        hideStatusBar()
-        setTaskDescriptionColorAuto()
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1) {
+			setShowWhenLocked(true)
+			setTurnScreenOn(true)
+		} else {
+			this.window.addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD or WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON)
+		}
+		setDrawUnderStatusBar()
+		setContentView(R.layout.activity_lock_screen)
+		hideStatusBar()
+		setStatusbarColorAuto()
+		setNavigationbarColorAuto()
+		setTaskDescriptionColorAuto()
+		setLightNavigationBar(true)
 
-        val config = SlidrConfig.Builder().listener(object : SlidrListener {
-            override fun onSlideStateChanged(state: Int) {
-            }
+		val config = SlidrConfig.Builder().listener(object : SlidrListener {
+			override fun onSlideStateChanged(state: Int) {
 
-            override fun onSlideChange(percent: Float) {
-            }
+			}
 
-            override fun onSlideOpened() {
-            }
+			override fun onSlideChange(percent: Float) {
 
-            override fun onSlideClosed(): Boolean {
-                if (VersionUtils.hasOreo()) {
-                    val keyguardManager =
-                        getSystemService<KeyguardManager>()
-                    keyguardManager?.requestDismissKeyguard(this@LockScreenActivity, null)
-                }
-                finish()
-                return true
-            }
-        }).position(SlidrPosition.BOTTOM).build()
+			}
 
-        Slidr.attach(this, config)
+			override fun onSlideOpened() {
 
-        fragment = whichFragment<LockScreenControlsFragment>(R.id.playback_controls_fragment)
+			}
 
-        binding.slide.apply {
-            translationY = 100f
-            alpha = 0f
-            animate().translationY(0f).alpha(1f).setDuration(1500).start()
-        }
-    }
+			override fun onSlideClosed(): Boolean {
+				if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+					val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager
+					keyguardManager.requestDismissKeyguard(this@LockScreenActivity, null)
+				}
+				finish()
+				return true
+			}
+		}).position(SlidrPosition.BOTTOM).build()
 
-    @Suppress("Deprecation")
-    private fun lockScreenInit() {
-        if (VersionUtils.hasOreoMR1()) {
-            setShowWhenLocked(true)
-            //setTurnScreenOn(true)
-        } else {
-            window.addFlags(
-                WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED
-                //          or WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON
-            )
-        }
-    }
+		Slidr.attach(this, config)
 
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSongs()
-    }
+		fragment = supportFragmentManager.findFragmentById(R.id.playback_controls_fragment) as LockScreenPlayerControlsFragment?
 
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSongs()
-    }
+		findViewById<View>(R.id.slide).apply {
+			translationY = 100f
+			alpha = 0f
+			ViewCompat.animate(this).translationY(0f).alpha(1f).setDuration(1500).start()
+		}
+	}
 
-    private fun updateSongs() {
-        val song = MusicPlayerRemote.currentSong
-        Glide.with(this)
-            .asBitmapPalette()
-            .songCoverOptions(song)
-            .load(RetroGlideExtension.getSongModel(song))
-            .dontAnimate()
-            .into(object : RetroMusicColoredTarget(binding.image) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    fragment?.setColor(colors)
-                }
-            })
-    }
-}
+	override fun onPlayingMetaChanged() {
+		super.onPlayingMetaChanged()
+		updateSongs()
+	}
+
+	override fun onServiceConnected() {
+		super.onServiceConnected()
+		updateSongs()
+	}
+
+	private fun updateSongs() {
+		val song = MusicPlayerRemote.currentSong
+		SongGlideRequest.Builder.from(Glide.with(this), song).checkIgnoreMediaStore(this)
+			.generatePalette(this).build().dontAnimate()
+			.into(object : RetroMusicColoredTarget(image) {
+				override fun onColorReady(color: Int) {
+					fragment?.setDark(color)
+				}
+			})
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
new file mode 100644
index 000000000..70551114c
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/LyricsActivity.kt
@@ -0,0 +1,421 @@
+package code.name.monkey.retromusic.activities
+
+import android.annotation.SuppressLint
+import android.content.res.ColorStateList
+import android.os.AsyncTask
+import android.os.Build
+import android.os.Bundle
+import android.text.InputType
+import android.text.TextUtils
+import android.view.*
+import androidx.annotation.StringRes
+import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.FragmentStatePagerAdapter
+import androidx.viewpager.widget.ViewPager
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.appthemehelper.util.TintHelper
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.activities.tageditor.WriteTagsAsyncTask
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.lyrics.LrcHelper
+import code.name.monkey.retromusic.lyrics.LrcView
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.model.lyrics.Lyrics
+import code.name.monkey.retromusic.util.LyricUtil
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.input.getInputLayout
+import com.afollestad.materialdialogs.input.input
+import kotlinx.android.synthetic.main.activity_lyrics.*
+import kotlinx.android.synthetic.main.fragment_lyrics.*
+import kotlinx.android.synthetic.main.fragment_synced.*
+import org.jaudiotagger.tag.FieldKey
+import java.io.File
+import java.util.*
+import kotlin.collections.ArrayList
+
+class LyricsActivity : AbsMusicServiceActivity(), View.OnClickListener, ViewPager.OnPageChangeListener {
+    override fun onPageScrollStateChanged(state: Int) {
+        when (state) {
+            ViewPager.SCROLL_STATE_IDLE -> fab.show()
+            ViewPager.SCROLL_STATE_DRAGGING, ViewPager.SCROLL_STATE_SETTLING -> fab.hide()
+        }
+    }
+
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+    }
+
+    override fun onPageSelected(position: Int) {
+        PreferenceUtil.getInstance(this).lyricsOptions = position
+        if (position == 0) fab.text = getString(R.string.synced_lyrics)
+        else if (position == 1) fab.text = getString(R.string.lyrics)
+    }
+
+    override fun onClick(v: View?) {
+        when (viewPager.currentItem) {
+            0 -> showSyncedLyrics()
+            1 -> showLyricsSaveDialog()
+        }
+    }
+
+    private lateinit var song: Song
+    private var lyricsString: String? = null
+
+    private val googleSearchLrcUrl: String
+        get() {
+            var baseUrl = "http://www.google.com/search?"
+            var query = song.title + "+" + song.artistName
+            query = "q=" + query.replace(" ", "+") + " .lrc"
+            baseUrl += query
+            return baseUrl
+        }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_lyrics)
+        setStatusbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setNavigationbarColorAuto()
+
+        applyToolbar(toolbar)
+        fab.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
+        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this))))
+                .apply {
+                    fab.setTextColor(this)
+                    fab.iconTint = this
+                }
+        setupWakelock()
+
+        viewPager.apply {
+            adapter = PagerAdapter(supportFragmentManager)
+            currentItem = PreferenceUtil.getInstance(this@LyricsActivity).lyricsOptions
+            addOnPageChangeListener(this@LyricsActivity)
+        }
+
+        tabs.apply {
+            setupWithViewPager(viewPager)
+            setSelectedTabIndicator(
+                    TintHelper.createTintedDrawable(
+                            ContextCompat.getDrawable(
+                                    this@LyricsActivity, R.drawable.tab_indicator
+                            ), ThemeStore.accentColor(this@LyricsActivity)
+                    )
+            )
+            setTabTextColors(
+                    ThemeStore.textColorSecondary(this@LyricsActivity),
+                    ThemeStore.accentColor(this@LyricsActivity)
+            )
+            setSelectedTabIndicatorColor(ThemeStore.accentColor(context))
+        }
+        fab.setOnClickListener(this)
+    }
+
+    override fun onPlayingMetaChanged() {
+        super.onPlayingMetaChanged()
+        song = MusicPlayerRemote.currentSong
+        toolbar.title = song.title
+        toolbar.subtitle = song.artistName
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        song = MusicPlayerRemote.currentSong
+        toolbar.title = song.title
+        toolbar.subtitle = song.artistName
+    }
+
+    private fun setupWakelock() {
+        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun showSyncedLyrics() {
+        var content = ""
+        try {
+            content = LyricUtil.getStringFromFile(song.data, song.artistName)
+        } catch (e: Exception) {
+            try {
+                content = LyricUtil.getStringFromFile(song.title, song.artistName)
+            } catch (e2: Exception) {
+
+            }
+            e.printStackTrace()
+        }
+
+        val materialDialog = MaterialDialog(
+                this, BottomSheet(LayoutMode.WRAP_CONTENT)
+        ).show {
+            title(R.string.add_time_framed_lryics)
+            negativeButton(R.string.action_search) {
+                RetroUtil.openUrl(
+                        this@LyricsActivity, googleSearchLrcUrl
+                )
+            }
+            input(
+                    hint = getString(R.string.paste_lyrics_here),
+                    prefill = content,
+                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            ) { _, input ->
+                LyricUtil.writeLrcToLoc(song.data, song.artistName, input.toString())
+            }
+            positiveButton(android.R.string.ok) {
+                updateSong()
+            }
+        }
+        MaterialUtil.setTint(materialDialog.getInputLayout(), false)
+    }
+
+    private fun updateSong() {
+        val page = supportFragmentManager.findFragmentByTag("android:switcher:" + R.id.viewPager + ":" + viewPager.currentItem)
+        if (viewPager.currentItem == 0 && page != null) {
+            (page as BaseLyricsFragment).upDateSong()
+        }
+    }
+
+    private fun showLyricsSaveDialog() {
+        val content: String = if (lyricsString == null) {
+            ""
+        } else {
+            lyricsString!!
+        }
+
+        val materialDialog = MaterialDialog(
+                this, BottomSheet(LayoutMode.WRAP_CONTENT)
+        ).show {
+            title(R.string.add_lyrics)
+            negativeButton(R.string.action_search) {
+                RetroUtil.openUrl(
+                        this@LyricsActivity, getGoogleSearchUrl()
+                )
+            }
+            input(
+                    hint = getString(R.string.paste_lyrics_here),
+                    prefill = content,
+                    inputType = InputType.TYPE_CLASS_TEXT or InputType.TYPE_TEXT_FLAG_MULTI_LINE
+            ) { _, input ->
+                val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
+                fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
+                WriteTagsAsyncTask(this@LyricsActivity).execute(
+                        WriteTagsAsyncTask.LoadingInfo(
+                                getSongPaths(song), fieldKeyValueMap, null
+                        )
+                )
+            }
+            positiveButton(android.R.string.ok) {
+                updateSong()
+            }
+        }
+        MaterialUtil.setTint(materialDialog.getInputLayout(), false)
+    }
+
+    private fun getSongPaths(song: Song): ArrayList<String> {
+        val paths = ArrayList<String>(1)
+        paths.add(song.data)
+        return paths
+    }
+
+    private fun getGoogleSearchUrl(): String {
+        var baseUrl = "http://www.google.com/search?"
+        var query = song.title + "+" + song.artistName
+        query = "q=" + query.replace(" ", "+") + " lyrics"
+        baseUrl += query
+        return baseUrl
+    }
+
+    class PagerAdapter(fm: FragmentManager) : FragmentStatePagerAdapter(
+            fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT
+    ) {
+        class Tabs(
+                @StringRes val title: Int, val fragment: Fragment
+        )
+
+        private var tabs = ArrayList<Tabs>()
+
+        init {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP_MR1) {
+                tabs.add(Tabs(R.string.synced_lyrics, SyncedLyricsFragment()))
+            }
+            tabs.add(Tabs(R.string.normal_lyrics, OfflineLyricsFragment()))
+        }
+
+        override fun getItem(position: Int): Fragment {
+            return tabs[position].fragment
+        }
+
+        override fun getPageTitle(position: Int): CharSequence? {
+            return App.getContext().getString(tabs[position].title)
+        }
+
+        override fun getCount(): Int {
+            return tabs.size
+        }
+
+    }
+
+    abstract class BaseLyricsFragment : AbsMusicServiceFragment() {
+        abstract fun upDateSong()
+
+        override fun onPlayingMetaChanged() {
+            super.onPlayingMetaChanged()
+            upDateSong()
+        }
+
+        override fun onServiceConnected() {
+            super.onServiceConnected()
+            upDateSong()
+        }
+
+    }
+
+    class OfflineLyricsFragment : BaseLyricsFragment() {
+        override fun upDateSong() {
+            loadSongLyrics()
+        }
+
+        private var updateLyricsAsyncTask: AsyncTask<*, *, *>? = null
+        private var lyrics: Lyrics? = null
+
+        @SuppressLint("StaticFieldLeak")
+        private fun loadSongLyrics() {
+            if (updateLyricsAsyncTask != null) {
+                updateLyricsAsyncTask!!.cancel(false)
+            }
+            val song = MusicPlayerRemote.currentSong
+            updateLyricsAsyncTask = object : AsyncTask<Void?, Void?, Lyrics?>() {
+                override fun doInBackground(vararg params: Void?): Lyrics? {
+                    val data = MusicUtil.getLyrics(song)
+                    return if (TextUtils.isEmpty(data)) {
+                        null
+                    } else Lyrics.parse(song, data!!)
+                }
+
+                override fun onPreExecute() {
+                    super.onPreExecute()
+                    lyrics = null
+                }
+
+                override fun onPostExecute(l: Lyrics?) {
+                    lyrics = l
+                    offlineLyrics?.visibility = View.VISIBLE
+                    if (l == null) {
+                        offlineLyrics?.setText(R.string.no_lyrics_found)
+                        return
+                    }
+                    (activity as LyricsActivity).lyricsString = l.text
+                    offlineLyrics?.text = l.text
+                }
+
+                override fun onCancelled(s: Lyrics?) {
+                    onPostExecute(null)
+                }
+            }.execute()
+        }
+
+        override fun onActivityCreated(savedInstanceState: Bundle?) {
+            super.onActivityCreated(savedInstanceState)
+            loadSongLyrics()
+        }
+
+        override fun onDestroyView() {
+            super.onDestroyView()
+            if (updateLyricsAsyncTask != null && !updateLyricsAsyncTask!!.isCancelled) {
+                updateLyricsAsyncTask?.cancel(true)
+            }
+        }
+
+        override fun onCreateView(
+                inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        ): View? {
+            return inflater.inflate(R.layout.fragment_lyrics, container, false)
+        }
+    }
+
+    class SyncedLyricsFragment : BaseLyricsFragment(), MusicProgressViewUpdateHelper.Callback {
+        override fun upDateSong() {
+            loadLRCLyrics()
+        }
+
+        private lateinit var updateHelper: MusicProgressViewUpdateHelper
+        override fun onCreateView(
+                inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+        ): View? {
+            return inflater.inflate(R.layout.fragment_synced, container, false)
+        }
+
+        override fun onCreate(savedInstanceState: Bundle?) {
+            super.onCreate(savedInstanceState)
+            updateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
+        }
+
+        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+            super.onViewCreated(view, savedInstanceState)
+            setupLyricsView()
+        }
+
+        private fun setupLyricsView() {
+            lyricsView.apply {
+                val context = activity!!
+                setCurrentPlayLineColor(ThemeStore.accentColor(context))
+                setIndicatorTextColor(ThemeStore.accentColor(context))
+                setCurrentIndicateLineTextColor(ThemeStore.textColorPrimary(context))
+                setNoLrcTextColor(ThemeStore.textColorPrimary(context))
+                setOnPlayIndicatorLineListener(object : LrcView.OnPlayIndicatorLineListener {
+                    override fun onPlay(time: Long, content: String) {
+                        MusicPlayerRemote.seekTo(time.toInt())
+                    }
+                })
+            }
+        }
+
+        override fun onResume() {
+            super.onResume()
+            updateHelper.start()
+        }
+
+        override fun onPause() {
+            super.onPause()
+            updateHelper.stop()
+        }
+
+        override fun onUpdateProgressViews(progress: Int, total: Int) {
+            lyricsView.updateTime(progress.toLong())
+        }
+
+        private fun loadLRCLyrics() {
+            val song = MusicPlayerRemote.currentSong
+            if (LyricUtil.isLrcFile2Exist(song.data, song.artistName)) {
+                showLyricsLocal(LyricUtil.getLocalLyricFile(song.data, song.artistName))
+            } else {
+                if (LyricUtil.isLrcFileExist(song.title, song.artistName)) {
+                    showLyricsLocal(LyricUtil.getLocalLyricFile(song.title, song.artistName))
+                }
+            }
+        }
+
+        private fun showLyricsLocal(file: File?) {
+            if (file != null) {
+                lyricsView.setLrcData(LrcHelper.parseLrcFromFile(file))
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
index e9cb29abe..116c73500 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
@@ -1,214 +1,267 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities
 
-import android.content.Intent
-import android.net.Uri
+import android.content.*
 import android.os.Bundle
 import android.provider.MediaStore
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.contains
-import androidx.navigation.ui.setupWithNavController
+import android.util.Log
+import android.view.View
+import androidx.core.app.ActivityCompat
+import androidx.fragment.app.Fragment
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
+import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment
+import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SearchQueryHelper.getSongs
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.PlaylistSongsLoader
+import code.name.monkey.retromusic.helper.SearchQueryHelper
+import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
+import code.name.monkey.retromusic.loaders.AlbumLoader
+import code.name.monkey.retromusic.loaders.ArtistLoader
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.AppRater
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logE
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.get
+import io.reactivex.disposables.CompositeDisposable
+import java.util.*
 
-class MainActivity : AbsSlidingMusicPanelActivity() {
-    companion object {
-        const val TAG = "MainActivity"
-        const val EXPAND_PANEL = "expand_panel"
+class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    private lateinit var currentFragment: MainActivityFragmentCallbacks
+
+    private var blockRequestPermissions: Boolean = false
+    private val disposable = CompositeDisposable()
+    private val broadcastReceiver = object : BroadcastReceiver() {
+        override fun onReceive(context: Context, intent: Intent) {
+            val action = intent.action
+            if (action != null && action == Intent.ACTION_SCREEN_OFF) {
+                if (PreferenceUtil.getInstance(this@MainActivity).lockScreen && MusicPlayerRemote.isPlaying) {
+                    val activity = Intent(context, LockScreenActivity::class.java)
+                    activity.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    activity.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY)
+                    ActivityCompat.startActivity(context, activity, null)
+                }
+            }
+        }
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
+    override fun createContentView(): View {
+        return wrapSlidingMusicPanel(R.layout.activity_main_content)
+    }
+
+    override fun onCreate(
+            savedInstanceState: Bundle?
+    ) {
+        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-        setTaskDescriptionColorAuto()
-        hideStatusBar()
-        updateTabs()
+        getBottomNavigationView().selectedItemId = PreferenceUtil.getInstance(this).lastPage
+        getBottomNavigationView().setOnNavigationItemSelectedListener {
+            PreferenceUtil.getInstance(this).lastPage = it.itemId
+            selectedFragment(it.itemId)
+            true
+        }
 
-        setupNavigationController()
+        if (savedInstanceState == null) {
+            setMusicChooser(PreferenceUtil.getInstance(this).lastMusicChooser)
+        } else {
+            restoreCurrentFragment()
+        }
 
-        WhatsNewFragment.showChangeLog(this)
+        checkShowChangelog()
+        AppRater.appLaunched(this)
     }
 
-    private fun setupNavigationController() {
-        val navController = findNavController(R.id.fragment_container)
-        val navInflater = navController.navInflater
-        val navGraph = navInflater.inflate(R.navigation.main_graph)
+    private fun checkShowChangelog() {
+        try {
+            val pInfo = packageManager.getPackageInfo(packageName, 0)
+            val currentVersion = pInfo.versionCode
+            if (currentVersion != PreferenceUtil.getInstance(this).lastChangelogVersion) {
+                startActivityForResult(
+                        Intent(this, WhatsNewActivity::class.java),
+                        APP_INTRO_REQUEST
+                )
+            }
+        } catch (e: Throwable) {
+            e.printStackTrace()
+        }
 
-        val categoryInfo: CategoryInfo = PreferenceUtil.libraryCategory.first { it.visible }
-        if (categoryInfo.visible) {
-            if (!navGraph.contains(PreferenceUtil.lastTab)) PreferenceUtil.lastTab =
-                categoryInfo.category.id
-            navGraph.setStartDestination(
-                if (PreferenceUtil.rememberLastTab) {
-                    PreferenceUtil.lastTab.let {
-                        if (it == 0) {
-                            categoryInfo.category.id
-                        } else {
-                            it
-                        }
-                    }
-                } else categoryInfo.category.id
-            )
-        }
-        navController.graph = navGraph
-        navigationView.setupWithNavController(navController)
-        // Scroll Fragment to top
-        navigationView.setOnItemReselectedListener {
-            currentFragment(R.id.fragment_container).apply {
-                if (this is IScrollHelper) {
-                    scrollToTop()
-                }
-            }
-        }
-        navController.addOnDestinationChangedListener { _, destination, _ ->
-            if (destination.id == navGraph.startDestinationId) {
-                currentFragment(R.id.fragment_container)?.enterTransition = null
-            }
-            when (destination.id) {
-                R.id.action_home, R.id.action_song, R.id.action_album, R.id.action_artist, R.id.action_folder, R.id.action_playlist, R.id.action_genre, R.id.action_search -> {
-                    // Save the last tab
-                    if (PreferenceUtil.rememberLastTab) {
-                        saveTab(destination.id)
-                    }
-                    // Show Bottom Navigation Bar
-                    setBottomNavVisibility(visible = true, animate = true)
-                }
-                R.id.playing_queue_fragment -> {
-                    setBottomNavVisibility(visible = false, hideBottomSheet = true)
-                }
-                else -> setBottomNavVisibility(
-                    visible = false,
-                    animate = true
-                ) // Hide Bottom Navigation Bar
+    }
+
+    override fun onResume() {
+        super.onResume()
+        val screenOnOff = IntentFilter()
+        screenOnOff.addAction(Intent.ACTION_SCREEN_OFF)
+        registerReceiver(broadcastReceiver, screenOnOff)
+
+        PreferenceUtil.getInstance(this).registerOnSharedPreferenceChangedListener(this)
+
+        if (intent.hasExtra("expand")) {
+            if (intent.getBooleanExtra("expand", false)) {
+                expandPanel()
+                intent.putExtra("expand", false)
             }
         }
     }
 
-    private fun saveTab(id: Int) {
-        if (PreferenceUtil.libraryCategory.firstOrNull { it.category.id == id }?.visible == true) {
-            PreferenceUtil.lastTab = id
+    override fun onDestroy() {
+        super.onDestroy()
+        disposable.clear()
+        unregisterReceiver(broadcastReceiver)
+        PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this)
+    }
+
+    private fun setCurrentFragment(fragment: Fragment, tag: String) {
+        if (tag != supportFragmentManager.findFragmentById(R.id.fragment_container)?.tag) {
+            supportFragmentManager.beginTransaction()
+                    .replace(R.id.fragment_container, fragment, tag).commit()
+            currentFragment = fragment as MainActivityFragmentCallbacks
         }
     }
 
-    override fun onSupportNavigateUp(): Boolean =
-        findNavController(R.id.fragment_container).navigateUp()
+    fun setDetailsFragments(fragment: Fragment, tag: String) {
+        supportFragmentManager.beginTransaction()
+                .add(R.id.fragment_container, fragment, tag)
+                .addToBackStack(tag)
+                .commit()
+        currentFragment = fragment as MainActivityFragmentCallbacks
+    }
 
-    override fun onNewIntent(intent: Intent?) {
-        super.onNewIntent(intent)
-        val expand = intent?.extra<Boolean>(EXPAND_PANEL)?.value ?: false
-        if (expand && PreferenceUtil.isExpandPanel) {
-            fromNotification = true
-            slidingPanel.bringToFront()
-            expandPanel()
-            intent?.removeExtra(EXPAND_PANEL)
+    private fun restoreCurrentFragment() {
+        currentFragment = supportFragmentManager.findFragmentById(R.id.fragment_container) as MainActivityFragmentCallbacks
+    }
+
+    private fun handlePlaybackIntent(intent: Intent?) {
+        if (intent == null) {
+            return
+        }
+        val uri = intent.data
+        val mimeType = intent.type
+        var handled = false
+        if (intent.action != null && intent.action == MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH) {
+            val songs = SearchQueryHelper.getSongs(this, intent.extras!!)
+            if (MusicPlayerRemote.shuffleMode == MusicService.SHUFFLE_MODE_SHUFFLE) {
+                MusicPlayerRemote.openAndShuffleQueue(songs, true)
+            } else {
+                MusicPlayerRemote.openQueue(songs, 0, true)
+            }
+            handled = true
         }
-    }
 
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        intent ?: return
-        handlePlaybackIntent(intent)
-    }
-
-    private fun handlePlaybackIntent(intent: Intent) {
-        lifecycleScope.launch(IO) {
-            val uri: Uri? = intent.data
-            val mimeType: String? = intent.type
-            var handled = false
-            if (intent.action != null &&
-                intent.action == MediaStore.INTENT_ACTION_MEDIA_PLAY_FROM_SEARCH
-            ) {
-                val songs: List<Song> = getSongs(intent.extras!!)
-                if (MusicPlayerRemote.shuffleMode == MusicService.SHUFFLE_MODE_SHUFFLE) {
-                    MusicPlayerRemote.openAndShuffleQueue(songs, true)
-                } else {
-                    MusicPlayerRemote.openQueue(songs, 0, true)
-                }
+        if (uri != null && uri.toString().isNotEmpty()) {
+            MusicPlayerRemote.playFromUri(uri)
+            handled = true
+        } else if (MediaStore.Audio.Playlists.CONTENT_TYPE == mimeType) {
+            val id = parseIdFromIntent(intent, "playlistId", "playlist").toInt()
+            if (id >= 0) {
+                val position = intent.getIntExtra("position", 0)
+                val songs = ArrayList(PlaylistSongsLoader.getPlaylistSongList(this, id))
+                MusicPlayerRemote.openQueue(songs, position, true)
                 handled = true
             }
-            if (uri != null && uri.toString().isNotEmpty()) {
-                MusicPlayerRemote.playFromUri(this@MainActivity, uri)
+        } else if (MediaStore.Audio.Albums.CONTENT_TYPE == mimeType) {
+            val id = parseIdFromIntent(intent, "albumId", "album").toInt()
+            if (id >= 0) {
+                val position = intent.getIntExtra("position", 0)
+                MusicPlayerRemote.openQueue(AlbumLoader.getAlbum(this, id).songs!!, position, true)
                 handled = true
-            } else if (MediaStore.Audio.Playlists.CONTENT_TYPE == mimeType) {
-                val id = parseLongFromIntent(intent, "playlistId", "playlist")
-                if (id >= 0L) {
-                    val position: Int = intent.getIntExtra("position", 0)
-                    val songs: List<Song> = PlaylistSongsLoader.getPlaylistSongList(get(), id)
-                    MusicPlayerRemote.openQueue(songs, position, true)
-                    handled = true
-                }
-            } else if (MediaStore.Audio.Albums.CONTENT_TYPE == mimeType) {
-                val id = parseLongFromIntent(intent, "albumId", "album")
-                if (id >= 0L) {
-                    val position: Int = intent.getIntExtra("position", 0)
-                    val songs = libraryViewModel.albumById(id).songs
-                    MusicPlayerRemote.openQueue(
-                        songs,
-                        position,
-                        true
-                    )
-                    handled = true
-                }
-            } else if (MediaStore.Audio.Artists.CONTENT_TYPE == mimeType) {
-                val id = parseLongFromIntent(intent, "artistId", "artist")
-                if (id >= 0L) {
-                    val position: Int = intent.getIntExtra("position", 0)
-                    val songs: List<Song> = libraryViewModel.artistById(id).songs
-                    MusicPlayerRemote.openQueue(
-                        songs,
-                        position,
-                        true
-                    )
-                    handled = true
-                }
             }
-            if (handled) {
-                setIntent(Intent())
+        } else if (MediaStore.Audio.Artists.CONTENT_TYPE == mimeType) {
+            val id = parseIdFromIntent(intent, "artistId", "artist").toInt()
+            if (id >= 0) {
+                val position = intent.getIntExtra("position", 0)
+                MusicPlayerRemote.openQueue(ArtistLoader.getArtist(this, id).songs, position, true)
+                handled = true
             }
         }
+        if (handled) {
+            setIntent(Intent())
+        }
     }
 
-    private fun parseLongFromIntent(
-        intent: Intent,
-        longKey: String,
-        stringKey: String,
-    ): Long {
+    private fun parseIdFromIntent(intent: Intent, longKey: String, stringKey: String): Long {
         var id = intent.getLongExtra(longKey, -1)
         if (id < 0) {
             val idString = intent.getStringExtra(stringKey)
             if (idString != null) {
                 try {
-                    id = idString.toLong()
+                    id = java.lang.Long.parseLong(idString)
                 } catch (e: NumberFormatException) {
-                    logE(e)
+                    Log.e(TAG, e.message)
                 }
             }
         }
         return id
     }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            APP_INTRO_REQUEST -> {
+                blockRequestPermissions = false
+                if (!hasPermissions()) {
+                    requestPermissions()
+                }
+            }
+            REQUEST_CODE_THEME, APP_USER_INFO_REQUEST -> postRecreate()
+            PURCHASE_REQUEST -> {
+                if (resultCode == RESULT_OK) {
+                    //checkSetUpPro();
+                }
+            }
+        }
+
+    }
+
+    override fun handleBackPress(): Boolean {
+        return super.handleBackPress() || currentFragment.handleBackPress()
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        handlePlaybackIntent(intent)
+    }
+
+    override fun requestPermissions() {
+        if (!blockRequestPermissions) {
+            super.requestPermissions()
+        }
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        if (key == PreferenceUtil.GENERAL_THEME || key == PreferenceUtil.BLACK_THEME || key == PreferenceUtil.ADAPTIVE_COLOR_APP || key == PreferenceUtil.DOMINANT_COLOR || key == PreferenceUtil.USER_NAME || key == PreferenceUtil.TOGGLE_FULL_SCREEN || key == PreferenceUtil.TOGGLE_VOLUME || key == PreferenceUtil.ROUND_CORNERS || key == PreferenceUtil.CAROUSEL_EFFECT || key == PreferenceUtil.NOW_PLAYING_SCREEN_ID || key == PreferenceUtil.TOGGLE_GENRE || key == PreferenceUtil.BANNER_IMAGE_PATH || key == PreferenceUtil.PROFILE_IMAGE_PATH || key == PreferenceUtil.CIRCULAR_ALBUM_ART || key == PreferenceUtil.KEEP_SCREEN_ON || key == PreferenceUtil.TOGGLE_SEPARATE_LINE || key == PreferenceUtil.ALBUM_GRID_STYLE || key == PreferenceUtil.ARTIST_GRID_STYLE || key == PreferenceUtil.TOGGLE_HOME_BANNER || key == PreferenceUtil.TOGGLE_ADD_CONTROLS || key == PreferenceUtil.ALBUM_COVER_STYLE || key == PreferenceUtil.HOME_ARTIST_GRID_STYLE || key == PreferenceUtil.ALBUM_COVER_TRANSFORM || key == PreferenceUtil.DESATURATED_COLOR || key == PreferenceUtil.TAB_TEXT_MODE || key == PreferenceUtil.LIBRARY_CATEGORIES) postRecreate()
+
+    }
+
+    private fun selectedFragment(itemId: Int) {
+        when (itemId) {
+            R.id.action_album,
+            R.id.action_artist,
+            R.id.action_playlist,
+            R.id.action_genre,
+            R.id.action_playing_queue,
+            R.id.action_song -> setCurrentFragment(LibraryFragment.newInstance(itemId), itemId.toString())
+            R.id.action_home -> setCurrentFragment(BannerHomeFragment.newInstance(), BannerHomeFragment.TAG)
+            else -> {
+                setCurrentFragment(BannerHomeFragment.newInstance(), BannerHomeFragment.TAG)
+            }
+        }
+    }
+
+    fun setMusicChooser(key: Int) {
+        PreferenceUtil.getInstance(this).lastMusicChooser = key
+        when (key) {
+            FOLDER -> setCurrentFragment(FoldersFragment.newInstance(this), FoldersFragment.TAG)
+            else -> selectedFragment(PreferenceUtil.getInstance(this).lastPage)
+        }
+    }
+
+    companion object {
+        const val APP_INTRO_REQUEST = 2323
+        const val HOME = 0
+        const val FOLDER = 1
+        const val LIBRARY = 2
+        private const val TAG = "MainActivity"
+        private const val APP_USER_INFO_REQUEST = 9003
+        private const val REQUEST_CODE_THEME = 9002
+        private const val PURCHASE_REQUEST = 101
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
deleted file mode 100644
index 5cb64cf93..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PermissionActivity.kt
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.activities
-
-import android.Manifest.permission.BLUETOOTH_CONNECT
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.content.res.ColorStateList
-import android.os.Build
-import android.os.Bundle
-import android.provider.Settings
-import androidx.activity.OnBackPressedCallback
-import androidx.annotation.RequiresApi
-import androidx.core.app.ActivityCompat
-import androidx.core.net.toUri
-import androidx.core.text.parseAsHtml
-import androidx.core.view.isVisible
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.databinding.ActivityPermissionBinding
-import code.name.monkey.retromusic.extensions.*
-
-class PermissionActivity : AbsMusicServiceActivity() {
-    private lateinit var binding: ActivityPermissionBinding
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityPermissionBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setStatusBarColorAuto()
-        setTaskDescriptionColorAuto()
-        setupTitle()
-
-        binding.storagePermission.setButtonClick {
-            requestPermissions()
-        }
-        if (VersionUtils.hasMarshmallow()) {
-            binding.audioPermission.show()
-            binding.audioPermission.setButtonClick {
-                if (!hasAudioPermission()) {
-                    val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
-                    intent.data = ("package:" + applicationContext.packageName).toUri()
-                    startActivity(intent)
-                }
-            }
-        }
-
-        if (VersionUtils.hasS()) {
-            binding.bluetoothPermission.show()
-            binding.bluetoothPermission.setButtonClick {
-                ActivityCompat.requestPermissions(
-                    this,
-                    arrayOf(BLUETOOTH_CONNECT),
-                    BLUETOOTH_PERMISSION_REQUEST
-                )
-            }
-        } else {
-            binding.audioPermission.setNumber("2")
-        }
-
-        binding.finish.accentBackgroundColor()
-        binding.finish.setOnClickListener {
-            if (hasPermissions()) {
-                startActivity(
-                    Intent(this, MainActivity::class.java).addFlags(
-                        Intent.FLAG_ACTIVITY_NEW_TASK or
-                                Intent.FLAG_ACTIVITY_CLEAR_TASK
-                    )
-                )
-                finish()
-            }
-        }
-        onBackPressedDispatcher.addCallback(object : OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                finishAffinity()
-                remove()
-            }
-        })
-    }
-
-    private fun setupTitle() {
-        val appName =
-            getString(
-                R.string.message_welcome,
-                "<b>Metro</b>"
-            )
-                .parseAsHtml()
-        binding.appNameText.text = appName
-    }
-
-    override fun onResume() {
-        super.onResume()
-        binding.finish.isEnabled = hasStoragePermission()
-        if (hasStoragePermission()) {
-            binding.storagePermission.checkImage.isVisible = true
-            binding.storagePermission.checkImage.imageTintList =
-                ColorStateList.valueOf(accentColor())
-        }
-        if (VersionUtils.hasMarshmallow()) {
-            if (hasAudioPermission()) {
-                binding.audioPermission.checkImage.isVisible = true
-                binding.audioPermission.checkImage.imageTintList =
-                    ColorStateList.valueOf(accentColor())
-            }
-        }
-        if (VersionUtils.hasS()) {
-            if (hasBluetoothPermission()) {
-                binding.bluetoothPermission.checkImage.isVisible = true
-                binding.bluetoothPermission.checkImage.imageTintList =
-                    ColorStateList.valueOf(accentColor())
-            }
-        }
-    }
-
-    private fun hasStoragePermission(): Boolean {
-        return hasPermissions()
-    }
-
-    @RequiresApi(Build.VERSION_CODES.S)
-    private fun hasBluetoothPermission(): Boolean {
-        return ActivityCompat.checkSelfPermission(
-            this,
-            BLUETOOTH_CONNECT
-        ) == PackageManager.PERMISSION_GRANTED
-    }
-
-    @RequiresApi(Build.VERSION_CODES.M)
-    private fun hasAudioPermission(): Boolean {
-        return Settings.System.canWrite(this)
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
similarity index 52%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
index 0526ade15..194bb26b3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/queue/PlayingQueueFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlayingQueueActivity.kt
@@ -1,47 +1,29 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.queue
+package code.name.monkey.retromusic.activities
 
 import android.content.res.ColorStateList
 import android.os.Bundle
-import android.view.View
-import androidx.navigation.fragment.findNavController
+import android.view.MenuItem
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlayingQueueBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.extensions.applyToolbar
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller
+import code.name.monkey.retromusic.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
+import kotlinx.android.synthetic.main.activity_playing_queue.*
 
-class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_queue) {
+open class PlayingQueueActivity : AbsMusicServiceActivity() {
 
-    private var _binding: FragmentPlayingQueueBinding? = null
-    private val binding get() = _binding!!
     private var wrappedAdapter: RecyclerView.Adapter<*>? = null
     private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null
     private var recyclerViewSwipeManager: RecyclerViewSwipeManager? = null
@@ -49,29 +31,37 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
     private var playingQueueAdapter: PlayingQueueAdapter? = null
     private lateinit var linearLayoutManager: LinearLayoutManager
 
-    val mainActivity: MainActivity
-        get() = activity as MainActivity
-
     private fun getUpNextAndQueueTime(): String {
         val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
-        return MusicUtil.buildInfoString(
-            resources.getString(R.string.up_next),
-            MusicUtil.getReadableDurationString(duration)
-        )
+        return MusicUtil.buildInfoString(resources.getString(R.string.up_next), MusicUtil.getReadableDurationString(duration))
     }
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlayingQueueBinding.bind(view)
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_playing_queue)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
 
         setupToolbar()
         setUpRecyclerView()
 
-        binding.clearQueue.setOnClickListener {
+        clearQueue.setOnClickListener {
             MusicPlayerRemote.clearQueue()
         }
         checkForPadding()
-        mainActivity.collapsePanel()
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
     }
 
     private fun setUpRecyclerView() {
@@ -79,47 +69,48 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
         recyclerViewDragDropManager = RecyclerViewDragDropManager()
         recyclerViewSwipeManager = RecyclerViewSwipeManager()
 
+        val animator = DraggableItemAnimator()
+        animator.supportsChangeAnimations = false
+
         playingQueueAdapter = PlayingQueueAdapter(
-            requireActivity(),
-            MusicPlayerRemote.playingQueue.toMutableList(),
-            MusicPlayerRemote.position,
-            R.layout.item_queue
+                this,
+                MusicPlayerRemote.playingQueue,
+                MusicPlayerRemote.position,
+                R.layout.item_queue
         )
         wrappedAdapter = recyclerViewDragDropManager?.createWrappedAdapter(playingQueueAdapter!!)
         wrappedAdapter = wrappedAdapter?.let { recyclerViewSwipeManager?.createWrappedAdapter(it) }
 
-        linearLayoutManager = LinearLayoutManager(requireContext())
+        linearLayoutManager = LinearLayoutManager(this)
 
-
-        binding.recyclerView.apply {
-            layoutManager = linearLayoutManager
-            adapter = wrappedAdapter
-            itemAnimator = DraggableItemAnimator()
-            recyclerViewTouchActionGuardManager?.attachRecyclerView(this)
-            recyclerViewDragDropManager?.attachRecyclerView(this)
-            recyclerViewSwipeManager?.attachRecyclerView(this)
-        }
+        recyclerView.layoutManager = linearLayoutManager
+        recyclerView.adapter = wrappedAdapter
+        recyclerView.itemAnimator = animator
+        recyclerViewTouchActionGuardManager?.attachRecyclerView(recyclerView)
+        recyclerViewDragDropManager?.attachRecyclerView(recyclerView)
+        recyclerViewSwipeManager?.attachRecyclerView(recyclerView)
         linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
 
-        binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+        recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
                 super.onScrolled(recyclerView, dx, dy)
                 if (dy > 0) {
-                    binding.clearQueue.shrink()
+                    clearQueue.shrink()
                 } else if (dy < 0) {
-                    binding.clearQueue.extend()
+                    clearQueue.extend()
                 }
             }
         })
-        ThemedFastScroller.create(binding.recyclerView)
+        ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView)
     }
 
     private fun checkForPadding() {
+
     }
 
     override fun onQueueChanged() {
         if (MusicPlayerRemote.playingQueue.isEmpty()) {
-            findNavController().navigateUp()
+            finish()
             return
         }
         checkForPadding()
@@ -133,7 +124,7 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
     }
 
     private fun updateCurrentSong() {
-        binding.appBarLayout.toolbar.subtitle = getUpNextAndQueueTime()
+        playerQueueSubHeader.text = getUpNextAndQueueTime()
     }
 
     override fun onPlayingMetaChanged() {
@@ -143,15 +134,16 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
     private fun updateQueuePosition() {
         playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
         resetToCurrentPosition()
-        binding.appBarLayout.toolbar.subtitle = getUpNextAndQueueTime()
+        playerQueueSubHeader.text = getUpNextAndQueueTime()
     }
 
     private fun updateQueue() {
         playingQueueAdapter?.swapDataSet(MusicPlayerRemote.playingQueue, MusicPlayerRemote.position)
+        resetToCurrentPosition()
     }
 
     private fun resetToCurrentPosition() {
-        binding.recyclerView.stopScroll()
+        recyclerView.stopScroll()
         linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
     }
 
@@ -177,33 +169,26 @@ class PlayingQueueFragment : AbsMusicServiceFragment(R.layout.fragment_playing_q
         }
         playingQueueAdapter = null
         super.onDestroy()
-        if (MusicPlayerRemote.playingQueue.isNotEmpty())
-            mainActivity.expandPanel()
     }
 
     private fun setupToolbar() {
-        binding.appBarLayout.toolbar.subtitle = getUpNextAndQueueTime()
-        binding.appBarLayout.toolbar.isTitleCentered = false
-        binding.clearQueue.backgroundTintList = ColorStateList.valueOf(accentColor())
+        playerQueueSubHeader.text = getUpNextAndQueueTime()
+        playerQueueSubHeader.setTextColor(ThemeStore.accentColor(this))
+
+        applyToolbar(toolbar)
+        clearQueue.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
         ColorStateList.valueOf(
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                ColorUtil.isColorLight(accentColor())
-            )
+                MaterialValueHelper.getPrimaryTextColor(
+                        this,
+                        ColorUtil.isColorLight(
+                                ThemeStore.accentColor(
+                                        this
+                                )
+                        )
+                )
         ).apply {
-            binding.clearQueue.setTextColor(this)
-            binding.clearQueue.iconTint = this
-        }
-        binding.appBarLayout.pinWhenScrolled()
-        binding.appBarLayout.toolbar.apply {
-            setNavigationOnClickListener {
-                findNavController().navigateUp()
-            }
-            setTitle(R.string.now_playing_queue)
-            setTitleTextAppearance(context, R.style.ToolbarTextAppearanceNormal)
-            setNavigationIcon(R.drawable.ic_arrow_back)
-            ToolbarContentTintHelper.colorBackButton(this)
+            clearQueue.setTextColor(this)
+            clearQueue.iconTint = this
         }
     }
 }
-
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
new file mode 100644
index 000000000..5d1361ce8
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PlaylistDetailActivity.kt
@@ -0,0 +1,232 @@
+package code.name.monkey.retromusic.activities
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuItem
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsSlidingMusicPanelActivity
+import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.PlaylistSongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.loaders.PlaylistLoader
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsView
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import com.afollestad.materialcab.MaterialCab
+import com.h6ah4i.android.widget.advrecyclerview.animator.RefactoredDefaultItemAnimator
+import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
+import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
+import kotlinx.android.synthetic.main.activity_playlist_detail.*
+import javax.inject.Inject
+
+class PlaylistDetailActivity : AbsSlidingMusicPanelActivity(), CabHolder, PlaylistSongsView {
+
+    @Inject
+    lateinit var playlistSongsPresenter: PlaylistSongsPresenter
+
+    private lateinit var playlist: Playlist
+    private var cab: MaterialCab? = null
+    private lateinit var adapter: SongAdapter
+    private var wrappedAdapter: RecyclerView.Adapter<*>? = null
+    private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+        toggleBottomNavigationView(true)
+
+        App.musicComponent.inject(this)
+        playlistSongsPresenter.attachView(this)
+
+        if (intent.extras != null) {
+            playlist = intent.extras!!.getParcelable(EXTRA_PLAYLIST)!!
+        } else {
+            finish()
+        }
+
+        setUpToolBar()
+        setUpRecyclerView()
+    }
+
+    override fun createContentView(): View {
+        return wrapSlidingMusicPanel(R.layout.activity_playlist_detail)
+    }
+
+    private fun setUpRecyclerView() {
+        ViewUtil.setUpFastScrollRecyclerViewColor(this, recyclerView)
+        recyclerView.layoutManager = LinearLayoutManager(this)
+        if (playlist is AbsCustomPlaylist) {
+            adapter = PlaylistSongAdapter(this, ArrayList(), R.layout.item_list, false, this)
+            recyclerView.adapter = adapter
+        } else {
+            recyclerViewDragDropManager = RecyclerViewDragDropManager()
+            val animator = RefactoredDefaultItemAnimator()
+            adapter = OrderablePlaylistSongAdapter(this,
+                    ArrayList(),
+                    R.layout.item_list,
+                    false,
+                    this,
+                    object : OrderablePlaylistSongAdapter.OnMoveItemListener {
+                        override fun onMoveItem(fromPosition: Int, toPosition: Int) {
+                            if (PlaylistsUtil.moveItem(this@PlaylistDetailActivity, playlist.id, fromPosition, toPosition)) {
+                                val song = adapter.dataSet.removeAt(fromPosition)
+                                adapter.dataSet.add(toPosition, song)
+                                adapter.notifyItemMoved(fromPosition, toPosition)
+                            }
+                        }
+                    })
+            wrappedAdapter = recyclerViewDragDropManager!!.createWrappedAdapter(adapter)
+
+            recyclerView.adapter = wrappedAdapter
+            recyclerView.itemAnimator = animator
+
+            recyclerViewDragDropManager?.attachRecyclerView(recyclerView)
+        }
+        adapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                checkIsEmpty()
+            }
+        })
+    }
+
+    override fun onResume() {
+        super.onResume()
+        playlistSongsPresenter.loadPlaylistSongs(playlist)
+    }
+
+    private fun setUpToolBar() {
+        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setSupportActionBar(toolbar)
+        title = playlist.name
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(
+                if (playlist is AbsCustomPlaylist) R.menu.menu_smart_playlist_detail
+                else R.menu.menu_playlist_detail, menu
+        )
+        return super.onCreateOptionsMenu(menu)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                return true
+            }
+        }
+        return PlaylistMenuHelper.handleMenuClick(this, playlist, item)
+    }
+
+    override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
+        if (cab != null && cab!!.isActive) {
+            cab!!.finish()
+        }
+        cab = MaterialCab(this, R.id.cab_stub).setMenu(menuRes).setCloseDrawableRes(R.drawable.ic_close_white_24dp).setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(this, R.attr.colorSurface))).start(callback)
+        return cab!!
+    }
+
+    override fun onBackPressed() {
+        if (cab != null && cab!!.isActive) {
+            cab!!.finish()
+        } else {
+            recyclerView!!.stopScroll()
+            super.onBackPressed()
+        }
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        if (playlist !is AbsCustomPlaylist) {
+            // Playlist deleted
+            if (!PlaylistsUtil.doesPlaylistExist(this, playlist.id)) {
+                finish()
+                return
+            }
+            // Playlist renamed
+            val playlistName = PlaylistsUtil.getNameForPlaylist(this, playlist.id.toLong())
+            if (playlistName != playlist.name) {
+                playlist = PlaylistLoader.getPlaylist(this, playlist.id)
+                setToolbarTitle(playlist.name)
+            }
+        }
+        playlistSongsPresenter.loadPlaylistSongs(playlist)
+    }
+
+    private fun setToolbarTitle(title: String) {
+        supportActionBar!!.title = title
+    }
+
+    private fun checkForPadding() {
+        val height = DensityUtil.dip2px(this, 52f)
+        recyclerView.setPadding(0, 0, 0, (height))
+    }
+
+    private fun checkIsEmpty() {
+        checkForPadding()
+        emptyEmoji.text = getEmojiByUnicode(0x1F631)
+        empty.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE
+        emptyText.visibility = if (adapter.itemCount == 0) View.VISIBLE else View.GONE
+    }
+
+    private fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
+    public override fun onPause() {
+        if (recyclerViewDragDropManager != null) {
+            recyclerViewDragDropManager!!.cancelDrag()
+        }
+        super.onPause()
+    }
+
+    override fun onDestroy() {
+        if (recyclerViewDragDropManager != null) {
+            recyclerViewDragDropManager!!.release()
+            recyclerViewDragDropManager = null
+        }
+
+        if (recyclerView != null) {
+            recyclerView!!.itemAnimator = null
+            recyclerView!!.adapter = null
+        }
+
+        if (wrappedAdapter != null) {
+            WrapperAdapterUtils.releaseAll(wrappedAdapter)
+            wrappedAdapter = null
+        }
+        super.onDestroy()
+        playlistSongsPresenter.detachView()
+    }
+
+    override fun showEmptyView() {
+        empty.visibility = View.VISIBLE
+        emptyText.visibility = View.VISIBLE
+    }
+
+    override fun songs(songs: ArrayList<Song>) {
+        adapter.swapDataSet(songs)
+    }
+
+    companion object {
+        var EXTRA_PLAYLIST = "extra_playlist"
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
new file mode 100644
index 000000000..419f81df3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@@ -0,0 +1,155 @@
+package code.name.monkey.retromusic.activities
+
+import android.content.Intent
+import android.os.AsyncTask
+import android.os.Bundle
+import android.util.Log
+import android.view.MenuItem
+import android.widget.Toast
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.BuildConfig
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.extensions.applyToolbar
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.TransactionDetails
+import kotlinx.android.synthetic.main.activity_pro_version.*
+import java.lang.ref.WeakReference
+
+class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
+
+	private lateinit var billingProcessor: BillingProcessor
+	private var restorePurchaseAsyncTask: AsyncTask<*, *, *>? = null
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_pro_version)
+		setDrawUnderStatusBar()
+		setStatusbarColorAuto()
+		setNavigationbarColorAuto()
+		setTaskDescriptionColorAuto()
+		setLightNavigationBar(true)
+
+		applyToolbar(toolbar)
+
+		restoreButton.isEnabled = false
+		purchaseButton.isEnabled = false
+
+		billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this)
+
+		MaterialUtil.setTint(restoreButton, false)
+		MaterialUtil.setTint(purchaseButton, true)
+
+		restoreButton.setOnClickListener {
+			if (restorePurchaseAsyncTask == null || restorePurchaseAsyncTask!!.status != AsyncTask.Status.RUNNING) {
+				restorePurchase()
+			}
+
+		}
+		purchaseButton.setOnClickListener {
+			billingProcessor.purchase(this@PurchaseActivity, App.PRO_VERSION_PRODUCT_ID)
+		}
+	}
+
+	private fun restorePurchase() {
+		if (restorePurchaseAsyncTask != null) {
+			restorePurchaseAsyncTask!!.cancel(false)
+		}
+		restorePurchaseAsyncTask = RestorePurchaseAsyncTask(this).execute()
+	}
+
+	override fun onProductPurchased(productId: String, details: TransactionDetails?) {
+		Toast.makeText(this, R.string.thank_you, Toast.LENGTH_SHORT).show()
+		setResult(RESULT_OK)
+	}
+
+	override fun onPurchaseHistoryRestored() {
+		if (App.isProVersion()) {
+			Toast.makeText(
+					this,
+					R.string.restored_previous_purchase_please_restart,
+					Toast.LENGTH_LONG
+			).show()
+			setResult(RESULT_OK)
+		} else {
+			Toast.makeText(this, R.string.no_purchase_found, Toast.LENGTH_SHORT).show()
+		}
+	}
+
+	override fun onBillingError(errorCode: Int, error: Throwable?) {
+		Log.e(TAG, "Billing error: code = $errorCode", error)
+	}
+
+	override fun onBillingInitialized() {
+		restoreButton.isEnabled = true
+		purchaseButton.isEnabled = true
+	}
+
+	public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		if (!billingProcessor.handleActivityResult(requestCode, resultCode, data)) {
+			super.onActivityResult(requestCode, resultCode, data)
+		}
+	}
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		when (item.itemId) {
+			android.R.id.home -> finish()
+		}
+		return super.onOptionsItemSelected(item)
+	}
+
+	override fun onDestroy() {
+		billingProcessor.release()
+		super.onDestroy()
+	}
+
+	private class RestorePurchaseAsyncTask internal constructor(purchaseActivity: PurchaseActivity) : AsyncTask<Void, Void, Boolean>() {
+
+		private val buyActivityWeakReference: WeakReference<PurchaseActivity> = WeakReference(
+				purchaseActivity
+		)
+
+		override fun onPreExecute() {
+			super.onPreExecute()
+			val purchaseActivity = buyActivityWeakReference.get()
+			if (purchaseActivity != null) {
+				Toast.makeText(purchaseActivity, R.string.restoring_purchase, Toast.LENGTH_SHORT)
+					.show()
+			} else {
+				cancel(false)
+			}
+		}
+
+		override fun doInBackground(vararg params: Void): Boolean? {
+			val purchaseActivity = buyActivityWeakReference.get()
+			if (purchaseActivity != null) {
+				return purchaseActivity.billingProcessor.loadOwnedPurchasesFromGoogle()
+			}
+			cancel(false)
+			return null
+		}
+
+		override fun onPostExecute(b: Boolean?) {
+			super.onPostExecute(b)
+			val purchaseActivity = buyActivityWeakReference.get()
+			if (purchaseActivity == null || b == null) {
+				return
+			}
+
+			if (b) {
+				purchaseActivity.onPurchaseHistoryRestored()
+			} else {
+				Toast.makeText(
+						purchaseActivity,
+						R.string.could_not_restore_purchase,
+						Toast.LENGTH_SHORT
+				).show()
+			}
+		}
+	}
+
+	companion object {
+		private const val TAG: String = "PurchaseActivity"
+	}
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
new file mode 100644
index 000000000..082adc6b5
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SearchActivity.kt
@@ -0,0 +1,223 @@
+package code.name.monkey.retromusic.activities
+
+import android.app.Activity
+import android.app.Service
+import android.content.ActivityNotFoundException
+import android.content.Intent
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.speech.RecognizerIntent
+import android.text.Editable
+import android.text.TextWatcher
+import android.view.View
+import android.view.inputmethod.InputMethodManager
+import android.widget.TextView.BufferType
+import android.widget.Toast
+import androidx.appcompat.widget.SearchView.OnQueryTextListener
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.transition.TransitionManager
+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.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
+import code.name.monkey.retromusic.adapter.SearchAdapter
+import code.name.monkey.retromusic.mvp.presenter.SearchPresenter
+import code.name.monkey.retromusic.mvp.presenter.SearchView
+import code.name.monkey.retromusic.util.RetroUtil
+import com.google.android.material.textfield.TextInputEditText
+import kotlinx.android.synthetic.main.activity_search.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.collections.ArrayList
+
+class SearchActivity : AbsMusicServiceActivity(), OnQueryTextListener, TextWatcher, SearchView {
+    @Inject
+    lateinit var searchPresenter: SearchPresenter
+
+    private var searchAdapter: SearchAdapter? = null
+    private var query: String? = null
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_search)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+
+        App.musicComponent.inject(this)
+        searchPresenter.attachView(this)
+
+        setupRecyclerView()
+        setUpToolBar()
+        setupSearchView()
+
+        if (intent.getBooleanExtra(EXTRA_SHOW_MIC, false)) {
+            startMicSearch()
+        }
+
+        back.setOnClickListener { onBackPressed() }
+        voiceSearch.setOnClickListener { startMicSearch() }
+        clearText.setOnClickListener { searchView.clearText() }
+        searchContainer.backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(this, R.attr.colorSurface))
+
+        keyboardPopup.setOnClickListener {
+            val inputManager = getSystemService(Service.INPUT_METHOD_SERVICE) as InputMethodManager
+            inputManager.showSoftInput(searchView, InputMethodManager.SHOW_IMPLICIT)
+        }
+
+        keyboardPopup.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
+        ColorStateList.valueOf(
+                MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this)))
+        ).apply {
+            keyboardPopup.setTextColor(this)
+            keyboardPopup.iconTint = this
+        }
+        if (savedInstanceState != null) {
+            query = savedInstanceState.getString(QUERY)
+        }
+
+    }
+
+    private fun setupRecyclerView() {
+        searchAdapter = SearchAdapter(this, emptyList())
+        searchAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                empty.visibility = if (searchAdapter!!.itemCount < 1) View.VISIBLE else View.GONE
+            }
+        })
+        recyclerView.apply {
+            layoutManager = LinearLayoutManager(this@SearchActivity)
+            adapter = searchAdapter
+        }
+        recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
+            override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
+                super.onScrolled(recyclerView, dx, dy)
+                if (dy > 0) {
+                    keyboardPopup.shrink()
+                } else if (dy < 0) {
+                    keyboardPopup.extend()
+                }
+            }
+        })
+    }
+
+    private fun setupSearchView() {
+        searchView.addTextChangedListener(this)
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        searchPresenter.detachView()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString(QUERY, query)
+    }
+
+    private fun setUpToolBar() {
+        title = null
+    }
+
+    private fun search(query: String) {
+        this.query = query
+        TransitionManager.beginDelayedTransition(appBarLayout)
+        voiceSearch.visibility = if (query.isNotEmpty()) View.GONE else View.VISIBLE
+        clearText.visibility = if (query.isNotEmpty()) View.VISIBLE else View.GONE
+        searchPresenter.search(query)
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        query?.let { search(it) }
+    }
+
+    override fun onQueryTextSubmit(query: String): Boolean {
+        hideSoftKeyboard()
+        return false
+    }
+
+    override fun onQueryTextChange(newText: String): Boolean {
+        search(newText)
+        return false
+    }
+
+    private fun hideSoftKeyboard() {
+        RetroUtil.hideSoftKeyboard(this@SearchActivity)
+        if (searchView != null) {
+            searchView.clearFocus()
+        }
+    }
+
+    override fun showEmptyView() {
+        searchAdapter?.swapDataSet(ArrayList())
+    }
+
+    override fun showData(data: MutableList<Any>) {
+        searchAdapter?.swapDataSet(data)
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        when (requestCode) {
+            REQ_CODE_SPEECH_INPUT -> {
+                if (resultCode == Activity.RESULT_OK && null != data) {
+                    val result: ArrayList<String>? = data.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)
+                    query = result?.get(0)
+                    searchView.setText(query, BufferType.EDITABLE)
+                    searchPresenter.search(query!!)
+                }
+            }
+        }
+    }
+
+    private fun startMicSearch() {
+        val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
+        intent.putExtra(
+                RecognizerIntent.EXTRA_LANGUAGE_MODEL,
+                RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
+        )
+        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
+        intent.putExtra(RecognizerIntent.EXTRA_PROMPT, getString(R.string.speech_prompt))
+        try {
+            startActivityForResult(intent, REQ_CODE_SPEECH_INPUT)
+        } catch (e: ActivityNotFoundException) {
+            e.printStackTrace()
+            Toast.makeText(this, getString(R.string.speech_not_supported), Toast.LENGTH_SHORT)
+                    .show()
+        }
+
+    }
+
+    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+
+    }
+
+    override fun onTextChanged(newText: CharSequence, start: Int, before: Int, count: Int) {
+        search(newText.toString())
+    }
+
+    override fun afterTextChanged(s: Editable) {
+
+    }
+
+    companion object {
+        val TAG: String = SearchActivity::class.java.simpleName
+
+        const val EXTRA_SHOW_MIC = "extra_show_mic"
+        const val QUERY: String = "query"
+
+        private const val REQ_CODE_SPEECH_INPUT = 9002
+    }
+}
+
+fun TextInputEditText.clearText() {
+    text = null
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
new file mode 100755
index 000000000..b11287322
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SettingsActivity.kt
@@ -0,0 +1,82 @@
+package code.name.monkey.retromusic.activities
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.annotation.StringRes
+import androidx.fragment.app.Fragment
+import androidx.transition.TransitionManager
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.fragments.settings.MainSettingsFragment
+import kotlinx.android.synthetic.main.activity_settings.*
+
+class SettingsActivity : AbsBaseActivity() {
+
+    private val fragmentManager = supportFragmentManager
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_settings)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setLightNavigationBar(true)
+
+        setupToolbar()
+
+        if (savedInstanceState == null) {
+            fragmentManager.beginTransaction().replace(R.id.contentFrame, MainSettingsFragment()).commit()
+        }
+    }
+
+    private fun setupToolbar() {
+        setTitle(R.string.action_settings)
+        toolbar.apply {
+            setBackgroundColor(ATHUtil.resolveColor(this@SettingsActivity, R.attr.colorSurface))
+            setNavigationOnClickListener { onBackPressed() }
+            ToolbarContentTintHelper.colorBackButton(toolbar)
+        }
+        setSupportActionBar(toolbar)
+    }
+
+    fun setupFragment(fragment: Fragment, @StringRes titleName: Int) {
+        val fragmentTransaction = fragmentManager
+                .beginTransaction()
+                .setCustomAnimations(R.anim.sliding_in_left, R.anim.sliding_out_right, android.R.anim.slide_in_left, android.R.anim.slide_out_right)
+
+        if (detailContentFrame == null) {
+            fragmentTransaction.replace(R.id.contentFrame, fragment, fragment.tag)
+            fragmentTransaction.addToBackStack(null)
+            fragmentTransaction.commit()
+        } else {
+            fragmentTransaction.replace(R.id.detailContentFrame, fragment, fragment.tag)
+            fragmentTransaction.commit()
+        }
+
+        TransitionManager.beginDelayedTransition(appBarLayout)
+        setTitle(titleName)
+    }
+
+    override fun onBackPressed() {
+        if (fragmentManager.backStackEntryCount == 0) {
+            super.onBackPressed()
+        } else {
+            setTitle(R.string.action_settings)
+            fragmentManager.popBackStack()
+        }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+            return true
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    companion object {
+        const val TAG: String = "SettingsActivity"
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
deleted file mode 100644
index 546c9d794..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.activities
-
-import android.content.res.ColorStateList
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.graphics.drawable.GradientDrawable
-import android.os.Bundle
-import android.provider.MediaStore.Images.Media
-import android.view.MenuItem
-import androidx.core.net.toUri
-import androidx.core.os.BundleCompat
-import androidx.core.view.drawToBitmap
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.activities.base.AbsThemeActivity
-import code.name.monkey.retromusic.databinding.ActivityShareInstagramBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.setStatusBarColor
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.Share
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-
-/**
- * Created by hemanths on 2020-02-02.
- */
-
-class ShareInstagramStory : AbsThemeActivity() {
-
-    private lateinit var binding: ActivityShareInstagramBinding
-
-    companion object {
-        const val EXTRA_SONG = "extra_song"
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
-            return true
-        }
-        return super.onOptionsItemSelected(item)
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        binding = ActivityShareInstagramBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setStatusBarColor(Color.TRANSPARENT)
-
-        binding.toolbar.setBackgroundColor(Color.TRANSPARENT)
-        setSupportActionBar(binding.toolbar)
-
-        val song = intent.extras?.let { BundleCompat.getParcelable(it, EXTRA_SONG, Song::class.java) }
-        song?.let { songFinal ->
-            Glide.with(this)
-                .asBitmapPalette()
-                .songCoverOptions(songFinal)
-                .load(RetroGlideExtension.getSongModel(songFinal))
-                .into(object : RetroMusicColoredTarget(binding.image) {
-                    override fun onColorReady(colors: MediaNotificationProcessor) {
-                        setColors(colors.backgroundColor)
-                    }
-                })
-
-            binding.shareTitle.text = songFinal.title
-            binding.shareText.text = songFinal.artistName
-            binding.shareButton.setOnClickListener {
-                val path: String = Media.insertImage(
-                    contentResolver,
-                    binding.mainContent.drawToBitmap(Bitmap.Config.ARGB_8888),
-                    "Design", null
-                )
-                Share.shareStoryToSocial(
-                    this@ShareInstagramStory,
-                    path.toUri()
-                )
-            }
-        }
-        binding.shareButton.setTextColor(
-            MaterialValueHelper.getPrimaryTextColor(
-                this,
-                ColorUtil.isColorLight(accentColor())
-            )
-        )
-        binding.shareButton.backgroundTintList =
-            ColorStateList.valueOf(accentColor())
-    }
-
-    private fun setColors(color: Int) {
-        binding.mainContent.background =
-            GradientDrawable(
-                GradientDrawable.Orientation.TOP_BOTTOM,
-                intArrayOf(color, Color.BLACK)
-            )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
new file mode 100644
index 000000000..0f27363ea
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt
@@ -0,0 +1,247 @@
+package code.name.monkey.retromusic.activities
+
+import android.content.Intent
+import android.graphics.Paint
+import android.os.AsyncTask
+import android.os.Bundle
+import android.util.Log
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import android.widget.Toast
+import androidx.annotation.LayoutRes
+import androidx.appcompat.widget.AppCompatImageView
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+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.BuildConfig
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.extensions.applyToolbar
+import com.anjlab.android.iab.v3.BillingProcessor
+import com.anjlab.android.iab.v3.SkuDetails
+import com.anjlab.android.iab.v3.TransactionDetails
+import kotlinx.android.synthetic.main.activity_donation.*
+import java.lang.ref.WeakReference
+import java.util.*
+
+class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
+
+	companion object {
+		val TAG: String = SupportDevelopmentActivity::class.java.simpleName
+		const val DONATION_PRODUCT_IDS = R.array.donation_ids
+		private const val TEZ_REQUEST_CODE = 123
+	}
+
+	var billingProcessor: BillingProcessor? = null
+	private var skuDetailsLoadAsyncTask: AsyncTask<*, *, *>? = null
+
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		if (item.itemId == android.R.id.home) {
+			onBackPressed()
+			return true
+		}
+		return super.onOptionsItemSelected(item)
+	}
+
+	fun donate(i: Int) {
+		val ids = resources.getStringArray(DONATION_PRODUCT_IDS)
+		billingProcessor!!.purchase(this, ids[i])
+	}
+
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(R.layout.activity_donation)
+
+		setStatusbarColorAuto()
+		setNavigationbarColorAuto()
+		setTaskDescriptionColorAuto()
+		setLightNavigationBar(true)
+
+		setupToolbar()
+
+		billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this)
+		TintHelper.setTint(progress, ThemeStore.accentColor(this))
+		donation.setTextColor(ThemeStore.accentColor(this))
+	}
+
+	private fun setupToolbar() {
+		applyToolbar(toolbar)
+	}
+
+	override fun onBillingInitialized() {
+		loadSkuDetails()
+	}
+
+	private fun loadSkuDetails() {
+		if (skuDetailsLoadAsyncTask != null) {
+			skuDetailsLoadAsyncTask!!.cancel(false)
+		}
+		skuDetailsLoadAsyncTask = SkuDetailsLoadAsyncTask(this).execute()
+
+	}
+
+	override fun onProductPurchased(productId: String, details: TransactionDetails?) {
+		//loadSkuDetails();
+		Toast.makeText(this, R.string.thank_you, Toast.LENGTH_SHORT).show()
+	}
+
+	override fun onBillingError(errorCode: Int, error: Throwable?) {
+		Log.e(TAG, "Billing error: code = $errorCode", error)
+	}
+
+	override fun onPurchaseHistoryRestored() {
+		//loadSkuDetails();
+		Toast.makeText(this, R.string.restored_previous_purchases, Toast.LENGTH_SHORT).show()
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+		if (!billingProcessor!!.handleActivityResult(requestCode, resultCode, data)) {
+			super.onActivityResult(requestCode, resultCode, data)
+		}
+		if (requestCode == TEZ_REQUEST_CODE) {
+			// Process based on the data in response.
+			Log.d("result", data!!.getStringExtra("Status"))
+		}
+	}
+
+	override fun onDestroy() {
+		if (billingProcessor != null) {
+			billingProcessor!!.release()
+		}
+		if (skuDetailsLoadAsyncTask != null) {
+			skuDetailsLoadAsyncTask!!.cancel(true)
+		}
+		super.onDestroy()
+	}
+}
+
+private class SkuDetailsLoadAsyncTask internal constructor(supportDevelopmentActivity: SupportDevelopmentActivity) : AsyncTask<Void, Void, List<SkuDetails>>() {
+	private val weakReference: WeakReference<SupportDevelopmentActivity> = WeakReference(
+			supportDevelopmentActivity
+	)
+
+	override fun onPreExecute() {
+		super.onPreExecute()
+		val supportDevelopmentActivity = weakReference.get() ?: return
+
+		supportDevelopmentActivity.progressContainer.visibility = View.VISIBLE
+		supportDevelopmentActivity.recyclerView.visibility = View.GONE
+	}
+
+	override fun doInBackground(vararg params: Void): List<SkuDetails>? {
+		val dialog = weakReference.get()
+		if (dialog != null) {
+			val ids = dialog.resources.getStringArray(SupportDevelopmentActivity.DONATION_PRODUCT_IDS)
+			return dialog.billingProcessor!!.getPurchaseListingDetails(ArrayList(Arrays.asList(*ids)))
+		}
+		cancel(false)
+		return null
+	}
+
+	override fun onPostExecute(skuDetails: List<SkuDetails>?) {
+		super.onPostExecute(skuDetails)
+		val dialog = weakReference.get() ?: return
+
+		if (skuDetails == null || skuDetails.isEmpty()) {
+			dialog.progressContainer.visibility = View.GONE
+			return
+		}
+
+		dialog.progressContainer.visibility = View.GONE
+		dialog.recyclerView.itemAnimator = DefaultItemAnimator()
+		dialog.recyclerView.layoutManager = GridLayoutManager(dialog, 2)
+		dialog.recyclerView.adapter = SkuDetailsAdapter(dialog, skuDetails)
+		dialog.recyclerView.visibility = View.VISIBLE
+	}
+}
+
+class SkuDetailsAdapter(
+		private var donationsDialog: SupportDevelopmentActivity, objects: List<SkuDetails>
+) : RecyclerView.Adapter<SkuDetailsAdapter.ViewHolder>() {
+	private var skuDetailsList: List<SkuDetails> = ArrayList()
+
+	init {
+		skuDetailsList = objects
+	}
+
+	private fun getIcon(position: Int): Int {
+		return when (position) {
+			0 -> R.drawable.ic_cookie_white_24dp
+			1 -> R.drawable.ic_take_away_white_24dp
+			2 -> R.drawable.ic_take_away_coffe_white_24dp
+			3 -> R.drawable.ic_beer_white_24dp
+			4 -> R.drawable.ic_fast_food_meal_white_24dp
+			5 -> R.drawable.ic_popcorn_white_24dp
+			6 -> R.drawable.ic_card_giftcard_white_24dp
+			else -> R.drawable.ic_card_giftcard_white_24dp
+		}
+	}
+
+	override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): ViewHolder {
+		return ViewHolder(
+				LayoutInflater.from(donationsDialog).inflate(
+						LAYOUT_RES_ID,
+						viewGroup,
+						false
+				)
+		)
+	}
+
+	override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) {
+		val skuDetails = skuDetailsList[i]
+		viewHolder.title.text = skuDetails.title.replace("(Retro Music Player)", "")
+			.trim { it <= ' ' }
+		viewHolder.text.text = skuDetails.description
+		viewHolder.text.visibility = View.GONE
+		viewHolder.price.text = skuDetails.priceText
+		viewHolder.image.setImageResource(getIcon(i))
+
+		val purchased = donationsDialog.billingProcessor!!.isPurchased(skuDetails.productId)
+		val titleTextColor = if (purchased) ATHUtil.resolveColor(
+				donationsDialog,
+				android.R.attr.textColorHint
+		) else ThemeStore.textColorPrimary(donationsDialog)
+		val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary(
+				donationsDialog
+		)
+
+
+		viewHolder.title.setTextColor(titleTextColor)
+		viewHolder.text.setTextColor(contentTextColor)
+		viewHolder.price.setTextColor(titleTextColor)
+
+		strikeThrough(viewHolder.title, purchased)
+		strikeThrough(viewHolder.text, purchased)
+		strikeThrough(viewHolder.price, purchased)
+
+		viewHolder.itemView.setOnTouchListener { _, _ -> purchased }
+		viewHolder.itemView.setOnClickListener { donationsDialog.donate(i) }
+	}
+
+	override fun getItemCount(): Int {
+		return skuDetailsList.size
+	}
+
+	class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
+		var title: TextView = view.findViewById(R.id.itemTitle)
+		var text: TextView = view.findViewById(R.id.itemText)
+		var price: TextView = view.findViewById(R.id.itemPrice)
+		var image: AppCompatImageView = view.findViewById(R.id.itemImage)
+	}
+
+	companion object {
+		@LayoutRes
+		private val LAYOUT_RES_ID = R.layout.item_donation_option
+
+		private fun strikeThrough(textView: TextView, strikeThrough: Boolean) {
+			textView.paintFlags = if (strikeThrough) textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG
+			else textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv()
+		}
+	}
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
new file mode 100644
index 000000000..c623d11d9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/UserInfoActivity.kt
@@ -0,0 +1,245 @@
+package code.name.monkey.retromusic.activities
+
+import android.app.Activity
+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.Images.Media
+import android.provider.MediaStore.Images.Media.getBitmap
+import android.text.TextUtils
+import android.view.MenuItem
+import android.widget.Toast
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.Constants.USER_BANNER
+import code.name.monkey.retromusic.Constants.USER_PROFILE
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.util.Compressor
+import code.name.monkey.retromusic.util.ImageUtil.getResizedBitmap
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.activity_user_info.*
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+
+class UserInfoActivity : AbsBaseActivity() {
+
+    private var disposable = CompositeDisposable()
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_user_info)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
+        setTaskDescriptionColorAuto()
+        setLightNavigationBar(true)
+
+        applyToolbar(toolbar)
+
+        MaterialUtil.setTint(nameContainer, false)
+        name.setText(PreferenceUtil.getInstance(this).userName)
+
+        if (PreferenceUtil.getInstance(this).profileImage.isNotEmpty()) {
+            loadImageFromStorage(PreferenceUtil.getInstance(this).profileImage)
+        }
+        if (PreferenceUtil.getInstance(this).bannerImage.isNotEmpty()) {
+            loadBannerFromStorage(PreferenceUtil.getInstance(this).bannerImage)
+        }
+        userImage.setOnClickListener {
+            MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
+                title(text = getString(R.string.set_photo))
+                listItems(items = listOf(getString(R.string.new_profile_photo), getString(R.string.remove_profile_photo))) { _, position, _ ->
+                    when (position) {
+                        0 -> pickNewPhoto()
+                        1 -> PreferenceUtil.getInstance(this@UserInfoActivity).saveProfileImage("")
+                    }
+                }
+            }
+        }
+        bannerSelect.setOnClickListener {
+            MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(this@UserInfoActivity).dialogCorner)
+                title(R.string.select_banner_photo)
+                listItems(items = listOf(getString(R.string.new_banner_photo), getString(R.string.remove_banner_photo)))
+                { _, position, _ ->
+                    when (position) {
+                        0 -> selectBannerImage()
+                        1 -> PreferenceUtil.getInstance(this@UserInfoActivity).setBannerImagePath("")
+                    }
+                }
+            }
+        }
+        next.setOnClickListener {
+            val nameString = name.text.toString().trim { it <= ' ' }
+            if (TextUtils.isEmpty(nameString)) {
+                Toast.makeText(this, "Umm name is empty", Toast.LENGTH_SHORT).show()
+                return@setOnClickListener
+            }
+            PreferenceUtil.getInstance(this).userName = nameString
+            setResult(Activity.RESULT_OK)
+            finish()
+        }
+        next.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
+        ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this, ColorUtil.isColorLight(ThemeStore.accentColor(this))))
+                .apply {
+                    next.setTextColor(this)
+                    next.iconTint = this
+                }
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == android.R.id.home) {
+            onBackPressed()
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun selectBannerImage() {
+        val pickImageIntent = Intent(Intent.ACTION_PICK, Media.EXTERNAL_CONTENT_URI)
+        pickImageIntent.type = "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)
+    }
+
+    private fun pickNewPhoto() {
+        val pickImageIntent = Intent(Intent.ACTION_PICK, Media.EXTERNAL_CONTENT_URI)
+        pickImageIntent.type = "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)
+    }
+
+    public override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        super.onActivityResult(requestCode, resultCode, data)
+        if (resultCode == Activity.RESULT_OK && data != null) {
+            when (requestCode) {
+                PICK_IMAGE_REQUEST -> {
+                    try {
+                        data.data?.let {
+                            val bitmap = getResizedBitmap(
+                                    getBitmap(contentResolver, it),
+                                    PROFILE_ICON_SIZE
+                            )
+                            val profileImagePath = saveToInternalStorage(bitmap, USER_PROFILE)
+                            PreferenceUtil.getInstance(this).saveProfileImage(profileImagePath)
+                            loadImageFromStorage(profileImagePath)
+                        }
+
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+                PICK_BANNER_REQUEST -> {
+                    try {
+                        data.data?.let {
+                            val bitmap = getBitmap(contentResolver, it)
+                            val profileImagePath = saveToInternalStorage(bitmap, USER_BANNER)
+                            PreferenceUtil.getInstance(this).setBannerImagePath(profileImagePath)
+                            loadBannerFromStorage(profileImagePath)
+                        }
+                    } catch (e: IOException) {
+                        e.printStackTrace()
+                    }
+                }
+            }
+        }
+    }
+
+    private fun getImagePath(aUri: Uri, aSelection: String?): String? {
+        var path: String? = null
+        val cursor = App.getContext().contentResolver.query(aUri, null, aSelection, null, null)
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                path = cursor.getString(cursor.getColumnIndex(Media.DATA))
+            }
+            cursor.close()
+        }
+        return path
+    }
+
+    private fun loadBannerFromStorage(profileImagePath: String) {
+        disposable.add(Compressor(this).setQuality(100)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(File(profileImagePath, USER_BANNER))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({ bitmap -> bannerImage.setImageBitmap(bitmap) }, { t -> println(t) })
+        )
+    }
+
+    private fun loadImageFromStorage(path: String) {
+        disposable.add(Compressor(this)
+                .setMaxHeight(300)
+                .setMaxWidth(300)
+                .setQuality(75)
+                .setCompressFormat(Bitmap.CompressFormat.WEBP)
+                .compressToBitmapAsFlowable(File(path, USER_PROFILE))
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe({ bitmap -> userImage.setImageBitmap(bitmap) }, { t -> println(t) })
+        )
+    }
+
+    private fun saveToInternalStorage(bitmapImage: Bitmap, userBanner: String): String {
+        val cw = ContextWrapper(this)
+        val directory = cw.getDir("imageDir", Context.MODE_PRIVATE)
+        val myPath = File(directory, userBanner)
+        var fos: FileOutputStream? = null
+        try {
+            fos = FileOutputStream(myPath)
+            // Use the compress method on the BitMap object to write image to the OutputStream
+            bitmapImage.compress(Bitmap.CompressFormat.WEBP, 100, fos)
+        } catch (e: Exception) {
+            e.printStackTrace()
+        } finally {
+            try {
+                fos?.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+        }
+        return directory.absolutePath
+    }
+
+    companion object {
+
+        private const val PICK_IMAGE_REQUEST = 9002
+        private const val PICK_BANNER_REQUEST = 9004
+        private const val PROFILE_ICON_SIZE = 400
+    }
+}
+
+fun Activity.pickImage(requestCode: Int) {
+    Intent(Intent.ACTION_GET_CONTENT).apply {
+        addCategory(Intent.CATEGORY_OPENABLE)
+        type = "image/*"
+        startActivityForResult(this, requestCode)
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
new file mode 100644
index 000000000..176114cbb
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewActivity.java
@@ -0,0 +1,93 @@
+package code.name.monkey.retromusic.activities;
+
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.graphics.Color;
+import android.os.Bundle;
+import android.webkit.WebView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
+
+import com.google.android.material.appbar.AppBarLayout;
+
+import java.io.BufferedReader;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.nio.charset.StandardCharsets;
+
+import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.appthemehelper.util.ColorUtil;
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.base.AbsBaseActivity;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+import static code.name.monkey.appthemehelper.util.ATHUtil.INSTANCE;
+
+public class WhatsNewActivity extends AbsBaseActivity {
+    WebView webView;
+    Toolbar toolbar;
+    AppBarLayout appBarLayout;
+
+
+    private static void setChangelogRead(@NonNull Context context) {
+        try {
+            PackageInfo pInfo = context.getPackageManager().getPackageInfo(context.getPackageName(), 0);
+            int currentVersion = pInfo.versionCode;
+            PreferenceUtil.getInstance(context).setLastChangeLogVersion(currentVersion);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private static String colorToCSS(int color) {
+        return String.format("rgb(%d, %d, %d)", Color.red(color), Color.green(color), Color.blue(color)); // on API 29, WebView doesn't load with hex colors
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        setDrawUnderStatusBar();
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_whats_new);
+        setStatusbarColorAuto();
+        setNavigationbarColorAuto();
+        setTaskDescriptionColorAuto();
+
+        webView = findViewById(R.id.webView);
+        toolbar = findViewById(R.id.toolbar);
+        appBarLayout = findViewById(R.id.appBarLayout);
+
+        toolbar.setBackgroundColor(INSTANCE.resolveColor(this, R.attr.colorSurface));
+        //setSupportActionBar(toolbar);
+
+        toolbar.setNavigationOnClickListener(v -> onBackPressed());
+        ToolbarContentTintHelper.colorBackButton(toolbar);
+
+        try {
+            StringBuilder buf = new StringBuilder();
+            InputStream json = getAssets().open("retro-changelog.html");
+            BufferedReader in = new BufferedReader(new InputStreamReader(json, StandardCharsets.UTF_8));
+            String str;
+            while ((str = in.readLine()) != null)
+                buf.append(str);
+            in.close();
+
+            // Inject color values for WebView body background and links
+            final boolean isDark = INSTANCE.isWindowBackgroundDark(this);
+            final String backgroundColor = colorToCSS(INSTANCE.resolveColor(this,  R.attr.colorSurface, Color.parseColor(isDark ? "#424242" : "#ffffff")));
+            final String contentColor = colorToCSS(Color.parseColor(isDark ? "#ffffff" : "#000000"));
+            final String changeLog = buf.toString()
+                    .replace("{style-placeholder}", String.format("body { background-color: %s; color: %s; }", backgroundColor, contentColor))
+                    .replace("{link-color}", colorToCSS(ThemeStore.Companion.accentColor(this)))
+                    .replace("{link-color-active}", colorToCSS(ColorUtil.INSTANCE.lightenColor(ThemeStore.Companion.accentColor(this))));
+
+            webView.loadData(changeLog, "text/html", "UTF-8");
+        } catch (Throwable e) {
+            webView.loadData("<h1>Unable to load</h1><p>" + e.getLocalizedMessage() + "</p>", "text/html", "UTF-8");
+        }
+        setChangelogRead(this);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
deleted file mode 100644
index 48b39ed35..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/WhatsNewFragment.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-package code.name.monkey.retromusic.activities
-
-import android.content.Context
-import android.content.Intent
-import android.content.pm.PackageManager
-import android.graphics.Color
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.webkit.WebResourceRequest
-import android.webkit.WebView
-import android.webkit.WebViewClient
-import androidx.core.content.pm.PackageInfoCompat
-import androidx.core.widget.NestedScrollView
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
-import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
-import code.name.monkey.appthemehelper.util.ColorUtil.lightenColor
-import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.databinding.FragmentWhatsNewBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.util.PreferenceUtil.lastVersion
-import com.google.android.material.bottomsheet.BottomSheetDialogFragment
-import java.nio.charset.StandardCharsets
-import java.util.*
-
-class WhatsNewFragment : BottomSheetDialogFragment() {
-    private var _binding: FragmentWhatsNewBinding? = null
-    val binding get() = _binding!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentWhatsNewBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        try {
-            val buf = StringBuilder()
-            val stream = requireContext().assets.open("retro-changelog.html")
-            stream.reader(StandardCharsets.UTF_8).buffered().use { br ->
-                var str: String?
-                while (br.readLine().also { str = it } != null) {
-                    buf.append(str)
-                }
-            }
-
-            // Inject color values for WebView body background and links
-            val isDark = isWindowBackgroundDark(requireContext())
-            val accentColor = accentColor()
-            binding.webView.setBackgroundColor(0)
-            val contentColor = colorToCSS(Color.parseColor(if (isDark) "#ffffff" else "#000000"))
-            val textColor = colorToCSS(Color.parseColor(if (isDark) "#60FFFFFF" else "#80000000"))
-            val accentColorString = colorToCSS(accentColor())
-            val cardBackgroundColor =
-                colorToCSS(Color.parseColor(if (isDark) "#353535" else "#ffffff"))
-            val accentTextColor = colorToCSS(
-                getPrimaryTextColor(
-                    requireContext(), isColorLight(accentColor)
-                )
-            )
-            val changeLog = buf.toString()
-                .replace(
-                    "{style-placeholder}",
-                    "body { color: $contentColor; } li {color: $textColor;} h3 {color: $accentColorString;} .tag {background-color: $accentColorString; color: $accentTextColor; } div{background-color: $cardBackgroundColor;}"
-                )
-                .replace("{link-color}", colorToCSS(accentColor()))
-                .replace(
-                    "{link-color-active}",
-                    colorToCSS(
-                        lightenColor(accentColor())
-                    )
-                )
-            binding.webView.loadData(changeLog, "text/html", "UTF-8")
-            binding.webView.webViewClient = object : WebViewClient() {
-                override fun shouldOverrideUrlLoading(
-                    view: WebView?,
-                    request: WebResourceRequest?
-                ): Boolean {
-                    val url = request?.url ?: return false
-                    //you can do checks here e.g. url.host equals to target one
-                    startActivity(Intent(Intent.ACTION_VIEW, url))
-                    return true
-                }
-            }
-        } catch (e: Throwable) {
-            binding.webView.loadData(
-                "<h1>Unable to load</h1><p>" + e.localizedMessage + "</p>", "text/html", "UTF-8"
-            )
-        }
-        setChangelogRead(requireContext())
-        binding.tgFab.setOnClickListener {
-            openUrl(Constants.TELEGRAM_CHANGE_LOG)
-        }
-        binding.tgFab.accentColor()
-        binding.tgFab.shrink()
-        binding.container.setOnScrollChangeListener { _: NestedScrollView?, _: Int, scrollY: Int, _: Int, oldScrollY: Int ->
-            val dy = scrollY - oldScrollY
-            if (dy > 0) {
-                binding.tgFab.shrink()
-            } else if (dy < 0) {
-                binding.tgFab.extend()
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-    companion object {
-
-        const val TAG = "WhatsNewFragment"
-        private fun colorToCSS(color: Int): String {
-            return String.format(
-                Locale.getDefault(),
-                "rgba(%d, %d, %d, %d)",
-                Color.red(color),
-                Color.green(color),
-                Color.blue(color),
-                Color.alpha(color)
-            ) // on API 29, WebView doesn't load with hex colors
-        }
-
-        private fun setChangelogRead(context: Context) {
-            try {
-                val pInfo = context.packageManager.getPackageInfo(context.packageName, 0)
-                val currentVersion = PackageInfoCompat.getLongVersionCode(pInfo)
-                lastVersion = currentVersion
-            } catch (e: PackageManager.NameNotFoundException) {
-                e.printStackTrace()
-            }
-        }
-
-        fun showChangeLog(activity: FragmentActivity) {
-            val pInfo = activity.packageManager.getPackageInfo(activity.packageName, 0)
-            val currentVersion = PackageInfoCompat.getLongVersionCode(pInfo)
-            if (currentVersion > lastVersion && !BuildConfig.DEBUG) {
-                val changelogBottomSheet = WhatsNewFragment()
-                changelogBottomSheet.show(activity.supportFragmentManager, TAG)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
index 1e0c110d5..3b096f518 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsBaseActivity.kt
@@ -1,204 +1,143 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.graphics.Rect
 import android.media.AudioManager
 import android.net.Uri
-import android.os.Bundle
+import android.os.*
 import android.provider.Settings
-import android.view.KeyEvent
-import android.view.MotionEvent
-import android.view.View
-import android.view.inputmethod.InputMethodManager
-import android.widget.EditText
+import android.view.*
 import androidx.core.app.ActivityCompat
-import androidx.core.content.getSystemService
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.rootView
-import code.name.monkey.retromusic.util.logD
+import code.name.monkey.appthemehelper.ThemeStore
 import com.google.android.material.snackbar.Snackbar
 
 abstract class AbsBaseActivity : AbsThemeActivity() {
-    private var hadPermissions: Boolean = false
-    private lateinit var permissions: Array<String>
-    private var permissionDeniedMessage: String? = null
+	private var hadPermissions: Boolean = false
+	private lateinit var permissions: Array<String>
+	private var permissionDeniedMessage: String? = null
 
-    open fun getPermissionsToRequest(): Array<String> {
-        return arrayOf()
-    }
+	open fun getPermissionsToRequest(): Array<String> {
+		return arrayOf()
+	}
 
-    protected fun setPermissionDeniedMessage(message: String) {
-        permissionDeniedMessage = message
-    }
+	protected fun setPermissionDeniedMessage(message: String) {
+		permissionDeniedMessage = message
+	}
 
-    fun getPermissionDeniedMessage(): String {
-        return if (permissionDeniedMessage == null) getString(R.string.permissions_denied) else permissionDeniedMessage!!
-    }
+	fun getPermissionDeniedMessage(): String {
+		return if (permissionDeniedMessage == null) getString(code.name.monkey.retromusic.R.string.permissions_denied) else permissionDeniedMessage!!
+	}
 
-    private val snackBarContainer: View
-        get() = rootView
+	private val snackBarContainer: View
+		get() = window.decorView
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        volumeControlStream = AudioManager.STREAM_MUSIC
-        permissions = getPermissionsToRequest()
-        hadPermissions = hasPermissions()
-        permissionDeniedMessage = null
-    }
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		volumeControlStream = AudioManager.STREAM_MUSIC
+		permissions = getPermissionsToRequest()
+		hadPermissions = hasPermissions()
+		permissionDeniedMessage = null
+	}
 
-    override fun onResume() {
-        super.onResume()
-        val hasPermissions = hasPermissions()
-        if (hasPermissions != hadPermissions) {
-            hadPermissions = hasPermissions
-            if (VersionUtils.hasMarshmallow()) {
-                onHasPermissionsChanged(hasPermissions)
-            }
-        }
-    }
+	override fun onPostCreate(savedInstanceState: Bundle?) {
+		super.onPostCreate(savedInstanceState)
+		if (!hasPermissions()) {
+			requestPermissions()
+		}
+	}
 
-    protected open fun onHasPermissionsChanged(hasPermissions: Boolean) {
-        // implemented by sub classes
-        logD(hasPermissions)
-    }
+	override fun onResume() {
+		super.onResume()
+		val hasPermissions = hasPermissions()
+		if (hasPermissions != hadPermissions) {
+			hadPermissions = hasPermissions
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+				onHasPermissionsChanged(hasPermissions)
+			}
+		}
+	}
 
-    override fun dispatchKeyEvent(event: KeyEvent): Boolean {
-        if (event.keyCode == KeyEvent.KEYCODE_MENU && event.action == KeyEvent.ACTION_UP) {
-            showOverflowMenu()
-            return true
-        }
-        return super.dispatchKeyEvent(event)
-    }
+	protected open fun onHasPermissionsChanged(hasPermissions: Boolean) {
+		// implemented by sub classes
+	}
 
-    private fun showOverflowMenu() {
-    }
+	override fun dispatchKeyEvent(event: KeyEvent): Boolean {
+		if (event.keyCode == KeyEvent.KEYCODE_MENU && event.action == KeyEvent.ACTION_UP) {
+			showOverflowMenu()
+			return true
+		}
+		return super.dispatchKeyEvent(event)
+	}
 
-    protected open fun requestPermissions() {
-        ActivityCompat.requestPermissions(this, permissions, PERMISSION_REQUEST)
-    }
+	protected fun showOverflowMenu() {
 
-    protected fun hasPermissions(): Boolean {
-        for (permission in permissions) {
-            if (ActivityCompat.checkSelfPermission(this,
-                    permission) != PackageManager.PERMISSION_GRANTED
-            ) {
-                return false
-            }
-        }
-        return true
-    }
+	}
 
-    override fun onRequestPermissionsResult(
-        requestCode: Int,
-        permissions: Array<String>,
-        grantResults: IntArray,
-    ) {
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
-        if (requestCode == PERMISSION_REQUEST) {
-            for (grantResult in grantResults) {
-                if (grantResult != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.READ_EXTERNAL_STORAGE,
-                        ) || ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                        )
-                    ) {
-                        // User has deny from permission dialog
-                        Snackbar.make(
-                            snackBarContainer,
-                            permissionDeniedMessage!!,
-                            Snackbar.LENGTH_SHORT
-                        )
-                            .setAction(R.string.action_grant) { requestPermissions() }
-                            .setActionTextColor(accentColor()).show()
-                    } else {
-                        // User has deny permission and checked never show permission dialog so you can redirect to Application settings page
-                        Snackbar.make(
-                            snackBarContainer,
-                            permissionDeniedMessage!!,
-                            Snackbar.LENGTH_INDEFINITE
-                        )
-                            .setAction(R.string.action_settings) {
-                                val intent = Intent()
-                                intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
-                                val uri = Uri.fromParts(
-                                    "package",
-                                    this@AbsBaseActivity.packageName,
-                                    null
-                                )
-                                intent.data = uri
-                                startActivity(intent)
-                            }.setActionTextColor(accentColor()).show()
-                    }
-                    return
-                }
-            }
-            hadPermissions = true
-            onHasPermissionsChanged(true)
-        } else if (requestCode == BLUETOOTH_PERMISSION_REQUEST) {
-            for (grantResult in grantResults) {
-                if (grantResult != PackageManager.PERMISSION_GRANTED) {
-                    if (ActivityCompat.shouldShowRequestPermissionRationale(
-                            this@AbsBaseActivity, Manifest.permission.BLUETOOTH_CONNECT
-                        )
-                    ) {
-                        // User has deny from permission dialog
-                        Snackbar.make(
-                            snackBarContainer,
-                            R.string.permission_bluetooth_denied,
-                            Snackbar.LENGTH_SHORT
-                        )
-                            .setAction(R.string.action_grant) {
-                                ActivityCompat.requestPermissions(this,
-                                    arrayOf(Manifest.permission.BLUETOOTH_CONNECT),
-                                    BLUETOOTH_PERMISSION_REQUEST)
-                            }
-                            .setActionTextColor(accentColor()).show()
-                    }
-                }
-            }
-        }
-    }
+	protected open fun requestPermissions() {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			requestPermissions(permissions, PERMISSION_REQUEST)
+		}
+	}
 
-    companion object {
-        const val PERMISSION_REQUEST = 100
-        const val BLUETOOTH_PERMISSION_REQUEST = 101
-    }
+	protected fun hasPermissions(): Boolean {
+		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+			for (permission in permissions) {
+				if (checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
+					return false
+				}
+			}
+		}
+		return true
+	}
 
-    // this lets keyboard close when clicked in background
-    override fun dispatchTouchEvent(event: MotionEvent): Boolean {
-        if (event.action == MotionEvent.ACTION_DOWN) {
-            val v = currentFocus
-            if (v is EditText) {
-                val outRect = Rect()
-                v.getGlobalVisibleRect(outRect)
-                if (!outRect.contains(event.rawX.toInt(), event.rawY.toInt())) {
-                    v.clearFocus()
-                    getSystemService<InputMethodManager>()?.hideSoftInputFromWindow(
-                        v.windowToken,
-                        0
-                    )
-                }
-            }
-        }
-        return super.dispatchTouchEvent(event)
-    }
+	override fun onRequestPermissionsResult(
+			requestCode: Int,
+			permissions: Array<String>,
+			grantResults: IntArray
+	) {
+		super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+		if (requestCode == PERMISSION_REQUEST) {
+			for (grantResult in grantResults) {
+				if (grantResult != PackageManager.PERMISSION_GRANTED) {
+					if (ActivityCompat.shouldShowRequestPermissionRationale(
+									this@AbsBaseActivity, Manifest.permission.WRITE_EXTERNAL_STORAGE
+							)) {
+						//User has deny from permission dialog
+						Snackbar.make(
+								snackBarContainer,
+								permissionDeniedMessage!!,
+								Snackbar.LENGTH_INDEFINITE
+						)
+							.setAction(code.name.monkey.retromusic.R.string.action_grant) { requestPermissions() }
+							.setActionTextColor(ThemeStore.accentColor(this)).show()
+					} else {
+						// User has deny permission and checked never show permission dialog so you can redirect to Application settings page
+						Snackbar.make(
+								snackBarContainer,
+								permissionDeniedMessage!!,
+								Snackbar.LENGTH_INDEFINITE
+						).setAction(code.name.monkey.retromusic.R.string.action_settings) {
+							val intent = Intent()
+							intent.action = Settings.ACTION_APPLICATION_DETAILS_SETTINGS
+							val uri = Uri.fromParts(
+									"package",
+									this@AbsBaseActivity.packageName,
+									null
+							)
+							intent.data = uri
+							startActivity(intent)
+						}.setActionTextColor(ThemeStore.accentColor(this)).show()
+					}
+					return
+				}
+			}
+			hadPermissions = true
+			onHasPermissionsChanged(true)
+		}
+	}
+
+	companion object {
+		const val PERMISSION_REQUEST = 100
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
index f9f05c919..30e99735b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsMusicServiceActivity.kt
@@ -1,221 +1,167 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.base
 
 import android.Manifest
 import android.content.*
-import android.os.Bundle
-import android.os.IBinder
-import androidx.core.content.ContextCompat
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.appthemehelper.util.VersionUtils
+import android.os.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.toPlayCount
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.MEDIA_STORE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.QUEUE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.REPEAT_MODE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_CHANGED
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logD
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.koin.android.ext.android.inject
+import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
+import code.name.monkey.retromusic.service.MusicService.*
 import java.lang.ref.WeakReference
+import java.util.*
 
-abstract class AbsMusicServiceActivity : AbsBaseActivity(), IMusicServiceEventListener {
+abstract class AbsMusicServiceActivity : AbsBaseActivity(), MusicServiceEventListener {
 
-    private val mMusicServiceEventListeners = ArrayList<IMusicServiceEventListener>()
-    private val repository: RealRepository by inject()
-    private var serviceToken: MusicPlayerRemote.ServiceToken? = null
-    private var musicStateReceiver: MusicStateReceiver? = null
-    private var receiverRegistered: Boolean = false
+	private val mMusicServiceEventListeners = ArrayList<MusicServiceEventListener>()
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        serviceToken = MusicPlayerRemote.bindToService(this, object : ServiceConnection {
-            override fun onServiceConnected(name: ComponentName, service: IBinder) {
-                this@AbsMusicServiceActivity.onServiceConnected()
-            }
+	private var serviceToken: MusicPlayerRemote.ServiceToken? = null
+	private var musicStateReceiver: MusicStateReceiver? = null
+	private var receiverRegistered: Boolean = false
 
-            override fun onServiceDisconnected(name: ComponentName) {
-                this@AbsMusicServiceActivity.onServiceDisconnected()
-            }
-        })
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		serviceToken = MusicPlayerRemote.bindToService(this, object : ServiceConnection {
+			override fun onServiceConnected(name: ComponentName, service: IBinder) {
+				this@AbsMusicServiceActivity.onServiceConnected()
+			}
 
-        setPermissionDeniedMessage(getString(R.string.permission_external_storage_denied))
-    }
+			override fun onServiceDisconnected(name: ComponentName) {
+				this@AbsMusicServiceActivity.onServiceDisconnected()
+			}
+		})
 
-    override fun onDestroy() {
-        super.onDestroy()
-        MusicPlayerRemote.unbindFromService(serviceToken)
-        if (receiverRegistered) {
-            unregisterReceiver(musicStateReceiver)
-            receiverRegistered = false
-        }
-    }
+		setPermissionDeniedMessage(getString(R.string.permission_external_storage_denied));
+	}
 
-    fun addMusicServiceEventListener(listenerI: IMusicServiceEventListener?) {
-        if (listenerI != null) {
-            mMusicServiceEventListeners.add(listenerI)
-        }
-    }
+	override fun onDestroy() {
+		super.onDestroy()
+		MusicPlayerRemote.unbindFromService(serviceToken)
+		if (receiverRegistered) {
+			unregisterReceiver(musicStateReceiver)
+			receiverRegistered = false
+		}
+	}
 
-    fun removeMusicServiceEventListener(listenerI: IMusicServiceEventListener?) {
-        if (listenerI != null) {
-            mMusicServiceEventListeners.remove(listenerI)
-        }
-    }
+	fun addMusicServiceEventListener(listener: MusicServiceEventListener?) {
+		if (listener != null) {
+			mMusicServiceEventListeners.add(listener)
+		}
+	}
 
-    override fun onServiceConnected() {
-        if (!receiverRegistered) {
-            musicStateReceiver = MusicStateReceiver(this)
+	fun removeMusicServiceEventListener(listener: MusicServiceEventListener?) {
+		if (listener != null) {
+			mMusicServiceEventListeners.remove(listener)
+		}
+	}
 
-            val filter = IntentFilter()
-            filter.addAction(PLAY_STATE_CHANGED)
-            filter.addAction(SHUFFLE_MODE_CHANGED)
-            filter.addAction(REPEAT_MODE_CHANGED)
-            filter.addAction(META_CHANGED)
-            filter.addAction(QUEUE_CHANGED)
-            filter.addAction(MEDIA_STORE_CHANGED)
-            filter.addAction(FAVORITE_STATE_CHANGED)
+	override fun onServiceConnected() {
+		if (!receiverRegistered) {
+			musicStateReceiver = MusicStateReceiver(this)
 
-            ContextCompat.registerReceiver(this, musicStateReceiver, filter, ContextCompat.RECEIVER_NOT_EXPORTED)
-            receiverRegistered = true
-        }
+			val filter = IntentFilter()
+			filter.addAction(PLAY_STATE_CHANGED)
+			filter.addAction(SHUFFLE_MODE_CHANGED)
+			filter.addAction(REPEAT_MODE_CHANGED)
+			filter.addAction(META_CHANGED)
+			filter.addAction(QUEUE_CHANGED)
+			filter.addAction(MEDIA_STORE_CHANGED)
+			filter.addAction(FAVORITE_STATE_CHANGED)
 
-        for (listener in mMusicServiceEventListeners) {
-            listener.onServiceConnected()
-        }
-    }
+			registerReceiver(musicStateReceiver, filter)
 
-    override fun onServiceDisconnected() {
-        if (receiverRegistered) {
-            unregisterReceiver(musicStateReceiver)
-            receiverRegistered = false
-        }
+			receiverRegistered = true
+		}
 
-        for (listener in mMusicServiceEventListeners) {
-            listener.onServiceDisconnected()
-        }
-    }
+		for (listener in mMusicServiceEventListeners) {
+			listener.onServiceConnected()
+		}
+	}
 
-    override fun onPlayingMetaChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onPlayingMetaChanged()
-        }
-        lifecycleScope.launch(Dispatchers.IO) {
-            if (!PreferenceUtil.pauseHistory) {
-                repository.upsertSongInHistory(MusicPlayerRemote.currentSong)
-            }
-            val song = repository.findSongExistInPlayCount(MusicPlayerRemote.currentSong.id)
-                ?.apply { playCount += 1 }
-                ?: MusicPlayerRemote.currentSong.toPlayCount()
+	override fun onServiceDisconnected() {
+		if (receiverRegistered) {
+			unregisterReceiver(musicStateReceiver)
+			receiverRegistered = false
+		}
 
-            repository.upsertSongInPlayCount(song)
-        }
-    }
+		for (listener in mMusicServiceEventListeners) {
+			listener.onServiceDisconnected()
+		}
+	}
 
-    override fun onQueueChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onQueueChanged()
-        }
-    }
+	override fun onPlayingMetaChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onPlayingMetaChanged()
+		}
+	}
 
-    override fun onPlayStateChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onPlayStateChanged()
-        }
-    }
+	override fun onQueueChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onQueueChanged()
+		}
+	}
 
-    override fun onMediaStoreChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onMediaStoreChanged()
-        }
-    }
+	override fun onPlayStateChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onPlayStateChanged()
+		}
+	}
 
-    override fun onRepeatModeChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onRepeatModeChanged()
-        }
-    }
+	override fun onMediaStoreChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onMediaStoreChanged()
+		}
+	}
 
-    override fun onShuffleModeChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onShuffleModeChanged()
-        }
-    }
+	override fun onRepeatModeChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onRepeatModeChanged()
+		}
+	}
 
-    override fun onFavoriteStateChanged() {
-        for (listener in mMusicServiceEventListeners) {
-            listener.onFavoriteStateChanged()
-        }
-    }
+	override fun onShuffleModeChanged() {
+		for (listener in mMusicServiceEventListeners) {
+			listener.onShuffleModeChanged()
+		}
+	}
 
-    override fun onHasPermissionsChanged(hasPermissions: Boolean) {
-        super.onHasPermissionsChanged(hasPermissions)
-        val intent = Intent(MEDIA_STORE_CHANGED)
-        intent.putExtra(
-            "from_permissions_changed",
-            true
-        ) // just in case we need to know this at some point
-        sendBroadcast(intent)
-        logD("sendBroadcast $hasPermissions")
-    }
+	override fun onHasPermissionsChanged(hasPermissions: Boolean) {
+		super.onHasPermissionsChanged(hasPermissions)
+		val intent = Intent(MEDIA_STORE_CHANGED)
+		intent.putExtra(
+				"from_permissions_changed",
+				true
+		) // just in case we need to know this at some point
+		sendBroadcast(intent)
+	}
 
-    override fun getPermissionsToRequest(): Array<String> {
-        return mutableListOf<String>().apply {
-            if (VersionUtils.hasT()) {
-                add(Manifest.permission.READ_MEDIA_AUDIO)
-                add(Manifest.permission.POST_NOTIFICATIONS)
-            } else {
-                add(Manifest.permission.READ_EXTERNAL_STORAGE)
-            }
-            if (!VersionUtils.hasR()) {
-                add(Manifest.permission.WRITE_EXTERNAL_STORAGE)
-            }
-        }.toTypedArray()
-    }
+	override fun getPermissionsToRequest(): Array<String> {
+		return arrayOf(
+				Manifest.permission.READ_EXTERNAL_STORAGE,
+				Manifest.permission.WRITE_EXTERNAL_STORAGE
+		)
+	}
 
-    private class MusicStateReceiver(activity: AbsMusicServiceActivity) : BroadcastReceiver() {
+	private class MusicStateReceiver(activity: AbsMusicServiceActivity) : BroadcastReceiver() {
 
-        private val reference: WeakReference<AbsMusicServiceActivity> = WeakReference(activity)
+		private val reference: WeakReference<AbsMusicServiceActivity> = WeakReference(activity)
 
-        override fun onReceive(context: Context, intent: Intent) {
-            val action = intent.action
-            val activity = reference.get()
-            if (activity != null && action != null) {
-                when (action) {
-                    FAVORITE_STATE_CHANGED -> activity.onFavoriteStateChanged()
-                    META_CHANGED -> activity.onPlayingMetaChanged()
-                    QUEUE_CHANGED -> activity.onQueueChanged()
-                    PLAY_STATE_CHANGED -> activity.onPlayStateChanged()
-                    REPEAT_MODE_CHANGED -> activity.onRepeatModeChanged()
-                    SHUFFLE_MODE_CHANGED -> activity.onShuffleModeChanged()
-                    MEDIA_STORE_CHANGED -> activity.onMediaStoreChanged()
-                }
-            }
-        }
-    }
+		override fun onReceive(context: Context, intent: Intent) {
+			val action = intent.action
+			val activity = reference.get()
+			if (activity != null && action != null) {
+				when (action) {
+					FAVORITE_STATE_CHANGED, META_CHANGED -> activity.onPlayingMetaChanged()
+					QUEUE_CHANGED                        -> activity.onQueueChanged()
+					PLAY_STATE_CHANGED                   -> activity.onPlayStateChanged()
+					REPEAT_MODE_CHANGED                  -> activity.onRepeatModeChanged()
+					SHUFFLE_MODE_CHANGED                 -> activity.onShuffleModeChanged()
+					MEDIA_STORE_CHANGED                  -> activity.onMediaStoreChanged()
+				}
+			}
+		}
+	}
 
-    companion object {
-        val TAG: String = AbsMusicServiceActivity::class.java.simpleName
-    }
+	companion object {
+		val TAG: String = AbsMusicServiceActivity::class.java.simpleName
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
index 2a81ca9b4..cc72372dc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsSlidingMusicPanelActivity.kt
@@ -1,226 +1,110 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.base
 
-import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.content.Intent
-import android.content.SharedPreferences
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver
-import android.view.animation.PathInterpolator
-import android.widget.FrameLayout
-import androidx.activity.OnBackPressedCallback
-import androidx.core.animation.doOnEnd
-import androidx.core.view.*
-import androidx.fragment.app.commit
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.ADAPTIVE_COLOR_APP
-import code.name.monkey.retromusic.ALBUM_COVER_STYLE
-import code.name.monkey.retromusic.ALBUM_COVER_TRANSFORM
-import code.name.monkey.retromusic.CAROUSEL_EFFECT
-import code.name.monkey.retromusic.CIRCLE_PLAY_BUTTON
-import code.name.monkey.retromusic.EXTRA_SONG_INFO
-import code.name.monkey.retromusic.KEEP_SCREEN_ON
-import code.name.monkey.retromusic.LIBRARY_CATEGORIES
-import code.name.monkey.retromusic.NOW_PLAYING_SCREEN_ID
+import androidx.annotation.LayoutRes
+import androidx.fragment.app.Fragment
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SCREEN_ON_LYRICS
-import code.name.monkey.retromusic.SWIPE_ANYWHERE_NOW_PLAYING
-import code.name.monkey.retromusic.SWIPE_DOWN_DISMISS
-import code.name.monkey.retromusic.TAB_TEXT_MODE
-import code.name.monkey.retromusic.TOGGLE_ADD_CONTROLS
-import code.name.monkey.retromusic.TOGGLE_FULL_SCREEN
-import code.name.monkey.retromusic.TOGGLE_VOLUME
-import code.name.monkey.retromusic.activities.PermissionActivity
-import code.name.monkey.retromusic.databinding.SlidingMusicPanelLayoutBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
 import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.other.MiniPlayerFragment
 import code.name.monkey.retromusic.fragments.player.adaptive.AdaptiveFragment
 import code.name.monkey.retromusic.fragments.player.blur.BlurPlayerFragment
 import code.name.monkey.retromusic.fragments.player.card.CardFragment
 import code.name.monkey.retromusic.fragments.player.cardblur.CardBlurFragment
-import code.name.monkey.retromusic.fragments.player.circle.CirclePlayerFragment
-import code.name.monkey.retromusic.fragments.player.classic.ClassicPlayerFragment
 import code.name.monkey.retromusic.fragments.player.color.ColorFragment
 import code.name.monkey.retromusic.fragments.player.fit.FitFragment
 import code.name.monkey.retromusic.fragments.player.flat.FlatPlayerFragment
 import code.name.monkey.retromusic.fragments.player.full.FullPlayerFragment
-import code.name.monkey.retromusic.fragments.player.gradient.GradientPlayerFragment
 import code.name.monkey.retromusic.fragments.player.material.MaterialFragment
-import code.name.monkey.retromusic.fragments.player.md3.MD3PlayerFragment
 import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
-import code.name.monkey.retromusic.fragments.player.peek.PeekPlayerFragment
+import code.name.monkey.retromusic.fragments.player.peak.PeakPlayerFragment
 import code.name.monkey.retromusic.fragments.player.plain.PlainPlayerFragment
 import code.name.monkey.retromusic.fragments.player.simple.SimplePlayerFragment
 import code.name.monkey.retromusic.fragments.player.tiny.TinyPlayerFragment
-import code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.CategoryInfo
+import code.name.monkey.retromusic.util.DensityUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.logD
-import com.google.android.material.bottomnavigation.BottomNavigationView
+import code.name.monkey.retromusic.views.BottomNavigationBarTinted
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_DRAGGING
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_HIDDEN
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_SETTLING
-import com.google.android.material.bottomsheet.BottomSheetBehavior.from
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import com.google.android.material.card.MaterialCardView
+import kotlinx.android.synthetic.main.sliding_music_panel_layout.*
 
-
-abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(), AbsPlayerFragment.Callbacks {
     companion object {
         val TAG: String = AbsSlidingMusicPanelActivity::class.java.simpleName
     }
 
-    var fromNotification = false
-    private var windowInsets: WindowInsetsCompat? = null
-    protected val libraryViewModel by viewModel<LibraryViewModel>()
-    private lateinit var bottomSheetBehavior: BottomSheetBehavior<FrameLayout>
-    private lateinit var playerFragment: AbsPlayerFragment
+    private lateinit var bottomSheetBehavior: BottomSheetBehavior<MaterialCardView>
     private var miniPlayerFragment: MiniPlayerFragment? = null
-    private var nowPlayingScreen: NowPlayingScreen? = null
+    private var playerFragment: AbsPlayerFragment? = null
+    private var currentNowPlayingScreen: NowPlayingScreen? = null
+    private var navigationBarColor: Int = 0
     private var taskColor: Int = 0
-    private var paletteColor: Int = Color.WHITE
-    private var navigationBarColor = 0
-
+    private var lightStatusBar: Boolean = false
+    private var lightNavigationBar: Boolean = false
+    private var navigationBarColorAnimator: ValueAnimator? = null
+    protected abstract fun createContentView(): View
     private val panelState: Int
         get() = bottomSheetBehavior.state
-    private lateinit var binding: SlidingMusicPanelLayoutBinding
-    private var isInOneTabMode = false
 
-    private var navigationBarColorAnimator: ValueAnimator? = null
-    private val argbEvaluator: ArgbEvaluator = ArgbEvaluator()
+    private val bottomSheetCallbackList = object : BottomSheetBehavior.BottomSheetCallback() {
 
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            println("Handle back press ${bottomSheetBehavior.state}")
-            if (!handleBackPress()) {
-                remove()
-                onBackPressedDispatcher.onBackPressed()
-            }
+        override fun onSlide(bottomSheet: View, slideOffset: Float) {
+            setMiniPlayerAlphaProgress(slideOffset)
+            dimBackground.show()
+            dimBackground.alpha = slideOffset
         }
-    }
 
-    private val bottomSheetCallbackList by lazy {
-        object : BottomSheetCallback() {
+        override fun onStateChanged(bottomSheet: View, newState: Int) {
+            when (newState) {
+                BottomSheetBehavior.STATE_EXPANDED -> {
+                    onPanelExpanded()
+                }
+                BottomSheetBehavior.STATE_COLLAPSED -> {
+                    onPanelCollapsed()
+                    dimBackground.hide()
+                }
+                else -> {
 
-            override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                setMiniPlayerAlphaProgress(slideOffset)
-                navigationBarColorAnimator?.cancel()
-                setNavigationBarColorPreOreo(
-                    argbEvaluator.evaluate(
-                        slideOffset,
-                        surfaceColor(),
-                        navigationBarColor
-                    ) as Int
-                )
-            }
-
-            override fun onStateChanged(bottomSheet: View, newState: Int) {
-                onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
-                when (newState) {
-                    STATE_EXPANDED -> {
-                        onPanelExpanded()
-                        if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
-                            keepScreenOn(true)
-                        }
-                    }
-
-                    STATE_COLLAPSED -> {
-                        onPanelCollapsed()
-                        if ((PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) || !PreferenceUtil.isScreenOnEnabled) {
-                            keepScreenOn(false)
-                        }
-                    }
-
-                    STATE_SETTLING, STATE_DRAGGING -> {
-                        if (fromNotification) {
-                            binding.navigationView.bringToFront()
-                            fromNotification = false
-                        }
-                    }
-
-                    STATE_HIDDEN -> {
-                        MusicPlayerRemote.clearQueue()
-                    }
-
-                    else -> {
-                        logD("Do a flip")
-                    }
                 }
             }
         }
     }
 
-    fun getBottomSheetBehavior() = bottomSheetBehavior
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        if (!hasPermissions()) {
-            startActivity(Intent(this, PermissionActivity::class.java))
-            finish()
-        }
-        binding = SlidingMusicPanelLayoutBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        binding.root.setOnApplyWindowInsetsListener { _, insets ->
-            windowInsets = WindowInsetsCompat.toWindowInsetsCompat(insets)
-            insets
-        }
+        setContentView(createContentView())
+
         chooseFragmentForTheme()
         setupSlidingUpPanel()
-        setupBottomSheet()
-        updateColor()
-        if (!PreferenceUtil.materialYou) {
-            binding.slidingPanel.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
-            navigationView.backgroundTintList = ColorStateList.valueOf(darkAccentColor())
-        }
 
-        navigationBarColor = surfaceColor()
+        updateTabs()
 
-        onBackPressedDispatcher.addCallback(onBackPressedCallback)
-    }
+        bottomSheetBehavior = BottomSheetBehavior.from(slidingPanel)
 
-    private fun setupBottomSheet() {
-        bottomSheetBehavior = from(binding.slidingPanel)
-        bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallbackList)
-        bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
-        bottomSheetBehavior.significantVelocityThreshold = 300
-        setMiniPlayerAlphaProgress(0F)
+        val themeColor = ATHUtil.resolveColor(this, android.R.attr.windowBackground, Color.GRAY)
+        dimBackground.setBackgroundColor(ColorUtil.withAlpha(themeColor, 0.5f))
     }
 
     override fun onResume() {
         super.onResume()
-        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
-        if (nowPlayingScreen != PreferenceUtil.nowPlayingScreen) {
+        if (currentNowPlayingScreen != PreferenceUtil.getInstance(this).nowPlayingScreen) {
             postRecreate()
         }
-        if (bottomSheetBehavior.state == STATE_EXPANDED) {
+        bottomSheetBehavior.addBottomSheetCallback(bottomSheetCallbackList)
+
+        if (bottomSheetBehavior.state == BottomSheetBehavior.STATE_EXPANDED) {
             setMiniPlayerAlphaProgress(1f)
         }
     }
@@ -228,354 +112,246 @@ abstract class AbsSlidingMusicPanelActivity : AbsMusicServiceActivity(),
     override fun onDestroy() {
         super.onDestroy()
         bottomSheetBehavior.removeBottomSheetCallback(bottomSheetCallbackList)
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
+        if (navigationBarColorAnimator != null) navigationBarColorAnimator?.cancel() // just in case
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        when (key) {
-            SWIPE_DOWN_DISMISS -> {
-                bottomSheetBehavior.isHideable = PreferenceUtil.swipeDownToDismiss
-            }
-
-            TOGGLE_ADD_CONTROLS -> {
-                miniPlayerFragment?.setUpButtons()
-            }
-
-            NOW_PLAYING_SCREEN_ID -> {
-                chooseFragmentForTheme()
-                binding.slidingPanel.updateLayoutParams<ViewGroup.LayoutParams> {
-                    height = if (nowPlayingScreen != Peek) {
-                        ViewGroup.LayoutParams.MATCH_PARENT
-                    } else {
-                        ViewGroup.LayoutParams.WRAP_CONTENT
-                    }
-                    onServiceConnected()
-                }
-            }
-
-            ALBUM_COVER_TRANSFORM, CAROUSEL_EFFECT,
-            ALBUM_COVER_STYLE, TOGGLE_VOLUME, EXTRA_SONG_INFO, CIRCLE_PLAY_BUTTON,
-            -> {
-                chooseFragmentForTheme()
-                onServiceConnected()
-            }
-
-            SWIPE_ANYWHERE_NOW_PLAYING -> {
-                playerFragment.addSwipeDetector()
-            }
-
-            ADAPTIVE_COLOR_APP -> {
-                if (PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)) {
-                    chooseFragmentForTheme()
-                    onServiceConnected()
-                }
-            }
-
-            LIBRARY_CATEGORIES -> {
-                updateTabs()
-            }
-
-            TAB_TEXT_MODE -> {
-                navigationView.labelVisibilityMode = PreferenceUtil.tabTitleMode
-            }
-
-            TOGGLE_FULL_SCREEN -> {
-                recreate()
-            }
-
-            SCREEN_ON_LYRICS -> {
-                keepScreenOn(bottomSheetBehavior.state == STATE_EXPANDED && PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics || PreferenceUtil.isScreenOnEnabled)
-            }
-
-            KEEP_SCREEN_ON -> {
-                maybeSetScreenOn()
-            }
-        }
+    protected fun wrapSlidingMusicPanel(@LayoutRes resId: Int): View {
+        val slidingMusicPanelLayout = layoutInflater.inflate(R.layout.sliding_music_panel_layout, null)
+        val contentContainer = slidingMusicPanelLayout.findViewById<ViewGroup>(R.id.mainContentFrame)
+        layoutInflater.inflate(resId, contentContainer)
+        return slidingMusicPanelLayout
     }
 
-    fun collapsePanel() {
-        bottomSheetBehavior.state = STATE_COLLAPSED
+    private fun collapsePanel() {
+        bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
     }
 
     fun expandPanel() {
-        bottomSheetBehavior.state = STATE_EXPANDED
+        bottomSheetBehavior.state = BottomSheetBehavior.STATE_EXPANDED
+        setMiniPlayerAlphaProgress(1f)
     }
 
     private fun setMiniPlayerAlphaProgress(progress: Float) {
-        if (progress < 0) return
+        if (miniPlayerFragment?.view == null) return
         val alpha = 1 - progress
-        miniPlayerFragment?.view?.alpha = 1 - (progress / 0.2F)
-        miniPlayerFragment?.view?.isGone = alpha == 0f
-        if (!isLandscape) {
-            binding.navigationView.translationY = progress * 500
-            binding.navigationView.alpha = alpha
-        }
-        binding.playerFragmentContainer.alpha = (progress - 0.2F) / 0.2F
-    }
+        miniPlayerFragment?.view?.alpha = alpha
+        // necessary to make the views below clickable
+        miniPlayerFragment?.view?.visibility = if (alpha == 0f) View.GONE else View.VISIBLE
 
-    private fun animateNavigationBarColor(color: Int) {
-        if (VersionUtils.hasOreo()) return
-        navigationBarColorAnimator?.cancel()
-        navigationBarColorAnimator = ValueAnimator
-            .ofArgb(window.navigationBarColor, color).apply {
-                duration = ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong()
-                interpolator = PathInterpolator(0.4f, 0f, 1f, 1f)
-                addUpdateListener { animation: ValueAnimator ->
-                    setNavigationBarColorPreOreo(
-                        animation.animatedValue as Int
-                    )
-                }
-                start()
-            }
+        bottomNavigationView.translationY = progress * 500
+        //bottomNavigationView.alpha = alpha
     }
 
     open fun onPanelCollapsed() {
-        setMiniPlayerAlphaProgress(0F)
         // restore values
-        animateNavigationBarColor(surfaceColor())
-        setLightStatusBarAuto()
-        setLightNavigationBarAuto()
-        setTaskDescriptionColor(taskColor)
-        //playerFragment?.onHide()
+        super.setLightStatusbar(lightStatusBar)
+        super.setTaskDescriptionColor(taskColor)
+        super.setNavigationbarColor(navigationBarColor)
+        super.setLightNavigationBar(lightNavigationBar)
+
+
+        playerFragment?.setMenuVisibility(false)
+        playerFragment?.userVisibleHint = false
+        playerFragment?.onHide()
     }
 
     open fun onPanelExpanded() {
-        setMiniPlayerAlphaProgress(1F)
+        val playerFragmentColor = playerFragment!!.paletteColor
+        super.setTaskDescriptionColor(playerFragmentColor)
+
+        playerFragment?.setMenuVisibility(true)
+        playerFragment?.userVisibleHint = true
+        playerFragment?.onShow()
         onPaletteColorChanged()
-        //playerFragment?.onShow()
     }
 
     private fun setupSlidingUpPanel() {
-        binding.slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object :
-            ViewTreeObserver.OnGlobalLayoutListener {
+        slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
             override fun onGlobalLayout() {
-                binding.slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                if (nowPlayingScreen != Peek) {
-                    binding.slidingPanel.updateLayoutParams<ViewGroup.LayoutParams> {
-                        height = ViewGroup.LayoutParams.MATCH_PARENT
-                    }
+                slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                if (currentNowPlayingScreen != PEAK) {
+                    val params = slidingPanel.layoutParams as ViewGroup.LayoutParams
+                    params.height = ViewGroup.LayoutParams.MATCH_PARENT
+                    slidingPanel.layoutParams = params
                 }
                 when (panelState) {
-                    STATE_EXPANDED -> onPanelExpanded()
-                    STATE_COLLAPSED -> onPanelCollapsed()
-                    else -> {
-                        // playerFragment!!.onHide()
-                    }
+                    BottomSheetBehavior.STATE_EXPANDED -> onPanelExpanded()
+                    BottomSheetBehavior.STATE_COLLAPSED -> onPanelCollapsed()
+                    else -> playerFragment!!.onHide()
                 }
             }
         })
     }
 
-    val navigationView get() = binding.navigationView
+    fun toggleBottomNavigationView(toggle: Boolean) {
+        bottomNavigationView.visibility = if (toggle) View.GONE else View.VISIBLE
+    }
 
-    val slidingPanel get() = binding.slidingPanel
+    fun getBottomNavigationView(): BottomNavigationBarTinted {
+        return bottomNavigationView
+    }
 
-    val isBottomNavVisible get() = navigationView.isVisible && navigationView is BottomNavigationView
+    private fun hideBottomBar(hide: Boolean) {
+        val heightOfBar = resources.getDimensionPixelSize(R.dimen.mini_player_height)
+        val heightOfBarWithTabs = resources.getDimensionPixelSize(R.dimen.mini_player_height_expanded)
+
+        if (hide) {
+            bottomSheetBehavior.isHideable = true
+            bottomSheetBehavior.peekHeight = 0
+            collapsePanel()
+            bottomNavigationView.elevation = DensityUtil.dip2px(this, 10f).toFloat()
+        } else {
+            if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
+                slidingPanel.cardElevation = DensityUtil.dip2px(this, 10f).toFloat()
+                bottomNavigationView.elevation = DensityUtil.dip2px(this, 10f).toFloat()
+                bottomSheetBehavior.isHideable = false
+                bottomSheetBehavior.peekHeight = if (bottomNavigationView.visibility == View.VISIBLE) heightOfBarWithTabs else heightOfBar
+            }
+        }
+    }
+
+    fun setBottomBarVisibility(gone: Int) {
+        bottomNavigationView.visibility = gone
+        hideBottomBar(false)
+    }
+
+    private fun chooseFragmentForTheme() {
+        currentNowPlayingScreen = PreferenceUtil.getInstance(this).nowPlayingScreen
+
+        val fragment: Fragment = when (currentNowPlayingScreen) {
+            BLUR -> BlurPlayerFragment()
+            ADAPTIVE -> AdaptiveFragment()
+            NORMAL -> PlayerFragment()
+            CARD -> CardFragment()
+            BLUR_CARD -> CardBlurFragment()
+            FIT -> FitFragment()
+            FLAT -> FlatPlayerFragment()
+            FULL -> FullPlayerFragment()
+            PLAIN -> PlainPlayerFragment()
+            SIMPLE -> SimplePlayerFragment()
+            MATERIAL -> MaterialFragment()
+            COLOR -> ColorFragment()
+            TINY -> TinyPlayerFragment()
+            PEAK -> PeakPlayerFragment()
+            else -> PlayerFragment()
+        } // must implement AbsPlayerFragment
+        supportFragmentManager.beginTransaction().replace(R.id.playerFragmentContainer, fragment)
+                .commit()
+        supportFragmentManager.executePendingTransactions()
+
+        playerFragment = supportFragmentManager.findFragmentById(R.id.playerFragmentContainer) as AbsPlayerFragment
+        miniPlayerFragment = supportFragmentManager.findFragmentById(R.id.miniPlayerFragment) as MiniPlayerFragment
+        miniPlayerFragment?.view?.setOnClickListener { expandPanel() }
+    }
 
     override fun onServiceConnected() {
         super.onServiceConnected()
-        hideBottomSheet(false)
+        if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
+            slidingPanel.viewTreeObserver.addOnGlobalLayoutListener(object : ViewTreeObserver.OnGlobalLayoutListener {
+                override fun onGlobalLayout() {
+                    slidingPanel.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                    hideBottomBar(false)
+                }
+            })
+        } // don't call hideBottomBar(true) here as it causes a bug with the SlidingUpPanelLayout
     }
 
     override fun onQueueChanged() {
         super.onQueueChanged()
-        // Mini player should be hidden in Playing Queue
-        // it may pop up if hideBottomSheet is called
-        if (currentFragment(R.id.fragment_container) !is PlayingQueueFragment) {
-            hideBottomSheet(MusicPlayerRemote.playingQueue.isEmpty())
-        }
+        hideBottomBar(MusicPlayerRemote.playingQueue.isEmpty())
     }
 
-    private fun handleBackPress(): Boolean {
-        if (panelState == STATE_EXPANDED) {
+    override fun onBackPressed() {
+        if (!handleBackPress()) super.onBackPressed()
+    }
+
+    open fun handleBackPress(): Boolean {
+        if (bottomSheetBehavior.peekHeight != 0 && playerFragment!!.onBackPressed()) return true
+        if (panelState == BottomSheetBehavior.STATE_EXPANDED) {
             collapsePanel()
             return true
         }
         return false
     }
 
-    private fun onPaletteColorChanged() {
-        if (panelState == STATE_EXPANDED) {
-            navigationBarColor = surfaceColor()
-            setTaskDescColor(paletteColor)
-            val isColorLight = paletteColor.isColorLight
-            if (PreferenceUtil.isAdaptiveColor && (nowPlayingScreen == Normal || nowPlayingScreen == Flat || nowPlayingScreen == Material)) {
-                setLightNavigationBar(true)
-                setLightStatusBar(isColorLight)
-            } else if (nowPlayingScreen == Card || nowPlayingScreen == Blur || nowPlayingScreen == BlurCard) {
-                animateNavigationBarColor(Color.BLACK)
-                navigationBarColor = Color.BLACK
-                setLightStatusBar(false)
-                setLightNavigationBar(true)
-            } else if (nowPlayingScreen == Color || nowPlayingScreen == Tiny || nowPlayingScreen == Gradient) {
-                animateNavigationBarColor(paletteColor)
-                navigationBarColor = paletteColor
-                setLightNavigationBar(isColorLight)
-                setLightStatusBar(isColorLight)
-            } else if (nowPlayingScreen == Full) {
-                animateNavigationBarColor(paletteColor)
-                navigationBarColor = paletteColor
-                setLightNavigationBar(isColorLight)
-                setLightStatusBar(false)
-            } else if (nowPlayingScreen == Classic) {
-                setLightStatusBar(false)
-            } else if (nowPlayingScreen == Fit) {
-                setLightStatusBar(false)
+    override fun onPaletteColorChanged() {
+        if (panelState == BottomSheetBehavior.STATE_EXPANDED) {
+            val paletteColor = playerFragment!!.paletteColor
+            super.setTaskDescriptionColor(paletteColor)
+
+            val isColorLight = ColorUtil.isColorLight(paletteColor)
+
+            if (PreferenceUtil.getInstance(this).adaptiveColor && (currentNowPlayingScreen == NORMAL || currentNowPlayingScreen == FLAT)) {
+                super.setLightNavigationBar(true)
+                super.setLightStatusbar(isColorLight)
+            } else if (currentNowPlayingScreen == FULL || currentNowPlayingScreen == CARD || currentNowPlayingScreen == FIT || currentNowPlayingScreen == BLUR || currentNowPlayingScreen == BLUR_CARD) {
+                super.setLightStatusbar(false)
+                super.setLightNavigationBar(true)
+            } else if (currentNowPlayingScreen == COLOR || currentNowPlayingScreen == TINY) {
+                super.setNavigationbarColor(paletteColor)
+                super.setLightNavigationBar(isColorLight)
+                super.setLightStatusbar(isColorLight)
+            } else {
+                super.setLightStatusbar(ColorUtil.isColorLight(ATHUtil.resolveColor(this, android.R.attr.windowBackground)))
+                super.setLightNavigationBar(true)
             }
         }
     }
 
-    private fun setTaskDescColor(color: Int) {
-        taskColor = color
-        if (panelState == STATE_COLLAPSED) {
-            setTaskDescriptionColor(color)
+    override fun setLightStatusbar(enabled: Boolean) {
+        lightStatusBar = enabled
+        if (panelState == BottomSheetBehavior.STATE_COLLAPSED) {
+            super.setLightStatusbar(enabled)
         }
     }
 
-    fun updateTabs() {
-        binding.navigationView.menu.clear()
-        val currentTabs: List<CategoryInfo> = PreferenceUtil.libraryCategory
+    override fun setLightNavigationBar(enabled: Boolean) {
+        lightNavigationBar = enabled
+        if (panelState == BottomSheetBehavior.STATE_COLLAPSED) {
+            super.setLightNavigationBar(enabled)
+        }
+    }
+
+    override fun setNavigationbarColor(color: Int) {
+        navigationBarColor = color
+        if (panelState == BottomSheetBehavior.STATE_COLLAPSED) {
+            if (navigationBarColorAnimator != null) navigationBarColorAnimator!!.cancel()
+            super.setNavigationbarColor(color)
+        }
+    }
+
+    override fun setTaskDescriptionColor(color: Int) {
+        taskColor = color
+        if (panelState == BottomSheetBehavior.STATE_COLLAPSED) {
+            super.setTaskDescriptionColor(color)
+        }
+    }
+
+    private fun updateTabs() {
+        bottomNavigationView.menu.clear()
+        val currentTabs: List<CategoryInfo> = PreferenceUtil.getInstance(this).libraryCategoryInfos
         for (tab in currentTabs) {
             if (tab.visible) {
                 val menu = tab.category
-                binding.navigationView.menu.add(0, menu.id, 0, menu.stringRes)
-                    .setIcon(menu.icon)
+                bottomNavigationView.menu.add(0, menu.id, 0, menu.stringRes).setIcon(menu.icon)
             }
         }
-        if (binding.navigationView.menu.size() == 1) {
-            isInOneTabMode = true
-            binding.navigationView.isVisible = false
-        } else {
-            isInOneTabMode = false
+        print("Tabs -> ${currentTabs.size}")
+        if (currentTabs.size <= 1) {
+            toggleBottomNavigationView(true)
         }
     }
 
-    private fun updateColor() {
-        libraryViewModel.paletteColor.observe(this) { color ->
-            this.paletteColor = color
-            onPaletteColorChanged()
-        }
-    }
-
-    fun setBottomNavVisibility(
-        visible: Boolean,
-        animate: Boolean = false,
-        hideBottomSheet: Boolean = MusicPlayerRemote.playingQueue.isEmpty(),
-    ) {
-        if (!ViewCompat.isLaidOut(navigationView)) {
-            return
-        }
-        if (isInOneTabMode) {
-            hideBottomSheet(
-                hide = hideBottomSheet,
-                animate = animate,
-                isBottomNavVisible = false
-            )
-            return
-        }
-        if (visible xor navigationView.isVisible) {
-            val mAnimate = animate && bottomSheetBehavior.state == STATE_COLLAPSED
-            if (mAnimate) {
-                if (visible) {
-                    binding.navigationView.bringToFront()
-                    binding.navigationView.show()
-                } else {
-                    binding.navigationView.hide()
-                }
-            } else {
-                binding.navigationView.isVisible = visible
-                if (visible && bottomSheetBehavior.state != STATE_EXPANDED) {
-                    binding.navigationView.bringToFront()
+    /*override fun dispatchTouchEvent(ev: MotionEvent?): Boolean {
+        if (ev?.action == MotionEvent.ACTION_DOWN) {
+            if (panelState == BottomSheetBehavior.STATE_EXPANDED) {
+                val outRect = Rect()
+                slidingPanel.getGlobalVisibleRect(outRect)
+                if (!outRect.contains(ev.rawX.toInt(), ev.rawY.toInt())) {
+                    bottomSheetBehavior.state = BottomSheetBehavior.STATE_COLLAPSED
                 }
             }
         }
-        hideBottomSheet(
-            hide = hideBottomSheet,
-            animate = animate,
-            isBottomNavVisible = visible && navigationView is BottomNavigationView
-        )
-    }
-
-    fun hideBottomSheet(
-        hide: Boolean,
-        animate: Boolean = false,
-        isBottomNavVisible: Boolean = navigationView.isVisible && navigationView is BottomNavigationView,
-    ) {
-        val heightOfBar = windowInsets.getBottomInsets() + dip(R.dimen.mini_player_height)
-        val heightOfBarWithTabs = heightOfBar + dip(R.dimen.bottom_nav_height)
-        if (hide) {
-            bottomSheetBehavior.peekHeight = -windowInsets.getBottomInsets()
-            bottomSheetBehavior.state = STATE_COLLAPSED
-            libraryViewModel.setFabMargin(
-                this,
-                if (isBottomNavVisible) dip(R.dimen.bottom_nav_height) else 0
-            )
-        } else {
-            if (MusicPlayerRemote.playingQueue.isNotEmpty()) {
-                binding.slidingPanel.elevation = 0F
-                binding.navigationView.elevation = 5F
-                if (isBottomNavVisible) {
-                    logD("List")
-                    if (animate) {
-                        bottomSheetBehavior.peekHeightAnimate(heightOfBarWithTabs)
-                    } else {
-                        bottomSheetBehavior.peekHeight = heightOfBarWithTabs
-                    }
-                    libraryViewModel.setFabMargin(
-                        this,
-                        dip(R.dimen.bottom_nav_mini_player_height)
-                    )
-                } else {
-                    logD("Details")
-                    if (animate) {
-                        bottomSheetBehavior.peekHeightAnimate(heightOfBar).doOnEnd {
-                            binding.slidingPanel.bringToFront()
-                        }
-                    } else {
-                        bottomSheetBehavior.peekHeight = heightOfBar
-                        binding.slidingPanel.bringToFront()
-                    }
-                    libraryViewModel.setFabMargin(this, dip(R.dimen.mini_player_height))
-                }
-            }
-        }
-    }
-
-    fun setAllowDragging(allowDragging: Boolean) {
-        bottomSheetBehavior.isDraggable = allowDragging
-        hideBottomSheet(false)
-    }
-
-    private fun chooseFragmentForTheme() {
-        nowPlayingScreen = PreferenceUtil.nowPlayingScreen
-
-        val fragment: AbsPlayerFragment = when (nowPlayingScreen) {
-            Blur -> BlurPlayerFragment()
-            Adaptive -> AdaptiveFragment()
-            Normal -> PlayerFragment()
-            Card -> CardFragment()
-            BlurCard -> CardBlurFragment()
-            Fit -> FitFragment()
-            Flat -> FlatPlayerFragment()
-            Full -> FullPlayerFragment()
-            Plain -> PlainPlayerFragment()
-            Simple -> SimplePlayerFragment()
-            Material -> MaterialFragment()
-            Color -> ColorFragment()
-            Gradient -> GradientPlayerFragment()
-            Tiny -> TinyPlayerFragment()
-            Peek -> PeekPlayerFragment()
-            Circle -> CirclePlayerFragment()
-            Classic -> ClassicPlayerFragment()
-            MD3 -> MD3PlayerFragment()
-            else -> PlayerFragment()
-        } // must extend AbsPlayerFragment
-        supportFragmentManager.commit {
-            replace(R.id.playerFragmentContainer, fragment)
-        }
-        supportFragmentManager.executePendingTransactions()
-        playerFragment = whichFragment(R.id.playerFragmentContainer)
-        miniPlayerFragment = whichFragment<MiniPlayerFragment>(R.id.miniPlayerFragment)
-        miniPlayerFragment?.view?.setOnClickListener { expandPanel() }
-    }
-}
+        return super.dispatchTouchEvent(ev)
+    }*/
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
index 32b025f01..96bace4d9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt
@@ -1,69 +1,44 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.base
 
-import android.content.Context
+import android.graphics.Color
+import android.graphics.drawable.Drawable
 import android.os.Bundle
 import android.os.Handler
-import android.os.Looper
 import android.view.KeyEvent
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.appcompat.app.AppCompatDelegate.setDefaultNightMode
-import androidx.core.os.LocaleListCompat
+import android.view.View
+import android.view.WindowManager
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import code.name.monkey.appthemehelper.ATH
+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.TintHelper
 import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.getNightMode
-import code.name.monkey.retromusic.util.theme.getThemeResValue
+import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.ThemeManager
 
 abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
-    private val handler = Handler(Looper.getMainLooper())
+    private val handler = Handler()
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        updateLocale()
-        updateTheme()
+        setTheme(ThemeManager.getThemeResValue(this))
         hideStatusBar()
         super.onCreate(savedInstanceState)
-        setEdgeToEdgeOrImmersive()
-        maybeSetScreenOn()
-        setLightNavigationBarAuto()
-        setLightStatusBarAuto(surfaceColor())
-        if (VersionUtils.hasQ()) {
-            window.decorView.isForceDarkAllowed = false
-        }
+        setImmersiveFullscreen()
+        registerSystemUiVisibility()
+        toggleScreenOn()
     }
 
-    private fun updateTheme() {
-        setTheme(getThemeResValue())
-        if (PreferenceUtil.materialYou) {
-            setDefaultNightMode(getNightMode())
-        }
-
-        if (PreferenceUtil.isCustomFont) {
-            setTheme(R.style.FontThemeOverlay)
-        }
-    }
-
-    private fun updateLocale() {
-        val localeCode = PreferenceUtil.languageCode
-        if (PreferenceUtil.isLocaleAutoStorageEnabled) {
-            AppCompatDelegate.setApplicationLocales(LocaleListCompat.forLanguageTags(localeCode))
-            PreferenceUtil.isLocaleAutoStorageEnabled = true
+    private fun toggleScreenOn() {
+        if (PreferenceUtil.getInstance(this).isScreenOnEnabled) {
+            window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        } else {
+            window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
         }
     }
 
@@ -78,6 +53,122 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
         }
     }
 
+    fun hideStatusBar() {
+        hideStatusBar(PreferenceUtil.getInstance(this).fullScreenMode)
+    }
+
+    private fun hideStatusBar(fullscreen: Boolean) {
+        val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
+        if (statusBar != null) {
+            statusBar.visibility = if (fullscreen) View.GONE else View.VISIBLE
+        }
+    }
+
+    private fun changeBackgroundShape() {
+        var background: Drawable? = if (PreferenceUtil.getInstance(this).isRoundCorners)
+            ContextCompat.getDrawable(this, R.drawable.round_window)
+        else ContextCompat.getDrawable(this, R.drawable.square_window)
+        background = TintHelper.createTintedDrawable(background, ATHUtil.resolveColor(this, android.R.attr.windowBackground))
+        window.setBackgroundDrawable(background)
+    }
+
+    fun setDrawUnderStatusBar() {
+        RetroUtil.setAllowDrawUnderStatusBar(window)
+    }
+
+    fun setDrawUnderNavigationBar() {
+        RetroUtil.setAllowDrawUnderNavigationBar(window)
+    }
+
+    /**
+     * This will set the color of the view with the id "status_bar" on KitKat and Lollipop. On
+     * Lollipop if no such view is found it will set the statusbar color using the native method.
+     *
+     * @param color the new statusbar color (will be shifted down on Lollipop and above)
+     */
+    fun setStatusbarColor(color: Int) {
+        val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
+        if (statusBar != null) {
+            when {
+                VersionUtils.hasMarshmallow() -> statusBar.setBackgroundColor(color)
+                VersionUtils.hasLollipop() -> statusBar.setBackgroundColor(ColorUtil.darkenColor(color))
+                else -> statusBar.setBackgroundColor(color)
+            }
+        } else {
+            when {
+                VersionUtils.hasMarshmallow() -> window.statusBarColor = color
+                else -> window.statusBarColor = ColorUtil.darkenColor(color)
+            }
+        }
+        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
+    }
+
+    fun setStatusbarColorAuto() {
+        // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
+        setStatusbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+        setLightStatusbarAuto(ATHUtil.resolveColor(this, R.attr.colorSurface))
+    }
+
+    open fun setTaskDescriptionColor(@ColorInt color: Int) {
+        ATH.setTaskDescriptionColor(this, color)
+    }
+
+    fun setTaskDescriptionColorAuto() {
+        setTaskDescriptionColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+    }
+
+    open fun setNavigationbarColor(color: Int) {
+        if (ThemeStore.coloredNavigationBar(this)) {
+            ATH.setNavigationbarColor(this, color)
+        } else {
+            ATH.setNavigationbarColor(this, Color.BLACK)
+        }
+    }
+
+    fun setNavigationbarColorAuto() {
+        setNavigationbarColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
+    }
+
+    open fun setLightStatusbar(enabled: Boolean) {
+        ATH.setLightStatusbar(this, enabled)
+    }
+
+    fun setLightStatusbarAuto(bgColor: Int) {
+        setLightStatusbar(ColorUtil.isColorLight(bgColor))
+    }
+
+    open fun setLightNavigationBar(enabled: Boolean) {
+        if (!ATHUtil.isWindowBackgroundDark(this) and ThemeStore.coloredNavigationBar(this)) {
+            ATH.setLightNavigationbar(this, enabled)
+        }
+    }
+
+    private fun registerSystemUiVisibility() {
+        val decorView = window.decorView
+        decorView.setOnSystemUiVisibilityChangeListener { visibility ->
+            if (visibility and View.SYSTEM_UI_FLAG_FULLSCREEN == 0) {
+                setImmersiveFullscreen()
+            }
+        }
+    }
+
+    private fun unregisterSystemUiVisibility() {
+        val decorView = window.decorView
+        decorView.setOnSystemUiVisibilityChangeListener(null)
+    }
+
+    private fun setImmersiveFullscreen() {
+        val flags = (View.SYSTEM_UI_FLAG_LAYOUT_STABLE or View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_HIDE_NAVIGATION or View.SYSTEM_UI_FLAG_FULLSCREEN or View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY)
+
+        if (PreferenceUtil.getInstance(this).fullScreenMode) {
+            window.decorView.systemUiVisibility = flags
+        }
+    }
+
+    private fun exitFullscreen() {
+        window.decorView.systemUiVisibility = View.SYSTEM_UI_FLAG_VISIBLE
+    }
+
     override fun run() {
         setImmersiveFullscreen()
     }
@@ -89,6 +180,7 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
 
     public override fun onDestroy() {
         super.onDestroy()
+        unregisterSystemUiVisibility()
         exitFullscreen()
     }
 
@@ -98,9 +190,6 @@ abstract class AbsThemeActivity : ATHToolbarActivity(), Runnable {
             handler.postDelayed(this, 500)
         }
         return super.onKeyDown(keyCode, event)
-    }
 
-    override fun attachBaseContext(newBase: Context?) {
-        super.attachBaseContext(newBase)
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
index e99881953..a8a578094 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/BugReportActivity.kt
@@ -1,91 +1,331 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.bugreport
 
+import android.app.Activity
+import android.app.Dialog
 import android.content.ClipData
 import android.content.ClipboardManager
+import android.content.Context
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
+import android.text.TextUtils
 import android.view.MenuItem
-import androidx.core.content.getSystemService
-import androidx.core.net.toUri
+import android.view.inputmethod.EditorInfo
+import android.widget.Toast
+import androidx.annotation.StringDef
+import androidx.annotation.StringRes
+import androidx.appcompat.app.AlertDialog
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsThemeActivity
 import code.name.monkey.retromusic.activities.bugreport.model.DeviceInfo
-import code.name.monkey.retromusic.databinding.ActivityBugReportBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.activities.bugreport.model.Report
+import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubLogin
+import code.name.monkey.retromusic.activities.bugreport.model.github.GithubTarget
+import code.name.monkey.retromusic.misc.DialogAsyncTask
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.callbacks.onCancel
+import com.google.android.material.floatingactionbutton.FloatingActionButton
+import com.google.android.material.textfield.TextInputLayout
+import kotlinx.android.synthetic.main.activity_bug_report.*
+import kotlinx.android.synthetic.main.bug_report_card_device_info.*
+import kotlinx.android.synthetic.main.bug_report_card_report.*
+import org.eclipse.egit.github.core.Issue
+import org.eclipse.egit.github.core.client.GitHubClient
+import org.eclipse.egit.github.core.client.RequestException
+import org.eclipse.egit.github.core.service.IssueService
+import java.io.IOException
+
+private const val RESULT_SUCCESS = "RESULT_OK"
+private const val RESULT_BAD_CREDENTIALS = "RESULT_BAD_CREDENTIALS"
+private const val RESULT_INVALID_TOKEN = "RESULT_INVALID_TOKEN"
+private const val RESULT_ISSUES_NOT_ENABLED = "RESULT_ISSUES_NOT_ENABLED"
+private const val RESULT_UNKNOWN = "RESULT_UNKNOWN"
+
+@StringDef(
+        RESULT_SUCCESS,
+        RESULT_BAD_CREDENTIALS,
+        RESULT_INVALID_TOKEN,
+        RESULT_ISSUES_NOT_ENABLED,
+        RESULT_UNKNOWN
+)
+@Retention(AnnotationRetention.SOURCE)
+private annotation class Result
 
 open class BugReportActivity : AbsThemeActivity() {
 
-    private lateinit var binding: ActivityBugReportBinding
     private var deviceInfo: DeviceInfo? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setDrawUnderStatusBar()
         super.onCreate(savedInstanceState)
-        binding = ActivityBugReportBinding.inflate(layoutInflater)
-        setContentView(binding.root)
+        setContentView(R.layout.activity_bug_report)
+        setStatusbarColorAuto()
+        setNavigationbarColorAuto()
         setTaskDescriptionColorAuto()
 
         initViews()
 
-        if (title.isNullOrEmpty()) setTitle(R.string.report_an_issue)
+        if (TextUtils.isEmpty(title)) setTitle(R.string.report_an_issue)
 
         deviceInfo = DeviceInfo(this)
-        binding.cardDeviceInfo.airTextDeviceInfo.text = deviceInfo.toString()
+        airTextDeviceInfo.text = deviceInfo.toString()
     }
 
     private fun initViews() {
-        val accentColor = accentColor()
-        setSupportActionBar(binding.toolbar)
-        ToolbarContentTintHelper.colorBackButton(binding.toolbar)
+        val accentColor = ThemeStore.accentColor(this)
+        val primaryColor = ATHUtil.resolveColor(this, R.attr.colorSurface)
+        toolbar.setBackgroundColor(primaryColor)
+        setSupportActionBar(toolbar)
+        ToolbarContentTintHelper.colorBackButton(toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        TintHelper.setTintAuto(optionUseAccount, accentColor, false)
+        optionUseAccount?.setOnClickListener {
+            inputTitle.isEnabled = true
+            inputDescription.isEnabled = true
+            inputUsername.isEnabled = true
+            inputPassword.isEnabled = true
 
-        binding.cardDeviceInfo.airTextDeviceInfo.setOnClickListener { copyDeviceInfoToClipBoard() }
+            optionAnonymous.isChecked = false
+            sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
+                override fun onHidden(fab: FloatingActionButton?) {
+                    super.onHidden(fab)
+                    sendFab.setImageResource(R.drawable.ic_send_white_24dp)
+                    sendFab.show()
+                }
+            })
+        }
+        TintHelper.setTintAuto(optionAnonymous, accentColor, false)
+        optionAnonymous.setOnClickListener {
+            inputTitle.isEnabled = false
+            inputDescription.isEnabled = false
+            inputUsername.isEnabled = false
+            inputPassword.isEnabled = false
 
-        TintHelper.setTintAuto(binding.sendFab, accentColor, true)
-        binding.sendFab.setOnClickListener { reportIssue() }
+            optionUseAccount.isChecked = false
+            sendFab.hide(object : FloatingActionButton.OnVisibilityChangedListener() {
+                override fun onHidden(fab: FloatingActionButton?) {
+                    super.onHidden(fab)
+                    sendFab.setImageResource(R.drawable.ic_open_in_browser_white_24dp)
+                    sendFab.show()
+                }
+            })
+        }
+
+        inputPassword.setOnEditorActionListener { _, actionId, _ ->
+            if (actionId == EditorInfo.IME_ACTION_SEND) {
+                reportIssue()
+                return@setOnEditorActionListener true
+            }
+            false
+        }
+
+        airTextDeviceInfo.setOnClickListener { copyDeviceInfoToClipBoard() }
+
+        TintHelper.setTintAuto(sendFab, accentColor, true)
+        sendFab.setOnClickListener { reportIssue() }
+
+        MaterialUtil.setTint(inputLayoutTitle, false)
+        MaterialUtil.setTint(inputLayoutDescription, false)
+        MaterialUtil.setTint(inputLayoutUsername, false)
+        MaterialUtil.setTint(inputLayoutPassword, false)
     }
 
     private fun reportIssue() {
-        copyDeviceInfoToClipBoard()
-        val i = Intent(Intent.ACTION_VIEW)
-        i.data = ISSUE_TRACKER_LINK.toUri()
-        i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-        startActivity(i)
+        if (optionUseAccount.isChecked) {
+            if (!validateInput()) return
+            val username = inputUsername.text.toString()
+            val password = inputPassword.text.toString()
+            sendBugReport(GithubLogin(username, password))
+        } else {
+            copyDeviceInfoToClipBoard()
+
+            val i = Intent(Intent.ACTION_VIEW)
+            i.data = Uri.parse(ISSUE_TRACKER_LINK)
+            i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
+            startActivity(i)
+        }
     }
 
     private fun copyDeviceInfoToClipBoard() {
-        val clipboard = getSystemService<ClipboardManager>()
+        val clipboard = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
         val clip = ClipData.newPlainText(getString(R.string.device_info), deviceInfo?.toMarkdown())
-        clipboard?.setPrimaryClip(clip)
-        showToast(R.string.copied_device_info_to_clipboard)
+        clipboard.setPrimaryClip(clip)
+        Toast.makeText(
+                this@BugReportActivity,
+                R.string.copied_device_info_to_clipboard,
+                Toast.LENGTH_LONG
+        ).show()
     }
 
+    private fun validateInput(): Boolean {
+        var hasErrors = false
+
+        if (optionUseAccount.isChecked) {
+            if (TextUtils.isEmpty(inputUsername.text)) {
+                setError(inputLayoutUsername, R.string.bug_report_no_username)
+                hasErrors = true
+            } else {
+                removeError(inputLayoutUsername)
+            }
+
+            if (TextUtils.isEmpty(inputPassword.text)) {
+                setError(inputLayoutPassword, R.string.bug_report_no_password)
+                hasErrors = true
+            } else {
+                removeError(inputLayoutPassword)
+            }
+        }
+
+        if (TextUtils.isEmpty(inputTitle.text)) {
+            setError(inputLayoutTitle, R.string.bug_report_no_title)
+            hasErrors = true
+        } else {
+            removeError(inputLayoutTitle)
+        }
+
+        if (TextUtils.isEmpty(inputDescription.text)) {
+            setError(inputLayoutDescription, R.string.bug_report_no_description)
+            hasErrors = true
+        } else {
+            removeError(inputLayoutDescription)
+        }
+
+        return !hasErrors
+    }
+
+    private fun setError(editTextLayout: TextInputLayout, @StringRes errorRes: Int) {
+        editTextLayout.error = getString(errorRes)
+    }
+
+    private fun removeError(editTextLayout: TextInputLayout) {
+        editTextLayout.error = null
+    }
+
+    private fun sendBugReport(login: GithubLogin) {
+        if (!validateInput()) return
+
+        val bugTitle = inputTitle.text.toString()
+        val bugDescription = inputDescription.text.toString()
+
+        val extraInfo = ExtraInfo()
+        onSaveExtraInfo()
+
+        val report = Report(bugTitle, bugDescription, deviceInfo, extraInfo)
+        val target = GithubTarget("h4h13", "RetroMusicPlayer")
+
+        ReportIssueAsyncTask.report(this, report, target, login)
+    }
+
+    private fun onSaveExtraInfo() {}
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         if (item.itemId == android.R.id.home) {
-            onBackPressedDispatcher.onBackPressed()
+            onBackPressed()
         }
         return super.onOptionsItemSelected(item)
     }
 
+    private class ReportIssueAsyncTask private constructor(
+            activity: Activity,
+            private val report: Report,
+            private val target: GithubTarget,
+            private val login: GithubLogin
+    ) : DialogAsyncTask<Void, Void, String>(activity) {
+        override fun createDialog(context: Context): Dialog {
+            return AlertDialog.Builder(context).show()
+        }
+
+        @Result
+        override fun doInBackground(vararg params: Void): String {
+            val client: GitHubClient = if (login.shouldUseApiToken()) {
+                GitHubClient().setOAuth2Token(login.apiToken)
+            } else {
+                GitHubClient().setCredentials(login.username, login.password)
+            }
+
+            val issue = Issue().setTitle(report.title).setBody(report.description)
+            try {
+                IssueService(client).createIssue(target.username, target.repository, issue)
+                return RESULT_SUCCESS
+            } catch (e: RequestException) {
+                return when (e.status) {
+                    STATUS_BAD_CREDENTIALS -> {
+                        if (login.shouldUseApiToken()) RESULT_INVALID_TOKEN else RESULT_BAD_CREDENTIALS
+                    }
+                    STATUS_ISSUES_NOT_ENABLED -> RESULT_ISSUES_NOT_ENABLED
+                    else -> {
+                        e.printStackTrace()
+                        RESULT_UNKNOWN
+                    }
+                }
+            } catch (e: IOException) {
+                e.printStackTrace()
+                return RESULT_UNKNOWN
+            }
+
+        }
+
+        override fun onPostExecute(@Result result: String) {
+            super.onPostExecute(result)
+
+            val context = context ?: return
+
+            when (result) {
+                RESULT_SUCCESS -> tryToFinishActivity()
+                RESULT_BAD_CREDENTIALS -> MaterialDialog(context).show {
+                    title(R.string.bug_report_failed)
+                    message(R.string.bug_report_failed_wrong_credentials)
+                    positiveButton(android.R.string.ok)
+                }
+                RESULT_INVALID_TOKEN -> MaterialDialog(context).show {
+                    title(R.string.bug_report_failed)
+                    message(R.string.bug_report_failed_invalid_token)
+                    positiveButton(android.R.string.ok)
+                }
+                RESULT_ISSUES_NOT_ENABLED -> MaterialDialog(context).show {
+                    title(R.string.bug_report_failed)
+                    message(R.string.bug_report_failed_issues_not_available)
+                    positiveButton(android.R.string.ok)
+                }
+                else -> MaterialDialog(context).show {
+                    title(R.string.bug_report_failed)
+                    message(R.string.bug_report_failed_unknown)
+                    positiveButton(android.R.string.ok) { tryToFinishActivity() }
+                    onCancel { tryToFinishActivity() }
+                }
+            }
+        }
+
+        private fun tryToFinishActivity() {
+            val context = context
+            if (context is Activity && !context.isFinishing) {
+                context.finish()
+            }
+        }
+
+        companion object {
+
+            fun report(
+                    activity: Activity,
+                    report: Report,
+                    target: GithubTarget,
+                    login: GithubLogin
+            ) {
+                ReportIssueAsyncTask(activity, report, target, login).execute()
+            }
+        }
+    }
+
     companion object {
-        private const val ISSUE_TRACKER_LINK =
-            "https://github.com/MuntashirAkon/Metro/issues/new"
+
+        private const val STATUS_BAD_CREDENTIALS = 401
+        private const val STATUS_ISSUES_NOT_ENABLED = 410
+        private const val ISSUE_TRACKER_LINK = "https://github.com/h4h13/RetroMusicPlayer"
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
new file mode 100644
index 000000000..4e7ea77eb
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.java
@@ -0,0 +1,106 @@
+package code.name.monkey.retromusic.activities.bugreport.model;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+
+import androidx.annotation.IntRange;
+
+import java.util.Arrays;
+
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+public class DeviceInfo {
+    private final int versionCode;
+    private final String versionName;
+    private final String buildVersion = Build.VERSION.INCREMENTAL;
+    private final String releaseVersion = Build.VERSION.RELEASE;
+    @IntRange(from = 0)
+    private final int sdkVersion = Build.VERSION.SDK_INT;
+    private final String buildID = Build.DISPLAY;
+    private final String brand = Build.BRAND;
+    private final String manufacturer = Build.MANUFACTURER;
+    private final String device = Build.DEVICE;
+    private final String model = Build.MODEL;
+    private final String product = Build.PRODUCT;
+    private final String hardware = Build.HARDWARE;
+    private final String baseTheme;
+    private final String nowPlayingTheme;
+    private final boolean isAdaptive;
+    @SuppressLint("NewApi")
+    @SuppressWarnings("deprecation")
+    private final String[] abis = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+            Build.SUPPORTED_ABIS : new String[]{Build.CPU_ABI, Build.CPU_ABI2};
+    @SuppressLint("NewApi")
+    private final String[] abis32Bits = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+            Build.SUPPORTED_32_BIT_ABIS : null;
+    @SuppressLint("NewApi")
+    private final String[] abis64Bits = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP ?
+            Build.SUPPORTED_64_BIT_ABIS : null;
+
+    public DeviceInfo(Context context) {
+        PackageInfo packageInfo;
+        try {
+            packageInfo = context.getPackageManager()
+                    .getPackageInfo(context.getPackageName(), 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            packageInfo = null;
+        }
+        if (packageInfo != null) {
+            versionCode = packageInfo.versionCode;
+            versionName = packageInfo.versionName;
+        } else {
+            versionCode = -1;
+            versionName = null;
+        }
+        baseTheme = PreferenceUtil.getInstance(context).getBaseTheme();
+        nowPlayingTheme = context.getString(PreferenceUtil.getInstance(context).getNowPlayingScreen().getTitleRes());
+        isAdaptive = PreferenceUtil.getInstance(context).getAdaptiveColor();
+    }
+
+    public String toMarkdown() {
+        return "Device info:\n"
+                + "---\n"
+                + "<table>\n"
+                + "<tr><td>App version</td><td>" + versionName + "</td></tr>\n"
+                + "<tr><td>App version code</td><td>" + versionCode + "</td></tr>\n"
+                + "<tr><td>Android build version</td><td>" + buildVersion + "</td></tr>\n"
+                + "<tr><td>Android release version</td><td>" + releaseVersion + "</td></tr>\n"
+                + "<tr><td>Android SDK version</td><td>" + sdkVersion + "</td></tr>\n"
+                + "<tr><td>Android build ID</td><td>" + buildID + "</td></tr>\n"
+                + "<tr><td>Device brand</td><td>" + brand + "</td></tr>\n"
+                + "<tr><td>Device manufacturer</td><td>" + manufacturer + "</td></tr>\n"
+                + "<tr><td>Device name</td><td>" + device + "</td></tr>\n"
+                + "<tr><td>Device model</td><td>" + model + "</td></tr>\n"
+                + "<tr><td>Device product name</td><td>" + product + "</td></tr>\n"
+                + "<tr><td>Device hardware name</td><td>" + hardware + "</td></tr>\n"
+                + "<tr><td>ABIs</td><td>" + Arrays.toString(abis) + "</td></tr>\n"
+                + "<tr><td>ABIs (32bit)</td><td>" + Arrays.toString(abis32Bits) + "</td></tr>\n"
+                + "<tr><td>ABIs (64bit)</td><td>" + Arrays.toString(abis64Bits) + "</td></tr>\n"
+                + "</table>\n";
+    }
+
+    @Override
+    public String toString() {
+        return "App version: " + versionName + "\n"
+                + "App version code: " + versionCode + "\n"
+                + "Android build version: " + buildVersion + "\n"
+                + "Android release version: " + releaseVersion + "\n"
+                + "Android SDK version: " + sdkVersion + "\n"
+                + "Android build ID: " + buildID + "\n"
+                + "Device brand: " + brand + "\n"
+                + "Device manufacturer: " + manufacturer + "\n"
+                + "Device name: " + device + "\n"
+                + "Device model: " + model + "\n"
+                + "Device product name: " + product + "\n"
+                + "Device hardware name: " + hardware + "\n"
+                + "ABIs: " + Arrays.toString(abis) + "\n"
+                + "ABIs (32bit): " + Arrays.toString(abis32Bits) + "\n"
+                + "ABIs (64bit): " + Arrays.toString(abis64Bits) + "\n"
+                + "Base theme: " + baseTheme + "\n"
+                + "Now playing theme: " + nowPlayingTheme + "\n"
+                + "Adaptive: " + isAdaptive;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
deleted file mode 100644
index 19aff73a2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/DeviceInfo.kt
+++ /dev/null
@@ -1,111 +0,0 @@
-package code.name.monkey.retromusic.activities.bugreport.model
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageManager
-import android.os.Build
-import androidx.annotation.IntRange
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.content.pm.PackageInfoCompat
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.isAdaptiveColor
-import code.name.monkey.retromusic.util.PreferenceUtil.nowPlayingScreen
-import java.util.*
-
-class DeviceInfo(context: Context) {
-    @SuppressLint("NewApi")
-    private val abis = Build.SUPPORTED_ABIS
-
-    @SuppressLint("NewApi")
-    private val abis32Bits = Build.SUPPORTED_32_BIT_ABIS
-
-    @SuppressLint("NewApi")
-    private val abis64Bits = Build.SUPPORTED_64_BIT_ABIS
-    private val baseTheme: String
-    private val brand = Build.BRAND
-    private val buildID = Build.DISPLAY
-    private val buildVersion = Build.VERSION.INCREMENTAL
-    private val device = Build.DEVICE
-    private val hardware = Build.HARDWARE
-    private val isAdaptive: Boolean
-    private val manufacturer = Build.MANUFACTURER
-    private val model = Build.MODEL
-    private val nowPlayingTheme: String
-    private val product = Build.PRODUCT
-    private val releaseVersion = Build.VERSION.RELEASE
-
-    @IntRange(from = 0)
-    private val sdkVersion = Build.VERSION.SDK_INT
-    private var versionCode = 0L
-    private var versionName: String? = null
-    private val selectedLang: String
-    fun toMarkdown(): String {
-        return """
-               Device info:
-               ---
-               <table>
-               <tr><td><b>App version</b></td><td>$versionName</td></tr>
-               <tr><td>App version code</td><td>$versionCode</td></tr>
-               <tr><td>Android build version</td><td>$buildVersion</td></tr>
-               <tr><td>Android release version</td><td>$releaseVersion</td></tr>
-               <tr><td>Android SDK version</td><td>$sdkVersion</td></tr>
-               <tr><td>Android build ID</td><td>$buildID</td></tr>
-               <tr><td>Device brand</td><td>$brand</td></tr>
-               <tr><td>Device manufacturer</td><td>$manufacturer</td></tr>
-               <tr><td>Device name</td><td>$device</td></tr>
-               <tr><td>Device model</td><td>$model</td></tr>
-               <tr><td>Device product name</td><td>$product</td></tr>
-               <tr><td>Device hardware name</td><td>$hardware</td></tr>
-               <tr><td>ABIs</td><td>${Arrays.toString(abis)}</td></tr>
-               <tr><td>ABIs (32bit)</td><td>${Arrays.toString(abis32Bits)}</td></tr>
-               <tr><td>ABIs (64bit)</td><td>${Arrays.toString(abis64Bits)}</td></tr>
-               <tr><td>Language</td><td>$selectedLang</td></tr>
-               </table>
-               
-               """.trimIndent()
-    }
-
-    override fun toString(): String {
-        return """
-            App version: $versionName
-            App version code: $versionCode
-            Android build version: $buildVersion
-            Android release version: $releaseVersion
-            Android SDK version: $sdkVersion
-            Android build ID: $buildID
-            Device brand: $brand
-            Device manufacturer: $manufacturer
-            Device name: $device
-            Device model: $model
-            Device product name: $product
-            Device hardware name: $hardware
-            ABIs: ${Arrays.toString(abis)}
-            ABIs (32bit): ${Arrays.toString(abis32Bits)}
-            ABIs (64bit): ${Arrays.toString(abis64Bits)}
-            Base theme: $baseTheme
-            Now playing theme: $nowPlayingTheme
-            Adaptive: $isAdaptive
-            System language: ${Locale.getDefault().toLanguageTag()}
-            In-App Language: $selectedLang
-            """.trimIndent()
-    }
-
-    init {
-        val packageInfo = try {
-            context.packageManager.getPackageInfo(context.packageName, 0)
-        } catch (e: PackageManager.NameNotFoundException) {
-            null
-        }
-        if (packageInfo != null) {
-            versionCode = PackageInfoCompat.getLongVersionCode(packageInfo)
-            versionName = packageInfo.versionName
-        } else {
-            versionCode = -1
-            versionName = null
-        }
-        baseTheme = PreferenceUtil.baseTheme
-        nowPlayingTheme = context.getString(nowPlayingScreen.titleRes)
-        isAdaptive = isAdaptiveColor
-        selectedLang = AppCompatDelegate.getApplicationLocales().toLanguageTags()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java
new file mode 100644
index 000000000..4549693f4
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/Report.java
@@ -0,0 +1,32 @@
+package code.name.monkey.retromusic.activities.bugreport.model;
+
+
+import code.name.monkey.retromusic.activities.bugreport.model.github.ExtraInfo;
+
+public class Report {
+    private final String title;
+
+    private final String description;
+
+    private final DeviceInfo deviceInfo;
+
+    private final ExtraInfo extraInfo;
+
+    public Report(String title, String description, DeviceInfo deviceInfo, ExtraInfo extraInfo) {
+        this.title = title;
+        this.description = description;
+        this.deviceInfo = deviceInfo;
+        this.extraInfo = extraInfo;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getDescription() {
+        return description + "\n\n"
+                + "-\n\n"
+                + deviceInfo.toMarkdown() + "\n\n"
+                + extraInfo.toMarkdown();
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java
new file mode 100644
index 000000000..c9bedfa63
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/ExtraInfo.java
@@ -0,0 +1,59 @@
+package code.name.monkey.retromusic.activities.bugreport.model.github;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+public class ExtraInfo {
+    private final Map<String, String> extraInfo = new LinkedHashMap<>();
+
+    public void put(String key, String value) {
+        extraInfo.put(key, value);
+    }
+
+    public void put(String key, boolean value) {
+        extraInfo.put(key, Boolean.toString(value));
+    }
+
+    public void put(String key, double value) {
+        extraInfo.put(key, Double.toString(value));
+    }
+
+    public void put(String key, float value) {
+        extraInfo.put(key, Float.toString(value));
+    }
+
+    public void put(String key, long value) {
+        extraInfo.put(key, Long.toString(value));
+    }
+
+    public void put(String key, int value) {
+        extraInfo.put(key, Integer.toString(value));
+    }
+
+    public void put(String key, Object value) {
+        extraInfo.put(key, String.valueOf(value));
+    }
+
+    public void remove(String key) {
+        extraInfo.remove(key);
+    }
+
+    public String toMarkdown() {
+        if (extraInfo.isEmpty()) return "";
+
+        StringBuilder output = new StringBuilder();
+        output.append("Extra info:\n"
+                + "---\n"
+                + "<table>\n");
+        for (String key : extraInfo.keySet()) {
+            output.append("<tr><td>")
+                    .append(key)
+                    .append("</td><td>")
+                    .append(extraInfo.get(key))
+                    .append("</td></tr>\n");
+        }
+        output.append("</table>\n");
+
+        return output.toString();
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java
new file mode 100644
index 000000000..a2d147eea
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubLogin.java
@@ -0,0 +1,40 @@
+package code.name.monkey.retromusic.activities.bugreport.model.github;
+
+import android.text.TextUtils;
+
+public class GithubLogin {
+    private final String username;
+
+    private final String password;
+
+    private final String apiToken;
+
+    public GithubLogin(String username, String password) {
+        this.username = username;
+        this.password = password;
+        this.apiToken = null;
+    }
+
+    public GithubLogin(String apiToken) {
+        this.username = null;
+        this.password = null;
+        this.apiToken = apiToken;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getPassword() {
+        return password;
+    }
+
+    public boolean shouldUseApiToken() {
+        return TextUtils.isEmpty(username) || TextUtils.isEmpty(password);
+    }
+
+    public String getApiToken() {
+        return apiToken;
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java
new file mode 100644
index 000000000..4bea98be7
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/bugreport/model/github/GithubTarget.java
@@ -0,0 +1,20 @@
+package code.name.monkey.retromusic.activities.bugreport.model.github;
+
+public class GithubTarget {
+    private final String username;
+
+    private final String repository;
+
+    public GithubTarget(String username, String repository) {
+        this.username = username;
+        this.repository = repository;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public String getRepository() {
+        return repository;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
index efd56210e..4ba6c9902 100644
--- a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFGuideActivity.java
@@ -24,53 +24,47 @@ import com.heinrichreimersoftware.materialintro.slide.SimpleSlide;
 
 import code.name.monkey.retromusic.R;
 
-/** Created by hemanths on 2019-07-31. */
+/**
+ * Created by hemanths on 2019-07-31.
+ */
 public class SAFGuideActivity extends IntroActivity {
+    public static final int REQUEST_CODE_SAF_GUIDE = 98;
 
-  public static final int REQUEST_CODE_SAF_GUIDE = 98;
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
 
-  @Override
-  protected void onCreate(@Nullable Bundle savedInstanceState) {
-    super.onCreate(savedInstanceState);
+        setButtonCtaVisible(false);
+        setButtonNextVisible(false);
+        setButtonBackVisible(false);
 
-    setButtonCtaVisible(false);
-    setButtonNextVisible(false);
-    setButtonBackVisible(false);
+        setButtonCtaTintMode(BUTTON_CTA_TINT_MODE_TEXT);
 
-    setButtonCtaTintMode(BUTTON_CTA_TINT_MODE_TEXT);
+        String title = String.format(getString(R.string.saf_guide_slide1_title), getString(R.string.app_name));
 
-    String title =
-        String.format(getString(R.string.saf_guide_slide1_title), getString(R.string.app_name));
-
-    addSlide(
-        new SimpleSlide.Builder()
-            .title(title)
-            .description(
-                Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1
-                    ? R.string.saf_guide_slide1_description_before_o
-                    : R.string.saf_guide_slide1_description)
-            .image(R.drawable.saf_guide_1)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_300)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_400)
-            .layout(R.layout.fragment_simple_slide_large_image)
-            .build());
-    addSlide(
-        new SimpleSlide.Builder()
-            .title(R.string.saf_guide_slide2_title)
-            .description(R.string.saf_guide_slide2_description)
-            .image(R.drawable.saf_guide_2)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_500)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_600)
-            .layout(R.layout.fragment_simple_slide_large_image)
-            .build());
-    addSlide(
-        new SimpleSlide.Builder()
-            .title(R.string.saf_guide_slide3_title)
-            .description(R.string.saf_guide_slide3_description)
-            .image(R.drawable.saf_guide_3)
-            .background(code.name.monkey.appthemehelper.R.color.md_deep_purple_700)
-            .backgroundDark(code.name.monkey.appthemehelper.R.color.md_deep_purple_800)
-            .layout(R.layout.fragment_simple_slide_large_image)
-            .build());
-  }
+        addSlide(new SimpleSlide.Builder()
+                .title(title)
+                .description(Build.VERSION.SDK_INT <= Build.VERSION_CODES.N_MR1 ? R.string.saf_guide_slide1_description_before_o : R.string.saf_guide_slide1_description)
+                .image(R.drawable.saf_guide_1)
+                .background(R.color.md_deep_purple_300)
+                .backgroundDark(R.color.md_deep_purple_400)
+                .layout(R.layout.fragment_simple_slide_large_image)
+                .build());
+        addSlide(new SimpleSlide.Builder()
+                .title(R.string.saf_guide_slide2_title)
+                .description(R.string.saf_guide_slide2_description)
+                .image(R.drawable.saf_guide_2)
+                .background(R.color.md_deep_purple_500)
+                .backgroundDark(R.color.md_deep_purple_600)
+                .layout(R.layout.fragment_simple_slide_large_image)
+                .build());
+        addSlide(new SimpleSlide.Builder()
+                .title(R.string.saf_guide_slide3_title)
+                .description(R.string.saf_guide_slide3_description)
+                .image(R.drawable.saf_guide_3)
+                .background(R.color.md_deep_purple_700)
+                .backgroundDark(R.color.md_deep_purple_800)
+                .layout(R.layout.fragment_simple_slide_large_image)
+                .build());
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt
deleted file mode 100644
index 1b389b9d2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/saf/SAFRequestActivity.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2021 Bartlomiej Uliasz.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.activities.saf
-
-import android.app.Activity
-import android.content.Intent
-import android.os.Bundle
-import code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
-import code.name.monkey.retromusic.util.SAFUtil
-
-/** Created by buliasz on 2021-02-07.  */
-class SAFRequestActivity : Activity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val intent = Intent(this, code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java)
-        startActivityForResult(intent, REQUEST_CODE_SAF_GUIDE)
-    }
-
-    override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
-        super.onActivityResult(requestCode, resultCode, intent)
-        when (requestCode) {
-            REQUEST_CODE_SAF_GUIDE -> {
-                SAFUtil.openTreePicker(this)
-            }
-            SAFUtil.REQUEST_SAF_PICK_TREE -> {
-                if (resultCode == RESULT_OK) {
-                    SAFUtil.saveTreeUri(this, intent)
-                }
-                finish()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
index 3a9ca4e4b..df8cbe297 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt
@@ -1,457 +1,416 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.tageditor
 
-import android.app.Activity
-import android.app.SearchManager
+import android.app.*
 import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
+import android.content.res.ColorStateList
+import android.graphics.*
 import android.net.Uri
-import android.os.Bundle
-import android.provider.MediaStore
+import android.os.*
 import android.util.Log
-import android.view.LayoutInflater
-import android.view.MenuItem
+import android.view.*
 import android.view.animation.OvershootInterpolator
-import android.widget.ImageView
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.IntentSenderRequest
-import androidx.activity.result.PickVisualMediaRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
-import androidx.lifecycle.lifecycleScope
-import androidx.viewbinding.ViewBinding
-import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsBaseActivity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.hideSoftKeyboard
-import code.name.monkey.retromusic.extensions.setTaskDescriptionColorAuto
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.util.logD
-import code.name.monkey.retromusic.util.logE
+import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
+import code.name.monkey.retromusic.util.*
+import com.afollestad.materialdialogs.*
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
 import com.google.android.material.button.MaterialButton
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.jaudiotagger.audio.AudioFile
-import org.jaudiotagger.audio.AudioFileIO
+import kotlinx.android.synthetic.main.activity_album_tag_editor.*
+import org.jaudiotagger.audio.*
 import org.jaudiotagger.tag.FieldKey
-import org.koin.android.ext.android.inject
 import java.io.File
+import java.util.*
 
-abstract class AbsTagEditorActivity<VB : ViewBinding> : AbsBaseActivity() {
-    abstract val editorImage: ImageView
-    val repository by inject<Repository>()
+abstract class AbsTagEditorActivity : AbsBaseActivity() {
 
-    lateinit var saveFab: MaterialButton
-    protected var id: Long = 0
-        private set
-    private var paletteColorPrimary: Int = 0
-    private var songPaths: List<String>? = null
-    private var savedSongPaths: List<String>? = null
-    private val currentSongPath: String? = null
-    private var savedTags: Map<FieldKey, String>? = null
-    private var savedArtworkInfo: ArtworkInfo? = null
-    private var _binding: VB? = null
-    protected val binding: VB get() = _binding!!
-    private var cacheFiles = listOf<File>()
+	protected var id: Int = 0
+		private set
+	private var paletteColorPrimary: Int = 0
+	private var isInNoImageMode: Boolean = false
+	private var songPaths: List<String>? = null
+	lateinit var saveFab: MaterialButton
 
-    abstract val bindingInflater: (LayoutInflater) -> VB
+	private var savedSongPaths: List<String>? = null
+	private val currentSongPath: String? = null
+	private var savedTags: Map<FieldKey, String>? = null
+	private var savedArtworkInfo: ArtworkInfo? = null
 
-    private lateinit var launcher: ActivityResultLauncher<IntentSenderRequest>
+	protected val show: MaterialDialog
+		get() = MaterialDialog(this, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+			cornerRadius(PreferenceUtil.getInstance(this@AbsTagEditorActivity).dialogCorner)
+			title(R.string.update_image)
+			listItems(items = items) { _, position, _ ->
+				when (position) {
+					0 -> startImagePicker()
+					1 -> searchImageOnWeb()
+					2 -> deleteImage()
+				}
+			}
+		}
+	protected abstract val contentViewLayout: Int
 
-    protected abstract fun loadImageFromFile(selectedFile: Uri?)
+	internal val albumArtist: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val show: AlertDialog
-        get() =
-            MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.update_image)
-                .setItems(items.toTypedArray()) { _, position ->
-                    when (position) {
-                        0 -> startImagePicker()
-                        1 -> searchImageOnWeb()
-                        2 -> deleteImage()
-                    }
-                }
-                .setNegativeButton(R.string.action_cancel, null)
-                .show()
-                .colorButtons()
+		}
 
-    internal val albumArtist: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+	protected val songTitle: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TITLE)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val songTitle: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TITLE)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
-    protected val composer: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.COMPOSER)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+		}
+	protected val composer: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.COMPOSER)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val albumTitle: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+		}
 
-    protected val artistName: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ARTIST)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+	protected val albumTitle: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val albumArtistName: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+		}
 
-    protected val genreName: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.GENRE)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+	protected val artistName: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ARTIST)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val songYear: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.YEAR)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+		}
 
-    protected val trackNumber: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TRACK)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+	protected val albumArtistName: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.ALBUM_ARTIST)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val discNumber: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.DISC_NO)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+		}
 
-    protected val lyrics: String?
-        get() {
-            return try {
-                getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.LYRICS)
-            } catch (e: Exception) {
-                logE(e)
-                null
-            }
-        }
+	protected val genreName: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.GENRE)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    protected val albumArt: Bitmap?
-        get() {
-            try {
-                val artworkTag = getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.firstArtwork
-                if (artworkTag != null) {
-                    val artworkBinaryData = artworkTag.binaryData
-                    return BitmapFactory.decodeByteArray(
-                        artworkBinaryData,
-                        0,
-                        artworkBinaryData.size
-                    )
-                }
-                return null
-            } catch (e: Exception) {
-                logE(e)
-                return null
-            }
-        }
+		}
 
-    private val pickArtworkImage =
-        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-            loadImageFromFile(uri)
-        }
+	protected val songYear: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.YEAR)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        _binding = bindingInflater.invoke(layoutInflater)
-        setContentView(binding.root)
-        setTaskDescriptionColorAuto()
+		}
 
-        saveFab = findViewById(R.id.saveTags)
-        getIntentExtras()
+	protected val trackNumber: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.TRACK)
+			} catch (ignored: Exception) {
+				null
+			}
 
-        songPaths = getSongPaths()
-        logD(songPaths?.size)
-        if (songPaths!!.isEmpty()) {
-            finish()
-        }
-        setUpViews()
-        launcher = registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) {
-            if (it.resultCode == Activity.RESULT_OK) {
-                writeToFiles(getSongUris(), cacheFiles)
-            }
-        }
-    }
+		}
 
-    private fun setUpViews() {
-        setUpFab()
-        setUpImageView()
-    }
+	protected val lyrics: String?
+		get() {
+			return try {
+				getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.getFirst(FieldKey.LYRICS)
+			} catch (ignored: Exception) {
+				null
+			}
 
-    private lateinit var items: List<String>
+		}
 
-    private fun setUpImageView() {
-        loadCurrentImage()
-        items = listOf(
-            getString(R.string.pick_from_local_storage),
-            getString(R.string.web_search),
-            getString(R.string.remove_cover)
-        )
-        editorImage.setOnClickListener { show }
-    }
+	protected val albumArt: Bitmap?
+		get() {
+			try {
+				val artworkTag = getAudioFile(songPaths!![0]).tagOrCreateAndSetDefault.firstArtwork
+				if (artworkTag != null) {
+					val artworkBinaryData = artworkTag.binaryData
+					return BitmapFactory.decodeByteArray(
+							artworkBinaryData,
+							0,
+							artworkBinaryData.size
+					)
+				}
+				return null
+			} catch (ignored: Exception) {
+				return null
+			}
 
-    private fun startImagePicker() {
-        pickArtworkImage.launch(PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly))
-    }
+		}
 
-    protected abstract fun loadCurrentImage()
+	override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
+		setContentView(contentViewLayout)
 
-    protected abstract fun searchImageOnWeb()
+		saveFab = findViewById(R.id.saveTags)
+		getIntentExtras()
 
-    protected abstract fun deleteImage()
+		songPaths = getSongPaths()
+		if (songPaths!!.isEmpty()) {
+			finish()
+			return
+		}
 
-    private fun setUpFab() {
-        saveFab.accentColor()
-        saveFab.apply {
-            scaleX = 0f
-            scaleY = 0f
-            isEnabled = false
-            setOnClickListener { save() }
-        }
-    }
+		setUpViews()
 
-    protected abstract fun save()
 
-    private fun getIntentExtras() {
-        val intentExtras = intent.extras
-        if (intentExtras != null) {
-            id = intentExtras.getLong(EXTRA_ID)
-        }
-    }
+		setNavigationbarColorAuto()
+		setTaskDescriptionColorAuto()
+	}
 
-    protected abstract fun getSongPaths(): List<String>
+	private fun setUpViews() {
+		setUpScrollView()
+		setUpFab()
+		setUpImageView()
+	}
 
-    protected abstract fun getSongUris(): List<Uri>
+	private fun setUpScrollView() {
+		//observableScrollView.setScrollViewCallbacks(observableScrollViewCallbacks);
+	}
 
-    protected fun searchWebFor(vararg keys: String) {
-        val stringBuilder = StringBuilder()
-        for (key in keys) {
-            stringBuilder.append(key)
-            stringBuilder.append(" ")
-        }
-        val intent = Intent(Intent.ACTION_WEB_SEARCH)
-        intent.putExtra(SearchManager.QUERY, stringBuilder.toString())
-        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+	private lateinit var items: List<String>
 
-        startActivity(intent)
-    }
+	private fun setUpImageView() {
+		loadCurrentImage()
+		items = listOf(
+				getString(code.name.monkey.retromusic.R.string.pick_from_local_storage),
+				getString(code.name.monkey.retromusic.R.string.web_search),
+				getString(code.name.monkey.retromusic.R.string.remove_cover)
+		)
+		editorImage?.setOnClickListener { show }
+	}
 
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            android.R.id.home -> {
-                onBackPressedDispatcher.onBackPressed()
-                return true
-            }
-        }
-        return super.onOptionsItemSelected(item)
-    }
+	private fun startImagePicker() {
+		val intent = Intent(Intent.ACTION_GET_CONTENT)
+		intent.type = "image/*"
+		startActivityForResult(
+				Intent.createChooser(
+						intent,
+						getString(code.name.monkey.retromusic.R.string.pick_from_local_storage)
+				), REQUEST_CODE_SELECT_IMAGE
+		)
+	}
 
-    protected fun dataChanged() {
-        showFab()
-    }
+	protected abstract fun loadCurrentImage()
 
-    private fun showFab() {
-        saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(1f)
-            .scaleY(1f).start()
-        saveFab.isEnabled = true
-    }
+	protected abstract fun searchImageOnWeb()
 
-    private fun hideFab() {
-        saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(0.0f)
-            .scaleY(0.0f).start()
-        saveFab.isEnabled = false
-    }
+	protected abstract fun deleteImage()
 
-    protected fun setImageBitmap(bitmap: Bitmap?, bgColor: Int) {
-        if (bitmap == null) {
-            editorImage.setImageResource(R.drawable.default_audio_art)
-        } else {
-            editorImage.setImageBitmap(bitmap)
-        }
-        setColors(bgColor)
-    }
+	private fun setUpFab() {
+		saveFab.backgroundTintList = ColorStateList.valueOf(ThemeStore.accentColor(this))
+		ColorStateList.valueOf(
+				MaterialValueHelper.getPrimaryTextColor(
+						this,
+						ColorUtil.isColorLight(
+								ThemeStore.accentColor(
+										this
+								)
+						)
+				)
+		).apply {
+			saveFab.setTextColor(this)
+			saveFab.iconTint = this
+		}
+		saveFab.apply {
+			scaleX = 0f
+			scaleY = 0f
+			isEnabled = false
+			setOnClickListener { save() }
+			TintHelper.setTintAuto(this, ThemeStore.accentColor(this@AbsTagEditorActivity), true)
+		}
+	}
 
-    protected open fun setColors(color: Int) {
-        paletteColorPrimary = color
-    }
+	protected abstract fun save()
 
-    protected fun writeValuesToFiles(
-        fieldKeyValueMap: Map<FieldKey, String>,
-        artworkInfo: ArtworkInfo?
-    ) {
-        hideSoftKeyboard()
+	private fun getIntentExtras() {
+		val intentExtras = intent.extras
+		if (intentExtras != null) {
+			id = intentExtras.getInt(EXTRA_ID)
+		}
+	}
 
-        hideFab()
-        logD(fieldKeyValueMap)
-        GlobalScope.launch {
-            if (VersionUtils.hasR()) {
-                cacheFiles = TagWriter.writeTagsToFilesR(
-                    this@AbsTagEditorActivity, AudioTagInfo(
-                        songPaths,
-                        fieldKeyValueMap,
-                        artworkInfo
-                    )
-                )
+	protected abstract fun getSongPaths(): List<String>
 
-                if (cacheFiles.isNotEmpty()) {
-                    val pendingIntent =
-                        MediaStore.createWriteRequest(contentResolver, getSongUris())
-                    launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
-                }
-            } else {
-                TagWriter.writeTagsToFiles(
-                    this@AbsTagEditorActivity, AudioTagInfo(
-                        songPaths,
-                        fieldKeyValueMap,
-                        artworkInfo
-                    )
-                )
-            }
-        }
-    }
+	protected fun searchWebFor(vararg keys: String) {
+		val stringBuilder = StringBuilder()
+		for (key in keys) {
+			stringBuilder.append(key)
+			stringBuilder.append(" ")
+		}
+		val intent = Intent(Intent.ACTION_WEB_SEARCH)
+		intent.putExtra(SearchManager.QUERY, stringBuilder.toString())
+		intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
 
-    private fun writeTags(paths: List<String>?) {
-        GlobalScope.launch {
-            if (VersionUtils.hasR()) {
-                cacheFiles = TagWriter.writeTagsToFilesR(
-                    this@AbsTagEditorActivity, AudioTagInfo(
-                        paths,
-                        savedTags,
-                        savedArtworkInfo
-                    )
-                )
-                val pendingIntent = MediaStore.createWriteRequest(contentResolver, getSongUris())
+		startActivity(intent)
+	}
 
-                launcher.launch(IntentSenderRequest.Builder(pendingIntent).build())
-            } else {
-                TagWriter.writeTagsToFiles(
-                    this@AbsTagEditorActivity, AudioTagInfo(
-                        paths,
-                        savedTags,
-                        savedArtworkInfo
-                    )
-                )
-            }
-        }
-    }
+	override fun onOptionsItemSelected(item: MenuItem): Boolean {
+		when (item.itemId) {
+			android.R.id.home -> {
+				super.onBackPressed()
+				return true
+			}
+		}
+		return super.onOptionsItemSelected(item)
+	}
 
-    private lateinit var audioFile: AudioFile
+	protected fun setNoImageMode() {
+		isInNoImageMode = true
+		imageContainer?.visibility = View.GONE
+		editorImage?.visibility = View.GONE
+		editorImage?.isEnabled = false
 
-    private fun getAudioFile(path: String): AudioFile {
-        return try {
-            if (!this::audioFile.isInitialized) {
-                audioFile = AudioFileIO.read(File(path))
-            }
-            audioFile
-        } catch (e: Exception) {
-            Log.e(TAG, "Could not read audio file $path", e)
-            AudioFile()
-        }
-    }
+		setColors(
+				intent.getIntExtra(
+						EXTRA_PALETTE,
+						ATHUtil.resolveColor(this, R.attr.colorPrimary)
+				)
+		)
+	}
 
-    private fun writeToFiles(songUris: List<Uri>, cacheFiles: List<File>) {
-        if (cacheFiles.size == songUris.size) {
-            for (i in cacheFiles.indices) {
-                contentResolver.openOutputStream(songUris[i])?.use { output ->
-                    cacheFiles[i].inputStream().use { input ->
-                        input.copyTo(output)
-                    }
-                }
-            }
-        }
-        lifecycleScope.launch {
-            TagWriter.scan(this@AbsTagEditorActivity, getSongPaths())
-        }
-    }
+	protected fun dataChanged() {
+		showFab()
+	}
 
-    override fun onDestroy() {
-        super.onDestroy()
-        // Delete Cache Files
-        cacheFiles.forEach { file ->
-            file.delete()
-        }
-    }
+	private fun showFab() {
+		saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(1f)
+			.scaleY(1f).start()
+		saveFab.isEnabled = true
+	}
 
-    companion object {
-        const val EXTRA_ID = "extra_id"
-        const val EXTRA_PALETTE = "extra_palette"
-        private val TAG = AbsTagEditorActivity::class.java.simpleName
-        private const val REQUEST_CODE_SELECT_IMAGE = 1000
-    }
+	private fun hideFab() {
+		saveFab.animate().setDuration(500).setInterpolator(OvershootInterpolator()).scaleX(0.0f)
+			.scaleY(0.0f).start()
+		saveFab.isEnabled = false
+	}
+
+	protected fun setImageBitmap(bitmap: Bitmap?, bgColor: Int) {
+		if (bitmap == null) {
+			editorImage.setImageResource(code.name.monkey.retromusic.R.drawable.default_album_art)
+		} else {
+			editorImage.setImageBitmap(bitmap)
+		}
+		setColors(bgColor)
+	}
+
+	protected open fun setColors(color: Int) {
+		paletteColorPrimary = color
+	}
+
+	protected fun writeValuesToFiles(
+			fieldKeyValueMap: Map<FieldKey, String>, artworkInfo: ArtworkInfo?
+	) {
+		RetroUtil.hideSoftKeyboard(this)
+
+		hideFab()
+
+		savedSongPaths = getSongPaths()
+		savedTags = fieldKeyValueMap
+		savedArtworkInfo = artworkInfo
+
+		if (!SAFUtil.isSAFRequired(savedSongPaths)) {
+			writeTags(savedSongPaths)
+		} else {
+			if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+				if (SAFUtil.isSDCardAccessGranted(this)) {
+					writeTags(savedSongPaths)
+				} else {
+					startActivityForResult(
+							Intent(this, SAFGuideActivity::class.java),
+							SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
+					)
+				}
+			}
+		}
+	}
+
+	private fun writeTags(paths: List<String>?) {
+		WriteTagsAsyncTask(this).execute(
+				WriteTagsAsyncTask.LoadingInfo(
+						paths,
+						savedTags,
+						savedArtworkInfo
+				)
+		)
+	}
+
+	override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
+		super.onActivityResult(requestCode, resultCode, intent)
+		when (requestCode) {
+			REQUEST_CODE_SELECT_IMAGE -> if (resultCode == Activity.RESULT_OK) {
+				intent?.data?.let {
+					loadImageFromFile(it)
+				}
+			}
+			SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+				SAFUtil.openTreePicker(this)
+			}
+			SAFUtil.REQUEST_SAF_PICK_TREE -> {
+				if (resultCode == Activity.RESULT_OK) {
+					SAFUtil.saveTreeUri(this, intent)
+					writeTags(savedSongPaths)
+				}
+			}
+			SAFUtil.REQUEST_SAF_PICK_FILE -> {
+				if (resultCode == Activity.RESULT_OK) {
+					writeTags(Collections.singletonList(currentSongPath + SAFUtil.SEPARATOR + intent!!.dataString))
+				}
+			}
+		}
+	}
+
+	protected abstract fun loadImageFromFile(selectedFile: Uri?)
+
+	private fun getAudioFile(path: String): AudioFile {
+		return try {
+			AudioFileIO.read(File(path))
+		} catch (e: Exception) {
+			Log.e(TAG, "Could not read audio file $path", e)
+			AudioFile()
+		}
+	}
+
+	class ArtworkInfo constructor(val albumId: Int, val artwork: Bitmap?)
+
+	companion object {
+
+		const val EXTRA_ID = "extra_id"
+		const val EXTRA_PALETTE = "extra_palette"
+		private val TAG = AbsTagEditorActivity::class.java.simpleName
+		private const val REQUEST_CODE_SELECT_IMAGE = 1000
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
index 2c9013657..c96990322 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AlbumTagEditorActivity.kt
@@ -1,17 +1,3 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.tageditor
 
 import android.app.Activity
@@ -22,198 +8,241 @@ import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
-import android.transition.Slide
-import android.view.LayoutInflater
-import android.widget.ImageView
+import android.text.Editable
+import android.text.TextUtils
+import android.text.TextWatcher
 import android.widget.Toast
-import androidx.core.widget.doAfterTextChanged
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ActivityAlbumTagEditorBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
+import code.name.monkey.retromusic.extensions.appHandleColor
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.loaders.AlbumLoader
+import code.name.monkey.retromusic.rest.LastFMRestClient
+import code.name.monkey.retromusic.rest.model.LastFmAlbum
 import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.LastFMUtil
 import code.name.monkey.retromusic.util.RetroColorUtil.generatePalette
 import code.name.monkey.retromusic.util.RetroColorUtil.getColor
-import code.name.monkey.retromusic.util.logD
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.target.ImageViewTarget
-import com.bumptech.glide.request.transition.Transition
-import com.google.android.material.shape.MaterialShapeDrawable
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.SimpleTarget
+import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.activity_album_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
 import java.util.*
 
-class AlbumTagEditorActivity : AbsTagEditorActivity<ActivityAlbumTagEditorBinding>() {
+class AlbumTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
+	override val contentViewLayout: Int
+		get() = R.layout.activity_album_tag_editor
 
-    override val bindingInflater: (LayoutInflater) -> ActivityAlbumTagEditorBinding =
-        ActivityAlbumTagEditorBinding::inflate
+	override fun loadImageFromFile(selectedFileUri: Uri?) {
 
-    private fun windowEnterTransition() {
-        val slide = Slide()
-        slide.excludeTarget(R.id.appBarLayout, true)
-        slide.excludeTarget(R.id.status_bar, true)
-        slide.excludeTarget(android.R.id.statusBarBackground, true)
-        slide.excludeTarget(android.R.id.navigationBarBackground, true)
+		Glide.with(this@AlbumTagEditorActivity).load(selectedFileUri).asBitmap()
+			.transcode(BitmapPaletteTranscoder(this), BitmapPaletteWrapper::class.java)
+			.diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
+			.into(object : SimpleTarget<BitmapPaletteWrapper>() {
+				override fun onResourceReady(
+						resource: BitmapPaletteWrapper?,
+						glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+				) {
+					getColor(resource?.palette, Color.TRANSPARENT)
+					albumArtBitmap = resource?.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
+					setImageBitmap(albumArtBitmap, getColor(resource?.palette, ATHUtil.resolveColor(this@AlbumTagEditorActivity, R.attr.defaultFooterColor)))
+					deleteAlbumArt = false
+					dataChanged()
+					setResult(Activity.RESULT_OK)
+				}
 
-        window.enterTransition = slide
-    }
+				override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+					super.onLoadFailed(e, errorDrawable)
+					Toast.makeText(this@AlbumTagEditorActivity, e.toString(), Toast.LENGTH_LONG)
+						.show()
+				}
+			})
+	}
 
-    private var albumArtBitmap: Bitmap? = null
-    private var deleteAlbumArt: Boolean = false
+	private var albumArtBitmap: Bitmap? = null
+	private var deleteAlbumArt: Boolean = false
+	private var lastFMRestClient: LastFMRestClient? = null
+	private val disposable = CompositeDisposable()
 
-    private fun setupToolbar() {
-        setSupportActionBar(binding.toolbar)
-        binding.appBarLayout?.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(this)
-    }
+	private fun setupToolbar() {
+		applyToolbar(toolbar)
+		supportActionBar?.setDisplayShowHomeEnabled(true)
+	}
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        window.sharedElementsUseOverlay = true
-        binding.imageContainer.transitionName = getString(R.string.transition_album_art)
-        windowEnterTransition()
-        setUpViews()
-        setupToolbar()
-    }
+	override fun onCreate(savedInstanceState: Bundle?) {
+		setDrawUnderStatusBar()
+		super.onCreate(savedInstanceState)
+		lastFMRestClient = LastFMRestClient(this)
 
-    private fun setUpViews() {
-        fillViewsWithFileTags()
+		setUpViews()
+		setupToolbar()
+	}
 
-        binding.yearContainer.setTint(false)
-        binding.genreContainer.setTint(false)
-        binding.albumTitleContainer.setTint(false)
-        binding.albumArtistContainer.setTint(false)
+	private fun setUpViews() {
+		fillViewsWithFileTags()
 
-        binding.albumText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.albumArtistText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.genreTitle.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.yearTitle.appHandleColor().doAfterTextChanged { dataChanged() }
-    }
+		MaterialUtil.setTint(yearContainer, false)
+		MaterialUtil.setTint(genreContainer, false)
+		MaterialUtil.setTint(albumTitleContainer, false)
+		MaterialUtil.setTint(albumArtistContainer, false)
 
-    private fun fillViewsWithFileTags() {
-        binding.albumText.setText(albumTitle)
-        binding.albumArtistText.setText(albumArtistName)
-        binding.genreTitle.setText(genreName)
-        binding.yearTitle.setText(songYear)
-        logD(albumTitle + albumArtistName)
-    }
+		albumText.appHandleColor().addTextChangedListener(this)
+		albumArtistText.appHandleColor().addTextChangedListener(this)
+		genreTitle.appHandleColor().addTextChangedListener(this)
+		yearTitle.appHandleColor().addTextChangedListener(this)
+	}
 
-    override fun loadCurrentImage() {
-        val bitmap = albumArt
-        setImageBitmap(
-            bitmap,
-            getColor(
-                generatePalette(bitmap),
-                defaultFooterColor()
-            )
-        )
-        deleteAlbumArt = false
-    }
+	private fun fillViewsWithFileTags() {
+		albumText.setText(albumTitle)
+		albumArtistText.setText(albumArtistName)
+		genreTitle.setText(genreName)
+		yearTitle.setText(songYear)
+	}
 
-    private fun toastLoadingFailed() {
-        showToast(R.string.could_not_download_album_cover)
-    }
+	override fun loadCurrentImage() {
+		val bitmap = albumArt
+		setImageBitmap(
+				bitmap,
+				getColor(
+						generatePalette(bitmap),
+						ATHUtil.resolveColor(this, R.attr.defaultFooterColor)
+				)
+		)
+		deleteAlbumArt = false
+	}
 
-    override fun searchImageOnWeb() {
-        searchWebFor(binding.albumText.text.toString(), binding.albumArtistText.text.toString())
-    }
+	override fun onPause() {
+		super.onPause()
+		disposable.clear()
+	}
 
-    override fun deleteImage() {
-        setImageBitmap(
-            BitmapFactory.decodeResource(resources, R.drawable.default_audio_art),
-            defaultFooterColor()
-        )
-        deleteAlbumArt = true
-        dataChanged()
-    }
+	private fun extractDetails(lastFmAlbum: LastFmAlbum) {
+		if (lastFmAlbum.album != null) {
 
-    override fun loadImageFromFile(selectedFile: Uri?) {
-        Glide.with(this@AlbumTagEditorActivity)
-            .asBitmapPalette()
-            .load(selectedFile)
-            .diskCacheStrategy(DiskCacheStrategy.NONE).skipMemoryCache(true)
-            .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
-                override fun onResourceReady(
-                    resource: BitmapPaletteWrapper,
-                    transition: Transition<in BitmapPaletteWrapper>?
-                ) {
-                    getColor(resource.palette, Color.TRANSPARENT)
-                    albumArtBitmap = resource.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
-                    setImageBitmap(
-                        albumArtBitmap,
-                        getColor(
-                            resource.palette,
-                            defaultFooterColor()
-                        )
-                    )
-                    deleteAlbumArt = false
-                    dataChanged()
-                    setResult(Activity.RESULT_OK)
-                }
+			val url = LastFMUtil.getLargestAlbumImageUrl(lastFmAlbum.album.image)
 
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    showToast(R.string.error_load_failed, Toast.LENGTH_LONG)
-                }
+			if (!TextUtils.isEmpty(url) && url.trim { it <= ' ' }.isNotEmpty()) {
+				Glide.with(this@AlbumTagEditorActivity).load(url).asBitmap()
+					.transcode(BitmapPaletteTranscoder(this), BitmapPaletteWrapper::class.java)
+					.diskCacheStrategy(DiskCacheStrategy.SOURCE).error(R.drawable.default_album_art)
+					.into(object : SimpleTarget<BitmapPaletteWrapper>() {
+						override fun onLoadFailed(
+								e: java.lang.Exception?,
+								errorDrawable: Drawable?
+						) {
+							super.onLoadFailed(e, errorDrawable)
+							Toast.makeText(
+									this@AlbumTagEditorActivity,
+									e.toString(),
+									Toast.LENGTH_LONG
+							).show()
+						}
 
-                override fun setResource(resource: BitmapPaletteWrapper?) {}
-            })
-    }
+						override fun onResourceReady(
+								resource: BitmapPaletteWrapper?,
+								glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+						) {
+							albumArtBitmap = resource?.bitmap?.let {
+								ImageUtil.resizeBitmap(
+										it,
+										2048
+								)
+							}
+							setImageBitmap(
+									albumArtBitmap,
+									getColor(
+											resource?.palette,
+											ATHUtil.resolveColor(
+													this@AlbumTagEditorActivity,
+													R.attr.defaultFooterColor
+											)
+									)
+							)
+							deleteAlbumArt = false
+							dataChanged()
+							setResult(RESULT_OK)
+						}
+					})
+				return
+			}
+			if (lastFmAlbum.album.tags.tag.size > 0) {
+				genreTitle.setText(lastFmAlbum.album.tags.tag[0].name)
+			}
 
-    override fun save() {
-        val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
-        fieldKeyValueMap[FieldKey.ALBUM] = binding.albumText.text.toString()
-        // android seems not to recognize album_artist field so we additionally write the normal artist field
-        fieldKeyValueMap[FieldKey.ARTIST] = binding.albumArtistText.text.toString()
-        fieldKeyValueMap[FieldKey.ALBUM_ARTIST] = binding.albumArtistText.text.toString()
-        fieldKeyValueMap[FieldKey.GENRE] = binding.genreTitle.text.toString()
-        fieldKeyValueMap[FieldKey.YEAR] = binding.yearTitle.text.toString()
+		}
+		toastLoadingFailed()
+	}
 
-        writeValuesToFiles(
-            fieldKeyValueMap,
-            when {
-                deleteAlbumArt -> ArtworkInfo(id, null)
-                albumArtBitmap == null -> null
-                else -> ArtworkInfo(id, albumArtBitmap!!)
-            }
-        )
-    }
+	private fun toastLoadingFailed() {
+		Toast.makeText(
+				this@AlbumTagEditorActivity,
+				R.string.could_not_download_album_cover,
+				Toast.LENGTH_SHORT
+		).show()
+	}
 
-    override fun getSongPaths(): List<String> {
-        return repository.albumById(id).songs
-            .map(Song::data)
-    }
+	override fun searchImageOnWeb() {
+		searchWebFor(albumText.text.toString(), albumArtistText.text.toString())
+	}
 
-    override fun getSongUris(): List<Uri> = repository.albumById(id).songs.map {
-        MusicUtil.getSongFileUri(it.id)
-    }
+	override fun deleteImage() {
+		setImageBitmap(
+				BitmapFactory.decodeResource(resources, R.drawable.default_album_art),
+				ATHUtil.resolveColor(this, R.attr.defaultFooterColor)
+		)
+		deleteAlbumArt = true
+		dataChanged()
+	}
 
-    override fun setColors(color: Int) {
-        super.setColors(color)
-        saveFab.backgroundTintList = ColorStateList.valueOf(color)
-        saveFab.backgroundTintList = ColorStateList.valueOf(color)
-        ColorStateList.valueOf(
-            MaterialValueHelper.getPrimaryTextColor(
-                this,
-                color.isColorLight
-            )
-        ).also {
-            saveFab.iconTint = it
-            saveFab.setTextColor(it)
-        }
-    }
+	override fun save() {
+		val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
+		fieldKeyValueMap[FieldKey.ALBUM] = albumText.text.toString()
+		//android seems not to recognize album_artist field so we additionally write the normal artist field
+		fieldKeyValueMap[FieldKey.ARTIST] = albumArtistText.text.toString()
+		fieldKeyValueMap[FieldKey.ALBUM_ARTIST] = albumArtistText.text.toString()
+		fieldKeyValueMap[FieldKey.GENRE] = genreTitle.text.toString()
+		fieldKeyValueMap[FieldKey.YEAR] = yearTitle.text.toString()
 
+		writeValuesToFiles(
+				fieldKeyValueMap, if (deleteAlbumArt) ArtworkInfo(id, null)
+		else if (albumArtBitmap == null) null else ArtworkInfo(id, albumArtBitmap!!)
+		)
+	}
 
-    override val editorImage: ImageView
-        get() = binding.editorImage
+	override fun getSongPaths(): List<String> {
+		val songs = AlbumLoader.getAlbum(this, id).songs
+		val paths = ArrayList<String>(songs!!.size)
+		for (song in songs) {
+			paths.add(song.data)
+		}
+		return paths
+	}
 
-    companion object {
+	override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
 
-        val TAG: String = AlbumTagEditorActivity::class.java.simpleName
-    }
+	}
+
+	override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+
+	}
+
+	override fun afterTextChanged(s: Editable) {
+		dataChanged()
+	}
+
+	override fun setColors(color: Int) {
+		super.setColors(color)
+		saveFab.backgroundTintList = ColorStateList.valueOf(color)
+	}
+
+	companion object {
+
+		val TAG: String = AlbumTagEditorActivity::class.java.simpleName
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
index 93dd8a44f..fb1dbb50b 100755
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt
@@ -1,214 +1,119 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.activities.tageditor
 
-import android.annotation.SuppressLint
-import android.app.Activity
-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 android.view.LayoutInflater
-import android.widget.ImageView
-import android.widget.Toast
-import androidx.core.widget.doAfterTextChanged
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import android.text.Editable
+import android.text.TextWatcher
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ActivitySongTagEditorBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.ArtworkInfo
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.RetroColorUtil
-import code.name.monkey.retromusic.util.logD
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.request.target.ImageViewTarget
-import com.bumptech.glide.request.transition.Transition
-import com.google.android.material.shape.MaterialShapeDrawable
+import code.name.monkey.retromusic.extensions.appHandleColor
+import code.name.monkey.retromusic.extensions.applyToolbar
+import code.name.monkey.retromusic.loaders.SongLoader
+import kotlinx.android.synthetic.main.activity_song_tag_editor.*
 import org.jaudiotagger.tag.FieldKey
-import org.koin.android.ext.android.inject
 import java.util.*
 
-class SongTagEditorActivity : AbsTagEditorActivity<ActivitySongTagEditorBinding>() {
+class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher {
 
-    override val bindingInflater: (LayoutInflater) -> ActivitySongTagEditorBinding =
-        ActivitySongTagEditorBinding::inflate
+    override val contentViewLayout: Int
+        get() = R.layout.activity_song_tag_editor
 
 
-    private val songRepository by inject<SongRepository>()
-
-    private var albumArtBitmap: Bitmap? = null
-    private var deleteAlbumArt: Boolean = false
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
+        setNoImageMode()
         setUpViews()
-        setSupportActionBar(binding.toolbar)
-        binding.appBarLayout?.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(this)
+        applyToolbar(toolbar)
+        setStatusbarColorAuto()
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     private fun setUpViews() {
         fillViewsWithFileTags()
-        binding.songTextContainer.setTint(false)
-        binding.composerContainer.setTint(false)
-        binding.albumTextContainer.setTint(false)
-        binding.artistContainer.setTint(false)
-        binding.albumArtistContainer.setTint(false)
-        binding.yearContainer.setTint(false)
-        binding.genreContainer.setTint(false)
-        binding.trackNumberContainer.setTint(false)
-        binding.discNumberContainer.setTint(false)
-        binding.lyricsContainer.setTint(false)
+        MaterialUtil.setTint(songTextContainer, false)
+        MaterialUtil.setTint(composerContainer, false)
+        MaterialUtil.setTint(albumTextContainer, false)
+        MaterialUtil.setTint(artistContainer, false)
+        MaterialUtil.setTint(albumArtistContainer, false)
+        MaterialUtil.setTint(yearContainer, false)
+        MaterialUtil.setTint(genreContainer, false)
+        MaterialUtil.setTint(trackNumberContainer, false)
+        MaterialUtil.setTint(lyricsContainer, false)
 
-        binding.songText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.albumText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.albumArtistText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.artistText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.genreText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.yearText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.trackNumberText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.discNumberText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.lyricsText.appHandleColor().doAfterTextChanged { dataChanged() }
-        binding.songComposerText.appHandleColor().doAfterTextChanged { dataChanged() }
+        songText.appHandleColor().addTextChangedListener(this)
+        albumText.appHandleColor().addTextChangedListener(this)
+        albumArtistText.appHandleColor().addTextChangedListener(this)
+        artistText.appHandleColor().addTextChangedListener(this)
+        genreText.appHandleColor().addTextChangedListener(this)
+        yearText.appHandleColor().addTextChangedListener(this)
+        trackNumberText.appHandleColor().addTextChangedListener(this)
+        lyricsText.appHandleColor().addTextChangedListener(this)
+        songComposerText.appHandleColor().addTextChangedListener(this)
     }
 
     private fun fillViewsWithFileTags() {
-        binding.songText.setText(songTitle)
-        binding.albumArtistText.setText(albumArtist)
-        binding.albumText.setText(albumTitle)
-        binding.artistText.setText(artistName)
-        binding.genreText.setText(genreName)
-        binding.yearText.setText(songYear)
-        binding.trackNumberText.setText(trackNumber)
-        binding.discNumberText.setText(discNumber)
-        binding.lyricsText.setText(lyrics)
-        binding.songComposerText.setText(composer)
-        logD(songTitle + songYear)
+        songText.setText(songTitle)
+        albumArtistText.setText(albumArtist)
+        albumText.setText(albumTitle)
+        artistText.setText(artistName)
+        genreText.setText(genreName)
+        yearText.setText(songYear)
+        trackNumberText.setText(trackNumber)
+        lyricsText.setText(lyrics)
+        songComposerText.setText(composer)
     }
 
     override fun loadCurrentImage() {
-        val bitmap = albumArt
-        setImageBitmap(
-            bitmap,
-            RetroColorUtil.getColor(
-                RetroColorUtil.generatePalette(bitmap),
-                defaultFooterColor()
-            )
-        )
-        deleteAlbumArt = false
+
     }
 
     override fun searchImageOnWeb() {
-        searchWebFor(binding.songText.text.toString(), binding.artistText.text.toString())
+
     }
 
     override fun deleteImage() {
-        setImageBitmap(
-            BitmapFactory.decodeResource(resources, R.drawable.default_audio_art),
-            defaultFooterColor()
-        )
-        deleteAlbumArt = true
-        dataChanged()
-    }
 
-    override fun setColors(color: Int) {
-        super.setColors(color)
-        saveFab.backgroundTintList = ColorStateList.valueOf(color)
-        ColorStateList.valueOf(
-            MaterialValueHelper.getPrimaryTextColor(
-                this,
-                color.isColorLight
-            )
-        ).also {
-            saveFab.iconTint = it
-            saveFab.setTextColor(it)
-        }
     }
 
     override fun save() {
         val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
-        fieldKeyValueMap[FieldKey.TITLE] = binding.songText.text.toString()
-        fieldKeyValueMap[FieldKey.ALBUM] = binding.albumText.text.toString()
-        fieldKeyValueMap[FieldKey.ARTIST] = binding.artistText.text.toString()
-        fieldKeyValueMap[FieldKey.GENRE] = binding.genreText.text.toString()
-        fieldKeyValueMap[FieldKey.YEAR] = binding.yearText.text.toString()
-        fieldKeyValueMap[FieldKey.TRACK] = binding.trackNumberText.text.toString()
-        fieldKeyValueMap[FieldKey.DISC_NO] = binding.discNumberText.text.toString()
-        fieldKeyValueMap[FieldKey.LYRICS] = binding.lyricsText.text.toString()
-        fieldKeyValueMap[FieldKey.ALBUM_ARTIST] = binding.albumArtistText.text.toString()
-        fieldKeyValueMap[FieldKey.COMPOSER] = binding.songComposerText.text.toString()
-        writeValuesToFiles(
-            fieldKeyValueMap, when {
-                deleteAlbumArt -> ArtworkInfo(id, null)
-                albumArtBitmap == null -> null
-                else -> ArtworkInfo(id, albumArtBitmap!!)
-            }
-        )
+        fieldKeyValueMap[FieldKey.TITLE] = songText.text.toString()
+        fieldKeyValueMap[FieldKey.ALBUM] = albumText.text.toString()
+        fieldKeyValueMap[FieldKey.ARTIST] = artistText.text.toString()
+        fieldKeyValueMap[FieldKey.GENRE] = genreText.text.toString()
+        fieldKeyValueMap[FieldKey.YEAR] = yearText.text.toString()
+        fieldKeyValueMap[FieldKey.TRACK] = trackNumberText.text.toString()
+        fieldKeyValueMap[FieldKey.LYRICS] = lyricsText.text.toString()
+        fieldKeyValueMap[FieldKey.ALBUM_ARTIST] = albumArtistText.text.toString()
+        fieldKeyValueMap[FieldKey.COMPOSER] = songComposerText.text.toString()
+        writeValuesToFiles(fieldKeyValueMap, null)
     }
 
-    override fun getSongPaths(): List<String> = listOf(songRepository.song(id).data)
-
-    override fun getSongUris(): List<Uri> = listOf(MusicUtil.getSongFileUri(id))
+    override fun getSongPaths(): List<String> {
+        val paths = ArrayList<String>(1)
+        paths.add(SongLoader.getSong(this, id).data)
+        return paths
+    }
 
     override fun loadImageFromFile(selectedFile: Uri?) {
-        Glide.with(this@SongTagEditorActivity)
-            .asBitmapPalette()
-            .load(selectedFile)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .skipMemoryCache(true)
-            .into(object : ImageViewTarget<BitmapPaletteWrapper>(binding.editorImage) {
-                override fun onResourceReady(
-                    resource: BitmapPaletteWrapper,
-                    transition: Transition<in BitmapPaletteWrapper>?
-                ) {
-                    RetroColorUtil.getColor(resource.palette, Color.TRANSPARENT)
-                    albumArtBitmap = resource.bitmap?.let { ImageUtil.resizeBitmap(it, 2048) }
-                    setImageBitmap(
-                        albumArtBitmap,
-                        RetroColorUtil.getColor(
-                            resource.palette,
-                            defaultFooterColor()
-                        )
-                    )
-                    deleteAlbumArt = false
-                    dataChanged()
-                    setResult(Activity.RESULT_OK)
-                }
 
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    showToast(R.string.error_load_failed, Toast.LENGTH_LONG)
-                }
+    }
 
-                override fun setResource(resource: BitmapPaletteWrapper?) {}
-            })
+    override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {
+
+    }
+
+    override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+
+    }
+
+    override fun afterTextChanged(s: Editable) {
+        dataChanged()
     }
 
     companion object {
         val TAG: String = SongTagEditorActivity::class.java.simpleName
     }
-
-    override val editorImage: ImageView
-        get() = binding.editorImage
 }
+
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt
deleted file mode 100644
index b9d5f28dd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/TagWriter.kt
+++ /dev/null
@@ -1,204 +0,0 @@
-package code.name.monkey.retromusic.activities.tageditor
-
-import android.app.Activity
-import android.content.Context
-import android.graphics.Bitmap
-import android.media.MediaScannerConnection
-import android.os.Build
-import android.util.Log
-import androidx.annotation.RequiresApi
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.util.MusicUtil.createAlbumArtFile
-import code.name.monkey.retromusic.util.MusicUtil.deleteAlbumArt
-import code.name.monkey.retromusic.util.MusicUtil.insertAlbumArt
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.jaudiotagger.audio.AudioFileIO
-import org.jaudiotagger.audio.exceptions.CannotReadException
-import org.jaudiotagger.audio.exceptions.CannotWriteException
-import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException
-import org.jaudiotagger.audio.exceptions.ReadOnlyFileException
-import org.jaudiotagger.tag.FieldDataInvalidException
-import org.jaudiotagger.tag.TagException
-import org.jaudiotagger.tag.images.AndroidArtwork
-import org.jaudiotagger.tag.images.Artwork
-import java.io.File
-import java.io.IOException
-
-class TagWriter {
-
-    companion object {
-
-        suspend fun scan(context: Context, toBeScanned: List<String?>?) {
-            if (toBeScanned.isNullOrEmpty()) {
-                Log.i("scan", "scan: Empty")
-                context.showToast("Scan file from folder")
-                return
-            }
-            MediaScannerConnection.scanFile(
-                context,
-                toBeScanned.toTypedArray(),
-                null,
-                withContext(Dispatchers.Main) {
-                    if (context is Activity) UpdateToastMediaScannerCompletionListener(
-                        context, toBeScanned
-                    ) else null
-                }
-            )
-        }
-
-        suspend fun writeTagsToFiles(context: Context, info: AudioTagInfo) {
-            withContext(Dispatchers.IO) {
-                var artwork: Artwork? = null
-                var albumArtFile: File? = null
-                if (info.artworkInfo?.artwork != null) {
-                    try {
-                        albumArtFile = createAlbumArtFile(context).canonicalFile
-                        info.artworkInfo.artwork.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            100,
-                            albumArtFile.outputStream()
-                        )
-                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-                }
-                var wroteArtwork = false
-                var deletedArtwork = false
-                for (filePath in info.filePaths!!) {
-                    try {
-                        val audioFile = AudioFileIO.read(File(filePath))
-                        val tag = audioFile.tagOrCreateAndSetDefault
-                        if (info.fieldKeyValueMap != null) {
-                            for ((key, value) in info.fieldKeyValueMap) {
-                                try {
-                                    tag.setField(key, value)
-                                } catch (e: FieldDataInvalidException) {
-                                    withContext(Dispatchers.Main) {
-                                        context.showToast(R.string.could_not_write_tags_to_file)
-                                    }
-                                    return@withContext listOf<File>()
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-                        if (info.artworkInfo != null) {
-                            if (info.artworkInfo.artwork == null) {
-                                tag.deleteArtworkField()
-                                deletedArtwork = true
-                            } else if (artwork != null) {
-                                tag.deleteArtworkField()
-                                tag.setField(artwork)
-                                wroteArtwork = true
-                            }
-                        }
-                        audioFile.commit()
-                    } catch (e: CannotReadException) {
-                        e.printStackTrace()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    } catch (e: CannotWriteException) {
-                        e.printStackTrace()
-                    } catch (e: TagException) {
-                        e.printStackTrace()
-                    } catch (e: ReadOnlyFileException) {
-                        e.printStackTrace()
-                    } catch (e: InvalidAudioFrameException) {
-                        e.printStackTrace()
-                    }
-                }
-                if (wroteArtwork) {
-                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
-                } else if (deletedArtwork) {
-                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
-                }
-                scan(context, info.filePaths)
-            }
-        }
-
-        @RequiresApi(Build.VERSION_CODES.R)
-        suspend fun writeTagsToFilesR(context: Context, info: AudioTagInfo): List<File> =
-            withContext(Dispatchers.IO) {
-                val cacheFiles = mutableListOf<File>()
-                var artwork: Artwork? = null
-                var albumArtFile: File? = null
-                if (info.artworkInfo?.artwork != null) {
-                    try {
-                        albumArtFile = createAlbumArtFile(context).canonicalFile
-                        info.artworkInfo.artwork.compress(
-                            Bitmap.CompressFormat.JPEG,
-                            100,
-                            albumArtFile.outputStream()
-                        )
-                        artwork = AndroidArtwork.createArtworkFromFile(albumArtFile)
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    }
-                }
-                var wroteArtwork = false
-                var deletedArtwork = false
-                for (filePath in info.filePaths!!) {
-                    try {
-                        val originFile = File(filePath)
-                        val cacheFile = File(context.cacheDir, originFile.name)
-                        cacheFiles.add(cacheFile)
-                        originFile.inputStream().use { input ->
-                            cacheFile.outputStream().use { output ->
-                                input.copyTo(output)
-                            }
-                        }
-                        val audioFile = AudioFileIO.read(cacheFile)
-                        val tag = audioFile.tagOrCreateAndSetDefault
-                        if (info.fieldKeyValueMap != null) {
-                            for ((key, value) in info.fieldKeyValueMap) {
-                                try {
-                                    tag.setField(key, value)
-                                } catch (e: FieldDataInvalidException) {
-                                    withContext(Dispatchers.Main) {
-                                        context.showToast(R.string.could_not_write_tags_to_file)
-                                    }
-                                    return@withContext listOf<File>()
-                                } catch (e: Exception) {
-                                    e.printStackTrace()
-                                }
-                            }
-                        }
-                        if (info.artworkInfo != null) {
-                            if (info.artworkInfo.artwork == null) {
-                                tag.deleteArtworkField()
-                                deletedArtwork = true
-                            } else if (artwork != null) {
-                                tag.deleteArtworkField()
-                                tag.setField(artwork)
-                                wroteArtwork = true
-                            }
-                        }
-                        audioFile.commit()
-                    } catch (e: CannotReadException) {
-                        e.printStackTrace()
-                    } catch (e: IOException) {
-                        e.printStackTrace()
-                    } catch (e: CannotWriteException) {
-                        e.printStackTrace()
-                    } catch (e: TagException) {
-                        e.printStackTrace()
-                    } catch (e: ReadOnlyFileException) {
-                        e.printStackTrace()
-                    } catch (e: InvalidAudioFrameException) {
-                        e.printStackTrace()
-                    }
-                }
-                if (wroteArtwork) {
-                    insertAlbumArt(context, info.artworkInfo!!.albumId, albumArtFile!!.path)
-                } else if (deletedArtwork) {
-                    deleteAlbumArt(context, info.artworkInfo!!.albumId)
-                }
-                cacheFiles
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
new file mode 100644
index 000000000..d9bfb86af
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/WriteTagsAsyncTask.java
@@ -0,0 +1,188 @@
+package code.name.monkey.retromusic.activities.tageditor;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.media.MediaScannerConnection;
+import android.net.Uri;
+import android.os.Build;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import org.jaudiotagger.audio.AudioFile;
+import org.jaudiotagger.audio.AudioFileIO;
+import org.jaudiotagger.tag.FieldKey;
+import org.jaudiotagger.tag.Tag;
+import org.jaudiotagger.tag.images.Artwork;
+import org.jaudiotagger.tag.images.ArtworkFactory;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Map;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.misc.DialogAsyncTask;
+import code.name.monkey.retromusic.misc.UpdateToastMediaScannerCompletionListener;
+import code.name.monkey.retromusic.util.MusicUtil;
+import code.name.monkey.retromusic.util.SAFUtil;
+
+public class WriteTagsAsyncTask extends
+        DialogAsyncTask<WriteTagsAsyncTask.LoadingInfo, Integer, String[]> {
+
+    private WeakReference<Activity> activity;
+
+    public WriteTagsAsyncTask(@NonNull Activity activity) {
+        super(activity);
+        this.activity = new WeakReference<>(activity);
+    }
+
+    @Override
+    protected String[] doInBackground(LoadingInfo... params) {
+        try {
+            LoadingInfo info = params[0];
+
+            Artwork artwork = null;
+            File albumArtFile = null;
+            if (info.artworkInfo != null && info.artworkInfo.getArtwork() != null) {
+                try {
+                    albumArtFile = MusicUtil.createAlbumArtFile().getCanonicalFile();
+                    info.artworkInfo.getArtwork()
+                            .compress(Bitmap.CompressFormat.PNG, 0, new FileOutputStream(albumArtFile));
+                    artwork = ArtworkFactory.createArtworkFromFile(albumArtFile);
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+
+            int counter = 0;
+            boolean wroteArtwork = false;
+            boolean deletedArtwork = false;
+            for (String filePath : info.filePaths) {
+                publishProgress(++counter, info.filePaths.size());
+                try {
+                    Uri safUri = null;
+                    if (filePath.contains(SAFUtil.SEPARATOR)) {
+                        String[] fragments = filePath.split(SAFUtil.SEPARATOR);
+                        filePath = fragments[0];
+                        safUri = Uri.parse(fragments[1]);
+                    }
+
+                    AudioFile audioFile = AudioFileIO.read(new File(filePath));
+                    Tag tag = audioFile.getTagOrCreateAndSetDefault();
+
+                    if (info.fieldKeyValueMap != null) {
+                        for (Map.Entry<FieldKey, String> entry : info.fieldKeyValueMap.entrySet()) {
+                            try {
+                                tag.setField(entry.getKey(), entry.getValue());
+                            } catch (Exception e) {
+                                e.printStackTrace();
+                            }
+                        }
+                    }
+
+                    if (info.artworkInfo != null) {
+                        if (info.artworkInfo.getArtwork() == null) {
+                            tag.deleteArtworkField();
+                            deletedArtwork = true;
+                        } else if (artwork != null) {
+                            tag.deleteArtworkField();
+                            tag.setField(artwork);
+                            wroteArtwork = true;
+                        }
+                    }
+
+                    Activity activity = this.activity.get();
+                    SAFUtil.write(activity, audioFile, safUri);
+
+                } catch (@NonNull Exception e) {
+                    e.printStackTrace();
+                }
+            }
+
+            Context context = getContext();
+            if (context != null) {
+                if (wroteArtwork) {
+                    MusicUtil.insertAlbumArt(context, info.artworkInfo.getAlbumId(), albumArtFile.getPath());
+                } else if (deletedArtwork) {
+                    MusicUtil.deleteAlbumArt(context, info.artworkInfo.getAlbumId());
+                }
+            }
+
+            Collection<String> paths = info.filePaths;
+            if (Build.VERSION.SDK_INT == Build.VERSION_CODES.KITKAT) {
+                paths = new ArrayList<>(info.filePaths.size());
+                for (String path : info.filePaths) {
+                    if (path.contains(SAFUtil.SEPARATOR))
+                        path = path.split(SAFUtil.SEPARATOR)[0];
+                    paths.add(path);
+                }
+            }
+
+            return paths.toArray(new String[paths.size()]);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    protected void onPostExecute(String[] toBeScanned) {
+        super.onPostExecute(toBeScanned);
+        scan(toBeScanned);
+    }
+
+    @Override
+    protected void onCancelled(String[] toBeScanned) {
+        super.onCancelled(toBeScanned);
+        scan(toBeScanned);
+    }
+
+    private void scan(String[] toBeScanned) {
+        Activity activity = this.activity.get();
+        if (activity != null) {
+            MediaScannerConnection.scanFile(activity, toBeScanned, null, new UpdateToastMediaScannerCompletionListener(activity, toBeScanned));
+        }
+    }
+
+    @NonNull
+    @Override
+    protected Dialog createDialog(@NonNull Context context) {
+        return new MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.saving_changes)
+                .setCancelable(false)
+                .setView(R.layout.loading)
+                .create();
+    }
+
+    @Override
+    protected void onProgressUpdate(@NonNull Dialog dialog, Integer... values) {
+        super.onProgressUpdate(dialog, values);
+        //((MaterialDialog) dialog).setMaxProgress(values[1]);
+        //((MaterialDialog) dialog).setProgress(values[0]);
+    }
+
+    public static class LoadingInfo {
+
+        final Collection<String> filePaths;
+        @Nullable
+        final Map<FieldKey, String> fieldKeyValueMap;
+        @Nullable
+        private AbsTagEditorActivity.ArtworkInfo artworkInfo;
+
+        public LoadingInfo(Collection<String> filePaths,
+                           @Nullable Map<FieldKey, String> fieldKeyValueMap,
+                           @Nullable AbsTagEditorActivity.ArtworkInfo artworkInfo) {
+            this.filePaths = filePaths;
+            this.fieldKeyValueMap = fieldKeyValueMap;
+            this.artworkInfo = artworkInfo;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
new file mode 100644
index 000000000..83273edc9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.adapter;
+
+import android.annotation.SuppressLint;
+import android.content.res.ColorStateList;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.checkbox.MaterialCheckBox;
+
+import java.util.List;
+
+import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.model.CategoryInfo;
+import code.name.monkey.retromusic.util.SwipeAndDragHelper;
+
+public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapter.ViewHolder> implements SwipeAndDragHelper.ActionCompletionContract {
+    private List<CategoryInfo> categoryInfos;
+    private ItemTouchHelper touchHelper;
+
+    public CategoryInfoAdapter(@NonNull List<CategoryInfo> categoryInfos) {
+        this.categoryInfos = categoryInfos;
+        SwipeAndDragHelper swipeAndDragHelper = new SwipeAndDragHelper(this);
+        touchHelper = new ItemTouchHelper(swipeAndDragHelper);
+    }
+
+    @Override
+    @NonNull
+    public CategoryInfoAdapter.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.preference_dialog_library_categories_listitem, parent, false);
+        return new ViewHolder(view);
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    @Override
+    public void onBindViewHolder(@NonNull CategoryInfoAdapter.ViewHolder holder, int position) {
+        CategoryInfo categoryInfo = categoryInfos.get(position);
+
+        holder.checkBox.setChecked(categoryInfo.visible);
+        holder.title.setText(holder.title.getResources().getString(categoryInfo.category.stringRes));
+
+        holder.itemView.setOnClickListener(v -> {
+            if (!(categoryInfo.visible && isLastCheckedCategory(categoryInfo))) {
+                categoryInfo.visible = !categoryInfo.visible;
+                holder.checkBox.setChecked(categoryInfo.visible);
+            } else {
+                Toast.makeText(holder.itemView.getContext(), R.string.you_have_to_select_at_least_one_category, Toast.LENGTH_SHORT).show();
+            }
+        });
+
+        holder.dragView.setOnTouchListener((view, event) -> {
+                    if (event.getActionMasked() == MotionEvent.ACTION_DOWN) {
+                        touchHelper.startDrag(holder);
+                    }
+                    return false;
+                }
+        );
+    }
+
+    @Override
+    public int getItemCount() {
+        return categoryInfos.size();
+    }
+
+    @Override
+    public void onViewMoved(int oldPosition, int newPosition) {
+        CategoryInfo categoryInfo = categoryInfos.get(oldPosition);
+        categoryInfos.remove(oldPosition);
+        categoryInfos.add(newPosition, categoryInfo);
+        notifyItemMoved(oldPosition, newPosition);
+    }
+
+    public void attachToRecyclerView(RecyclerView recyclerView) {
+        touchHelper.attachToRecyclerView(recyclerView);
+    }
+
+    @NonNull
+    public List<CategoryInfo> getCategoryInfos() {
+        return categoryInfos;
+    }
+
+    public void setCategoryInfos(@NonNull List<CategoryInfo> categoryInfos) {
+        this.categoryInfos = categoryInfos;
+        notifyDataSetChanged();
+    }
+
+    private boolean isLastCheckedCategory(CategoryInfo categoryInfo) {
+        if (categoryInfo.visible) {
+            for (CategoryInfo c : categoryInfos) {
+                if (c != categoryInfo && c.visible) return false;
+            }
+        }
+        return true;
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+        MaterialCheckBox checkBox;
+        TextView title;
+        View dragView;
+
+        ViewHolder(View view) {
+            super(view);
+            checkBox = view.findViewById(R.id.checkbox);
+            checkBox.setButtonTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
+            title = view.findViewById(R.id.title);
+            dragView = view.findViewById(R.id.drag_view);
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt
deleted file mode 100644
index dd5cda1d3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.kt
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.adapter
-
-import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.view.LayoutInflater
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewGroup
-import androidx.recyclerview.widget.ItemTouchHelper
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogLibraryCategoriesListitemBinding
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.SwipeAndDragHelper
-import code.name.monkey.retromusic.util.SwipeAndDragHelper.ActionCompletionContract
-
-class CategoryInfoAdapter : RecyclerView.Adapter<code.name.monkey.retromusic.adapter.CategoryInfoAdapter.ViewHolder>(),
-    ActionCompletionContract {
-    var categoryInfos: MutableList<CategoryInfo> =
-        PreferenceUtil.libraryCategory.toMutableList()
-        @SuppressLint("NotifyDataSetChanged")
-        set(value) {
-            field = value
-            notifyDataSetChanged()
-        }
-    private val touchHelper: ItemTouchHelper
-    fun attachToRecyclerView(recyclerView: RecyclerView?) {
-        touchHelper.attachToRecyclerView(recyclerView)
-    }
-
-    override fun getItemCount(): Int {
-        return categoryInfos.size
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val categoryInfo = categoryInfos[position]
-        holder.binding.checkbox.isChecked = categoryInfo.visible
-        holder.binding.title.text =
-            holder.binding.title.resources.getString(categoryInfo.category.stringRes)
-        holder.itemView.setOnClickListener {
-            if (!(categoryInfo.visible && isLastCheckedCategory(categoryInfo))) {
-                categoryInfo.visible = !categoryInfo.visible
-                holder.binding.checkbox.isChecked = categoryInfo.visible
-            } else {
-                holder.itemView.context.showToast(R.string.you_have_to_select_at_least_one_category)
-            }
-        }
-        holder.binding.dragView.setOnTouchListener { _: View?, event: MotionEvent ->
-            if (event.actionMasked == MotionEvent.ACTION_DOWN) {
-                touchHelper.startDrag(holder)
-            }
-            false
-        }
-    }
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup, viewType: Int
-    ): ViewHolder {
-        return ViewHolder(
-            PreferenceDialogLibraryCategoriesListitemBinding.inflate(
-                LayoutInflater.from(
-                    parent.context
-                ), parent, false
-            )
-        )
-    }
-
-    override fun onViewMoved(oldPosition: Int, newPosition: Int) {
-        val categoryInfo = categoryInfos[oldPosition]
-        categoryInfos.removeAt(oldPosition)
-        categoryInfos.add(newPosition, categoryInfo)
-        notifyItemMoved(oldPosition, newPosition)
-    }
-
-    private fun isLastCheckedCategory(categoryInfo: CategoryInfo): Boolean {
-        if (categoryInfo.visible) {
-            for (c in categoryInfos) {
-                if (c !== categoryInfo && c.visible) {
-                    return false
-                }
-            }
-        }
-        return true
-    }
-
-    class ViewHolder(val binding: PreferenceDialogLibraryCategoriesListitemBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        init {
-            binding.checkbox.buttonTintList =
-                ColorStateList.valueOf(accentColor(binding.checkbox.context))
-        }
-    }
-
-    init {
-        val swipeAndDragHelper = SwipeAndDragHelper(this)
-        touchHelper = ItemTouchHelper(swipeAndDragHelper)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
new file mode 100644
index 000000000..df7fec524
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt
@@ -0,0 +1,74 @@
+package code.name.monkey.retromusic.adapter
+
+import android.app.Activity
+import android.view.*
+import android.widget.TextView
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.Contributor
+import code.name.monkey.retromusic.util.RetroUtil.openUrl
+import code.name.monkey.retromusic.views.CircularImageView
+import com.bumptech.glide.Glide
+
+class ContributorAdapter(
+		private var contributors: List<Contributor>
+) : RecyclerView.Adapter<ContributorAdapter.ViewHolder>() {
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+		return if (viewType == HEADER) {
+			ViewHolder(
+					LayoutInflater.from(parent.context).inflate(
+							R.layout.item_contributor_header,
+							parent,
+							false
+					)
+			)
+		} else ViewHolder(
+				LayoutInflater.from(parent.context).inflate(
+						R.layout.item_contributor,
+						parent,
+						false
+				)
+		)
+	}
+
+	companion object {
+		const val HEADER: Int = 0
+		const val ITEM: Int = 1
+	}
+
+	override fun getItemViewType(position: Int): Int {
+		return if (position == 0) {
+			HEADER
+		} else {
+			ITEM
+		}
+	}
+
+	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+		val contributor = contributors[position]
+		holder.bindData(contributor)
+		holder.itemView.setOnClickListener {
+			openUrl(it?.context as Activity, contributors[position].link)
+		}
+	}
+
+	override fun getItemCount(): Int {
+		return contributors.size
+	}
+
+	inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+		val title: TextView = itemView.findViewById(R.id.title)
+		val text: TextView = itemView.findViewById(R.id.text)
+		val image: CircularImageView = itemView.findViewById(R.id.icon)
+
+		internal fun bindData(contributor: Contributor) {
+			title.text = contributor.name
+			text.text = contributor.summary
+			println(contributor.profileImage)
+			Glide.with(image.context).load(contributor.profileImage)
+				.error(R.drawable.ic_account_white_24dp)
+				.placeholder(R.drawable.ic_account_white_24dp).dontAnimate().into(image)
+		}
+	}
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
index b139a0af8..d8166e4f1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/GenreAdapter.kt
@@ -1,37 +1,14 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter
 
-import android.annotation.SuppressLint
+import android.app.Activity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewOutlineProvider
-import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemGenreBinding
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.interfaces.IGenreClickListener
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
+import code.name.monkey.retromusic.util.NavigationUtil
 import java.util.*
 
 /**
@@ -39,74 +16,39 @@ import java.util.*
  */
 
 class GenreAdapter(
-    private val activity: FragmentActivity,
-    var dataSet: List<Genre>,
-    private val listener: IGenreClickListener
+        private val activity: Activity, dataSet: ArrayList<Genre>, private val mItemLayoutRes: Int
 ) : RecyclerView.Adapter<GenreAdapter.ViewHolder>() {
+    var dataSet = ArrayList<Genre>()
+        private set
 
     init {
-        this.setHasStableIds(true)
-    }
-
-    override fun getItemId(position: Int): Long {
-        return dataSet[position].id
+        this.dataSet = dataSet
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(ItemGenreBinding.inflate(LayoutInflater.from(activity), parent, false))
+        return ViewHolder(LayoutInflater.from(activity).inflate(mItemLayoutRes, parent, false))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val genre = dataSet[position]
-        holder.binding.title.text = genre.name
-        holder.binding.text.text = String.format(
-            Locale.getDefault(),
-            "%d %s",
-            genre.songCount,
-            if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song)
-        )
-        loadGenreImage(genre, holder)
-    }
-
-    private fun loadGenreImage(genre: Genre, holder: GenreAdapter.ViewHolder) {
-        val genreSong = MusicUtil.songByGenre(genre.id)
-        Glide.with(activity)
-            .asBitmapPalette()
-            .songCoverOptions(genreSong)
-            .load(RetroGlideExtension.getSongModel(genreSong))
-            .into(object : RetroMusicColoredTarget(holder.binding.image) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    setColors(holder, colors)
-                }
-            })
-        // Just for a bit of shadow around image
-        holder.binding.image.outlineProvider = ViewOutlineProvider.BOUNDS
-    }
-
-    private fun setColors(holder: ViewHolder, color: MediaNotificationProcessor) {
-        holder.binding.imageContainerCard.setCardBackgroundColor(color.backgroundColor)
-        holder.binding.title.setTextColor(color.primaryTextColor)
-        holder.binding.text.setTextColor(color.secondaryTextColor)
+        holder.title?.text = genre.name
+        holder.text?.text = String.format(Locale.getDefault(), "%d %s", genre.songCount, if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(R.string.song))
     }
 
     override fun getItemCount(): Int {
         return dataSet.size
     }
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun swapDataSet(list: List<Genre>) {
+    fun swapDataSet(list: ArrayList<Genre>) {
         dataSet = list
         notifyDataSetChanged()
     }
 
-    inner class ViewHolder(val binding: ItemGenreBinding) : RecyclerView.ViewHolder(binding.root),
-        View.OnClickListener {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
         override fun onClick(v: View?) {
-            listener.onClickGenre(dataSet[layoutPosition], itemView)
-        }
-
-        init {
-            itemView.setOnClickListener(this)
+            super.onClick(v)
+            val genre = dataSet[adapterPosition]
+            NavigationUtil.goToGenre(activity, genre)
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
index e3f809b5f..4ce778201 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/HomeAdapter.kt
@@ -1,124 +1,70 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter
 
-import android.annotation.SuppressLint
+import android.util.DisplayMetrics
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.IntDef
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatTextView
-import androidx.core.os.bundleOf
-import androidx.fragment.app.findFragment
-import androidx.navigation.findNavController
-import androidx.navigation.fragment.FragmentNavigatorExtras
 import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.album.album.AlbumFullWidthAdapter
 import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
 import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.fragments.home.HomeFragment
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
 import code.name.monkey.retromusic.model.Album
 import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Home
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.util.PreferenceUtil
 
-class HomeAdapter(private val activity: AppCompatActivity) :
-    RecyclerView.Adapter<RecyclerView.ViewHolder>(), IArtistClickListener, IAlbumClickListener {
+class HomeAdapter(
+        private val activity: AppCompatActivity, private val displayMetrics: DisplayMetrics
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
 
-    private var list = listOf<Home>()
+    private var list = ArrayList<Home>()
 
     override fun getItemViewType(position: Int): Int {
         return list[position].homeSection
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        val layout =
-            LayoutInflater.from(activity).inflate(R.layout.section_recycler_view, parent, false)
+        val layout = LayoutInflater.from(activity)
+                .inflate(R.layout.section_recycler_view, parent, false)
         return when (viewType) {
             RECENT_ARTISTS, TOP_ARTISTS -> ArtistViewHolder(layout)
-            FAVOURITES -> PlaylistViewHolder(layout)
-            TOP_ALBUMS, RECENT_ALBUMS -> AlbumViewHolder(layout)
+            PLAYLISTS -> PlaylistViewHolder(layout)
             else -> {
-                ArtistViewHolder(layout)
+                AlbumViewHolder(LayoutInflater.from(activity).inflate(R.layout.metal_section_recycler_view, parent, false))
             }
         }
     }
 
     override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        val home = list[position]
+        println("ViewType ${getItemViewType(position)}")
         when (getItemViewType(position)) {
             RECENT_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(home)
-                viewHolder.clickableArea.setOnClickListener {
-                    it.findFragment<HomeFragment>().setSharedAxisXTransitions()
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.detailListFragment,
-                        bundleOf("type" to RECENT_ALBUMS)
-                    )
-                }
+                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.recent_albums)
             }
             TOP_ALBUMS -> {
                 val viewHolder = holder as AlbumViewHolder
-                viewHolder.bindView(home)
-                viewHolder.clickableArea.setOnClickListener {
-                    it.findFragment<HomeFragment>().setSharedAxisXTransitions()
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.detailListFragment,
-                        bundleOf("type" to TOP_ALBUMS)
-                    )
-                }
+                viewHolder.bindView(list[position].arrayList.toAlbums(), R.string.top_albums)
             }
             RECENT_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-                viewHolder.bindView(home)
-                viewHolder.clickableArea.setOnClickListener {
-                    it.findFragment<HomeFragment>().setSharedAxisXTransitions()
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.detailListFragment,
-                        bundleOf("type" to RECENT_ARTISTS)
-                    )
-                }
+                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.recent_artists)
             }
             TOP_ARTISTS -> {
                 val viewHolder = holder as ArtistViewHolder
-                viewHolder.bindView(home)
-                viewHolder.clickableArea.setOnClickListener {
-                    it.findFragment<HomeFragment>().setSharedAxisXTransitions()
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.detailListFragment,
-                        bundleOf("type" to TOP_ARTISTS)
-                    )
-                }
+                viewHolder.bindView(list[position].arrayList.toArtists(), R.string.top_artists)
             }
-            FAVOURITES -> {
+            PLAYLISTS -> {
                 val viewHolder = holder as PlaylistViewHolder
-                viewHolder.bindView(home)
-                viewHolder.clickableArea.setOnClickListener {
-                    it.findFragment<HomeFragment>().setSharedAxisXTransitions()
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.detailListFragment,
-                        bundleOf("type" to FAVOURITES)
-                    )
-                }
+                viewHolder.bindView(list[position].arrayList.toPlaylist(), R.string.favorites)
             }
         }
     }
@@ -127,87 +73,108 @@ class HomeAdapter(private val activity: AppCompatActivity) :
         return list.size
     }
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun swapData(sections: List<Home>) {
+    fun swapData(sections: ArrayList<Home>) {
         list = sections
         notifyDataSetChanged()
     }
 
-    @Suppress("UNCHECKED_CAST")
+    companion object {
+
+        @IntDef(RECENT_ALBUMS, TOP_ALBUMS, RECENT_ARTISTS, TOP_ARTISTS, PLAYLISTS)
+        @Retention(AnnotationRetention.SOURCE)
+        annotation class HomeSection
+
+        const val RECENT_ALBUMS = 3
+        const val TOP_ALBUMS = 1
+        const val RECENT_ARTISTS = 2
+        const val TOP_ARTISTS = 0
+        const val PLAYLISTS = 4
+
+    }
+
     private inner class AlbumViewHolder(view: View) : AbsHomeViewItem(view) {
-        fun bindView(home: Home) {
-            title.setText(home.titleRes)
-            recyclerView.apply {
-                adapter = albumAdapter(home.arrayList as List<Album>)
-                layoutManager = gridLayoutManager()
+        fun bindView(list: ArrayList<Album>, titleRes: Int) {
+            if (list.isNotEmpty()) {
+                recyclerView.apply {
+                    show()
+                    adapter = AlbumFullWidthAdapter(activity, list, displayMetrics)
+                }
+                title.text = activity.getString(titleRes)
             }
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
-    private inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
-        fun bindView(home: Home) {
-            title.setText(home.titleRes)
-            recyclerView.apply {
-                layoutManager = linearLayoutManager()
-                adapter = artistsAdapter(home.arrayList as List<Artist>)
+    inner class ArtistViewHolder(view: View) : AbsHomeViewItem(view) {
+        fun bindView(list: ArrayList<Artist>, titleRes: Int) {
+            if (list.isNotEmpty()) {
+                recyclerView.apply {
+                    show()
+                    layoutManager = GridLayoutManager(
+                            activity, 1, GridLayoutManager.HORIZONTAL, false
+                    )
+                    val artistAdapter = ArtistAdapter(
+                            activity,
+                            list,
+                            PreferenceUtil.getInstance(activity).getHomeGridStyle(activity),
+                            false,
+                            null
+                    )
+                    adapter = artistAdapter
+                }
+                title.text = activity.getString(titleRes)
             }
         }
     }
 
-    @Suppress("UNCHECKED_CAST")
     private inner class PlaylistViewHolder(view: View) : AbsHomeViewItem(view) {
-        fun bindView(home: Home) {
-            title.setText(home.titleRes)
-            recyclerView.apply {
-                val songAdapter = SongAdapter(
-                    activity,
-                    home.arrayList as MutableList<Song>,
-                    R.layout.item_favourite_card
-                )
-                layoutManager = linearLayoutManager()
-                adapter = songAdapter
+        fun bindView(arrayList: ArrayList<Playlist>, titleRes: Int) {
+            if (arrayList.isNotEmpty()) {
+                val songs = PlaylistSongsLoader.getPlaylistSongList(activity, arrayList[0])
+                if (songs.isNotEmpty()) {
+                    recyclerView.apply {
+                        show()
+                        val songAdapter = SongAdapter(
+                                activity, songs, R.layout.item_album_card, false, null
+                        )
+                        layoutManager = GridLayoutManager(
+                                activity, 1, GridLayoutManager.HORIZONTAL, false
+                        )
+                        adapter = songAdapter
+
+                    }
+                    title.text = activity.getString(titleRes)
+                }
             }
         }
     }
 
-    open class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
+    open inner class AbsHomeViewItem(itemView: View) : RecyclerView.ViewHolder(itemView) {
         val recyclerView: RecyclerView = itemView.findViewById(R.id.recyclerView)
         val title: AppCompatTextView = itemView.findViewById(R.id.title)
-        val clickableArea: ViewGroup = itemView.findViewById(R.id.clickable_area)
-    }
-
-    private fun artistsAdapter(artists: List<Artist>) =
-        ArtistAdapter(activity, artists, PreferenceUtil.homeArtistGridStyle, this)
-
-    private fun albumAdapter(albums: List<Album>) =
-        AlbumAdapter(activity, albums, PreferenceUtil.homeAlbumGridStyle, this)
-
-    private fun gridLayoutManager() =
-        GridLayoutManager(activity, 1, GridLayoutManager.HORIZONTAL, false)
-
-    private fun linearLayoutManager() =
-        LinearLayoutManager(activity, LinearLayoutManager.HORIZONTAL, false)
-
-    override fun onArtist(artistId: Long, view: View) {
-        activity.findNavController(R.id.fragment_container).navigate(
-            R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to artistId),
-            null,
-            FragmentNavigatorExtras(
-                view to artistId.toString()
-            )
-        )
-    }
-
-    override fun onAlbumClick(albumId: Long, view: View) {
-        activity.findNavController(R.id.fragment_container).navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to albumId),
-            null,
-            FragmentNavigatorExtras(
-                view to albumId.toString()
-            )
-        )
     }
 }
+
+private fun <E> ArrayList<E>.toAlbums(): ArrayList<Album> {
+    val arrayList = ArrayList<Album>()
+    for (x in this) {
+        arrayList.add(x as Album)
+    }
+    return arrayList;
+}
+
+private fun <E> ArrayList<E>.toArtists(): ArrayList<Artist> {
+    val arrayList = ArrayList<Artist>()
+    for (x in this) {
+        arrayList.add(x as Artist)
+    }
+    return arrayList;
+}
+
+private fun <E> ArrayList<E>.toPlaylist(): ArrayList<Playlist> {
+    val arrayList = ArrayList<Playlist>()
+    for (x in this) {
+        arrayList.add(x as Playlist)
+    }
+    return arrayList;
+}
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
index 22a60bd95..dc5c066d4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SearchAdapter.kt
@@ -1,38 +1,16 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter
 
-import android.annotation.SuppressLint
+import android.app.ActivityOptions
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.core.view.isGone
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
-import androidx.navigation.findNavController
+import androidx.appcompat.app.AppCompatActivity
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.model.Album
@@ -40,137 +18,80 @@ import code.name.monkey.retromusic.model.Artist
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
-import java.util.*
+import android.util.Pair as UtilPair
 
 class SearchAdapter(
-    private val activity: FragmentActivity,
-    private var dataSet: List<Any>
+        private val activity: AppCompatActivity, private var dataSet: List<Any>?
 ) : RecyclerView.Adapter<SearchAdapter.ViewHolder>() {
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun swapDataSet(dataSet: List<Any>) {
+    fun swapDataSet(dataSet: MutableList<Any>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
     }
 
     override fun getItemViewType(position: Int): Int {
-        if (dataSet[position] is Album) return ALBUM
-        if (dataSet[position] is Artist) return if ((dataSet[position] as Artist).isAlbumArtist) ALBUM_ARTIST else ARTIST
-        if (dataSet[position] is Genre) return GENRE
-        if (dataSet[position] is PlaylistWithSongs) return PLAYLIST
-        return if (dataSet[position] is Song) SONG else HEADER
+        if (dataSet!![position] is Album) return ALBUM
+        if (dataSet!![position] is Artist) return ARTIST
+        if (dataSet!![position] is Genre) return GENRE
+        return if (dataSet!![position] is Song) SONG else HEADER
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return when (viewType) {
-            HEADER -> ViewHolder(
-                LayoutInflater.from(activity).inflate(
-                    R.layout.sub_header,
-                    parent,
-                    false
-                ), viewType
-            )
-
-            ALBUM, ARTIST, ALBUM_ARTIST -> ViewHolder(
-                LayoutInflater.from(activity).inflate(
-                    R.layout.item_list_big,
-                    parent,
-                    false
-                ), viewType
-            )
-
-            else -> ViewHolder(
-                LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false),
-                viewType
-            )
-        }
+        return if (viewType == HEADER) ViewHolder(LayoutInflater.from(activity).inflate(R.layout.sub_header, parent, false), viewType)
+        else
+            ViewHolder(LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false), viewType)
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         when (getItemViewType(position)) {
             ALBUM -> {
-                holder.imageTextContainer?.isVisible = true
-                val album = dataSet[position] as Album
+                val album = dataSet?.get(position) as Album
                 holder.title?.text = album.title
                 holder.text?.text = album.artistName
-                Glide.with(activity).asDrawable().albumCoverOptions(album.safeGetFirstSong())
-                    .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
-                    .into(holder.image!!)
+                SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
+                        .checkIgnoreMediaStore(activity).build().into(holder.image)
             }
-
             ARTIST -> {
-                holder.imageTextContainer?.isVisible = true
-                val artist = dataSet[position] as Artist
+                val artist = dataSet?.get(position) as Artist
                 holder.title?.text = artist.name
                 holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)
-                ).into(holder.image!!)
+                ArtistGlideRequest.Builder.from(Glide.with(activity), artist).build()
+                        .into(holder.image)
             }
-
             SONG -> {
-                holder.imageTextContainer?.isVisible = true
-                val song = dataSet[position] as Song
+                val song = dataSet?.get(position) as Song
                 holder.title?.text = song.title
                 holder.text?.text = song.albumName
-                Glide.with(activity).asDrawable().songCoverOptions(song)
-                    .load(RetroGlideExtension.getSongModel(song)).into(holder.image!!)
             }
-
             GENRE -> {
-                val genre = dataSet[position] as Genre
+                val genre = dataSet?.get(position) as Genre
                 holder.title?.text = genre.name
-                holder.text?.text = String.format(
-                    Locale.getDefault(),
-                    "%d %s",
-                    genre.songCount,
-                    if (genre.songCount > 1) activity.getString(R.string.songs) else activity.getString(
-                        R.string.song
-                    )
-                )
             }
-
-            PLAYLIST -> {
-                val playlist = dataSet[position] as PlaylistWithSongs
-                holder.title?.text = playlist.playlistEntity.playlistName
-                //holder.text?.text = MusicUtil.playlistInfoString(activity, playlist.songs)
-            }
-
-            ALBUM_ARTIST -> {
-                holder.imageTextContainer?.isVisible = true
-                val artist = dataSet[position] as Artist
-                holder.title?.text = artist.name
-                holder.text?.text = MusicUtil.getArtistInfoString(activity, artist)
-                Glide.with(activity).asDrawable().artistImageOptions(artist).load(
-                    RetroGlideExtension.getArtistModel(artist)
-                ).into(holder.image!!)
-            }
-
             else -> {
-                holder.title?.text = dataSet[position].toString()
+                holder.title?.text = dataSet?.get(position).toString()
                 holder.title?.setTextColor(ThemeStore.accentColor(activity))
             }
         }
     }
 
     override fun getItemCount(): Int {
-        return dataSet.size
+        return dataSet!!.size
     }
 
     inner class ViewHolder(itemView: View, itemViewType: Int) : MediaEntryViewHolder(itemView) {
         init {
             itemView.setOnLongClickListener(null)
-            imageTextContainer?.isInvisible = true
+
             if (itemViewType == SONG) {
-                imageTextContainer?.isGone = true
-                menu?.isVisible = true
+                menu?.visibility = View.VISIBLE
                 menu?.setOnClickListener(object : SongMenuHelper.OnClickSongMenu(activity) {
                     override val song: Song
-                        get() = dataSet[layoutPosition] as Song
+                        get() = dataSet!![adapterPosition] as Song
                 })
             } else {
-                menu?.isVisible = false
+                menu?.visibility = View.GONE
             }
 
             when (itemViewType) {
@@ -178,52 +99,29 @@ class SearchAdapter(
                 ARTIST -> setImageTransitionName(activity.getString(R.string.transition_artist_image))
                 else -> {
                     val container = itemView.findViewById<View>(R.id.imageContainer)
-                    container?.isVisible = false
+                    container?.visibility = View.GONE
                 }
             }
         }
 
         override fun onClick(v: View?) {
-            val item = dataSet[layoutPosition]
+            val item = dataSet!![adapterPosition]
             when (itemViewType) {
                 ALBUM -> {
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.albumDetailsFragment,
-                        bundleOf(EXTRA_ALBUM_ID to (item as Album).id)
-                    )
+                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_album_art)))
+                    NavigationUtil.goToAlbumOptions(activity, (item as Album).id, options)
                 }
-
                 ARTIST -> {
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.artistDetailsFragment,
-                        bundleOf(EXTRA_ARTIST_ID to (item as Artist).id)
-                    )
+                    val options = ActivityOptions.makeSceneTransitionAnimation(activity, UtilPair.create(image, activity.getString(R.string.transition_artist_image)))
+                    NavigationUtil.goToArtistOptions(activity, (item as Artist).id, options)
                 }
-
-                ALBUM_ARTIST -> {
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.albumArtistDetailsFragment,
-                        bundleOf(EXTRA_ARTIST_NAME to (item as Artist).name)
-                    )
-                }
-
                 GENRE -> {
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.genreDetailsFragment,
-                        bundleOf(EXTRA_GENRE to (item as Genre))
-                    )
+                    NavigationUtil.goToGenre(activity, item as Genre)
                 }
-
-                PLAYLIST -> {
-                    activity.findNavController(R.id.fragment_container).navigate(
-                        R.id.playlistDetailsFragment,
-                        bundleOf(EXTRA_PLAYLIST_ID to (item as PlaylistWithSongs).playlistEntity.playListId)
-                    )
-                }
-
                 SONG -> {
-                    MusicPlayerRemote.playNext(item as Song)
-                    MusicPlayerRemote.playNextSong()
+                    val playList = ArrayList<Song>()
+                    playList.add(item as Song)
+                    MusicPlayerRemote.openQueue(playList, 0, true)
                 }
             }
         }
@@ -235,7 +133,5 @@ class SearchAdapter(
         private const val ARTIST = 2
         private const val SONG = 3
         private const val GENRE = 4
-        private const val PLAYLIST = 5
-        private const val ALBUM_ARTIST = 6
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
index 4005c6e6c..60d2d8551 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/SongFileAdapter.kt
@@ -1,17 +1,3 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter
 
 import android.graphics.PorterDuff
@@ -20,43 +6,43 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.isVisible
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.interfaces.ICallbacks
-import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.signature.MediaStoreSignature
-import me.zhanghai.android.fastscroll.PopupTextProvider
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 import java.io.File
 import java.text.DecimalFormat
+import java.util.*
 import kotlin.math.log10
 import kotlin.math.pow
 
 class SongFileAdapter(
-    override val activity: AppCompatActivity,
-    private var dataSet: List<File>,
-    private val itemLayoutRes: Int,
-    private val iCallbacks: ICallbacks?
+        private val activity: AppCompatActivity,
+        private var dataSet: List<File>?,
+        private val itemLayoutRes: Int,
+        private val callbacks: Callbacks?,
+        cabHolder: CabHolder?
 ) : AbsMultiSelectAdapter<SongFileAdapter.ViewHolder, File>(
-    activity, R.menu.menu_media_selection
-), PopupTextProvider {
+        activity, cabHolder, R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
 
     init {
         this.setHasStableIds(true)
     }
 
     override fun getItemViewType(position: Int): Int {
-        return if (dataSet[position].isDirectory) FOLDER else FILE
+        return if (dataSet!![position].isDirectory) FOLDER else FILE
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].hashCode().toLong()
+        return dataSet!![position].hashCode().toLong()
     }
 
     fun swapDataSet(songFiles: List<File>) {
@@ -69,14 +55,14 @@ class SongFileAdapter(
     }
 
     override fun onBindViewHolder(holder: ViewHolder, index: Int) {
-        val file = dataSet[index]
+        val file = dataSet!![index]
         holder.itemView.isActivated = isChecked(file)
         holder.title?.text = getFileTitle(file)
         if (holder.text != null) {
             if (holder.itemViewType == FILE) {
                 holder.text?.text = getFileText(file)
             } else {
-                holder.text?.isVisible = false
+                holder.text?.visibility = View.GONE
             }
         }
 
@@ -94,64 +80,62 @@ class SongFileAdapter(
     }
 
     private fun loadFileImage(file: File, holder: ViewHolder) {
-        val iconColor = ATHUtil.resolveColor(activity, androidx.appcompat.R.attr.colorControlNormal)
+        val iconColor = ATHUtil.resolveColor(activity, R.attr.colorControlNormal)
         if (file.isDirectory) {
             holder.image?.let {
                 it.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
-                it.setImageResource(R.drawable.ic_folder)
+                it.setImageResource(R.drawable.ic_folder_white_24dp)
             }
-            holder.imageTextContainer?.setCardBackgroundColor(
-                ATHUtil.resolveColor(
-                    activity,
-                    com.google.android.material.R.attr.colorSurface
-                )
-            )
+            holder.imageTextContainer?.setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
+
         } else {
-            val error = activity.getTintedDrawable(R.drawable.ic_audio_file, iconColor)
-            Glide.with(activity)
-                .load(AudioFileCover(file.path))
-                .diskCacheStrategy(DiskCacheStrategy.NONE)
-                .error(error)
-                .placeholder(error)
-                .transition(RetroGlideExtension.getDefaultTransition())
-                .signature(MediaStoreSignature("", file.lastModified(), 0))
-                .into(holder.image!!)
+            val error = RetroUtil.getTintedVectorDrawable(
+                    activity, R.drawable.ic_file_music_white_24dp, iconColor
+            )
+            Glide.with(activity).load(AudioFileCover(file.path))
+                    .diskCacheStrategy(DiskCacheStrategy.NONE).error(error).placeholder(error)
+                    .animate(android.R.anim.fade_in)
+                    .signature(MediaStoreSignature("", file.lastModified(), 0)).into(holder.image)
         }
     }
 
     override fun getItemCount(): Int {
-        return dataSet.size
+        return dataSet!!.size
     }
 
-    override fun getIdentifier(position: Int): File {
-        return dataSet[position]
+    override fun getIdentifier(position: Int): File? {
+        return dataSet!![position]
     }
 
-    override fun getName(model: File): String {
-        return getFileTitle(model)
+    override fun getName(`object`: File): String {
+        return getFileTitle(`object`)
     }
 
-    override fun onMultipleItemAction(menuItem: MenuItem, selection: List<File>) {
-        if (iCallbacks == null) return
-        iCallbacks.onMultipleItemAction(menuItem, selection as ArrayList<File>)
+    override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<File>) {
+        if (callbacks == null) return
+        callbacks.onMultipleItemAction(menuItem, selection)
     }
 
-    override fun getPopupText(position: Int): String {
-        return if (position >= dataSet.lastIndex) "" else getSectionName(position)
+    override fun getSectionName(position: Int): String {
+        return dataSet!![position].name[0].toString().toUpperCase()
     }
 
-    private fun getSectionName(position: Int): String {
-        return MusicUtil.getSectionName(dataSet[position].name)
+    interface Callbacks {
+        fun onFileSelected(file: File)
+
+        fun onFileMenuClicked(file: File, view: View)
+
+        fun onMultipleItemAction(item: MenuItem, files: ArrayList<File>)
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
         init {
-            if (menu != null && iCallbacks != null) {
+            if (menu != null && callbacks != null) {
                 menu?.setOnClickListener { v ->
-                    val position = layoutPosition
+                    val position = adapterPosition
                     if (isPositionInRange(position)) {
-                        iCallbacks.onFileMenuClicked(dataSet[position], v)
+                        callbacks.onFileMenuClicked(dataSet!![position], v)
                     }
                 }
             }
@@ -161,23 +145,23 @@ class SongFileAdapter(
         }
 
         override fun onClick(v: View?) {
-            val position = layoutPosition
+            val position = adapterPosition
             if (isPositionInRange(position)) {
                 if (isInQuickSelectMode) {
                     toggleChecked(position)
                 } else {
-                    iCallbacks?.onFileSelected(dataSet[position])
+                    callbacks?.onFileSelected(dataSet!![position])
                 }
             }
         }
 
         override fun onLongClick(v: View?): Boolean {
-            val position = layoutPosition
+            val position = adapterPosition
             return isPositionInRange(position) && toggleChecked(position)
         }
 
         private fun isPositionInRange(position: Int): Boolean {
-            return position >= 0 && position < dataSet.size
+            return position >= 0 && position < dataSet!!.size
         }
     }
 
@@ -193,4 +177,4 @@ class SongFileAdapter(
             return DecimalFormat("#,##0.##").format(size / 1024.0.pow(digitGroups.toDouble())) + " " + units[digitGroups]
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt
deleted file mode 100644
index 98c2c632f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/StorageAdapter.kt
+++ /dev/null
@@ -1,55 +0,0 @@
-package code.name.monkey.retromusic.adapter
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import java.io.File
-
-class StorageAdapter(
-    val storageList: List<Storage>,
-    val storageClickListener: StorageClickListener
-) :
-    RecyclerView.Adapter<StorageAdapter.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            LayoutInflater.from(parent.context).inflate(
-                R.layout.item_storage,
-                parent,
-                false
-            )
-        )
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.bindData(storageList[position])
-    }
-
-    override fun getItemCount(): Int {
-        return storageList.size
-    }
-
-    inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-        val title: TextView = itemView.findViewById(R.id.title)
-
-        fun bindData(storage: Storage) {
-            title.text = storage.title
-        }
-
-        init {
-            itemView.setOnClickListener { storageClickListener.onStorageClicked(storageList[bindingAdapterPosition]) }
-        }
-    }
-}
-
-interface StorageClickListener {
-    fun onStorageClicked(storage: Storage)
-}
-
-class Storage {
-    lateinit var title: String
-    lateinit var file: File
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
deleted file mode 100644
index 160af7e47..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumAdapter.kt
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.adapter.album
-
-import android.content.res.ColorStateList
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import me.zhanghai.android.fastscroll.PopupTextProvider
-
-open class AlbumAdapter(
-    override val activity: FragmentActivity,
-    var dataSet: List<Album>,
-    var itemLayoutRes: Int,
-    val listener: IAlbumClickListener?
-) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
-    activity,
-    R.menu.menu_media_selection
-), PopupTextProvider {
-
-    init {
-        this.setHasStableIds(true)
-    }
-
-    fun swapDataSet(dataSet: List<Album>) {
-        this.dataSet = dataSet
-        notifyDataSetChanged()
-    }
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
-        return createViewHolder(view, viewType)
-    }
-
-    protected open fun createViewHolder(view: View, viewType: Int): ViewHolder {
-        return ViewHolder(view)
-    }
-
-    private fun getAlbumTitle(album: Album): String {
-        return album.title
-    }
-
-    protected open fun getAlbumText(album: Album): String? {
-        return album.albumArtist.let {
-            if (it.isNullOrEmpty()) {
-                album.artistName
-            } else {
-                it
-            }
-        }
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val album = dataSet[position]
-        val isChecked = isChecked(album)
-        holder.itemView.isActivated = isChecked
-        holder.title?.text = getAlbumTitle(album)
-        holder.text?.text = getAlbumText(album)
-        // Check if imageContainer exists so we can have a smooth transition without
-        // CardView clipping, if it doesn't exist in current layout set transition name to image instead.
-        if (holder.imageContainer != null) {
-            holder.imageContainer?.transitionName = album.id.toString()
-        } else {
-            holder.image?.transitionName = album.id.toString()
-        }
-        loadAlbumCover(album, holder)
-    }
-
-    protected open fun setColors(color: MediaNotificationProcessor, holder: ViewHolder) {
-        if (holder.paletteColorContainer != null) {
-            holder.title?.setTextColor(color.primaryTextColor)
-            holder.text?.setTextColor(color.secondaryTextColor)
-            holder.paletteColorContainer?.setBackgroundColor(color.backgroundColor)
-        }
-        holder.mask?.backgroundTintList = ColorStateList.valueOf(color.primaryTextColor)
-        holder.imageContainerCard?.setCardBackgroundColor(color.backgroundColor)
-    }
-
-    protected open fun loadAlbumCover(album: Album, holder: ViewHolder) {
-        if (holder.image == null) {
-            return
-        }
-        val song = album.safeGetFirstSong()
-        Glide.with(activity)
-            .asBitmapPalette()
-            .albumCoverOptions(song)
-            //.checkIgnoreMediaStore()
-            .load(RetroGlideExtension.getSongModel(song))
-            .into(object : RetroMusicColoredTarget(holder.image!!) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    setColors(colors, holder)
-                }
-            })
-    }
-
-    override fun getItemCount(): Int {
-        return dataSet.size
-    }
-
-    override fun getItemId(position: Int): Long {
-        return dataSet[position].id
-    }
-
-    override fun getIdentifier(position: Int): Album? {
-        return dataSet[position]
-    }
-
-    override fun getName(model: Album): String {
-        return model.title
-    }
-
-    override fun onMultipleItemAction(
-        menuItem: MenuItem,
-        selection: List<Album>
-    ) {
-        SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
-    }
-
-    private fun getSongList(albums: List<Album>): List<Song> {
-        val songs = ArrayList<Song>()
-        for (album in albums) {
-            songs.addAll(album.songs)
-        }
-        return songs
-    }
-
-    override fun getPopupText(position: Int): String {
-        return getSectionName(position)
-    }
-
-    private fun getSectionName(position: Int): String {
-        var sectionName: String? = null
-        when (PreferenceUtil.albumSortOrder) {
-            SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName =
-                dataSet[position].title
-
-            SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].albumArtist
-            SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(
-                dataSet[position].year
-            )
-        }
-        return MusicUtil.getSectionName(sectionName)
-    }
-
-    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
-
-        init {
-            menu?.isVisible = false
-        }
-
-        override fun onClick(v: View?) {
-            super.onClick(v)
-            if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
-            } else {
-                image?.let {
-                    listener?.onAlbumClick(dataSet[layoutPosition].id, imageContainer ?: it)
-                }
-            }
-        }
-
-        override fun onLongClick(v: View?): Boolean {
-            return toggleChecked(layoutPosition)
-        }
-    }
-
-    companion object {
-        val TAG: String = AlbumAdapter::class.java.simpleName
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
deleted file mode 100644
index 5a0a7d3cd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/AlbumCoverPagerAdapter.kt
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.adapter.album
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.ImageView
-import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.FragmentManager
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
-import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class AlbumCoverPagerAdapter(
-    fragmentManager: FragmentManager,
-    private val dataSet: List<Song>
-) : CustomFragmentStatePagerAdapter(fragmentManager) {
-
-    private var currentColorReceiver: AlbumCoverFragment.ColorReceiver? = null
-    private var currentColorReceiverPosition = -1
-
-    override fun getItem(position: Int): Fragment {
-        return AlbumCoverFragment.newInstance(dataSet[position])
-    }
-
-    override fun getCount(): Int {
-        return dataSet.size
-    }
-
-    override fun instantiateItem(container: ViewGroup, position: Int): Any {
-        val o = super.instantiateItem(container, position)
-        if (currentColorReceiver != null && currentColorReceiverPosition == position) {
-            receiveColor(currentColorReceiver!!, currentColorReceiverPosition)
-        }
-        return o
-    }
-
-    /**
-     * Only the latest passed [AlbumCoverFragment.ColorReceiver] is guaranteed to receive a
-     * response
-     */
-    fun receiveColor(colorReceiver: AlbumCoverFragment.ColorReceiver, position: Int) {
-
-        if (getFragment(position) is AlbumCoverFragment) {
-            val fragment = getFragment(position) as AlbumCoverFragment
-            currentColorReceiver = null
-            currentColorReceiverPosition = -1
-            fragment.receiveColor(colorReceiver, position)
-        } else {
-            currentColorReceiver = colorReceiver
-            currentColorReceiverPosition = position
-        }
-    }
-
-    class AlbumCoverFragment : Fragment() {
-
-        private var isColorReady: Boolean = false
-        private lateinit var color: MediaNotificationProcessor
-        private lateinit var song: Song
-        private var colorReceiver: ColorReceiver? = null
-        private var request: Int = 0
-        private val mainActivity get() = activity as MainActivity
-
-        override fun onCreate(savedInstanceState: Bundle?) {
-            super.onCreate(savedInstanceState)
-            if (arguments != null) {
-                song = BundleCompat.getParcelable(requireArguments(), SONG_ARG, Song::class.java)!!
-            }
-        }
-
-        override fun onCreateView(
-            inflater: LayoutInflater,
-            container: ViewGroup?,
-            savedInstanceState: Bundle?
-        ): View? {
-            val view = inflater.inflate(getLayoutWithPlayerTheme(), container, false)
-            view.setOnClickListener {
-                if (mainActivity.getBottomSheetBehavior().state == STATE_EXPANDED) {
-                    showLyricsDialog()
-                }
-            }
-            return view
-        }
-
-        private fun showLyricsDialog() {
-            lifecycleScope.launch(Dispatchers.IO) {
-                val data: String? = MusicUtil.getLyrics(song)
-                withContext(Dispatchers.Main) {
-                    MaterialAlertDialogBuilder(
-                        requireContext(),
-                        com.google.android.material.R.style.ThemeOverlay_MaterialComponents_Dialog_Alert
-                    ).apply {
-                        setTitle(song.title)
-                        setMessage(if (data.isNullOrEmpty()) "No lyrics found" else data)
-                        setNegativeButton(R.string.synced_lyrics) { _, _ ->
-                            goToLyrics(requireActivity())
-                        }
-                        show()
-                    }
-                }
-            }
-        }
-
-        private fun getLayoutWithPlayerTheme(): Int {
-            return when (PreferenceUtil.nowPlayingScreen) {
-                Card, Fit, Tiny, Classic, Gradient, Full -> R.layout.fragment_album_full_cover
-                Peek -> R.layout.fragment_peek_album_cover
-                else -> {
-                    if (PreferenceUtil.isCarouselEffect) {
-                        R.layout.fragment_album_carousel_cover
-                    } else {
-                        when (PreferenceUtil.albumCoverStyle) {
-                            AlbumCoverStyle.Normal -> R.layout.fragment_album_cover
-                            AlbumCoverStyle.Flat -> R.layout.fragment_album_flat_cover
-                            AlbumCoverStyle.Circle -> R.layout.fragment_album_circle_cover
-                            AlbumCoverStyle.Card -> R.layout.fragment_album_card_cover
-                            AlbumCoverStyle.Full -> R.layout.fragment_album_full_cover
-                            AlbumCoverStyle.FullCard -> R.layout.fragment_album_full_card_cover
-                        }
-                    }
-                }
-            }
-        }
-
-        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-            super.onViewCreated(view, savedInstanceState)
-            loadAlbumCover(albumCover = view.findViewById(R.id.player_image))
-        }
-
-        override fun onDestroyView() {
-            super.onDestroyView()
-            colorReceiver = null
-        }
-
-        private fun loadAlbumCover(albumCover: ImageView) {
-            Glide.with(this)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                //.checkIgnoreMediaStore()
-                .load(RetroGlideExtension.getSongModel(song))
-                .dontAnimate()
-                .into(object : RetroMusicColoredTarget(albumCover) {
-                    override fun onColorReady(colors: MediaNotificationProcessor) {
-                        setColor(colors)
-                    }
-                })
-        }
-
-        private fun setColor(color: MediaNotificationProcessor) {
-            this.color = color
-            isColorReady = true
-            if (colorReceiver != null) {
-                colorReceiver!!.onColorReady(color, request)
-                colorReceiver = null
-            }
-        }
-
-        internal fun receiveColor(colorReceiver: ColorReceiver, request: Int) {
-            if (isColorReady) {
-                colorReceiver.onColorReady(color, request)
-            } else {
-                this.colorReceiver = colorReceiver
-                this.request = request
-            }
-        }
-
-        interface ColorReceiver {
-            fun onColorReady(color: MediaNotificationProcessor, request: Int)
-        }
-
-        companion object {
-
-            private const val SONG_ARG = "song"
-
-            fun newInstance(song: Song): AlbumCoverFragment {
-                val frag = AlbumCoverFragment()
-                frag.arguments = bundleOf(SONG_ARG to song)
-                return frag
-            }
-        }
-    }
-
-    companion object {
-        val TAG: String = AlbumCoverPagerAdapter::class.java.simpleName
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
deleted file mode 100644
index 7a9f7fa6e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/album/HorizontalAlbumAdapter.kt
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.adapter.album
-
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
-import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-
-class HorizontalAlbumAdapter(
-    activity: FragmentActivity,
-    dataSet: List<Album>,
-    albumClickListener: IAlbumClickListener
-) : AlbumAdapter(
-    activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, albumClickListener
-) {
-
-    override fun createViewHolder(view: View, viewType: Int): ViewHolder {
-        val params = view.layoutParams as ViewGroup.MarginLayoutParams
-        HorizontalAdapterHelper.applyMarginToLayoutParams(activity, params, viewType)
-        return ViewHolder(view)
-    }
-
-    override fun setColors(color: MediaNotificationProcessor, holder: ViewHolder) {
-        // holder.title?.setTextColor(ATHUtil.resolveColor(activity, android.R.attr.textColorPrimary))
-        // holder.text?.setTextColor(ATHUtil.resolveColor(activity, android.R.attr.textColorSecondary))
-    }
-
-    override fun loadAlbumCover(album: Album, holder: ViewHolder) {
-        if (holder.image == null) return
-        Glide.with(activity)
-            .asBitmapPalette()
-            .albumCoverOptions(album.safeGetFirstSong())
-            .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
-            .into(object : RetroMusicColoredTarget(holder.image!!) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    setColors(colors, holder)
-                }
-            })
-    }
-
-    override fun getAlbumText(album: Album): String {
-        return MusicUtil.getYearString(album.year)
-    }
-
-    override fun getItemViewType(position: Int): Int {
-        return HorizontalAdapterHelper.getItemViewType(position, itemCount)
-    }
-
-    override fun getItemCount(): Int {
-        return dataSet.size
-    }
-
-    companion object {
-        val TAG: String = AlbumAdapter::class.java.simpleName
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
index e1ea2ca4c..fd4dcfa98 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/artist/ArtistAdapter.kt
@@ -1,186 +1,152 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.artist
 
-import android.annotation.SuppressLint
+import android.app.ActivityOptions
 import android.content.res.ColorStateList
-import android.content.res.Resources
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
+import android.graphics.drawable.Drawable
+import android.view.*
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.adapter.base.*
+import code.name.monkey.retromusic.glide.*
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.util.*
 import com.bumptech.glide.Glide
-import me.zhanghai.android.fastscroll.PopupTextProvider
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import java.util.*
 
 class ArtistAdapter(
-    override val activity: FragmentActivity,
-    var dataSet: List<Artist>,
-    var itemLayoutRes: Int,
-    val IArtistClickListener: IArtistClickListener,
-    val IAlbumArtistClickListener: IAlbumArtistClickListener? = null
-) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(activity, R.menu.menu_media_selection),
-    PopupTextProvider {
+		val activity: AppCompatActivity,
+		var dataSet: ArrayList<Artist>,
+		var itemLayoutRes: Int,
+		var usePalette: Boolean,
+		cabHolder: CabHolder?
+) : AbsMultiSelectAdapter<ArtistAdapter.ViewHolder, Artist>(
+		activity, cabHolder, R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
 
-    var albumArtistsOnly = false
+	fun swapDataSet(dataSet: ArrayList<Artist>) {
+		this.dataSet = dataSet
+		notifyDataSetChanged()
+	}
 
-    init {
-        this.setHasStableIds(true)
-    }
+	fun usePalette(usePalette: Boolean) {
+		this.usePalette = usePalette
+		notifyDataSetChanged()
+	}
 
-    @SuppressLint("NotifyDataSetChanged")
-    fun swapDataSet(dataSet: List<Artist>) {
-        this.dataSet = dataSet
-        notifyDataSetChanged()
-        albumArtistsOnly = PreferenceUtil.albumArtistsOnly
-    }
+	override fun getItemId(position: Int): Long {
+		return dataSet[position].id.toLong()
+	}
 
-    override fun getItemId(position: Int): Long {
-        return dataSet[position].id
-    }
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+		val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
+		return createViewHolder(view)
+	}
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view =
-            try {
-                LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
-            } catch (e: Resources.NotFoundException) {
-                LayoutInflater.from(activity).inflate(R.layout.item_grid_circle, parent, false)
-            }
-        return createViewHolder(view)
-    }
+	private fun createViewHolder(view: View): ViewHolder {
+		return ViewHolder(view)
+	}
 
-    private fun createViewHolder(view: View): ViewHolder {
-        return ViewHolder(view)
-    }
+	override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+		val artist = dataSet[position]
+		val isChecked = isChecked(artist)
+		holder.itemView.isActivated = isChecked
+		holder.title?.text = artist.name
+		holder.text?.visibility = View.GONE
+		loadArtistImage(artist, holder)
+	}
 
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val artist = dataSet[position]
-        val isChecked = isChecked(artist)
-        holder.itemView.isActivated = isChecked
-        holder.title?.text = artist.name
-        holder.text?.hide()
-        val transitionName =
-            if (albumArtistsOnly) artist.name else artist.id.toString()
-        if (holder.imageContainer != null) {
-            holder.imageContainer?.transitionName = transitionName
-        } else {
-            holder.image?.transitionName = transitionName
-        }
-        loadArtistImage(artist, holder)
-    }
+	fun setColors(color: Int, holder: ViewHolder) {
+		if (holder.paletteColorContainer != null) {
+			holder.paletteColorContainer?.setBackgroundColor(color)
+			holder.title?.setTextColor(
+					MaterialValueHelper.getPrimaryTextColor(
+							activity, ColorUtil.isColorLight(
+							color
+					)
+					)
+			)
+		}
 
-    private fun setColors(processor: MediaNotificationProcessor, holder: ViewHolder) {
-        holder.mask?.backgroundTintList = ColorStateList.valueOf(processor.primaryTextColor)
-        if (holder.paletteColorContainer != null) {
-            holder.paletteColorContainer?.setBackgroundColor(processor.backgroundColor)
-            holder.title?.setTextColor(processor.primaryTextColor)
-        }
-        holder.imageContainerCard?.setCardBackgroundColor(processor.backgroundColor)
-    }
+		holder.mask?.backgroundTintList = ColorStateList.valueOf(color)
+	}
 
-    private fun loadArtistImage(artist: Artist, holder: ViewHolder) {
-        if (holder.image == null) {
-            return
-        }
-        Glide.with(activity)
-            .asBitmapPalette()
-            .artistImageOptions(artist)
-            .load(RetroGlideExtension.getArtistModel(artist))
-            .transition(RetroGlideExtension.getDefaultTransition())
-            .into(object : RetroMusicColoredTarget(holder.image!!) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    setColors(colors, holder)
-                }
-            })
-    }
+	private fun loadArtistImage(artist: Artist, holder: ViewHolder) {
+		if (holder.image == null) {
+			return
+		}
+		ArtistGlideRequest.Builder.from(Glide.with(activity), artist).generatePalette(activity)
+			.build().into(object : RetroMusicColoredTarget(holder.image!!) {
+				override fun onLoadCleared(placeholder: Drawable?) {
+					super.onLoadCleared(placeholder)
+					setColors(defaultFooterColor, holder)
+				}
 
-    override fun getItemCount(): Int {
-        return dataSet.size
-    }
+				override fun onColorReady(color: Int) {
+					setColors(color, holder)
+				}
+			})
+	}
 
-    override fun getIdentifier(position: Int): Artist {
-        return dataSet[position]
-    }
+	override fun getItemCount(): Int {
+		return dataSet.size
+	}
 
-    override fun getName(model: Artist): String {
-        return model.name
-    }
+	override fun getIdentifier(position: Int): Artist? {
+		return dataSet[position]
+	}
 
-    override fun onMultipleItemAction(
-        menuItem: MenuItem,
-        selection: List<Artist>
-    ) {
-        SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
-    }
+	override fun getName(artist: Artist): String {
+		return artist.name
+	}
 
-    private fun getSongList(artists: List<Artist>): List<Song> {
-        val songs = ArrayList<Song>()
-        for (artist in artists) {
-            songs.addAll(artist.songs) // maybe async in future?
-        }
-        return songs
-    }
+	override fun onMultipleItemAction(
+			menuItem: MenuItem, selection: ArrayList<Artist>
+	) {
+		SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
+	}
 
-    override fun getPopupText(position: Int): String {
-        return getSectionName(position)
-    }
+	private fun getSongList(artists: List<Artist>): ArrayList<Song> {
+		val songs = ArrayList<Song>()
+		for (artist in artists) {
+			songs.addAll(artist.songs) // maybe async in future?
+		}
+		return songs
+	}
 
-    private fun getSectionName(position: Int): String {
-        return MusicUtil.getSectionName(dataSet[position].name)
-    }
+	override fun getSectionName(position: Int): String {
+		return MusicUtil.getSectionName(dataSet[position].name)
+	}
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+	inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
 
-        init {
-            menu?.isVisible = false
-        }
+		init {
+			setImageTransitionName(activity.getString(R.string.transition_artist_image))
+			menu?.visibility = View.GONE
+		}
 
-        override fun onClick(v: View?) {
-            super.onClick(v)
-            if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
-            } else {
-                val artist = dataSet[layoutPosition]
-                image?.let {
-                    if (albumArtistsOnly && IAlbumArtistClickListener != null) {
-                        IAlbumArtistClickListener.onAlbumArtist(artist.name, imageContainer ?: it)
-                    } else {
-                        IArtistClickListener.onArtist(artist.id, imageContainer ?: it)
-                    }
-                }
-            }
-        }
+		override fun onClick(v: View?) {
+			super.onClick(v)
+			if (isInQuickSelectMode) {
+				toggleChecked(adapterPosition)
+			} else {
+				val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
+						activity, image, activity.getString(
+						R.string.transition_artist_image
+				)
+				)
+				NavigationUtil.goToArtistOptions(
+						activity, dataSet[adapterPosition].id, activityOptions
+				)
+			}
+		}
 
-        override fun onLongClick(v: View?): Boolean {
-            return toggleChecked(layoutPosition)
-        }
-    }
+		override fun onLongClick(v: View?): Boolean {
+			toggleChecked(adapterPosition)
+			return super.onLongClick(v)
+		}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt
deleted file mode 100644
index adfcecf1b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/backup/BackupAdapter.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-package code.name.monkey.retromusic.adapter.backup
-
-import android.annotation.SuppressLint
-import android.view.LayoutInflater
-import android.view.MenuItem
-import android.view.ViewGroup
-import androidx.appcompat.widget.PopupMenu
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemListBackupBinding
-import java.io.File
-
-
-class BackupAdapter(
-    val activity: FragmentActivity,
-    var dataSet: MutableList<File>,
-    val backupClickedListener: BackupClickedListener
-) : RecyclerView.Adapter<BackupAdapter.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        return ViewHolder(
-            ItemListBackupBinding.inflate(LayoutInflater.from(activity), parent, false)
-        )
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.binding.title.text = dataSet[position].nameWithoutExtension
-    }
-
-    override fun getItemCount(): Int = dataSet.size
-
-    @SuppressLint("NotifyDataSetChanged")
-    fun swapDataset(dataSet: List<File>) {
-        this.dataSet = ArrayList(dataSet)
-        notifyDataSetChanged()
-    }
-
-    inner class ViewHolder(val binding: ItemListBackupBinding) :
-        RecyclerView.ViewHolder(binding.root) {
-
-        init {
-            binding.menu.setOnClickListener { view ->
-                val popupMenu = PopupMenu(activity, view)
-                popupMenu.inflate(R.menu.menu_backup)
-                popupMenu.setOnMenuItemClickListener { menuItem ->
-                    return@setOnMenuItemClickListener backupClickedListener.onBackupMenuClicked(
-                        dataSet[bindingAdapterPosition],
-                        menuItem
-                    )
-                }
-                popupMenu.show()
-            }
-            itemView.setOnClickListener {
-                backupClickedListener.onBackupClicked(dataSet[bindingAdapterPosition])
-            }
-        }
-    }
-
-    interface BackupClickedListener {
-        fun onBackupClicked(file: File)
-
-        fun onBackupMenuClicked(file: File, menuItem: MenuItem): Boolean
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
new file mode 100644
index 000000000..36bbe6bdf
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.java
@@ -0,0 +1,123 @@
+package code.name.monkey.retromusic.adapter.base;
+
+import android.content.Context;
+import android.view.Menu;
+import android.view.MenuItem;
+
+import androidx.annotation.MenuRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.afollestad.materialcab.MaterialCab;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.interfaces.CabHolder;
+
+
+public abstract class AbsMultiSelectAdapter<VH extends RecyclerView.ViewHolder, I> extends RecyclerView.Adapter<VH> implements MaterialCab.Callback {
+    @Nullable
+    private final CabHolder cabHolder;
+    private final Context context;
+    private MaterialCab cab;
+    private ArrayList<I> checked;
+    private int menuRes;
+
+    public AbsMultiSelectAdapter(@NonNull Context context, @Nullable CabHolder cabHolder, @MenuRes int menuRes) {
+        this.cabHolder = cabHolder;
+        checked = new ArrayList<>();
+        this.menuRes = menuRes;
+        this.context = context;
+    }
+
+    protected void setMultiSelectMenuRes(@MenuRes int menuRes) {
+        this.menuRes = menuRes;
+    }
+
+    protected boolean toggleChecked(final int position) {
+        if (cabHolder != null) {
+            I identifier = getIdentifier(position);
+            if (identifier == null) return false;
+
+            if (!checked.remove(identifier)) checked.add(identifier);
+
+            notifyItemChanged(position);
+            updateCab();
+            return true;
+        }
+        return false;
+    }
+
+    protected void checkAll() {
+        if (cabHolder != null) {
+            checked.clear();
+            for (int i = 0; i < getItemCount(); i++) {
+                I identifier = getIdentifier(i);
+                if (identifier != null) {
+                    checked.add(identifier);
+                }
+            }
+            notifyDataSetChanged();
+            updateCab();
+        }
+    }
+
+    private void updateCab() {
+        if (cabHolder != null) {
+            if (cab == null || !cab.isActive()) {
+                cab = cabHolder.openCab(menuRes, this);
+            }
+            final int size = checked.size();
+            if (size <= 0) cab.finish();
+            else if (size == 1) cab.setTitle(getName(checked.get(0)));
+            else cab.setTitle(context.getString(R.string.x_selected, size));
+        }
+    }
+
+    private void clearChecked() {
+        checked.clear();
+        notifyDataSetChanged();
+    }
+
+    protected boolean isChecked(I identifier) {
+        return checked.contains(identifier);
+    }
+
+    protected boolean isInQuickSelectMode() {
+        return cab != null && cab.isActive();
+    }
+
+    @Override
+    public boolean onCabCreated(MaterialCab materialCab, Menu menu) {
+        return true;
+    }
+
+    @Override
+    public boolean onCabItemClicked(MenuItem menuItem) {
+        if (menuItem.getItemId() == R.id.action_multi_select_adapter_check_all) {
+            checkAll();
+        } else {
+            onMultipleItemAction(menuItem, new ArrayList<>(checked));
+            cab.finish();
+            clearChecked();
+        }
+        return true;
+    }
+
+    @Override
+    public boolean onCabFinished(MaterialCab materialCab) {
+        clearChecked();
+        return true;
+    }
+
+    protected String getName(I object) {
+        return object.toString();
+    }
+
+    @Nullable
+    protected abstract I getIdentifier(int position);
+
+    protected abstract void onMultipleItemAction(MenuItem menuItem, ArrayList<I> selection);
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt
deleted file mode 100644
index bb7b8491c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/AbsMultiSelectAdapter.kt
+++ /dev/null
@@ -1,131 +0,0 @@
-package code.name.monkey.retromusic.adapter.base
-
-import android.graphics.Color
-import android.view.ActionMode
-import android.view.Menu
-import android.view.MenuItem
-import androidx.activity.OnBackPressedCallback
-import androidx.annotation.MenuRes
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.NumberRollViewBinding
-import code.name.monkey.retromusic.views.NumberRollView
-
-abstract class AbsMultiSelectAdapter<V : RecyclerView.ViewHolder?, I>(
-    open val activity: FragmentActivity, @MenuRes menuRes: Int,
-) : RecyclerView.Adapter<V>(), ActionMode.Callback {
-    var actionMode: ActionMode? = null
-    private val checked: MutableList<I>
-    private var menuRes: Int
-
-    override fun onCreateActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        val inflater = mode?.menuInflater
-        inflater?.inflate(menuRes, menu)
-        return true
-    }
-
-    override fun onPrepareActionMode(mode: ActionMode?, menu: Menu?): Boolean {
-        return false
-    }
-
-    override fun onActionItemClicked(mode: ActionMode?, item: MenuItem?): Boolean {
-        if (item?.itemId == R.id.action_multi_select_adapter_check_all) {
-            checkAll()
-        } else {
-            onMultipleItemAction(item!!, ArrayList(checked))
-            actionMode?.finish()
-            clearChecked()
-        }
-        return true
-    }
-
-    override fun onDestroyActionMode(mode: ActionMode?) {
-        clearChecked()
-        activity.window.statusBarColor = when {
-            VersionUtils.hasMarshmallow() -> Color.TRANSPARENT
-            else -> Color.BLACK
-        }
-        actionMode = null
-        onBackPressedCallback.remove()
-    }
-
-    private fun checkAll() {
-        if (actionMode != null) {
-            checked.clear()
-            for (i in 0 until itemCount) {
-                val identifier = getIdentifier(i)
-                if (identifier != null) {
-                    checked.add(identifier)
-                }
-            }
-            notifyDataSetChanged()
-            updateCab()
-        }
-    }
-
-    protected abstract fun getIdentifier(position: Int): I?
-
-    protected abstract fun getName(model: I): String?
-
-    protected fun isChecked(identifier: I): Boolean {
-        return checked.contains(identifier)
-    }
-
-    protected val isInQuickSelectMode: Boolean
-        get() = actionMode != null
-
-    protected abstract fun onMultipleItemAction(menuItem: MenuItem, selection: List<I>)
-    protected fun setMultiSelectMenuRes(@MenuRes menuRes: Int) {
-        this.menuRes = menuRes
-    }
-
-    protected fun toggleChecked(position: Int): Boolean {
-        val identifier = getIdentifier(position) ?: return false
-        if (!checked.remove(identifier)) {
-            checked.add(identifier)
-        }
-        notifyItemChanged(position)
-        updateCab()
-        return true
-    }
-
-    private fun clearChecked() {
-        checked.clear()
-        notifyDataSetChanged()
-    }
-
-    private fun updateCab() {
-        if (actionMode == null) {
-            actionMode = activity.startActionMode(this)?.apply {
-                customView = NumberRollViewBinding.inflate(activity.layoutInflater).root
-            }
-            activity.onBackPressedDispatcher.addCallback(onBackPressedCallback)
-        }
-        val size = checked.size
-        when {
-            size <= 0 -> {
-                actionMode?.finish()
-            }
-            else -> {
-                actionMode?.customView?.findViewById<NumberRollView>(R.id.selection_mode_number)
-                    ?.setNumber(size, true)
-            }
-        }
-    }
-
-    init {
-        checked = ArrayList()
-        this.menuRes = menuRes
-    }
-
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            if (actionMode != null) {
-                actionMode?.finish()
-                remove()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
index d68186c0f..f1652ea54 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/base/MediaEntryViewHolder.java
@@ -14,115 +14,113 @@
 
 package code.name.monkey.retromusic.adapter.base;
 
-import android.graphics.Color;
 import android.view.View;
-import android.widget.FrameLayout;
+import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.appcompat.widget.AppCompatImageView;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.card.MaterialCardView;
 import com.h6ah4i.android.widget.advrecyclerview.utils.AbstractDraggableSwipeableItemViewHolder;
 
+import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.retromusic.R;
 
-public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHolder
-        implements View.OnLongClickListener, View.OnClickListener {
-
+public class MediaEntryViewHolder extends AbstractDraggableSwipeableItemViewHolder implements View.OnLongClickListener, View.OnClickListener {
     @Nullable
-    public View dragView;
-
-    @Nullable
-    public View dummyContainer;
-
-    @Nullable
-    public ImageView image;
-
-    @Nullable
-    public MaterialCardView imageContainerCard;
-
-    @Nullable
-    public FrameLayout imageContainer;
-
-    @Nullable
-    public TextView imageText;
-
-    @Nullable
-    public MaterialCardView imageTextContainer;
-
-    @Nullable
-    public View mask;
-
-    @Nullable
-    public AppCompatImageView menu;
-
-    @Nullable
-    public View paletteColorContainer;
+    public TextView title;
 
     @Nullable
     public TextView text;
 
-    @Nullable
-    public TextView text2;
-
     @Nullable
     public TextView time;
 
     @Nullable
-    public TextView title;
+    public TextView imageText;
+
+    @Nullable
+    public ViewGroup imageContainer;
+
+    @Nullable
+    public MaterialCardView imageContainerCard;
+
+    @Nullable
+    public View menu;
+
+    @Nullable
+    public View dragView;
+
+    @Nullable
+    public View paletteColorContainer;
+
+    @Nullable
+    public RecyclerView recyclerView;
+
+    @Nullable
+    public ImageButton playSongs;
+
+    @Nullable
+    public View mask;
+
+    @Nullable
+    public MaterialCardView imageTextContainer;
+
+    @Nullable
+    public ImageView image;
+    @Nullable
+    public View dummyContainer;
 
     public MediaEntryViewHolder(@NonNull View itemView) {
         super(itemView);
         title = itemView.findViewById(R.id.title);
         text = itemView.findViewById(R.id.text);
-        text2 = itemView.findViewById(R.id.text2);
 
         image = itemView.findViewById(R.id.image);
         time = itemView.findViewById(R.id.time);
 
         imageText = itemView.findViewById(R.id.imageText);
+        imageContainer = itemView.findViewById(R.id.imageContainer);
         imageTextContainer = itemView.findViewById(R.id.imageTextContainer);
         imageContainerCard = itemView.findViewById(R.id.imageContainerCard);
-        imageContainer = itemView.findViewById(R.id.imageContainer);
 
         menu = itemView.findViewById(R.id.menu);
         dragView = itemView.findViewById(R.id.drag_view);
         paletteColorContainer = itemView.findViewById(R.id.paletteColorContainer);
+        recyclerView = itemView.findViewById(R.id.recycler_view);
         mask = itemView.findViewById(R.id.mask);
+        playSongs = itemView.findViewById(R.id.playSongs);
         dummyContainer = itemView.findViewById(R.id.dummy_view);
 
         if (imageContainerCard != null) {
-            imageContainerCard.setCardBackgroundColor(Color.TRANSPARENT);
+            imageContainerCard.setCardBackgroundColor(ATHUtil.INSTANCE.resolveColor(itemView.getContext(), R.attr.colorSurface));
         }
         itemView.setOnClickListener(this);
         itemView.setOnLongClickListener(this);
     }
 
-    @Nullable
     @Override
     public View getSwipeableContainerView() {
         return null;
     }
 
-    @Override
-    public void onClick(View v) {
-    }
-
     @Override
     public boolean onLongClick(View v) {
         return false;
     }
 
-    public void setImageTransitionName(@NonNull String transitionName) {
-        itemView.setTransitionName(transitionName);
-    /* if (imageContainerCard != null) {
-        imageContainerCard.setTransitionName(transitionName);
+    @Override
+    public void onClick(View v) {
+
     }
-    if (image != null) {
-        image.setTransitionName(transitionName);
-    }*/
+
+    public void setImageTransitionName(@NonNull String transitionName) {
+        if (image != null) {
+            image.setTransitionName(transitionName);
+        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt
deleted file mode 100644
index 19d681ecf..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/LegacyPlaylistAdapter.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.adapter.playlist
-
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.FragmentActivity
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.util.MusicUtil
-
-class LegacyPlaylistAdapter(
-    private val activity: FragmentActivity,
-    private var list: List<Playlist>,
-    private val layoutRes: Int,
-    private val playlistClickListener: PlaylistClickListener
-) :
-    RecyclerView.Adapter<LegacyPlaylistAdapter.ViewHolder>() {
-
-    fun swapData(list: List<Playlist>) {
-        this.list = list
-        notifyDataSetChanged()
-    }
-
-    class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView)
-
-    override fun onCreateViewHolder(
-        parent: ViewGroup,
-        viewType: Int
-    ): ViewHolder {
-        return ViewHolder(
-            LayoutInflater.from(parent.context).inflate(layoutRes, parent, false)
-        )
-    }
-
-    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        val playlist: Playlist = list[position]
-        holder.title?.text = playlist.name
-        holder.text?.text = MusicUtil.getPlaylistInfoString(activity, playlist.getSongs())
-        holder.itemView.setOnClickListener {
-            playlistClickListener.onPlaylistClick(playlist)
-        }
-    }
-
-    override fun getItemCount(): Int {
-        return list.size
-    }
-
-    interface PlaylistClickListener {
-        fun onPlaylistClick(playlist: Playlist)
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
index 6e5b0c001..f448f3d68 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/playlist/PlaylistAdapter.kt
@@ -1,70 +1,57 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.playlist
 
-import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.PopupMenu
-import androidx.core.view.isGone
-import androidx.core.view.setPadding
-import androidx.fragment.app.FragmentActivity
+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.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.dialogs.ClearSmartPlaylistDialog
+import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
 import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.IPlaylistClickListener
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.Glide
-import me.zhanghai.android.fastscroll.PopupTextProvider
+import code.name.monkey.retromusic.util.NavigationUtil
+import java.util.*
 
 class PlaylistAdapter(
-    override val activity: FragmentActivity,
-    var dataSet: List<PlaylistWithSongs>,
-    private var itemLayoutRes: Int,
-    private val listener: IPlaylistClickListener
-) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, PlaylistWithSongs>(
-    activity,
-    R.menu.menu_playlists_selection
-), PopupTextProvider {
+        private val activity: AppCompatActivity,
+        var dataSet: ArrayList<Playlist>,
+        private var itemLayoutRes: Int,
+        cabHolder: CabHolder?
+) : AbsMultiSelectAdapter<PlaylistAdapter.ViewHolder, Playlist>(
+        activity,
+        cabHolder,
+        R.menu.menu_playlists_selection
+) {
+
+    var songs = ArrayList<Song>()
 
     init {
         setHasStableIds(true)
     }
 
-    fun swapDataSet(dataSet: List<PlaylistWithSongs>) {
+    fun swapDataSet(dataSet: ArrayList<Playlist>) {
         this.dataSet = dataSet
         notifyDataSetChanged()
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].playlistEntity.playListId
+        return dataSet[position].id.toLong()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
@@ -72,115 +59,158 @@ class PlaylistAdapter(
         return createViewHolder(view)
     }
 
-    private fun createViewHolder(view: View): ViewHolder {
+    protected fun createViewHolder(view: View): ViewHolder {
         return ViewHolder(view)
     }
 
-    private fun getPlaylistTitle(playlist: PlaylistEntity): String {
-        return playlist.playlistName.ifEmpty { "-" }
+    protected fun getPlaylistTitle(playlist: Playlist): String {
+        return playlist.name
     }
 
-    private fun getPlaylistText(playlist: PlaylistWithSongs): String {
-        return MusicUtil.getPlaylistInfoString(activity, playlist.songs.toSongs())
-    }
-
-    override fun getPopupText(position: Int): String {
-        val sectionName: String = when (PreferenceUtil.playlistSortOrder) {
-            PlaylistSortOrder.PLAYLIST_A_Z, PlaylistSortOrder.PLAYLIST_Z_A -> dataSet[position].playlistEntity.playlistName
-            PlaylistSortOrder.PLAYLIST_SONG_COUNT, PlaylistSortOrder.PLAYLIST_SONG_COUNT_DESC -> dataSet[position].songs.size.toString()
-            else -> {
-                return ""
-            }
-        }
-        return MusicUtil.getSectionName(sectionName)
+    protected fun getPlaylistText(playlist: Playlist): String {
+        return MusicUtil.getPlaylistInfoString(activity, getSongs(playlist))
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         val playlist = dataSet[position]
         holder.itemView.isActivated = isChecked(playlist)
-        holder.title?.text = getPlaylistTitle(playlist.playlistEntity)
+        holder.title?.text = getPlaylistTitle(playlist)
         holder.text?.text = getPlaylistText(playlist)
-        holder.menu?.isGone = isChecked(playlist)
-        if (itemLayoutRes == R.layout.item_list) {
-            holder.image?.setPadding(activity.dipToPix(8F).toInt())
-            holder.image?.setImageDrawable(getIconRes())
-        } else {
-            Glide.with(activity)
-                .load(PlaylistPreview(playlist))
-                .playlistOptions()
-                .into(holder.image!!)
-        }
+        holder.image?.setImageDrawable(getIconRes(playlist))
     }
 
-    private fun getIconRes(): Drawable = TintHelper.createTintedDrawable(
-        activity,
-        R.drawable.ic_playlist_play,
-        ATHUtil.resolveColor(activity, android.R.attr.colorControlNormal)
-    )
+    private fun getIconRes(playlist: Playlist): Drawable {
+        return if (MusicUtil.isFavoritePlaylist(activity, playlist))
+            TintHelper.createTintedDrawable(activity, R.drawable.ic_favorite_white_24dp, ThemeStore.accentColor(activity))!!
+        else TintHelper.createTintedDrawable(activity, R.drawable.ic_playlist_play_white_24dp, ATHUtil.resolveColor(activity, R.attr.colorControlNormal))!!
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return if (dataSet[position] is AbsSmartPlaylist) SMART_PLAYLIST else DEFAULT_PLAYLIST
+    }
 
     override fun getItemCount(): Int {
         return dataSet.size
     }
 
-    override fun getIdentifier(position: Int): PlaylistWithSongs {
+    override fun getIdentifier(position: Int): Playlist? {
         return dataSet[position]
     }
 
-    override fun getName(model: PlaylistWithSongs): String {
-        return model.playlistEntity.playlistName
+    override fun getName(playlist: Playlist): String {
+        return playlist.name
     }
 
-    override fun onMultipleItemAction(menuItem: MenuItem, selection: List<PlaylistWithSongs>) {
+    override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Playlist>) {
         when (menuItem.itemId) {
+            R.id.action_delete_playlist -> {
+                var i = 0
+                while (i < selection.size) {
+                    val playlist = selection[i]
+                    if (playlist is AbsSmartPlaylist) {
+                        ClearSmartPlaylistDialog.create(playlist).show(
+                                activity.supportFragmentManager, "CLEAR_PLAYLIST_" + playlist.name
+                        )
+                        selection.remove(playlist)
+                        i--
+                    }
+                    i++
+                }
+                if (selection.size > 0) {
+                    DeletePlaylistDialog.create(selection)
+                            .show(activity.supportFragmentManager, "DELETE_PLAYLIST")
+                }
+            }
             else -> SongsMenuHelper.handleMenuClick(
-                activity,
-                getSongList(selection),
-                menuItem.itemId
+                    activity,
+                    getSongList(selection),
+                    menuItem.itemId
             )
         }
     }
 
-    private fun getSongList(playlists: List<PlaylistWithSongs>): List<Song> {
-        val songs = mutableListOf<Song>()
-        playlists.forEach {
-            songs.addAll(it.songs.toSongs())
+    private fun getSongList(playlists: List<Playlist>): ArrayList<Song> {
+        val songs = ArrayList<Song>()
+        for (playlist in playlists) {
+            if (playlist is AbsCustomPlaylist) {
+                songs.addAll(playlist.getSongs(activity))
+            } else {
+                songs.addAll(PlaylistSongsLoader.getPlaylistSongList(activity, playlist.id))
+            }
         }
         return songs
     }
 
-    inner class ViewHolder(itemView: View) : code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder(itemView) {
+    private fun getSongs(playlist: Playlist): ArrayList<Song> {
+        val songs = ArrayList<Song>()
+        if (playlist is AbsSmartPlaylist) {
+            songs.addAll(playlist.getSongs(activity))
+        } else {
+            songs.addAll(PlaylistSongsLoader.getPlaylistSongList(activity, playlist.id))
+        }
+        return songs
+    }
+
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
         init {
+
+            image?.apply {
+                val iconPadding = activity.resources.getDimensionPixelSize(R.dimen.list_item_image_icon_padding)
+                setPadding(iconPadding, iconPadding, iconPadding, iconPadding)
+                //setColorFilter(ATHUtil.resolveColor(activity, R.attr.iconColor), PorterDuff.Mode.SRC_IN)
+            }
+
             menu?.setOnClickListener { view ->
+                val playlist = dataSet[adapterPosition]
                 val popupMenu = PopupMenu(activity, view)
-                popupMenu.inflate(R.menu.menu_item_playlist)
+                popupMenu.inflate(
+                        if (itemViewType == SMART_PLAYLIST) R.menu.menu_item_smart_playlist
+                        else R.menu.menu_item_playlist
+                )
+                if (playlist is LastAddedPlaylist) {
+                    popupMenu.menu.findItem(R.id.action_clear_playlist).isVisible = false
+                }
                 popupMenu.setOnMenuItemClickListener { item ->
-                    PlaylistMenuHelper.handleMenuClick(activity, dataSet[layoutPosition], item)
+                    if (item.itemId == R.id.action_clear_playlist) {
+                        if (playlist is AbsSmartPlaylist) {
+                            ClearSmartPlaylistDialog.create(playlist).show(
+                                    activity.supportFragmentManager,
+                                    "CLEAR_SMART_PLAYLIST_" + playlist.name
+                            )
+                            return@setOnMenuItemClickListener true
+                        }
+                    }
+                    PlaylistMenuHelper.handleMenuClick(
+                            activity, dataSet[adapterPosition], item
+                    )
                 }
                 popupMenu.show()
             }
 
             imageTextContainer?.apply {
                 cardElevation = 0f
-                setCardBackgroundColor(Color.TRANSPARENT)
+                setCardBackgroundColor(ATHUtil.resolveColor(activity, R.attr.colorSurface))
             }
         }
 
         override fun onClick(v: View?) {
             if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
+                toggleChecked(adapterPosition)
             } else {
-                itemView.transitionName = "playlist"
-                listener.onPlaylistClick(dataSet[layoutPosition], itemView)
+                val playlist = dataSet[adapterPosition]
+                NavigationUtil.goToPlaylistNew(activity, playlist)
             }
         }
 
         override fun onLongClick(v: View?): Boolean {
-            toggleChecked(layoutPosition)
+            toggleChecked(adapterPosition)
             return true
         }
     }
 
     companion object {
         val TAG: String = PlaylistAdapter::class.java.simpleName
+        private const val SMART_PLAYLIST = 0
+        private const val DEFAULT_PLAYLIST = 1
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
index 2d5fd724f..9cf2aaf12 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/AbsOffsetSongAdapter.kt
@@ -1,91 +1,95 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
+import android.view.*
 import androidx.annotation.LayoutRes
-import androidx.fragment.app.FragmentActivity
+import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
+import java.util.*
 
-abstract class AbsOffsetSongAdapter(
-    activity: FragmentActivity,
-    dataSet: MutableList<Song>,
-    @LayoutRes itemLayoutRes: Int
-) : SongAdapter(activity, dataSet, itemLayoutRes) {
+abstract class AbsOffsetSongAdapter : SongAdapter {
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
-        if (viewType == OFFSET_ITEM) {
-            val view = LayoutInflater.from(activity)
-                .inflate(R.layout.item_list_quick_actions, parent, false)
-            return createViewHolder(view)
-        }
-        return super.onCreateViewHolder(parent, viewType)
-    }
+	constructor(
+			activity: AppCompatActivity,
+			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
+			usePalette: Boolean,
+			cabHolder: CabHolder?
+	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder)
 
-    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-        return ViewHolder(view)
-    }
+	constructor(
+			activity: AppCompatActivity,
+			dataSet: ArrayList<Song>, @LayoutRes itemLayoutRes: Int,
+			usePalette: Boolean,
+			cabHolder: CabHolder?,
+			showSectionName: Boolean
+	) : super(activity, dataSet, itemLayoutRes, usePalette, cabHolder, showSectionName) {
+	}
 
-    override fun getItemId(position: Int): Long {
-        var positionFinal = position
-        positionFinal--
-        return if (positionFinal < 0) -2 else super.getItemId(positionFinal)
-    }
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): SongAdapter.ViewHolder {
+		if (viewType == OFFSET_ITEM) {
+			val view = LayoutInflater.from(activity)
+				.inflate(R.layout.item_list_quick_actions, parent, false)
+			return createViewHolder(view)
+		}
+		return super.onCreateViewHolder(parent, viewType)
+	}
 
-    override fun getIdentifier(position: Int): Song? {
-        var positionFinal = position
-        positionFinal--
-        return if (positionFinal < 0) null else super.getIdentifier(positionFinal)
-    }
+	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+		return ViewHolder(view)
+	}
 
-    override fun getItemCount(): Int {
-        val superItemCount = super.getItemCount()
-        return if (superItemCount == 0) 0 else superItemCount + 1
-    }
+	override fun getItemId(position: Int): Long {
+		var positionFinal = position
+		positionFinal--
+		return if (positionFinal < 0) -2 else super.getItemId(positionFinal)
+	}
 
-    override fun getItemViewType(position: Int): Int {
-        return if (position == 0) OFFSET_ITEM else SONG
-    }
+	override fun getIdentifier(position: Int): Song? {
+		var positionFinal = position
+		positionFinal--
+		return if (positionFinal < 0) null else super.getIdentifier(positionFinal)
+	}
 
-    open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
+	override fun getItemCount(): Int {
+		val superItemCount = super.getItemCount()
+		return if (superItemCount == 0) 0 else superItemCount + 1
+	}
 
-        override // could also return null, just to be safe return empty song
-        val song: Song
-            get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[layoutPosition - 1]
+	override fun getItemViewType(position: Int): Int {
+		return if (position == 0) OFFSET_ITEM else SONG
+	}
 
-        override fun onClick(v: View?) {
-            if (isInQuickSelectMode && itemViewType != OFFSET_ITEM) {
-                toggleChecked(layoutPosition)
-            } else {
-                MusicPlayerRemote.openQueue(dataSet, layoutPosition - 1, true)
-            }
-        }
+	override fun getSectionName(position: Int): String {
+		var positionF = position
+		positionF--
+		return if (positionF < 0) "" else super.getSectionName(positionF)
+	}
 
-        override fun onLongClick(v: View?): Boolean {
-            if (itemViewType == OFFSET_ITEM) return false
-            toggleChecked(layoutPosition)
-            return true
-        }
-    }
+	open inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
 
-    companion object {
-        const val OFFSET_ITEM = 0
-        const val SONG = 1
-    }
-}
+		override // could also return null, just to be safe return empty song
+		val song: Song
+			get() = if (itemViewType == OFFSET_ITEM) Song.emptySong else dataSet[adapterPosition - 1]
+
+		override fun onClick(v: View?) {
+			if (isInQuickSelectMode && itemViewType != OFFSET_ITEM) {
+				toggleChecked(adapterPosition)
+			} else {
+				MusicPlayerRemote.openQueue(dataSet, adapterPosition - 1, true)
+			}
+		}
+
+		override fun onLongClick(v: View?): Boolean {
+			if (itemViewType == OFFSET_ITEM) return false
+			toggleChecked(adapterPosition)
+			return true
+		}
+	}
+
+	companion object {
+		const val OFFSET_ITEM = 0
+		const val SONG = 1
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
index bf85fe28b..5095a4408 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/OrderablePlaylistSongAdapter.kt
@@ -1,134 +1,134 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
-import android.view.MenuItem
-import android.view.View
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
+import android.view.*
+import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.db.toSongsEntity
-import code.name.monkey.retromusic.dialogs.RemoveSongFromPlaylistDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.dialogs.RemoveFromPlaylistDialog
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.*
 import code.name.monkey.retromusic.util.ViewUtil
-import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
-import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.koin.androidx.viewmodel.ext.android.viewModel
+import com.h6ah4i.android.widget.advrecyclerview.draggable.*
+import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
 
 class OrderablePlaylistSongAdapter(
-    private val playlistId: Long,
-    activity: FragmentActivity,
-    dataSet: MutableList<Song>,
-    itemLayoutRes: Int,
-) : SongAdapter(activity, dataSet, itemLayoutRes),
-    DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
+		activity: AppCompatActivity,
+		dataSet: ArrayList<Song>,
+		itemLayoutRes: Int,
+		usePalette: Boolean,
+		cabHolder: CabHolder?,
+		private val onMoveItemListener: OnMoveItemListener?
+) : PlaylistSongAdapter(
+		activity, dataSet, itemLayoutRes, usePalette, cabHolder
+), DraggableItemAdapter<OrderablePlaylistSongAdapter.ViewHolder> {
 
-    val libraryViewModel: LibraryViewModel by activity.viewModel()
+	init {
+		setMultiSelectMenuRes(code.name.monkey.retromusic.R.menu.menu_playlists_songs_selection)
+	}
 
-    init {
-        this.setHasStableIds(true)
-        this.setMultiSelectMenuRes(R.menu.menu_playlists_songs_selection)
-    }
+	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+		return ViewHolder(view)
+	}
 
-    override fun getItemId(position: Int): Long {
-        // requires static value, it means need to keep the same value
-        // even if the item position has been changed.
-        return dataSet[position].id
-    }
+	override fun getItemId(position: Int): Long {
+		var positionFinal = position
+		positionFinal--
 
-    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-        return ViewHolder(view)
-    }
+		var long: Long = 0
+		if (positionFinal < 0) {
+			long = -2
+		} else {
+			if (dataSet[positionFinal] is PlaylistSong) {
+				long = (dataSet[positionFinal] as PlaylistSong).idInPlayList.toLong()
+			}
+		}
+		return long
+	}
 
-    override fun onMultipleItemAction(menuItem: MenuItem, selection: List<Song>) {
-        when (menuItem.itemId) {
-            R.id.action_remove_from_playlist -> RemoveSongFromPlaylistDialog.create(
-                selection.toSongsEntity(
-                    playlistId
-                )
-            )
-                .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
+	override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Song>) {
+		when (menuItem.itemId) {
+			R.id.action_remove_from_playlist -> {
+				RemoveFromPlaylistDialog.create(selection as ArrayList<PlaylistSong>)
+					.show(activity.supportFragmentManager, "ADD_PLAYLIST")
+				return
+			}
+		}
+		super.onMultipleItemAction(menuItem, selection)
+	}
 
-            else -> super.onMultipleItemAction(menuItem, selection)
-        }
-    }
+	override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
+		return onMoveItemListener != null && position > 0 && (ViewUtil.hitTest(
+				holder.dragView!!, x, y
+		) || ViewUtil.hitTest(holder.image!!, x, y))
+	}
 
-    inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
+	override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange {
+		return ItemDraggableRange(1, dataSet.size)
+	}
 
-        override var songMenuRes: Int
-            get() = R.menu.menu_item_playlist_song
-            set(value) {
-                super.songMenuRes = value
-            }
+	override fun onMoveItem(fromPosition: Int, toPosition: Int) {
+		if (onMoveItemListener != null && fromPosition != toPosition) {
+			onMoveItemListener.onMoveItem(fromPosition - 1, toPosition - 1)
+		}
+	}
 
-        override fun onSongMenuItemClick(item: MenuItem): Boolean {
-            when (item.itemId) {
-                R.id.action_remove_from_playlist -> {
-                    RemoveSongFromPlaylistDialog.create(song.toSongEntity(playlistId))
-                        .show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
-                    return true
-                }
-            }
-            return super.onSongMenuItemClick(item)
-        }
+	override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
+		return dropPosition > 0
+	}
 
-        init {
-            dragView?.isVisible = true
-        }
-    }
+	override fun onItemDragStarted(position: Int) {
+		notifyDataSetChanged()
+	}
 
-    override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        if (isInQuickSelectMode) {
-            return false
-        }
-        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(
-            holder.dragView!!,
-            x,
-            y
-        )
-    }
+	override fun onItemDragFinished(fromPosition: Int, toPosition: Int, result: Boolean) {
+		notifyDataSetChanged()
+	}
 
-    override fun onMoveItem(fromPosition: Int, toPosition: Int) {
-        dataSet.add(toPosition, dataSet.removeAt(fromPosition))
-    }
+	interface OnMoveItemListener {
+		fun onMoveItem(fromPosition: Int, toPosition: Int)
+	}
 
-    override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange? {
-        return null
-    }
+	inner class ViewHolder(itemView: View) : PlaylistSongAdapter.ViewHolder(itemView), DraggableItemViewHolder {
+		@DraggableItemStateFlags
+		private var mDragStateFlags: Int = 0
 
-    override fun onCheckCanDrop(draggingPosition: Int, dropPosition: Int): Boolean {
-        return true
-    }
+		override var songMenuRes: Int
+			get() = code.name.monkey.retromusic.R.menu.menu_item_playlist_song
+			set(value) {
+				super.songMenuRes = value
+			}
 
-    override fun onItemDragStarted(position: Int) {
-        notifyDataSetChanged()
-    }
+		init {
+			if (dragView != null) {
+				if (onMoveItemListener != null) {
+					dragView?.visibility = View.VISIBLE
+				} else {
+					dragView?.visibility = View.GONE
+				}
+			}
+		}
 
-    override fun onItemDragFinished(fromPosition: Int, toPosition: Int, result: Boolean) {
-        notifyDataSetChanged()
-    }
+		override fun onSongMenuItemClick(item: MenuItem): Boolean {
+			when (item.itemId) {
+				code.name.monkey.retromusic.R.id.action_remove_from_playlist -> {
+					RemoveFromPlaylistDialog.create(song as PlaylistSong)
+						.show(activity.supportFragmentManager, "REMOVE_FROM_PLAYLIST")
+					return true
+				}
+			}
+			return super.onSongMenuItemClick(item)
+		}
 
-    fun saveSongs(playlistEntity: PlaylistEntity) {
-        activity.lifecycleScope.launch(Dispatchers.IO) {
-            libraryViewModel.insertSongs(dataSet.toSongsEntity(playlistEntity))
-        }
-    }
+		@DraggableItemStateFlags
+		override fun getDragStateFlags(): Int {
+			return mDragStateFlags
+		}
+
+		override fun setDragStateFlags(@DraggableItemStateFlags flags: Int) {
+			mDragStateFlags = flags
+		}
+	}
+
+	companion object {
+		val TAG: String = OrderablePlaylistSongAdapter::class.java.simpleName
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
index 2d387be44..1fa489f30 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt
@@ -1,26 +1,12 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.view.MenuItem
 import android.view.View
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.isPlaying
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.playNextSong
@@ -28,7 +14,6 @@ import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import com.bumptech.glide.Glide
 import com.h6ah4i.android.widget.advrecyclerview.draggable.DraggableItemAdapter
 import com.h6ah4i.android.widget.advrecyclerview.draggable.ItemDraggableRange
 import com.h6ah4i.android.widget.advrecyclerview.draggable.annotation.DraggableItemStateFlags
@@ -37,18 +22,20 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.SwipeableItemConstant
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultAction
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionDefault
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionRemoveItem
-import me.zhanghai.android.fastscroll.PopupTextProvider
+import com.h6ah4i.android.widget.advrecyclerview.swipeable.annotation.SwipeableItemResults
+import java.util.*
+
 
 class PlayingQueueAdapter(
-    activity: FragmentActivity,
-    dataSet: MutableList<Song>,
-    private var current: Int,
-    itemLayoutRes: Int,
-) : SongAdapter(activity, dataSet, itemLayoutRes),
-    DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>,
-    SwipeableItemAdapter<PlayingQueueAdapter.ViewHolder>,
-    PopupTextProvider {
+        activity: AppCompatActivity,
+        dataSet: ArrayList<Song>,
+        private var current: Int,
+        itemLayoutRes: Int
+) : SongAdapter(
+        activity, dataSet, itemLayoutRes, false, null
+), DraggableItemAdapter<PlayingQueueAdapter.ViewHolder>, SwipeableItemAdapter<PlayingQueueAdapter.ViewHolder> {
 
+    private var color = -1
     private var songToRemove: Song? = null
 
     override fun createViewHolder(view: View): SongAdapter.ViewHolder {
@@ -57,11 +44,37 @@ class PlayingQueueAdapter(
 
     override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
         super.onBindViewHolder(holder, position)
-        val song = dataSet[position]
-        holder.time?.text = MusicUtil.getReadableDurationString(song.duration)
+        holder.imageText?.text = (position - current).toString()
+        holder.time?.text = MusicUtil.getReadableDurationString(dataSet[position].duration)
         if (holder.itemViewType == HISTORY || holder.itemViewType == CURRENT) {
             setAlpha(holder, 0.5f)
         }
+        if (usePalette) {
+            setColor(holder, Color.WHITE)
+        }
+    }
+
+    private fun setColor(holder: SongAdapter.ViewHolder, white: Int) {
+
+        if (holder.title != null) {
+            holder.title!!.setTextColor(white)
+            if (color != -1) {
+                holder.title!!.setTextColor(color)
+            }
+        }
+
+        holder.text?.setTextColor(white)
+        holder.time?.setTextColor(white)
+        holder.imageText?.setTextColor(white)
+        if (holder.menu != null) {
+            (holder.menu as ImageView).setColorFilter(white, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    override fun usePalette(usePalette: Boolean) {
+        super.usePalette(usePalette)
+        this.usePalette = usePalette
+        notifyDataSetChanged()
     }
 
     override fun getItemViewType(position: Int): Int {
@@ -74,17 +87,11 @@ class PlayingQueueAdapter(
     }
 
     override fun loadAlbumCover(song: Song, holder: SongAdapter.ViewHolder) {
-        if (holder.image == null) {
-            return
-        }
-        Glide.with(activity)
-            .load(RetroGlideExtension.getSongModel(song))
-            .songCoverOptions(song)
-            .into(holder.image!!)
+        // We don't want to load it in this adapter
     }
 
-    fun swapDataSet(dataSet: List<Song>, position: Int) {
-        this.dataSet = dataSet.toMutableList()
+    fun swapDataSet(dataSet: ArrayList<Song>, position: Int) {
+        this.dataSet = dataSet
         current = position
         notifyDataSetChanged()
     }
@@ -98,21 +105,14 @@ class PlayingQueueAdapter(
         holder.image?.alpha = alpha
         holder.title?.alpha = alpha
         holder.text?.alpha = alpha
+        holder.imageText?.alpha = alpha
         holder.paletteColorContainer?.alpha = alpha
         holder.dragView?.alpha = alpha
         holder.menu?.alpha = alpha
     }
 
-    override fun getPopupText(position: Int): String {
-        return MusicUtil.getSectionName(dataSet[position].title)
-    }
-
     override fun onCheckCanStartDrag(holder: ViewHolder, position: Int, x: Int, y: Int): Boolean {
-        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(
-            holder.dragView!!,
-            x,
-            y
-        )
+        return ViewUtil.hitTest(holder.imageText!!, x, y) || ViewUtil.hitTest(holder.dragView!!, x, y)
     }
 
     override fun onGetItemDraggableRange(holder: ViewHolder, position: Int): ItemDraggableRange? {
@@ -140,6 +140,7 @@ class PlayingQueueAdapter(
     }
 
     inner class ViewHolder(itemView: View) : SongAdapter.ViewHolder(itemView) {
+
         @DraggableItemStateFlags
         private var mDragStateFlags: Int = 0
 
@@ -150,21 +151,14 @@ class PlayingQueueAdapter(
             }
 
         init {
-            dragView?.isVisible = true
-        }
-
-        override fun onClick(v: View?) {
-            if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
-            } else {
-                MusicPlayerRemote.playSongAt(layoutPosition)
-            }
+            imageText?.visibility = View.VISIBLE
+            dragView?.visibility = View.VISIBLE
         }
 
         override fun onSongMenuItemClick(item: MenuItem): Boolean {
             when (item.itemId) {
                 R.id.action_remove_from_playing_queue -> {
-                    removeFromQueue(layoutPosition)
+                    MusicPlayerRemote.removeFromQueue(adapterPosition)
                     return true
                 }
             }
@@ -180,8 +174,8 @@ class PlayingQueueAdapter(
             mDragStateFlags = flags
         }
 
-        override fun getSwipeableContainerView(): View {
-            return dummyContainer!!
+        override fun getSwipeableContainerView(): View? {
+            return dummyContainer
         }
     }
 
@@ -192,48 +186,50 @@ class PlayingQueueAdapter(
         private const val UP_NEXT = 2
     }
 
-    override fun onSwipeItem(holder: ViewHolder, position: Int, result: Int): SwipeResultAction {
-        return if (result == SwipeableItemConstants.RESULT_CANCELED) {
+    override fun onSwipeItem(holder: ViewHolder?, position: Int, @SwipeableItemResults result: Int): SwipeResultAction {
+        return if (result === SwipeableItemConstants.RESULT_CANCELED) {
             SwipeResultActionDefault()
         } else {
-            SwipedResultActionRemoveItem(this, position)
+            SwipedResultActionRemoveItem(this, position, activity)
         }
     }
 
-    override fun onGetSwipeReactionType(holder: ViewHolder, position: Int, x: Int, y: Int): Int {
-        return if (onCheckCanStartDrag(holder, position, x, y)) {
-            SwipeableItemConstants.REACTION_CAN_NOT_SWIPE_BOTH_H
+    override fun onGetSwipeReactionType(holder: ViewHolder?, position: Int, x: Int, y: Int): Int {
+        return if (onCheckCanStartDrag(holder!!, position, x, y)) {
+            SwipeableItemConstants.REACTION_CAN_NOT_SWIPE_BOTH_H;
         } else {
-            SwipeableItemConstants.REACTION_CAN_SWIPE_BOTH_H
+            SwipeableItemConstants.REACTION_CAN_SWIPE_BOTH_H;
         }
     }
 
-    override fun onSwipeItemStarted(holder: ViewHolder, p1: Int) {
+    override fun onSwipeItemStarted(p0: ViewHolder?, p1: Int) {
     }
 
-    override fun onSetSwipeBackground(holder: ViewHolder, position: Int, result: Int) {
+    override fun onSetSwipeBackground(holder: ViewHolder?, position: Int, result: Int) {
+
     }
 
-    internal class SwipedResultActionRemoveItem(
-        private val adapter: PlayingQueueAdapter,
-        private val position: Int,
-    ) : SwipeResultActionRemoveItem() {
-
+    internal class SwipedResultActionRemoveItem(private val adapter: PlayingQueueAdapter,
+                                                private val position: Int,
+                                                private val activity: AppCompatActivity) : SwipeResultActionRemoveItem() {
         private var songToRemove: Song? = null
+        private val isPlaying: Boolean = MusicPlayerRemote.isPlaying
+        private val songProgressMillis = 0
         override fun onPerformAction() {
-            // currentlyShownSnackbar = null
+            //currentlyShownSnackbar = null
         }
 
         override fun onSlideAnimationEnd() {
-            // initializeSnackBar(adapter, position, activity, isPlaying)
+            //initializeSnackBar(adapter, position, activity, isPlaying)
             songToRemove = adapter.dataSet[position]
-            // If song removed was the playing song, then play the next song
+            //If song removed was the playing song, then play the next song
             if (isPlaying(songToRemove!!)) {
                 playNextSong()
             }
-            // Swipe animation is much smoother when we do the heavy lifting after it's completed
+            //Swipe animation is much smoother when we do the heavy lifting after it's completed
             adapter.setSongToRemove(songToRemove!!)
             removeFromQueue(songToRemove!!)
         }
+
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
new file mode 100644
index 000000000..a128e17b6
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlaylistSongAdapter.kt
@@ -0,0 +1,79 @@
+package code.name.monkey.retromusic.adapter.song
+
+import android.app.ActivityOptions
+import android.view.MenuItem
+import android.view.View
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.NavigationUtil
+import com.google.android.material.button.MaterialButton
+import java.util.*
+
+open class PlaylistSongAdapter(
+        activity: AppCompatActivity,
+        dataSet: ArrayList<Song>,
+        itemLayoutRes: Int,
+        usePalette: Boolean,
+        cabHolder: CabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder, false) {
+
+    init {
+        this.setMultiSelectMenuRes(R.menu.menu_cannot_delete_single_songs_playlist_songs_selection)
+    }
+
+    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+        return ViewHolder(view)
+    }
+
+    override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
+        if (holder.itemViewType == OFFSET_ITEM) {
+            val viewHolder = holder as ViewHolder
+            viewHolder.playAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openQueue(dataSet, 0, true)
+                }
+            }
+            viewHolder.shuffleAction?.let {
+                it.setOnClickListener {
+                    MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+                }
+            }
+        } else {
+            super.onBindViewHolder(holder, position - 1)
+        }
+    }
+
+    open inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
+
+        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
+        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
+
+        override var songMenuRes: Int
+            get() = R.menu.menu_item_cannot_delete_single_songs_playlist_song
+            set(value) {
+                super.songMenuRes = value
+            }
+
+        override fun onSongMenuItemClick(item: MenuItem): Boolean {
+            if (item.itemId == R.id.action_go_to_album) {
+                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
+                        activity, image, activity.getString(
+                        R.string.transition_album_art
+                )
+                )
+                NavigationUtil.goToAlbumOptions(
+                        activity, dataSet[adapterPosition - 1].albumId, activityOptions
+                )
+                return true
+            }
+            return super.onSongMenuItemClick(item)
+        }
+    }
+
+    companion object {
+        val TAG: String = PlaylistSongAdapter::class.java.simpleName
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
index 82ba1a7f7..a0e63ae71 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/ShuffleButtonSongAdapter.kt
@@ -1,81 +1,54 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
 import android.view.View
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
+import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
 import com.google.android.material.button.MaterialButton
+import java.util.*
 
 class ShuffleButtonSongAdapter(
-    activity: FragmentActivity,
-    dataSet: MutableList<Song>,
-    itemLayoutRes: Int
-) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes) {
+		activity: AppCompatActivity,
+		dataSet: ArrayList<Song>,
+		itemLayoutRes: Int,
+		usePalette: Boolean,
+		cabHolder: CabHolder?
+) : AbsOffsetSongAdapter(activity, dataSet, itemLayoutRes, usePalette, cabHolder) {
 
+	override fun createViewHolder(view: View): SongAdapter.ViewHolder {
+		return ViewHolder(view)
+	}
 
-    override fun createViewHolder(view: View): SongAdapter.ViewHolder {
-        return ViewHolder(view)
-    }
+	override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
+		if (holder.itemViewType == OFFSET_ITEM) {
+			val viewHolder = holder as ViewHolder
+			viewHolder.playAction?.let {
+				it.setOnClickListener {
+					MusicPlayerRemote.openQueue(dataSet, 0, true)
+				}
+			}
+			viewHolder.shuffleAction?.let {
+				it.setOnClickListener {
+					MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+				}
+			}
+		} else {
+			super.onBindViewHolder(holder, position - 1)
+		}
+	}
 
-    override fun getItemViewType(position: Int): Int {
-        return if (position == 0) OFFSET_ITEM else SONG
-    }
+	inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
+		val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
+		val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
 
-    override fun onBindViewHolder(holder: SongAdapter.ViewHolder, position: Int) {
-        if (holder.itemViewType == OFFSET_ITEM) {
-            val viewHolder = holder as ViewHolder
-            viewHolder.playAction?.let {
-                it.setOnClickListener {
-                    MusicPlayerRemote.openQueue(dataSet, 0, true)
-                }
-                it.accentOutlineColor()
-            }
-            viewHolder.shuffleAction?.let {
-                it.setOnClickListener {
-                    MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
-                }
-                it.accentColor()
-            }
-        } else {
-            super.onBindViewHolder(holder, position - 1)
-            val landscape = RetroUtil.isLandscape
-            if ((PreferenceUtil.songGridSize > 2 && !landscape) || (PreferenceUtil.songGridSizeLand > 5 && landscape)) {
-                holder.menu?.isVisible = false
-            }
-        }
-    }
-
-    inner class ViewHolder(itemView: View) : AbsOffsetSongAdapter.ViewHolder(itemView) {
-        val playAction: MaterialButton? = itemView.findViewById(R.id.playAction)
-        val shuffleAction: MaterialButton? = itemView.findViewById(R.id.shuffleAction)
-
-        override fun onClick(v: View?) {
-            if (itemViewType == OFFSET_ITEM) {
-                MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
-                return
-            }
-            super.onClick(v)
-        }
-    }
-
-}
+		override fun onClick(v: View?) {
+			if (itemViewType == OFFSET_ITEM) {
+				MusicPlayerRemote.openAndShuffleQueue(dataSet, true)
+				return
+			}
+			super.onClick(v)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
index f1f50e627..c2d40a274 100755
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SimpleSongAdapter.kt
@@ -1,33 +1,23 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
-import androidx.fragment.app.FragmentActivity
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import java.util.*
 
 class SimpleSongAdapter(
-    context: FragmentActivity,
-    songs: ArrayList<Song>,
-    layoutRes: Int
-) : SongAdapter(context, songs, layoutRes) {
+        context: AppCompatActivity,
+        songs: ArrayList<Song>,
+        i: Int,
+        cabHolder: CabHolder?
+) : SongAdapter(context, songs, i, false, cabHolder) {
 
-    override fun swapDataSet(dataSet: List<Song>) {
-        this.dataSet = dataSet.toMutableList()
+    override fun swapDataSet(dataSet: ArrayList<Song>) {
+        this.dataSet.clear()
+        this.dataSet = dataSet
         notifyDataSetChanged()
     }
 
@@ -38,11 +28,9 @@ class SimpleSongAdapter(
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
         super.onBindViewHolder(holder, position)
         val fixedTrackNumber = MusicUtil.getFixedTrackNumber(dataSet[position].trackNumber)
-        val trackAndTime = (if (fixedTrackNumber > 0) "$fixedTrackNumber | " else "") +
-                MusicUtil.getReadableDurationString(dataSet[position].duration)
 
-        holder.time?.text = trackAndTime
-        holder.text2?.text = dataSet[position].artistName
+        holder.imageText?.text = if (fixedTrackNumber > 0) fixedTrackNumber.toString() else "-"
+        holder.time?.text = MusicUtil.getReadableDurationString(dataSet[position].duration)
     }
 
     override fun getItemCount(): Int {
diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
index 7b7b7bf99..14912aa24 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/SongAdapter.kt
@@ -1,87 +1,75 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.adapter.song
 
-import android.content.res.ColorStateList
-import android.content.res.Resources
+import android.app.ActivityOptions
+import android.graphics.drawable.Drawable
 import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.os.bundleOf
-import androidx.core.view.isGone
-import androidx.core.view.isVisible
-import androidx.fragment.app.FragmentActivity
-import androidx.navigation.findNavController
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
+import androidx.appcompat.app.AppCompatActivity
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
 import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.helper.menu.SongMenuHelper
 import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
+import code.name.monkey.retromusic.interfaces.CabHolder
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+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.util.color.MediaNotificationProcessor
+import com.afollestad.materialcab.MaterialCab
 import com.bumptech.glide.Glide
-import me.zhanghai.android.fastscroll.PopupTextProvider
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import java.util.*
 
 /**
  * Created by hemanths on 13/08/17.
  */
 
 open class SongAdapter(
-    override val activity: FragmentActivity,
-    var dataSet: MutableList<Song>,
-    protected var itemLayoutRes: Int,
-    showSectionName: Boolean = true
+        protected val activity: AppCompatActivity,
+        dataSet: ArrayList<Song>,
+        protected var itemLayoutRes: Int,
+        usePalette: Boolean,
+        cabHolder: CabHolder?,
+        showSectionName: Boolean = true
 ) : AbsMultiSelectAdapter<SongAdapter.ViewHolder, Song>(
-    activity,
-    R.menu.menu_media_selection
-), PopupTextProvider {
+        activity, cabHolder, R.menu.menu_media_selection
+), MaterialCab.Callback, FastScrollRecyclerView.SectionedAdapter {
+    var dataSet: ArrayList<Song>
 
+    protected var usePalette = false
     private var showSectionName = true
 
     init {
+        this.dataSet = dataSet
+        this.usePalette = usePalette
         this.showSectionName = showSectionName
         this.setHasStableIds(true)
     }
 
-    open fun swapDataSet(dataSet: List<Song>) {
-        this.dataSet = ArrayList(dataSet)
+    open fun swapDataSet(dataSet: ArrayList<Song>) {
+        this.dataSet = dataSet
+        notifyDataSetChanged()
+    }
+
+    open fun usePalette(usePalette: Boolean) {
+        this.usePalette = usePalette
         notifyDataSetChanged()
     }
 
     override fun getItemId(position: Int): Long {
-        return dataSet[position].id
+        return dataSet[position].id.toLong()
     }
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
-        val view =
-            try {
-                LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
-            } catch (e: Resources.NotFoundException) {
-                LayoutInflater.from(activity).inflate(R.layout.item_list, parent, false)
-            }
+        val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
         return createViewHolder(view)
     }
 
@@ -93,54 +81,51 @@ open class SongAdapter(
         val song = dataSet[position]
         val isChecked = isChecked(song)
         holder.itemView.isActivated = isChecked
-        holder.menu?.isGone = isChecked
+        if (isChecked) {
+            holder.menu?.hide()
+        } else {
+            holder.menu?.show()
+        }
         holder.title?.text = getSongTitle(song)
         holder.text?.text = getSongText(song)
-        holder.text2?.text = getSongText(song)
         loadAlbumCover(song, holder)
-        val landscape = RetroUtil.isLandscape
-        if ((PreferenceUtil.songGridSize > 2 && !landscape) || (PreferenceUtil.songGridSizeLand > 5 && landscape)) {
-            holder.menu?.isVisible = false
-        }
     }
 
-    private fun setColors(color: MediaNotificationProcessor, holder: ViewHolder) {
+    private fun setColors(color: Int, holder: ViewHolder) {
         if (holder.paletteColorContainer != null) {
-            holder.title?.setTextColor(color.primaryTextColor)
-            holder.text?.setTextColor(color.secondaryTextColor)
-            holder.paletteColorContainer?.setBackgroundColor(color.backgroundColor)
-            holder.menu?.imageTintList = ColorStateList.valueOf(color.primaryTextColor)
+            holder.paletteColorContainer?.setBackgroundColor(color)
+            //holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+            //holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
         }
-        holder.mask?.backgroundTintList = ColorStateList.valueOf(color.primaryTextColor)
     }
 
     protected open fun loadAlbumCover(song: Song, holder: ViewHolder) {
         if (holder.image == null) {
             return
         }
-        Glide.with(activity)
-            .asBitmapPalette()
-            .songCoverOptions(song)
-            .load(RetroGlideExtension.getSongModel(song))
-            .into(object : RetroMusicColoredTarget(holder.image!!) {
-                override fun onColorReady(colors: MediaNotificationProcessor) {
-                    setColors(colors, holder)
-                }
-            })
+        SongGlideRequest.Builder.from(Glide.with(activity), song).checkIgnoreMediaStore(activity)
+                .generatePalette(activity).build()
+                .into(object : RetroMusicColoredTarget(holder.image!!) {
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        super.onLoadCleared(placeholder)
+                        setColors(defaultFooterColor, holder)
+                    }
+
+                    override fun onColorReady(color: Int) {
+                        if (usePalette) setColors(color, holder)
+                        else setColors(defaultFooterColor, holder)
+                    }
+                })
     }
 
-    private fun getSongTitle(song: Song): String {
+    private fun getSongTitle(song: Song): String? {
         return song.title
     }
 
-    private fun getSongText(song: Song): String {
+    private fun getSongText(song: Song): String? {
         return song.artistName
     }
 
-    private fun getSongText2(song: Song): String {
-        return song.albumName
-    }
-
     override fun getItemCount(): Int {
         return dataSet.size
     }
@@ -149,27 +134,24 @@ open class SongAdapter(
         return dataSet[position]
     }
 
-    override fun getName(model: Song): String {
-        return model.title
+    override fun getName(song: Song): String {
+        return song.title
     }
 
-    override fun onMultipleItemAction(menuItem: MenuItem, selection: List<Song>) {
+    override fun onMultipleItemAction(menuItem: MenuItem, selection: ArrayList<Song>) {
         SongsMenuHelper.handleMenuClick(activity, selection, menuItem.itemId)
     }
 
-    override fun getPopupText(position: Int): String {
-        val sectionName: String? = when (PreferenceUtil.songSortOrder) {
-            SortOrder.SongSortOrder.SONG_DEFAULT -> return MusicUtil.getSectionName(
-                dataSet[position].title,
-                true
-            )
-
+    override fun getSectionName(position: Int): String {
+        if (!showSectionName) {
+            return ""
+        }
+        val sectionName: String? = when (PreferenceUtil.getInstance(activity).songSortOrder) {
             SortOrder.SongSortOrder.SONG_A_Z, SortOrder.SongSortOrder.SONG_Z_A -> dataSet[position].title
             SortOrder.SongSortOrder.SONG_ALBUM -> dataSet[position].albumName
             SortOrder.SongSortOrder.SONG_ARTIST -> dataSet[position].artistName
             SortOrder.SongSortOrder.SONG_YEAR -> return MusicUtil.getYearString(dataSet[position].year)
             SortOrder.SongSortOrder.COMPOSER -> dataSet[position].composer
-            SortOrder.SongSortOrder.SONG_ALBUM_ARTIST -> dataSet[position].albumArtist
             else -> {
                 return ""
             }
@@ -180,9 +162,10 @@ open class SongAdapter(
     open inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
         protected open var songMenuRes = SongMenuHelper.MENU_RES
         protected open val song: Song
-            get() = dataSet[layoutPosition]
+            get() = dataSet[adapterPosition]
 
         init {
+            setImageTransitionName(activity.getString(R.string.transition_album_art))
             menu?.setOnClickListener(object : SongMenuHelper.OnClickSongMenu(activity) {
                 override val song: Song
                     get() = this@ViewHolder.song
@@ -197,14 +180,13 @@ open class SongAdapter(
         }
 
         protected open fun onSongMenuItemClick(item: MenuItem): Boolean {
-            if (image != null && image!!.isVisible) {
+            if (image != null && image!!.visibility == View.VISIBLE) {
                 when (item.itemId) {
                     R.id.action_go_to_album -> {
-                        activity.findNavController(R.id.fragment_container)
-                            .navigate(
-                                R.id.albumDetailsFragment,
-                                bundleOf(EXTRA_ALBUM_ID to song.albumId)
-                            )
+                        val options: ActivityOptions = ActivityOptions.makeSceneTransitionAnimation(
+                                activity, image, activity.getString(R.string.transition_album_art)
+                        )
+                        NavigationUtil.goToAlbumOptions(activity, song.albumId, options)
                         return true
                     }
                 }
@@ -214,19 +196,19 @@ open class SongAdapter(
 
         override fun onClick(v: View?) {
             if (isInQuickSelectMode) {
-                toggleChecked(layoutPosition)
+                toggleChecked(adapterPosition)
             } else {
-                MusicPlayerRemote.openQueue(dataSet, layoutPosition, true)
+                MusicPlayerRemote.openQueue(dataSet, adapterPosition, true)
             }
         }
 
         override fun onLongClick(v: View?): Boolean {
-            println("Long click")
-            return toggleChecked(layoutPosition)
+            return toggleChecked(adapterPosition)
         }
     }
 
     companion object {
+
         val TAG: String = SongAdapter::class.java.simpleName
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsFragment.kt
new file mode 100644
index 000000000..8ff674f90
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsFragment.kt
@@ -0,0 +1,176 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.album
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.ImageView
+import androidx.appcompat.app.AppCompatActivity
+import androidx.core.app.ActivityCompat
+import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.GridLayoutManager
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
+import code.name.monkey.retromusic.album.album.HorizontalAlbumAdapter
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.extensions.withArgs
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.interfaces.MainActivityFragmentCallbacks
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsView
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.afollestad.materialcab.MaterialCab
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.activity_album.*
+import kotlinx.android.synthetic.main.activity_album_content.*
+import javax.inject.Inject
+
+/**
+ * Created by hemanths on 2019-12-15.
+ */
+
+class AlbumDetailsFragment : AbsMainActivityFragment(), MainActivityFragmentCallbacks, AlbumDetailsView, CabHolder {
+    @Inject
+    lateinit var albumDetailsPresenter: AlbumDetailsPresenter
+
+    private lateinit var album: Album
+    private lateinit var cab: MaterialCab
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_album_details, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        mainActivity.toggleBottomNavigationView(true)
+
+        App.musicComponent.inject(this)
+        albumDetailsPresenter.attachView(this)
+
+        ActivityCompat.startPostponedEnterTransition(requireActivity())
+
+        val albumId: Int? = arguments?.getInt(EXTRA_BUNDLE_ALBUM_ID)
+        if (albumId != null) {
+            albumDetailsPresenter.loadAlbum(albumId)
+        }
+    }
+
+    companion object {
+        private const val EXTRA_BUNDLE_ALBUM_ID: String = "extra_bundle_album_id"
+
+        fun newInstance(albumId: Int): AlbumDetailsFragment = AlbumDetailsFragment().withArgs {
+            putInt(EXTRA_BUNDLE_ALBUM_ID, albumId)
+        }
+    }
+
+    override fun handleBackPress(): Boolean {
+        return true
+    }
+
+    override fun album(album: Album) {
+        if (album.songs.isNullOrEmpty()) {
+            requireActivity().onBackPressed()
+            return
+        }
+        this.album = album
+        loadAlbumCover(album)
+
+        albumTitle.text = album.title
+        if (MusicUtil.getYearString(album.year) == "-") {
+            albumText.text = String.format("%s • %s", album.artistName, MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(requireContext(), album.songs)))
+        } else {
+            albumText.text = String.format("%s • %s • %s", album.artistName, MusicUtil.getYearString(album.year), MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(requireContext(), album.songs)))
+        }
+
+        albumDetailsPresenter.loadMore(album.artistId)
+
+        val simpleSongAdapter = SimpleSongAdapter(requireActivity() as AppCompatActivity, java.util.ArrayList(), R.layout.item_song, this)
+        recyclerView.apply {
+            layoutManager = LinearLayoutManager(context)
+            itemAnimator = DefaultItemAnimator()
+            isNestedScrollingEnabled = false
+            adapter = simpleSongAdapter
+        }
+
+    }
+
+    private fun loadAlbumCover(album: Album) {
+        SongGlideRequest.Builder.from(Glide.with(requireContext()), album.safeGetFirstSong())
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext())
+                .build()
+                .dontAnimate()
+                .dontTransform()
+                .into(object : RetroMusicColoredTarget(image) {
+                    override fun onColorReady(color: Int) {
+                        setColors(color)
+                    }
+                })
+    }
+
+    private fun setColors(color: Int) {
+
+    }
+
+    override fun complete() {
+        ActivityCompat.postponeEnterTransition(requireActivity())
+    }
+
+    override fun loadArtistImage(artist: Artist) {
+        ArtistGlideRequest.Builder.from(Glide.with(requireContext()), artist)
+                .generatePalette(requireContext()).build()
+                .dontAnimate()
+                .dontTransform().into(object : RetroMusicColoredTarget(artistImage as ImageView) {
+                    override fun onColorReady(color: Int) {
+
+                    }
+                })
+
+    }
+
+    override fun moreAlbums(albums: ArrayList<Album>) {
+        moreTitle.show()
+        moreRecyclerView.show()
+        moreTitle.text = String.format(getString(R.string.label_more_from), album.artistName)
+
+        val albumAdapter = HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, false, null)
+        moreRecyclerView.layoutManager = GridLayoutManager(requireContext(), 1, GridLayoutManager.HORIZONTAL, false)
+        moreRecyclerView.adapter = albumAdapter
+    }
+
+    override fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab {
+        cab.let {
+            if (it.isActive) it.finish()
+        }
+        cab = MaterialCab(requireActivity() as AppCompatActivity, R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)))
+                .start(callback)
+        return cab
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsInterface.kt b/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsInterface.kt
new file mode 100644
index 000000000..89f627a7f
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/AlbumDetailsInterface.kt
@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.album
+
+/**
+ * Created by hemanths on 2019-12-15.
+ */
+interface AlbumDetailsInterface {
+    fun onAlbumClick(albumId: Int)
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumAdapter.kt
new file mode 100644
index 000000000..9f9c6cf37
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumAdapter.kt
@@ -0,0 +1,195 @@
+package code.name.monkey.retromusic.album.album
+
+import android.app.ActivityOptions
+import android.content.res.ColorStateList
+import android.graphics.drawable.Drawable
+import android.view.LayoutInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.album.AlbumDetailsInterface
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.SortOrder
+import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.bumptech.glide.Glide
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+
+open class AlbumAdapter(
+        protected val activity: AppCompatActivity,
+        dataSet: ArrayList<Album>,
+        protected var itemLayoutRes: Int,
+        usePalette: Boolean,
+        cabHolder: CabHolder?,
+        private val albumDetailsInterface: AlbumDetailsInterface? = null
+) : AbsMultiSelectAdapter<AlbumAdapter.ViewHolder, Album>(
+        activity,
+        cabHolder,
+        R.menu.menu_media_selection
+), FastScrollRecyclerView.SectionedAdapter {
+    var dataSet: ArrayList<Album>
+        protected set
+
+    protected var usePalette = false
+
+    init {
+        this.dataSet = dataSet
+        this.usePalette = usePalette
+        this.setHasStableIds(true)
+    }
+
+    fun useItemLayout(itemLayoutRes: Int) {
+        this.itemLayoutRes = itemLayoutRes
+        notifyDataSetChanged()
+    }
+
+    fun usePalette(usePalette: Boolean) {
+        this.usePalette = usePalette
+        notifyDataSetChanged()
+    }
+
+    fun swapDataSet(dataSet: ArrayList<Album>) {
+        this.dataSet = dataSet
+        notifyDataSetChanged()
+    }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
+        val view = LayoutInflater.from(activity).inflate(itemLayoutRes, parent, false)
+        return createViewHolder(view, viewType)
+    }
+
+    protected open fun createViewHolder(view: View, viewType: Int): ViewHolder {
+        return ViewHolder(view)
+    }
+
+    private fun getAlbumTitle(album: Album): String? {
+        return album.title
+    }
+
+    protected open fun getAlbumText(album: Album): String? {
+        return album.artistName
+    }
+
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) {
+        val album = dataSet[position]
+        val isChecked = isChecked(album)
+        holder.itemView.isActivated = isChecked
+        holder.title?.text = getAlbumTitle(album)
+        holder.text?.text = getAlbumText(album)
+        holder.playSongs?.setOnClickListener { album.songs?.let { songs -> MusicPlayerRemote.openQueue(songs, 0, true) } }
+        loadAlbumCover(album, holder)
+    }
+
+    protected open fun setColors(color: Int, holder: ViewHolder) {
+        if (holder.paletteColorContainer != null) {
+            holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+            holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+            holder.paletteColorContainer?.setBackgroundColor(color)
+        }
+        holder.mask?.backgroundTintList = ColorStateList.valueOf(color)
+    }
+
+    protected open fun loadAlbumCover(album: Album, holder: ViewHolder) {
+        if (holder.image == null) {
+            return
+        }
+
+        SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
+                .checkIgnoreMediaStore(activity).generatePalette(activity).build()
+                .into(object : RetroMusicColoredTarget(holder.image!!) {
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        super.onLoadCleared(placeholder)
+                        setColors(defaultFooterColor, holder)
+                    }
+
+                    override fun onColorReady(color: Int) {
+                        setColors(color, holder)
+                    }
+                })
+    }
+
+    override fun getItemCount(): Int {
+        return dataSet.size
+    }
+
+    override fun getItemId(position: Int): Long {
+        return dataSet[position].id.toLong()
+    }
+
+    override fun getIdentifier(position: Int): Album? {
+        return dataSet[position]
+    }
+
+    override fun getName(album: Album): String {
+        return album.title!!
+    }
+
+    override fun onMultipleItemAction(
+            menuItem: MenuItem, selection: ArrayList<Album>
+    ) {
+        SongsMenuHelper.handleMenuClick(activity, getSongList(selection), menuItem.itemId)
+    }
+
+    private fun getSongList(albums: List<Album>): ArrayList<Song> {
+        val songs = ArrayList<Song>()
+        for (album in albums) {
+            songs.addAll(album.songs!!)
+        }
+        return songs
+    }
+
+    override fun getSectionName(position: Int): String {
+        var sectionName: String? = null
+        when (PreferenceUtil.getInstance(activity).albumSortOrder) {
+            SortOrder.AlbumSortOrder.ALBUM_A_Z, SortOrder.AlbumSortOrder.ALBUM_Z_A -> sectionName = dataSet[position].title
+            SortOrder.AlbumSortOrder.ALBUM_ARTIST -> sectionName = dataSet[position].artistName
+            SortOrder.AlbumSortOrder.ALBUM_YEAR -> return MusicUtil.getYearString(
+                    dataSet[position].year
+            )
+        }
+
+        return MusicUtil.getSectionName(sectionName)
+    }
+
+    inner class ViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
+
+        init {
+            setImageTransitionName(activity.getString(R.string.transition_album_art))
+            menu?.visibility = View.GONE
+        }
+
+        override fun onClick(v: View?) {
+            super.onClick(v)
+            if (isInQuickSelectMode) {
+                toggleChecked(adapterPosition)
+            } else {
+                val activityOptions = ActivityOptions.makeSceneTransitionAnimation(activity, image, activity.getString(
+                        R.string.transition_album_art
+                ))
+                albumDetailsInterface?.onAlbumClick(dataSet[adapterPosition].id)
+                //NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions)
+            }
+        }
+
+        override fun onLongClick(v: View?): Boolean {
+            toggleChecked(adapterPosition)
+            return super.onLongClick(v)
+        }
+    }
+
+    companion object {
+        val TAG: String = AlbumAdapter::class.java.simpleName
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumCoverPagerAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumCoverPagerAdapter.kt
new file mode 100644
index 000000000..d4b240bdb
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumCoverPagerAdapter.kt
@@ -0,0 +1,165 @@
+package code.name.monkey.retromusic.album.album
+
+import android.os.Bundle
+import android.view.*
+import android.widget.ImageView
+import androidx.fragment.app.*
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle
+import code.name.monkey.retromusic.glide.*
+import code.name.monkey.retromusic.misc.CustomFragmentStatePagerAdapter
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.*
+import com.bumptech.glide.Glide
+import java.util.*
+
+class AlbumCoverPagerAdapter(
+		fm: FragmentManager,
+		private val dataSet: ArrayList<Song>
+) : CustomFragmentStatePagerAdapter(fm) {
+
+	private var currentColorReceiver: AlbumCoverFragment.ColorReceiver? = null
+	private var currentColorReceiverPosition = -1
+
+	override fun getItem(position: Int): Fragment {
+		return AlbumCoverFragment.newInstance(dataSet[position])
+	}
+
+	override fun getCount(): Int {
+		return dataSet.size
+	}
+
+	override fun instantiateItem(container: ViewGroup, position: Int): Any {
+		val o = super.instantiateItem(container, position)
+		if (currentColorReceiver != null && currentColorReceiverPosition == position) {
+			receiveColor(currentColorReceiver!!, currentColorReceiverPosition)
+		}
+		return o
+	}
+
+	/**
+	 * Only the latest passed [AlbumCoverFragment.ColorReceiver] is guaranteed to receive a
+	 * response
+	 */
+	fun receiveColor(colorReceiver: AlbumCoverFragment.ColorReceiver, position: Int) {
+
+		if (getFragment(position) is AlbumCoverFragment) {
+			val fragment = getFragment(position) as AlbumCoverFragment
+			currentColorReceiver = null
+			currentColorReceiverPosition = -1
+			fragment.receiveColor(colorReceiver, position)
+		} else {
+			currentColorReceiver = colorReceiver
+			currentColorReceiverPosition = position
+		}
+	}
+
+	class AlbumCoverFragment : Fragment() {
+
+		lateinit var albumCover: ImageView
+		private var isColorReady: Boolean = false
+		private var color: Int = 0
+		private lateinit var song: Song
+		private var colorReceiver: ColorReceiver? = null
+		private var request: Int = 0
+
+		private val layout: Int
+			get() {
+				return when (PreferenceUtil.getInstance(activity).albumCoverStyle) {
+					AlbumCoverStyle.NORMAL    -> R.layout.fragment_album_cover
+					AlbumCoverStyle.FLAT      -> R.layout.fragment_album_flat_cover
+					AlbumCoverStyle.CIRCLE    -> R.layout.fragment_album_circle_cover
+					AlbumCoverStyle.CARD      -> R.layout.fragment_album_card_cover
+					AlbumCoverStyle.MATERIAL  -> R.layout.fragment_album_material_cover
+					AlbumCoverStyle.FULL      -> R.layout.fragment_album_full_cover
+					AlbumCoverStyle.FULL_CARD -> R.layout.fragment_album_full_card_cover
+					else                      -> R.layout.fragment_album_cover
+				}
+			}
+
+		override fun onCreate(savedInstanceState: Bundle?) {
+			super.onCreate(savedInstanceState)
+			if (arguments != null) {
+				song = arguments!!.getParcelable(SONG_ARG)!!
+			}
+		}
+
+		override fun onCreateView(
+				inflater: LayoutInflater,
+				container: ViewGroup?,
+				savedInstanceState: Bundle?
+		): View? {
+			val finalLayout = when {
+				PreferenceUtil.getInstance(activity).carouselEffect() -> R.layout.fragment_album_carousel_cover
+				else                                                  -> layout
+			}
+			val view = inflater.inflate(finalLayout, container, false)
+			albumCover = view.findViewById(R.id.player_image)
+			albumCover.setOnClickListener {
+
+				NavigationUtil.goToLyrics(requireActivity())
+			}
+			return view
+		}
+
+		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+			super.onViewCreated(view, savedInstanceState)
+			loadAlbumCover()
+		}
+
+		override fun onDestroyView() {
+			super.onDestroyView()
+			colorReceiver = null
+		}
+
+		private fun loadAlbumCover() {
+			SongGlideRequest.Builder.from(Glide.with(requireContext()), song)
+				.checkIgnoreMediaStore(activity).generatePalette(activity).build()
+				.into(object : RetroMusicColoredTarget(albumCover) {
+					override fun onColorReady(color: Int) {
+						setColor(color)
+					}
+				})
+		}
+
+		private fun setColor(color: Int) {
+			this.color = color
+			isColorReady = true
+			if (colorReceiver != null) {
+				colorReceiver!!.onColorReady(color, request)
+				colorReceiver = null
+			}
+		}
+
+		internal fun receiveColor(colorReceiver: ColorReceiver, request: Int) {
+			if (isColorReady) {
+				colorReceiver.onColorReady(color, request)
+			} else {
+				this.colorReceiver = colorReceiver
+				this.request = request
+			}
+		}
+
+		interface ColorReceiver {
+			fun onColorReady(color: Int, request: Int)
+		}
+
+		companion object {
+
+			private const val SONG_ARG = "song"
+
+			fun newInstance(song: Song): AlbumCoverFragment {
+				val frag = AlbumCoverFragment()
+				val args = Bundle()
+				args.putParcelable(SONG_ARG, song)
+				frag.arguments = args
+				return frag
+			}
+		}
+	}
+
+	companion object {
+		val TAG: String = AlbumCoverPagerAdapter::class.java.simpleName
+	}
+}
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumFullWidthAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumFullWidthAdapter.kt
new file mode 100644
index 000000000..cf03015ad
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/album/AlbumFullWidthAdapter.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (C) 2017. Alexander Bilchuk <a.bilchuk@sandrlab.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package code.name.monkey.retromusic.album.album
+
+import android.app.*
+import android.util.DisplayMetrics
+import android.view.*
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.glide.*
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.views.MetalRecyclerViewPager
+import com.bumptech.glide.Glide
+
+class AlbumFullWidthAdapter(
+		private val activity: Activity,
+		private val dataSet: ArrayList<Album>,
+		metrics: DisplayMetrics
+) : MetalRecyclerViewPager.MetalAdapter<AlbumFullWidthAdapter.FullMetalViewHolder>(metrics) {
+
+	override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): FullMetalViewHolder {
+		return FullMetalViewHolder(
+				LayoutInflater.from(parent.context).inflate(
+						R.layout.pager_item,
+						parent,
+						false
+				)
+		)
+	}
+
+	override fun onBindViewHolder(holder: FullMetalViewHolder, position: Int) {
+		// don't forget about calling supper.onBindViewHolder!
+		super.onBindViewHolder(holder, position)
+		val album = dataSet[position]
+		holder.title?.text = getAlbumTitle(album)
+		holder.text?.text = getAlbumText(album)
+		holder.playSongs?.setOnClickListener {
+			album.songs?.let { songs ->
+				MusicPlayerRemote.openQueue(
+						songs,
+						0,
+						true
+				)
+			}
+		}
+		loadAlbumCover(album, holder)
+	}
+
+	private fun getAlbumTitle(album: Album): String? {
+		return album.title
+	}
+
+	private fun getAlbumText(album: Album): String? {
+		return album.artistName
+	}
+
+	private fun loadAlbumCover(album: Album, holder: FullMetalViewHolder) {
+		if (holder.image == null) {
+			return
+		}
+		SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
+			.checkIgnoreMediaStore(activity).generatePalette(activity).build()
+			.into(object : RetroMusicColoredTarget(holder.image!!) {
+				override fun onColorReady(color: Int) {
+
+				}
+			})
+	}
+
+	override fun getItemCount(): Int {
+		return dataSet.size
+	}
+
+	inner class FullMetalViewHolder(itemView: View) : MetalRecyclerViewPager.MetalViewHolder(
+			itemView
+	) {
+
+		override fun onClick(v: View?) {
+			val activityOptions = ActivityOptions.makeSceneTransitionAnimation(
+					activity,
+					image,
+					activity.getString(R.string.transition_album_art)
+			)
+			NavigationUtil.goToAlbumOptions(activity, dataSet[adapterPosition].id, activityOptions)
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/album/album/HorizontalAlbumAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/album/album/HorizontalAlbumAdapter.kt
new file mode 100644
index 000000000..93a6b1d31
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/album/album/HorizontalAlbumAdapter.kt
@@ -0,0 +1,71 @@
+package code.name.monkey.retromusic.album.album
+
+import android.graphics.drawable.Drawable
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.HorizontalAdapterHelper
+import code.name.monkey.retromusic.interfaces.CabHolder
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.util.MusicUtil
+import com.bumptech.glide.Glide
+import java.util.*
+
+class HorizontalAlbumAdapter(
+        activity: AppCompatActivity,
+        dataSet: ArrayList<Album>,
+        usePalette: Boolean,
+        cabHolder: CabHolder?
+) : AlbumAdapter(
+        activity, dataSet, HorizontalAdapterHelper.LAYOUT_RES, usePalette, cabHolder, null
+) {
+
+    override fun createViewHolder(view: View, viewType: Int): ViewHolder {
+        val params = view.layoutParams as ViewGroup.MarginLayoutParams
+        HorizontalAdapterHelper.applyMarginToLayoutParams(activity, params, viewType)
+        return ViewHolder(view)
+    }
+
+    override fun setColors(color: Int, holder: ViewHolder) {
+        holder.title?.setTextColor(MaterialValueHelper.getPrimaryTextColor(activity, ColorUtil.isColorLight(color)))
+        holder.text?.setTextColor(MaterialValueHelper.getSecondaryTextColor(activity, ColorUtil.isColorLight(color)))
+    }
+
+    override fun loadAlbumCover(album: Album, holder: ViewHolder) {
+        if (holder.image == null) return
+
+        SongGlideRequest.Builder.from(Glide.with(activity), album.safeGetFirstSong())
+                .checkIgnoreMediaStore(activity).generatePalette(activity).build()
+                .into(object : RetroMusicColoredTarget(holder.image!!) {
+                    override fun onLoadCleared(placeholder: Drawable?) {
+                        super.onLoadCleared(placeholder)
+                        setColors(albumArtistFooterColor, holder)
+                    }
+
+                    override fun onColorReady(color: Int) {
+                        if (usePalette) setColors(color, holder)
+                        else setColors(albumArtistFooterColor, holder)
+                    }
+                })
+    }
+
+    override fun getAlbumText(album: Album): String? {
+        return MusicUtil.getYearString(album.year)
+    }
+
+    override fun getItemViewType(position: Int): Int {
+        return HorizontalAdapterHelper.getItemViewtype(position, itemCount)
+    }
+
+    override fun getItemCount(): Int {
+        return dataSet.size
+    }
+
+    companion object {
+        val TAG: String = AlbumAdapter::class.java.simpleName
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt
index ad8f964e7..70565d5aa 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutIconGenerator.kt
@@ -1,77 +1,83 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts
 
 import android.content.Context
-import android.graphics.drawable.Icon
-import android.graphics.drawable.LayerDrawable
+import android.graphics.*
+import android.graphics.drawable.*
 import android.os.Build
 import android.util.TypedValue
 import androidx.annotation.RequiresApi
-import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.*
 
 @RequiresApi(Build.VERSION_CODES.N_MR1)
 object AppShortcutIconGenerator {
-    fun generateThemedIcon(context: Context, iconId: Int): Icon {
-        return if (PreferenceUtil.isColoredAppShortcuts) {
-            generateUserThemedIcon(context, iconId)
-        } else {
-            generateDefaultThemedIcon(context, iconId)
-        }
-    }
+	fun generateThemedIcon(context: Context, iconId: Int): Icon {
+		return if (PreferenceUtil.getInstance(context).coloredAppShortcuts()) {
+			generateUserThemedIcon(context, iconId)
+		} else {
+			generateDefaultThemedIcon(context, iconId)
+		}
+	}
 
-    private fun generateDefaultThemedIcon(context: Context, iconId: Int): Icon {
-        // Return an Icon of iconId with default colors
-        return generateThemedIcon(
-            context,
-            iconId,
-            context.getColor(R.color.app_shortcut_default_foreground),
-            context.getColor(R.color.app_shortcut_default_background)
-        )
-    }
+	private fun generateDefaultThemedIcon(context: Context, iconId: Int): Icon {
+		// Return an Icon of iconId with default colors
+		return generateThemedIcon(
+				context,
+				iconId,
+				context.getColor(R.color.app_shortcut_default_foreground),
+				context.getColor(R.color.app_shortcut_default_background)
+		)
+	}
 
-    private fun generateUserThemedIcon(context: Context, iconId: Int): Icon {
-        // Get background color from context's theme
-        val typedColorBackground = TypedValue()
-        context.theme.resolveAttribute(android.R.attr.colorBackground, typedColorBackground, true)
+	private fun generateUserThemedIcon(context: Context, iconId: Int): Icon {
+		// Get background color from context's theme
+		val typedColorBackground = TypedValue()
+		context.theme.resolveAttribute(android.R.attr.colorBackground, typedColorBackground, true)
 
-        // Return an Icon of iconId with those colors
-        return generateThemedIcon(
-            context, iconId, ThemeStore.accentColor(context), typedColorBackground.data
-        )
-    }
+		// Return an Icon of iconId with those colors
+		return generateThemedIcon(
+				context, iconId, ThemeStore.accentColor(context), typedColorBackground.data
+		)
+	}
 
-    private fun generateThemedIcon(
-        context: Context,
-        iconId: Int,
-        foregroundColor: Int,
-        backgroundColor: Int,
-    ): Icon {
-        // Get and tint foreground and background drawables
-        val vectorDrawable = context.getTintedDrawable(iconId, foregroundColor)
-        val backgroundDrawable =
-            context.getTintedDrawable(R.drawable.ic_app_shortcut_background, backgroundColor)
+	private fun generateThemedIcon(
+			context: Context, iconId: Int, foregroundColor: Int, backgroundColor: Int
+	): Icon {
+		// Get and tint foreground and background drawables
+		val vectorDrawable = RetroUtil.getTintedVectorDrawable(context, iconId, foregroundColor)
+		val backgroundDrawable = RetroUtil.getTintedVectorDrawable(
+				context, R.drawable.ic_app_shortcut_background, backgroundColor
+		)
 
-        // Squash the two drawables together
-        val layerDrawable = LayerDrawable(arrayOf(backgroundDrawable, vectorDrawable))
+		// Squash the two drawables together
+		val layerDrawable = LayerDrawable(arrayOf(backgroundDrawable, vectorDrawable))
 
-        // Return as an Icon
-        return Icon.createWithBitmap(layerDrawable.toBitmap())
-    }
+		// Return as an Icon
+		return Icon.createWithBitmap(drawableToBitmap(layerDrawable))
+	}
+
+	private fun drawableToBitmap(drawable: Drawable): Bitmap {
+		val bitmap = Bitmap.createBitmap(
+				drawable.intrinsicWidth, drawable.intrinsicHeight, Bitmap.Config.ARGB_8888
+		)
+		val canvas = Canvas(bitmap)
+		drawable.setBounds(0, 0, canvas.width, canvas.height)
+		drawable.draw(canvas)
+		return bitmap
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
index 9f10d795b..0426ff654 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/AppShortcutLauncherActivity.kt
@@ -1,84 +1,88 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts
 
 import android.app.Activity
 import android.content.Intent
 import android.os.Bundle
-import androidx.core.os.bundleOf
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
-import code.name.monkey.retromusic.extensions.extraNotNull
+import code.name.monkey.retromusic.activities.SearchActivity
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.*
 import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.smartplaylist.LastAddedPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.ShuffleAllPlaylist
-import code.name.monkey.retromusic.model.smartplaylist.TopTracksPlaylist
+import code.name.monkey.retromusic.model.smartplaylist.*
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PLAY_PLAYLIST
-import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_PLAYLIST
-import code.name.monkey.retromusic.service.MusicService.Companion.INTENT_EXTRA_SHUFFLE_MODE
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_NONE
-import code.name.monkey.retromusic.service.MusicService.Companion.SHUFFLE_MODE_SHUFFLE
+import code.name.monkey.retromusic.service.MusicService.*
 
 class AppShortcutLauncherActivity : Activity() {
 
-    public override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        when (extraNotNull(KEY_SHORTCUT_TYPE, SHORTCUT_TYPE_NONE).value) {
-            SHORTCUT_TYPE_SHUFFLE_ALL -> {
-                startServiceWithPlaylist(
-                    SHUFFLE_MODE_SHUFFLE, ShuffleAllPlaylist()
-                )
-                DynamicShortcutManager.reportShortcutUsed(this, ShuffleAllShortcutType.id)
-            }
-            SHORTCUT_TYPE_TOP_TRACKS -> {
-                startServiceWithPlaylist(
-                    SHUFFLE_MODE_NONE, TopTracksPlaylist()
-                )
-                DynamicShortcutManager.reportShortcutUsed(this, TopTracksShortcutType.id)
-            }
-            SHORTCUT_TYPE_LAST_ADDED -> {
-                startServiceWithPlaylist(
-                    SHUFFLE_MODE_NONE, LastAddedPlaylist()
-                )
-                DynamicShortcutManager.reportShortcutUsed(this, LastAddedShortcutType.id)
-            }
-        }
-        finish()
-    }
+	public override fun onCreate(savedInstanceState: Bundle?) {
+		super.onCreate(savedInstanceState)
 
-    private fun startServiceWithPlaylist(shuffleMode: Int, playlist: Playlist) {
-        val intent = Intent(this, MusicService::class.java)
-        intent.action = ACTION_PLAY_PLAYLIST
+		var shortcutType = SHORTCUT_TYPE_NONE
 
-        val bundle = bundleOf(
-            INTENT_EXTRA_PLAYLIST to playlist,
-            INTENT_EXTRA_SHUFFLE_MODE to shuffleMode
-        )
+		// Set shortcutType from the intent extras
+		val extras = intent.extras
+		if (extras != null) {
+			shortcutType = extras.getInt(KEY_SHORTCUT_TYPE, SHORTCUT_TYPE_NONE)
+		}
 
-        intent.putExtras(bundle)
+		when (shortcutType) {
+			SHORTCUT_TYPE_SHUFFLE_ALL -> {
+				startServiceWithPlaylist(
+						MusicService.SHUFFLE_MODE_SHUFFLE, ShuffleAllPlaylist(applicationContext)
+				)
+				DynamicShortcutManager.reportShortcutUsed(this, ShuffleAllShortcutType.id)
+			}
+			SHORTCUT_TYPE_TOP_TRACKS  -> {
+				startServiceWithPlaylist(
+						MusicService.SHUFFLE_MODE_NONE, MyTopTracksPlaylist(applicationContext)
+				)
+				DynamicShortcutManager.reportShortcutUsed(this, TopTracksShortcutType.id)
+			}
+			SHORTCUT_TYPE_LAST_ADDED  -> {
+				startServiceWithPlaylist(
+						MusicService.SHUFFLE_MODE_NONE, LastAddedPlaylist(applicationContext)
+				)
+				DynamicShortcutManager.reportShortcutUsed(this, LastAddedShortcutType.id)
+			}
+			SHORTCUT_TYPE_SEARCH      -> {
+				startActivity(Intent(this, SearchActivity::class.java))
+				DynamicShortcutManager.reportShortcutUsed(this, SearchShortCutType.id)
+			}
+		}
+		finish()
+	}
 
-        startService(intent)
-    }
+	private fun startServiceWithPlaylist(shuffleMode: Int, playlist: Playlist) {
+		val intent = Intent(this, MusicService::class.java)
+		intent.action = ACTION_PLAY_PLAYLIST
 
-    companion object {
-        const val KEY_SHORTCUT_TYPE = "io.github.muntashirakon.Music.appshortcuts.ShortcutType"
-        const val SHORTCUT_TYPE_SHUFFLE_ALL = 0L
-        const val SHORTCUT_TYPE_TOP_TRACKS = 1L
-        const val SHORTCUT_TYPE_LAST_ADDED = 2L
-        const val SHORTCUT_TYPE_NONE = 4L
-    }
+		val bundle = Bundle()
+		bundle.putParcelable(INTENT_EXTRA_PLAYLIST, playlist)
+		bundle.putInt(INTENT_EXTRA_SHUFFLE_MODE, shuffleMode)
+
+		intent.putExtras(bundle)
+
+		startService(intent)
+	}
+
+	companion object {
+		const val KEY_SHORTCUT_TYPE = "code.name.monkey.retromusic.appshortcuts.ShortcutType"
+		const val SHORTCUT_TYPE_SHUFFLE_ALL = 0
+		const val SHORTCUT_TYPE_TOP_TRACKS = 1
+		const val SHORTCUT_TYPE_LAST_ADDED = 2
+		const val SHORTCUT_TYPE_SEARCH = 3
+		const val SHORTCUT_TYPE_NONE = 4
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt
index a943ed0c8..790afe573 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/DynamicShortcutManager.kt
@@ -1,73 +1,66 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts
 
 import android.annotation.TargetApi
-import android.content.Context
-import android.content.Intent
-import android.content.pm.ShortcutInfo
-import android.content.pm.ShortcutManager
+import android.content.*
+import android.content.pm.*
 import android.graphics.drawable.Icon
 import android.os.Build
-import androidx.core.content.getSystemService
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.LastAddedShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.ShuffleAllShortcutType
-import code.name.monkey.retromusic.appshortcuts.shortcuttype.TopTracksShortcutType
+import code.name.monkey.retromusic.appshortcuts.shortcuttype.*
+import java.util.*
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class DynamicShortcutManager(private val context: Context) {
-    private val shortcutManager: ShortcutManager? =
-        this.context.getSystemService()
+	private val shortcutManager: ShortcutManager = this.context.getSystemService(ShortcutManager::class.java)
 
-    private val defaultShortcuts: List<ShortcutInfo>
-        get() = listOf(
-            ShuffleAllShortcutType(context).shortcutInfo,
-            TopTracksShortcutType(context).shortcutInfo,
-            LastAddedShortcutType(context).shortcutInfo
-        )
+	private val defaultShortcuts: List<ShortcutInfo>
+		get() = Arrays.asList(
+				SearchShortCutType(context).shortcutInfo,
+				ShuffleAllShortcutType(context).shortcutInfo,
+				TopTracksShortcutType(context).shortcutInfo,
+				LastAddedShortcutType(context).shortcutInfo
 
-    fun initDynamicShortcuts() {
-        // if (shortcutManager.dynamicShortcuts.size == 0) {
-        shortcutManager?.dynamicShortcuts = defaultShortcuts
-        // }
-    }
+		)
 
-    fun updateDynamicShortcuts() {
-        shortcutManager?.updateShortcuts(defaultShortcuts)
-    }
+	fun initDynamicShortcuts() {
+		//if (shortcutManager.dynamicShortcuts.size == 0) {
+		shortcutManager.dynamicShortcuts = defaultShortcuts
+		//}
+	}
 
-    companion object {
+	fun updateDynamicShortcuts() {
+		shortcutManager.updateShortcuts(defaultShortcuts)
+	}
 
-        fun createShortcut(
-            context: Context,
-            id: String,
-            shortLabel: String,
-            longLabel: String,
-            icon: Icon,
-            intent: Intent
-        ): ShortcutInfo {
-            return ShortcutInfo.Builder(context, id)
-                .setShortLabel(shortLabel)
-                .setLongLabel(longLabel)
-                .setIcon(icon)
-                .setIntent(intent)
-                .build()
-        }
+	companion object {
 
-        fun reportShortcutUsed(context: Context, shortcutId: String) {
-            context.getSystemService<ShortcutManager>()?.reportShortcutUsed(shortcutId)
-        }
-    }
+		fun createShortcut(
+				context: Context,
+				id: String,
+				shortLabel: String,
+				longLabel: String,
+				icon: Icon,
+				intent: Intent
+		): ShortcutInfo {
+			return ShortcutInfo.Builder(context, id).setShortLabel(shortLabel)
+				.setLongLabel(longLabel).setIcon(icon).setIntent(intent).build()
+		}
+
+		fun reportShortcutUsed(context: Context, shortcutId: String) {
+			context.getSystemService(ShortcutManager::class.java).reportShortcutUsed(shortcutId)
+		}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt
index 4b0c7f3a0..5ca1284df 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/BaseShortcutType.kt
@@ -1,49 +1,48 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.content.pm.ShortcutInfo
-import android.os.Build
-import androidx.core.os.bundleOf
+import android.os.*
 import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 abstract class BaseShortcutType(internal var context: Context) {
 
-    internal abstract val shortcutInfo: ShortcutInfo
+	internal abstract val shortcutInfo: ShortcutInfo
 
-    /**
-     * Creates an Intent that will launch MainActivtiy and immediately play {@param songs} in either shuffle or normal mode
-     *
-     * @param shortcutType Describes the type of shortcut to create (ShuffleAll, TopTracks, custom playlist, etc.)
-     * @return
-     */
-    internal fun getPlaySongsIntent(shortcutType: Long): Intent {
-        val intent = Intent(context, AppShortcutLauncherActivity::class.java)
-        intent.action = Intent.ACTION_VIEW
-        val b = bundleOf(AppShortcutLauncherActivity.KEY_SHORTCUT_TYPE to shortcutType)
-        intent.putExtras(b)
-        return intent
-    }
+	/**
+	 * Creates an Intent that will launch MainActivtiy and immediately play {@param songs} in either shuffle or normal mode
+	 *
+	 * @param shortcutType Describes the type of shortcut to create (ShuffleAll, TopTracks, custom playlist, etc.)
+	 * @return
+	 */
+	internal fun getPlaySongsIntent(shortcutType: Int): Intent {
+		val intent = Intent(context, AppShortcutLauncherActivity::class.java)
+		intent.action = Intent.ACTION_VIEW
+		val b = Bundle()
+		b.putInt(AppShortcutLauncherActivity.KEY_SHORTCUT_TYPE, shortcutType)
+		intent.putExtras(b)
+		return intent
+	}
 
-    companion object {
-        internal const val ID_PREFIX = "io.github.muntashirakon.Music.appshortcuts.id."
-        val id: String
-            get() = ID_PREFIX + "invalid"
-    }
+	companion object {
+		internal const val ID_PREFIX = "code.name.monkey.retromusic.appshortcuts.id."
+		val id: String
+			get() = ID_PREFIX + "invalid"
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt
index d0976042c..df92969bc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/LastAddedShortcutType.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
@@ -19,29 +19,27 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.appshortcuts.*
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class LastAddedShortcutType(context: Context) : BaseShortcutType(context) {
 
-    override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(
-            context,
-            id
-        ).setShortLabel(context.getString(R.string.app_shortcut_last_added_short)).setLongLabel(
-            context.getString(R.string.app_shortcut_last_added_long)
-        ).setIcon(
-            AppShortcutIconGenerator.generateThemedIcon(
-                context,
-                R.drawable.ic_app_shortcut_last_added
-            )
-        ).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_LAST_ADDED))
-            .build()
+	override val shortcutInfo: ShortcutInfo
+		get() = ShortcutInfo.Builder(
+				context,
+				id
+		).setShortLabel(context.getString(R.string.app_shortcut_last_added_short)).setLongLabel(
+					context.getString(R.string.app_shortcut_last_added_long)
+			).setIcon(
+					AppShortcutIconGenerator.generateThemedIcon(
+							context,
+							R.drawable.ic_app_shortcut_last_added
+					)
+			).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_LAST_ADDED)).build()
 
-    companion object {
+	companion object {
 
-        val id: String
-            get() = ID_PREFIX + "last_added"
-    }
+		val id: String
+			get() = BaseShortcutType.ID_PREFIX + "last_added"
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/SearchShortCutType.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/SearchShortCutType.kt
new file mode 100644
index 000000000..ca2e7c4a0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/SearchShortCutType.kt
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.appshortcuts.shortcuttype
+
+import android.annotation.TargetApi
+import android.content.Context
+import android.content.pm.ShortcutInfo
+import android.os.Build
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.appshortcuts.*
+
+@TargetApi(Build.VERSION_CODES.N_MR1)
+class SearchShortCutType(context: Context) : BaseShortcutType(context) {
+	companion object {
+
+		val id: String
+			get() = BaseShortcutType.ID_PREFIX + "search"
+	}
+
+	override val shortcutInfo: ShortcutInfo
+		get() = ShortcutInfo.Builder(
+				context,
+				id
+		).setShortLabel(context.getString(R.string.action_search)).setLongLabel(context.getString(R.string.search_hint)).setIcon(
+					AppShortcutIconGenerator.generateThemedIcon(
+							context,
+							R.drawable.ic_app_shortcut_search
+					)
+			).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SEARCH)).build()
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
index 21855cacd..c5b7f24cd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/ShuffleAllShortcutType.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
@@ -19,23 +19,25 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.appshortcuts.*
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class ShuffleAllShortcutType(context: Context) : BaseShortcutType(context) {
 
-    override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(context, id)
-            .setShortLabel(context.getString(R.string.app_shortcut_shuffle_all_short))
-            .setLongLabel(context.getString(R.string.app_shortcut_shuffle_all_long))
-            .setIcon(AppShortcutIconGenerator.generateThemedIcon(context, R.drawable.ic_app_shortcut_shuffle_all))
-            .setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SHUFFLE_ALL))
-            .build()
+	override val shortcutInfo: ShortcutInfo
+		get() = ShortcutInfo.Builder(
+				context, id
+		).setShortLabel(context.getString(R.string.app_shortcut_shuffle_all_short)).setLongLabel(
+				context.getString(R.string.app_shortcut_shuffle_all_long)
+		).setIcon(
+				AppShortcutIconGenerator.generateThemedIcon(
+						context, R.drawable.ic_app_shortcut_shuffle_all
+				)
+		).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_SHUFFLE_ALL)).build()
 
-    companion object {
+	companion object {
 
-        val id: String
-            get() = ID_PREFIX + "shuffle_all"
-    }
+		val id: String
+			get() = BaseShortcutType.ID_PREFIX + "shuffle_all"
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt
index fc0fa9f47..32e53e412 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appshortcuts/shortcuttype/TopTracksShortcutType.kt
@@ -1,16 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
+
 package code.name.monkey.retromusic.appshortcuts.shortcuttype
 
 import android.annotation.TargetApi
@@ -18,27 +19,25 @@ import android.content.Context
 import android.content.pm.ShortcutInfo
 import android.os.Build
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.AppShortcutIconGenerator
-import code.name.monkey.retromusic.appshortcuts.AppShortcutLauncherActivity
+import code.name.monkey.retromusic.appshortcuts.*
 
 @TargetApi(Build.VERSION_CODES.N_MR1)
 class TopTracksShortcutType(context: Context) : BaseShortcutType(context) {
 
-    override val shortcutInfo: ShortcutInfo
-        get() = ShortcutInfo.Builder(
-            context, id
-        ).setShortLabel(context.getString(R.string.app_shortcut_top_tracks_short)).setLongLabel(
-            context.getString(R.string.app_shortcut_top_tracks_long)
-        ).setIcon(
-            AppShortcutIconGenerator.generateThemedIcon(
-                context, R.drawable.ic_app_shortcut_top_tracks
-            )
-        ).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_TOP_TRACKS))
-            .build()
+	override val shortcutInfo: ShortcutInfo
+		get() = ShortcutInfo.Builder(
+				context, id
+		).setShortLabel(context.getString(R.string.app_shortcut_top_tracks_short)).setLongLabel(
+				context.getString(R.string.app_shortcut_top_tracks_long)
+		).setIcon(
+				AppShortcutIconGenerator.generateThemedIcon(
+						context, R.drawable.ic_app_shortcut_top_tracks
+				)
+		).setIntent(getPlaySongsIntent(AppShortcutLauncherActivity.SHORTCUT_TYPE_TOP_TRACKS)).build()
 
-    companion object {
+	companion object {
 
-        val id: String
-            get() = ID_PREFIX + "top_tracks"
-    }
+		val id: String
+			get() = BaseShortcutType.ID_PREFIX + "top_tracks"
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
index 7d9497209..f7e51128a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetBig.kt
@@ -1,236 +1,231 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.text.TextUtils
 import android.view.View
 import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.service.MusicService.*
 import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.*
 import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
 
 class AppWidgetBig : BaseAppWidget() {
-    private var target: Target<Bitmap>? = null // for cancellation
+	private var target: Target<Bitmap>? = null // for cancellation
 
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(
-            context.packageName, R.layout.app_widget_big
-        )
+	/**
+	 * Initialize given widgets to default state, where we launch Music on default click and hide
+	 * actions if service not running.
+	 */
+	override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
+		val appWidgetView = RemoteViews(
+				context.packageName, code.name.monkey.retromusic.R.layout.app_widget_big
+		)
 
-        appWidgetView.setViewVisibility(
-            R.id.media_titles,
-            View.INVISIBLE
-        )
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next, context.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                MaterialValueHelper.getPrimaryTextColor(context, false)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                MaterialValueHelper.getPrimaryTextColor(context, false)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow_white_32dp,
-                MaterialValueHelper.getPrimaryTextColor(context, false)
-            ).toBitmap()
-        )
+		appWidgetView.setViewVisibility(
+				code.name.monkey.retromusic.R.id.media_titles,
+				View.INVISIBLE
+		)
+		appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, BaseAppWidget.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getPrimaryTextColor(context, false)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, BaseAppWidget.Companion.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getPrimaryTextColor(context, false)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, BaseAppWidget.Companion.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp,
+						MaterialValueHelper.getPrimaryTextColor(context, false)
+				)!!, 1f
+		)
+		)
 
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
+		linkButtons(context, appWidgetView)
+		pushUpdate(context, appWidgetIds, appWidgetView)
+	}
 
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(
-            service.packageName, R.layout.app_widget_big
-        )
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
+		val appWidgetView = RemoteViews(
+				service.packageName, code.name.monkey.retromusic.R.layout.app_widget_big
+		)
 
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
+		val isPlaying = service.isPlaying
+		val song = service.currentSong
 
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(
-                R.id.media_titles,
-                View.INVISIBLE
-            )
-        } else {
-            appWidgetView.setViewVisibility(
-                R.id.media_titles,
-                View.VISIBLE
-            )
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(
-                R.id.text,
-                getSongArtistAndAlbum(song)
-            )
-        }
+		// Set the titles and artwork
+		if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
+			appWidgetView.setViewVisibility(
+					code.name.monkey.retromusic.R.id.media_titles,
+					View.INVISIBLE
+			)
+		} else {
+			appWidgetView.setViewVisibility(
+					code.name.monkey.retromusic.R.id.media_titles,
+					View.VISIBLE
+			)
+			appWidgetView.setTextViewText(code.name.monkey.retromusic.R.id.title, song.title)
+			appWidgetView.setTextViewText(
+					code.name.monkey.retromusic.R.id.text,
+					getSongArtistAndAlbum(song)
+			)
+		}
 
-        val primaryColor = MaterialValueHelper.getPrimaryTextColor(service, false)
-        // Set correct drawable for pause state
-        val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            service.getTintedDrawable(
-                playPauseRes,
-                primaryColor
-            ).toBitmap()
-        )
+		// Set correct drawable for pause state
+		val playPauseRes = if (isPlaying) code.name.monkey.retromusic.R.drawable.ic_pause_white_24dp else code.name.monkey.retromusic.R.drawable.ic_play_arrow_white_32dp
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, BaseAppWidget.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						playPauseRes,
+						MaterialValueHelper.getPrimaryTextColor(service, false)
+				)!!, 1f
+		)
+		)
 
-        // Set prev/next button drawables
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                primaryColor
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                primaryColor
-            ).toBitmap()
-        )
+		// Set prev/next button drawables
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, BaseAppWidget.Companion.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						code.name.monkey.retromusic.R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getPrimaryTextColor(service, false)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, BaseAppWidget.Companion.createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						code.name.monkey.retromusic.R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getPrimaryTextColor(service, false)
+				)!!, 1f
+		)
+		)
 
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
+		// Link actions buttons to intents
+		linkButtons(service, appWidgetView)
 
-        // Load the album cover async and push the update on completion
-        val p = RetroUtil.getScreenSize(service)
-        val widgetImageSize = p.x.coerceAtMost(p.y)
-        val appContext = service.applicationContext
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(appContext)
-                .asBitmap()
-                //.checkIgnoreMediaStore()
-                .load(RetroGlideExtension.getSongModel(song))
-                .into(object : CustomTarget<Bitmap>(widgetImageSize, widgetImageSize) {
-                    override fun onResourceReady(
-                        resource: Bitmap,
-                        transition: Transition<in Bitmap>?,
-                    ) {
-                        update(resource)
-                    }
+		// Load the album cover async and push the update on completion
+		val p = RetroUtil.getScreenSize(service)
+		val widgetImageSize = Math.min(p.x, p.y)
+		val appContext = service.applicationContext
+		service.runOnUiThread {
+			if (target != null) {
+				Glide.clear(target)
+			}
+			target = SongGlideRequest.Builder.from(Glide.with(appContext), song)
+				.checkIgnoreMediaStore(appContext).asBitmap().build()
+				.into(object : SimpleTarget<Bitmap>(widgetImageSize, widgetImageSize) {
+					override fun onResourceReady(
+							resource: Bitmap,
+							glideAnimation: GlideAnimation<in Bitmap>
+					) {
+						update(resource)
+					}
 
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null)
-                    }
+					override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+						super.onLoadFailed(e, errorDrawable)
+						update(null)
+					}
 
-                    override fun onLoadCleared(placeholder: Drawable?) {}
+					private fun update(bitmap: Bitmap?) {
+						if (bitmap == null) {
+							appWidgetView.setImageViewResource(
+									R.id.image,
+									R.drawable.default_album_art
+							)
+						} else {
+							appWidgetView.setImageViewBitmap(R.id.image, bitmap)
+						}
+						pushUpdate(appContext, appWidgetIds, appWidgetView)
+					}
+				});
+		}
+	}
 
-                    private fun update(bitmap: Bitmap?) {
-                        if (bitmap == null) {
-                            appWidgetView.setImageViewResource(
-                                R.id.image,
-                                R.drawable.default_audio_art
-                            )
-                        } else {
-                            appWidgetView.setImageViewBitmap(R.id.image, bitmap)
-                        }
-                        pushUpdate(appContext, appWidgetIds, appWidgetView)
-                    }
-                })
-        }
-    }
+	/**
+	 * Link up various button actions using [PendingIntent].
+	 */
+	private fun linkButtons(context: Context, views: RemoteViews) {
+		val action = Intent(context, MainActivity::class.java).putExtra("expand", true)
+		var pendingIntent: PendingIntent
 
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
+		val serviceName = ComponentName(context, MusicService::class.java)
 
-        val serviceName = ComponentName(context, MusicService::class.java)
+		// Home
+		action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		pendingIntent = PendingIntent.getActivity(context, 0, action, 0)
+		views.setOnClickPendingIntent(R.id.clickable_area, pendingIntent)
 
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent =
-            PendingIntent.getActivity(
-                context, 0, action, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        views.setOnClickPendingIntent(R.id.clickable_area, pendingIntent)
+		// Previous track
+		pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
+		views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
 
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
+		// Play and pause
+		pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
+		views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
 
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
+		// Next track
+		pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
+		views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
 
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
 
-    companion object {
+	}
 
-        const val NAME: String = "app_widget_big"
-        private var mInstance: AppWidgetBig? = null
+	companion object {
 
-        val instance: AppWidgetBig
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetBig()
-                }
-                return mInstance!!
-            }
-    }
+		const val NAME: String = "app_widget_big"
+		private var mInstance: AppWidgetBig? = null
+
+		val instance: AppWidgetBig
+			@Synchronized get() {
+				if (mInstance == null) {
+					mInstance = AppWidgetBig()
+				}
+				return mInstance!!
+			}
+
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
index 471d908d6..bf72379d2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCard.kt
@@ -1,257 +1,259 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.text.TextUtils
 import android.view.View
 import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.*
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.*
 import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
 
 class AppWidgetCard : BaseAppWidget() {
-    private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
+	private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
 
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_card)
+	/**
+	 * Initialize given widgets to default state, where we launch Music on default click and hide
+	 * actions if service not running.
+	 */
+	override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
+		val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_card)
 
-        appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        val secondaryColor = MaterialValueHelper.getSecondaryTextColor(context, true)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                secondaryColor
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                secondaryColor
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow_white_32dp,
-                secondaryColor
-            ).toBitmap()
-        )
+		appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_play_arrow_white_32dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
 
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
+		linkButtons(context, appWidgetView)
+		pushUpdate(context, appWidgetIds, appWidgetView)
+	}
 
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_card)
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
+		val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_card)
 
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
+		val isPlaying = service.isPlaying
+		val song = service.currentSong
 
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        } else {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(R.id.text, getSongArtistAndAlbum(song))
-        }
+		// Set the titles and artwork
+		if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		} else {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
+			appWidgetView.setTextViewText(R.id.title, song.title)
+			appWidgetView.setTextViewText(R.id.text, getSongArtistAndAlbum(song))
+		}
 
-        // Set correct drawable for pause state
-        val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            service.getTintedDrawable(
-                playPauseRes,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
+		// Set correct drawable for pause state
+		val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_32dp
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						playPauseRes,
+						MaterialValueHelper.getSecondaryTextColor(service, true)
+				)!!, 1f
+		)
+		)
 
-        // Set prev/next button drawables
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
+		// Set prev/next button drawables
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(service, true)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						service,
+						R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(service, true)
+				)!!, 1f
+		)
+		)
 
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
+		// Link actions buttons to intents
+		linkButtons(service, appWidgetView)
 
-        if (imageSize == 0) {
-            imageSize =
-                service.resources.getDimensionPixelSize(R.dimen.app_widget_card_image_size)
-        }
-        if (cardRadius == 0f) {
-            cardRadius =
-                service.resources.getDimension(R.dimen.app_widget_card_radius)
-        }
+		if (imageSize == 0) {
+			imageSize = service.resources.getDimensionPixelSize(code.name.monkey.retromusic.R.dimen.app_widget_card_image_size)
+		}
+		if (cardRadius == 0f) {
+			cardRadius = service.resources.getDimension(code.name.monkey.retromusic.R.dimen.app_widget_card_radius)
+		}
+		val appContext = service.applicationContext
+		// Load the album cover async and push the update on completion
+		service.runOnUiThread {
+			if (target != null) {
+				Glide.clear(target)
+			}
+			target = SongGlideRequest.Builder.from(Glide.with(service), song)
+				.checkIgnoreMediaStore(service).generatePalette(service).build().centerCrop()
+				.into(object : SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
+					override fun onResourceReady(
+							resource: BitmapPaletteWrapper,
+							glideAnimation: GlideAnimation<in BitmapPaletteWrapper>
+					) {
+						val palette = resource.palette
+						update(
+								resource.bitmap, palette.getVibrantColor(
+								palette.getMutedColor(
+										MaterialValueHelper.getSecondaryTextColor(
+												service, true
+										)
+								)
+						)
+						)
+					}
 
-        // Load the album cover async and push the update on completion
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                .load(RetroGlideExtension.getSongModel(song))
-                .centerCrop()
-                .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                    override fun onResourceReady(
-                        resource: BitmapPaletteWrapper,
-                        transition: Transition<in BitmapPaletteWrapper>?,
-                    ) {
-                        val palette = resource.palette
-                        update(
-                            resource.bitmap, palette.getVibrantColor(
-                                palette.getMutedColor(
-                                    MaterialValueHelper.getSecondaryTextColor(
-                                        service, true
-                                    )
-                                )
-                            )
-                        )
-                    }
+					override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+						super.onLoadFailed(e, errorDrawable)
+						update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
+					}
 
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
-                    }
+					private fun update(bitmap: Bitmap?, color: Int) {
+						// Set correct drawable for pause state
+						appWidgetView.setImageViewBitmap(
+								R.id.button_toggle_play_pause, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, playPauseRes, color
+								)
+						)
+						)
 
-                    override fun onLoadCleared(placeholder: Drawable?) {}
+						// Set prev/next button drawables
+						appWidgetView.setImageViewBitmap(
+								R.id.button_next, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_next_white_24dp, color
+								)
+						)
+						)
+						appWidgetView.setImageViewBitmap(
+								R.id.button_prev, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_previous_white_24dp, color
+								)
+						)
+						)
 
-                    private fun update(bitmap: Bitmap?, color: Int) {
-                        // Set correct drawable for pause state
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_play_pause,
-                            service.getTintedDrawable(playPauseRes, color).toBitmap()
-                        )
+						val image = getAlbumArtDrawable(service.resources, bitmap)
+						val roundedBitmap = createRoundedBitmap(
+								image, imageSize, imageSize, cardRadius, 0F, cardRadius, 0F
+						)
+						appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
 
-                        // Set prev/next button drawables
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_next,
-                            service.getTintedDrawable(R.drawable.ic_skip_next, color).toBitmap()
-                        )
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_prev,
-                            service.getTintedDrawable(R.drawable.ic_skip_previous, color).toBitmap()
-                        )
+						pushUpdate(service, appWidgetIds, appWidgetView)
+					}
+				})
+		}
+	}
 
-                        val image = getAlbumArtDrawable(service, bitmap)
-                        val roundedBitmap = createRoundedBitmap(
-                            image, imageSize, imageSize, cardRadius, 0F, cardRadius, 0F
-                        )
-                        appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
+	/**
+	 * Link up various button actions using [PendingIntent].
+	 */
+	private fun linkButtons(context: Context, views: RemoteViews) {
+		val action: Intent = Intent(context, MainActivity::class.java).putExtra("expand", true)
+		var pendingIntent: PendingIntent
 
-                        pushUpdate(service, appWidgetIds, appWidgetView)
-                    }
-                })
-        }
-    }
+		val serviceName = ComponentName(context, MusicService::class.java)
 
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
+		// Home
+		action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		pendingIntent = PendingIntent.getActivity(context, 0, action, 0)
+		views.setOnClickPendingIntent(R.id.image, pendingIntent)
+		views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
 
-        val serviceName = ComponentName(context, MusicService::class.java)
+		// Previous track
+		pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
+		views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
 
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent =
-            PendingIntent.getActivity(
-                context, 0, action, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
+		// Play and pause
+		pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
+		views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
 
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
+		// Next track
+		pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
+		views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
+	}
 
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
+	companion object {
 
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
+		const val NAME = "app_widget_card"
 
-    companion object {
+		private var mInstance: AppWidgetCard? = null
+		private var imageSize = 0
+		private var cardRadius = 0f
 
-        const val NAME = "app_widget_card"
-
-        private var mInstance: AppWidgetCard? = null
-        private var imageSize = 0
-        private var cardRadius = 0f
-
-        val instance: AppWidgetCard
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetCard()
-                }
-                return mInstance!!
-            }
-    }
+		val instance: AppWidgetCard
+			@Synchronized get() {
+				if (mInstance == null) {
+					mInstance = AppWidgetCard()
+				}
+				return mInstance!!
+			}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt
deleted file mode 100644
index cb3ae0e44..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetCircle.kt
+++ /dev/null
@@ -1,218 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.appwidgets
-
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.RequestOptions
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.runBlocking
-
-class AppWidgetCircle : BaseAppWidget() {
-    private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
-
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_circle)
-
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        val secondaryColor = MaterialValueHelper.getSecondaryTextColor(context, true)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow,
-                secondaryColor
-            ).toBitmap()
-        )
-
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
-
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_circle)
-
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
-
-        // Set correct drawable for pause state
-        val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            service.getTintedDrawable(
-                playPauseRes,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-        val isFavorite = runBlocking(Dispatchers.IO) {
-            return@runBlocking MusicUtil.isFavorite(song)
-        }
-        val favoriteRes =
-            if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_favorite,
-            service.getTintedDrawable(
-                favoriteRes,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
-
-        if (imageSize == 0) {
-            val p = RetroUtil.getScreenSize(service)
-            imageSize = p.x.coerceAtMost(p.y)
-        }
-
-        // Load the album cover async and push the update on completion
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                .load(RetroGlideExtension.getSongModel(song))
-                .apply(RequestOptions.circleCropTransform())
-                .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                    override fun onResourceReady(
-                        resource: BitmapPaletteWrapper,
-                        transition: Transition<in BitmapPaletteWrapper>?,
-                    ) {
-                        val palette = resource.palette
-                        update(
-                            resource.bitmap, palette.getVibrantColor(
-                                palette.getMutedColor(
-                                    MaterialValueHelper.getSecondaryTextColor(
-                                        service, true
-                                    )
-                                )
-                            )
-                        )
-                    }
-
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
-                    }
-
-                    private fun update(bitmap: Bitmap?, color: Int) {
-                        // Set correct drawable for pause state
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_play_pause,
-                            service.getTintedDrawable(
-                                playPauseRes, color
-                            ).toBitmap()
-                        )
-
-                        // Set favorite button drawables
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_favorite,
-                            service.getTintedDrawable(
-                                favoriteRes, color
-                            ).toBitmap()
-                        )
-                        if (bitmap != null) {
-                            appWidgetView.setImageViewBitmap(R.id.image, bitmap)
-                        }
-
-                        pushUpdate(service, appWidgetIds, appWidgetView)
-                    }
-
-                    override fun onLoadCleared(placeholder: Drawable?) {}
-                })
-        }
-    }
-
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
-
-        val serviceName = ComponentName(context, MusicService::class.java)
-
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent =
-            PendingIntent.getActivity(
-                context, 0, action, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        // Favorite track
-        pendingIntent = buildPendingIntent(context, TOGGLE_FAVORITE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_favorite, pendingIntent)
-
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
-    }
-
-    companion object {
-
-        const val NAME = "app_widget_circle"
-
-        private var mInstance: AppWidgetCircle? = null
-        private var imageSize = 0
-
-        val instance: AppWidgetCircle
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetCircle()
-                }
-                return mInstance!!
-            }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
index ad04f8aae..3a63d69f3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetClassic.kt
@@ -1,253 +1,230 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.graphics.Bitmap
-import android.graphics.Color
 import android.graphics.drawable.Drawable
+import android.text.TextUtils
 import android.view.View
 import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.*
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.*
 import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
 
 class AppWidgetClassic : BaseAppWidget() {
-    private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
+	private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
 
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_classic)
+	/**
+	 * Initialize given widgets to default state, where we launch Music on default click and hide
+	 * actions if service not running.
+	 */
+	override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
+		val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_classic)
 
-        appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
 
-            context.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
+		appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_play_arrow_white_32dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
 
-            context.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
+		linkButtons(context, appWidgetView)
+		pushUpdate(context, appWidgetIds, appWidgetView)
+	}
 
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow_white_32dp,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
+		val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_classic)
 
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
+		val isPlaying = service.isPlaying
+		val song = service.currentSong
 
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_classic)
+		// Set the titles and artwork
+		if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		} else {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
+			appWidgetView.setTextViewText(R.id.title, song.title)
+			appWidgetView.setTextViewText(R.id.text, getSongArtistAndAlbum(song))
+		}
 
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
+		// Link actions buttons to intents
+		linkButtons(service, appWidgetView)
 
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        } else {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(R.id.text, getSongArtistAndAlbum(song))
-        }
+		if (imageSize == 0) {
+			imageSize = service.resources.getDimensionPixelSize(R.dimen.app_widget_classic_image_size)
+		}
+		if (cardRadius == 0f) {
+			cardRadius = service.resources.getDimension(R.dimen.app_widget_card_radius)
+		}
 
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
+		// Load the album cover async and push the update on completion
+		val appContext = service.applicationContext
+		service.runOnUiThread {
+			if (target != null) {
+				Glide.clear(target)
+			}
+			target = SongGlideRequest.Builder.from(Glide.with(service), song)
+				.checkIgnoreMediaStore(service).generatePalette(service).build().centerCrop()
+				.into(object : SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
+					override fun onResourceReady(
+							resource: BitmapPaletteWrapper,
+							glideAnimation: GlideAnimation<in BitmapPaletteWrapper>
+					) {
+						val palette = resource.palette
+						update(
+								resource.bitmap, palette.getVibrantColor(
+								palette.getMutedColor(
+										MaterialValueHelper.getSecondaryTextColor(
+												service, true
+										)
+								)
+						)
+						)
+					}
 
-        if (imageSize == 0) {
-            imageSize =
-                service.resources.getDimensionPixelSize(R.dimen.app_widget_classic_image_size)
-        }
-        if (cardRadius == 0f) {
-            cardRadius = service.resources.getDimension(R.dimen.app_widget_card_radius)
-        }
+					override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+						super.onLoadFailed(e, errorDrawable)
+						update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
+					}
 
-        // Load the album cover async and push the update on completion
-        val appContext = service.applicationContext
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                .load(RetroGlideExtension.getSongModel(song))
-                //.checkIgnoreMediaStore()
-                .centerCrop()
-                .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                    override fun onResourceReady(
-                        resource: BitmapPaletteWrapper,
-                        transition: Transition<in BitmapPaletteWrapper>?,
-                    ) {
-                        val palette = resource.palette
-                        update(
-                            resource.bitmap,
-                            palette.getVibrantColor(
-                                palette.getMutedColor(
-                                    MaterialValueHelper.getSecondaryTextColor(
-                                        service,
-                                        true
-                                    )
-                                )
-                            )
-                        )
-                    }
+					private fun update(bitmap: Bitmap?, color: Int) {
+						// Set correct drawable for pause state
+						val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp else R.drawable.ic_play_arrow_white_24dp
+						appWidgetView.setImageViewBitmap(
+								R.id.button_toggle_play_pause, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, playPauseRes, color
+								)
+						)
+						)
 
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null, Color.WHITE)
-                    }
+						// Set prev/next button drawables
+						appWidgetView.setImageViewBitmap(
+								R.id.button_next, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_next_white_24dp, color
+								)
+						)
+						)
+						appWidgetView.setImageViewBitmap(
+								R.id.button_prev, ImageUtil.createBitmap(
+								ImageUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_previous_white_24dp, color
+								)
+						)
+						)
 
-                    override fun onLoadCleared(placeholder: Drawable?) {}
+						val image = getAlbumArtDrawable(service.resources, bitmap)
+						val roundedBitmap = createRoundedBitmap(
+								image, imageSize, imageSize, cardRadius, 0F, cardRadius, 0F
+						)
+						appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
 
-                    private fun update(bitmap: Bitmap?, color: Int) {
-                        // Set correct drawable for pause state
-                        val playPauseRes =
-                            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_play_pause,
-                            service.getTintedDrawable(
-                                playPauseRes,
-                                color
-                            ).toBitmap()
-                        )
+						pushUpdate(appContext, appWidgetIds, appWidgetView)
+					}
+				})
+		}
+	}
 
-                        // Set prev/next button drawables
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_next,
-                            service.getTintedDrawable(
-                                R.drawable.ic_skip_next,
-                                color
-                            ).toBitmap()
-                        )
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_prev,
-                            service.getTintedDrawable(
-                                R.drawable.ic_skip_previous,
-                                color
-                            ).toBitmap()
-                        )
+	/**
+	 * Link up various button actions using [PendingIntent].
+	 */
+	private fun linkButtons(context: Context, views: RemoteViews) {
+		val action = Intent(context, MainActivity::class.java).putExtra("expand", true)
+		var pendingIntent: PendingIntent
 
-                        val image = getAlbumArtDrawable(service, bitmap)
-                        val roundedBitmap =
-                            createRoundedBitmap(
-                                image,
-                                imageSize,
-                                imageSize,
-                                cardRadius,
-                                0F,
-                                cardRadius,
-                                0F
-                            )
-                        appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
+		val serviceName = ComponentName(context, MusicService::class.java)
 
-                        pushUpdate(appContext, appWidgetIds, appWidgetView)
-                    }
-                })
-        }
-    }
+		// Home
+		action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		pendingIntent = PendingIntent.getActivity(context, 0, action, 0)
+		views.setOnClickPendingIntent(R.id.image, pendingIntent)
+		views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
 
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
+		// Previous track
+		pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
+		views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
 
-        val serviceName = ComponentName(context, MusicService::class.java)
+		// Play and pause
+		pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
+		views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
 
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent = PendingIntent.getActivity(
-            context, 0, action, if (VersionUtils.hasMarshmallow())
-                PendingIntent.FLAG_IMMUTABLE
-            else 0
-        )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
+		// Next track
+		pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
+		views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
+	}
 
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
+	companion object {
 
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
+		const val NAME = "app_widget_classic"
 
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
+		private var mInstance: AppWidgetClassic? = null
+		private var imageSize = 0
+		private var cardRadius = 0f
 
-    companion object {
-
-        const val NAME = "app_widget_classic"
-
-        private var mInstance: AppWidgetClassic? = null
-        private var imageSize = 0
-        private var cardRadius = 0f
-
-        val instance: AppWidgetClassic
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetClassic()
-                }
-                return mInstance!!
-            }
-    }
+		val instance: AppWidgetClassic
+			@Synchronized get() {
+				if (mInstance == null) {
+					mInstance = AppWidgetClassic()
+				}
+				return mInstance!!
+			}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
deleted file mode 100644
index 618914ff3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetMD3.kt
+++ /dev/null
@@ -1,264 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.appwidgets
-
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.drawable.Drawable
-import android.view.View
-import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
-
-class AppWidgetMD3 : BaseAppWidget() {
-    private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
-
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_md3)
-
-        appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        val secondaryColor = MaterialValueHelper.getSecondaryTextColor(context, true)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                secondaryColor
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                secondaryColor
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow_white_32dp,
-                secondaryColor
-            ).toBitmap()
-        )
-
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
-
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_md3)
-
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
-
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        } else {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(R.id.text, getSongArtistAndAlbum(song))
-        }
-
-        // Set correct drawable for pause state
-        val playPauseRes =
-            if (isPlaying) R.drawable.ic_pause else R.drawable.ic_play_arrow_white_32dp
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            service.getTintedDrawable(
-                playPauseRes,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-
-        // Set prev/next button drawables
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                MaterialValueHelper.getSecondaryTextColor(service, true)
-            ).toBitmap()
-        )
-
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
-
-        if (imageSize == 0) {
-            imageSize =
-                service.resources.getDimensionPixelSize(R.dimen.app_widget_card_image_size)
-        }
-        if (cardRadius == 0f) {
-            cardRadius =
-                DensityUtil.dip2px(service, 8F).toFloat()
-        }
-
-        // Load the album cover async and push the update on completion
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                .load(RetroGlideExtension.getSongModel(song))
-                .centerCrop()
-                .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                    override fun onResourceReady(
-                        resource: BitmapPaletteWrapper,
-                        transition: Transition<in BitmapPaletteWrapper>?,
-                    ) {
-                        val palette = resource.palette
-                        update(
-                            resource.bitmap, palette.getVibrantColor(
-                                palette.getMutedColor(
-                                    MaterialValueHelper.getSecondaryTextColor(
-                                        service, true
-                                    )
-                                )
-                            )
-                        )
-                    }
-
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
-                    }
-
-                    override fun onLoadCleared(placeholder: Drawable?) {}
-
-                    private fun update(bitmap: Bitmap?, color: Int) {
-                        // Set correct drawable for pause state
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_play_pause,
-                            service.getTintedDrawable(playPauseRes, color).toBitmap()
-                        )
-
-                        // Set prev/next button drawables
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_next,
-                            service.getTintedDrawable(R.drawable.ic_skip_next, color).toBitmap()
-                        )
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_prev,
-                            service.getTintedDrawable(R.drawable.ic_skip_previous, color).toBitmap()
-                        )
-
-                        val image = getAlbumArtDrawable(service, bitmap)
-                        val roundedBitmap = createRoundedBitmap(
-                            image,
-                            imageSize,
-                            imageSize,
-                            cardRadius,
-                            cardRadius,
-                            cardRadius,
-                            cardRadius
-                        )
-                        appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
-
-                        pushUpdate(service, appWidgetIds, appWidgetView)
-                    }
-                })
-        }
-    }
-
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
-
-        val serviceName = ComponentName(context, MusicService::class.java)
-
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent =
-            PendingIntent.getActivity(
-                context, 0, action, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
-
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
-
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
-
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
-
-    companion object {
-
-        const val NAME = "app_widget_md3"
-
-        private var mInstance: AppWidgetMD3? = null
-        private var imageSize = 0
-        private var cardRadius = 0F
-
-        val instance: AppWidgetMD3
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetMD3()
-                }
-                return mInstance!!
-            }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
index ee4e87e99..08f30b604 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetSmall.kt
@@ -1,241 +1,238 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.graphics.Bitmap
 import android.graphics.drawable.Drawable
+import android.text.TextUtils
 import android.view.View
 import android.widget.RemoteViews
-import androidx.core.graphics.drawable.toBitmap
 import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.RetroUtil
 import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.*
 import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
 
 class AppWidgetSmall : BaseAppWidget() {
-    private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
+	private var target: Target<BitmapPaletteWrapper>? = null // for cancellation
 
-    /**
-     * Initialize given widgets to default state, where we launch Music on default click and hide
-     * actions if service not running.
-     */
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_small)
+	/**
+	 * Initialize given widgets to default state, where we launch Music on default click and hide
+	 * actions if service not running.
+	 */
+	override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
+		val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_small)
 
-        appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        appWidgetView.setImageViewResource(R.id.image, R.drawable.default_audio_art)
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            context.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
+		appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		appWidgetView.setImageViewResource(R.id.image, R.drawable.default_album_art)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_next_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_skip_previous_white_24dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context,
+						R.drawable.ic_play_arrow_white_32dp,
+						MaterialValueHelper.getSecondaryTextColor(
+								context, true
+						)
+				)!!, 1f
+		)
+		)
 
-            context.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
+		linkButtons(context, appWidgetView)
+		pushUpdate(context, appWidgetIds, appWidgetView)
+	}
 
-            context.getTintedDrawable(
-                R.drawable.ic_play_arrow_white_32dp,
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            ).toBitmap()
-        )
+	/**
+	 * Update all active widget instances by pushing changes
+	 */
+	override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
+		val appWidgetView = RemoteViews(
+				service.packageName, R.layout.app_widget_small
+		)
 
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
+		val isPlaying = service.isPlaying
+		val song = service.currentSong
 
-    /**
-     * Update all active widget instances by pushing changes
-     */
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_small)
+		// Set the titles and artwork
+		if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		} else {
+			if (TextUtils.isEmpty(song.title) || TextUtils.isEmpty(song.artistName)) {
+				appWidgetView.setTextViewText(R.id.text_separator, "")
+			} else {
+				appWidgetView.setTextViewText(R.id.text_separator, "•")
+			}
 
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
+			appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
+			appWidgetView.setTextViewText(R.id.title, song.title)
+			appWidgetView.setTextViewText(R.id.text, song.artistName)
+		}
 
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        } else {
-            if (song.title.isEmpty() || song.artistName.isEmpty()) {
-                appWidgetView.setTextViewText(R.id.text_separator, "")
-            } else {
-                appWidgetView.setTextViewText(R.id.text_separator, "•")
-            }
+		// Link actions buttons to intents
+		linkButtons(service, appWidgetView)
 
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(R.id.text, song.artistName)
-        }
+		if (imageSize == 0) {
+			imageSize = service.resources.getDimensionPixelSize(R.dimen.app_widget_small_image_size)
+		}
+		if (cardRadius == 0f) {
+			cardRadius = service.resources.getDimension(R.dimen.app_widget_card_radius)
+		}
 
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
+		// Load the album cover async and push the update on completion
+		val appContext = service.applicationContext
+		service.runOnUiThread {
+			if (target != null) {
+				Glide.clear(target)
+			}
+			target = SongGlideRequest.Builder.from(Glide.with(service), song)
+				.checkIgnoreMediaStore(service).generatePalette(service).build().centerCrop()
+				.into(object : SimpleTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
+					override fun onResourceReady(
+							resource: BitmapPaletteWrapper,
+							glideAnimation: GlideAnimation<in BitmapPaletteWrapper>
+					) {
+						val palette = resource.palette
+						update(
+								resource.bitmap, palette.getVibrantColor(
+								palette.getMutedColor(
+										MaterialValueHelper.getSecondaryTextColor(
+												service, true
+										)
+								)
+						)
+						)
+					}
 
-        if (imageSize == 0) {
-            imageSize = service.resources.getDimensionPixelSize(R.dimen.app_widget_small_image_size)
-        }
-        if (cardRadius == 0f) {
-            cardRadius = service.resources.getDimension(R.dimen.app_widget_card_radius)
-        }
+					override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+						super.onLoadFailed(e, errorDrawable)
+						update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
+					}
 
-        // Load the album cover async and push the update on completion
-        val appContext = service.applicationContext
-        service.runOnUiThread {
-            if (target != null) {
-                Glide.with(service).clear(target)
-            }
-            target = Glide.with(service)
-                .asBitmapPalette()
-                .songCoverOptions(song)
-                //.checkIgnoreMediaStore()
-                .load(RetroGlideExtension.getSongModel(song))
-                .centerCrop()
-                .into(object : CustomTarget<BitmapPaletteWrapper>(imageSize, imageSize) {
-                    override fun onResourceReady(
-                        resource: BitmapPaletteWrapper,
-                        transition: Transition<in BitmapPaletteWrapper>?,
-                    ) {
-                        val palette = resource.palette
-                        update(
-                            resource.bitmap, palette.getVibrantColor(
-                                palette.getMutedColor(
-                                    MaterialValueHelper.getSecondaryTextColor(
-                                        service, true
-                                    )
-                                )
-                            )
-                        )
-                    }
+					private fun update(bitmap: Bitmap?, color: Int) {
+						// Set correct drawable for pause state
+						val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp
+						else R.drawable.ic_play_arrow_white_32dp
+						appWidgetView.setImageViewBitmap(
+								R.id.button_toggle_play_pause, createBitmap(
+								RetroUtil.getTintedVectorDrawable(
+										service, playPauseRes, color
+								)!!, 1f
+						)
+						)
 
-                    override fun onLoadFailed(errorDrawable: Drawable?) {
-                        super.onLoadFailed(errorDrawable)
-                        update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
-                    }
+						// Set prev/next button drawables
+						appWidgetView.setImageViewBitmap(
+								R.id.button_next, createBitmap(
+								RetroUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_next_white_24dp, color
+								)!!, 1f
+						)
+						)
+						appWidgetView.setImageViewBitmap(
+								R.id.button_prev, createBitmap(
+								RetroUtil.getTintedVectorDrawable(
+										service, R.drawable.ic_skip_previous_white_24dp, color
+								)!!, 1f
+						)
+						)
 
-                    override fun onLoadCleared(placeholder: Drawable?) {
-                        update(null, MaterialValueHelper.getSecondaryTextColor(service, true))
-                    }
+						val image = getAlbumArtDrawable(service.resources, bitmap)
+						val roundedBitmap = createRoundedBitmap(
+								image, imageSize, imageSize, cardRadius, 0f, 0f, 0f
+						)
+						appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
 
-                    private fun update(bitmap: Bitmap?, color: Int) {
-                        // Set correct drawable for pause state
-                        val playPauseRes = if (isPlaying) R.drawable.ic_pause
-                        else R.drawable.ic_play_arrow_white_32dp
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_toggle_play_pause,
-                            service.getTintedDrawable(playPauseRes, color).toBitmap()
-                        )
+						pushUpdate(appContext, appWidgetIds, appWidgetView)
+					}
+				})
+		}
+	}
 
-                        // Set prev/next button drawables
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_next,
-                            service.getTintedDrawable(R.drawable.ic_skip_next, color).toBitmap()
-                        )
-                        appWidgetView.setImageViewBitmap(
-                            R.id.button_prev,
-                            service.getTintedDrawable(R.drawable.ic_skip_previous, color).toBitmap()
-                        )
+	/**
+	 * Link up various button actions using [PendingIntent].
+	 */
+	private fun linkButtons(context: Context, views: RemoteViews) {
+		val action = Intent(context, MainActivity::class.java).putExtra("expand", true)
+		var pendingIntent: PendingIntent
 
-                        val image = getAlbumArtDrawable(service, bitmap)
-                        val roundedBitmap = createRoundedBitmap(
-                            image, imageSize, imageSize, cardRadius, 0f, 0f, 0f
-                        )
-                        appWidgetView.setImageViewBitmap(R.id.image, roundedBitmap)
+		val serviceName = ComponentName(context, MusicService::class.java)
 
-                        pushUpdate(appContext, appWidgetIds, appWidgetView)
-                    }
-                })
-        }
-    }
+		// Home
+		action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		pendingIntent = PendingIntent.getActivity(context, 0, action, 0)
+		views.setOnClickPendingIntent(R.id.image, pendingIntent)
+		views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
 
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
+		// Previous track
+		pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
+		views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
 
-        val serviceName = ComponentName(context, MusicService::class.java)
+		// Play and pause
+		pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
+		views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
 
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent =
-            PendingIntent.getActivity(
-                context, 0, action, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
+		// Next track
+		pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
+		views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
+	}
 
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
+	companion object {
 
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
+		const val NAME: String = "app_widget_small"
 
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
+		private var mInstance: AppWidgetSmall? = null
+		private var imageSize = 0
+		private var cardRadius = 0f
 
-    companion object {
-
-        const val NAME: String = "app_widget_small"
-
-        private var mInstance: AppWidgetSmall? = null
-        private var imageSize = 0
-        private var cardRadius = 0f
-
-        val instance: AppWidgetSmall
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetSmall()
-                }
-                return mInstance!!
-            }
-    }
+		val instance: AppWidgetSmall
+			@Synchronized get() {
+				if (mInstance == null) {
+					mInstance = AppWidgetSmall()
+				}
+				return mInstance!!
+			}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
index b7abb6ee5..88bba6a8b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/AppWidgetText.kt
@@ -1,170 +1,173 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
+import android.text.TextUtils
 import android.view.View
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
-import androidx.core.graphics.drawable.toBitmap
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.appwidgets.base.BaseAppWidget
-import code.name.monkey.retromusic.extensions.getTintedDrawable
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.RetroUtil
 
 class AppWidgetText : BaseAppWidget() {
-    override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
-        val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_text)
+	override fun defaultAppWidget(context: Context, appWidgetIds: IntArray) {
+		val appWidgetView = RemoteViews(context.packageName, R.layout.app_widget_text)
 
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            context.getTintedDrawable(R.drawable.ic_skip_next, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
-            )).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            context.getTintedDrawable(R.drawable.ic_skip_previous, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
-            )
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            context.getTintedDrawable(R.drawable.ic_play_arrow_white_32dp, ContextCompat.getColor(
-                context, code.name.monkey.appthemehelper.R.color.md_white_1000
-            )
-            ).toBitmap()
-        )
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context, R.drawable.ic_skip_next_white_24dp, ContextCompat.getColor(
+						context, R.color.md_white_1000
+				)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context, R.drawable.ic_skip_previous_white_24dp, ContextCompat.getColor(
+						context, R.color.md_white_1000
+				)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						context, R.drawable.ic_play_arrow_white_32dp, ContextCompat.getColor(
+						context, R.color.md_white_1000
+				)
+				)!!, 1f
+		)
+		)
 
-        appWidgetView.setTextColor(
-            R.id.title, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
-        )
-        appWidgetView.setTextColor(
-            R.id.text, ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.md_white_1000)
-        )
+		appWidgetView.setTextColor(
+				R.id.title, ContextCompat.getColor(context, R.color.md_white_1000)
+		)
+		appWidgetView.setTextColor(
+				R.id.text, ContextCompat.getColor(context, R.color.md_white_1000)
+		)
 
-        linkButtons(context, appWidgetView)
-        pushUpdate(context, appWidgetIds, appWidgetView)
-    }
+		linkButtons(context, appWidgetView)
+		pushUpdate(context, appWidgetIds, appWidgetView)
+	}
 
-    /**
-     * Link up various button actions using [PendingIntent].
-     */
-    private fun linkButtons(context: Context, views: RemoteViews) {
-        val action = Intent(context, MainActivity::class.java)
-            .putExtra(
-                MainActivity.EXPAND_PANEL,
-                PreferenceUtil.isExpandPanel
-            )
+	/**
+	 * Link up various button actions using [PendingIntent].
+	 */
+	private fun linkButtons(context: Context, views: RemoteViews) {
+		val action = Intent(context, MainActivity::class.java).putExtra("expand", true)
+		var pendingIntent: PendingIntent
 
-        val serviceName = ComponentName(context, MusicService::class.java)
+		val serviceName = ComponentName(context, MusicService::class.java)
 
-        // Home
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        var pendingIntent = PendingIntent.getActivity(
-            context, 0, action, if (VersionUtils.hasMarshmallow())
-                PendingIntent.FLAG_IMMUTABLE
-            else 0
-        )
-        views.setOnClickPendingIntent(R.id.image, pendingIntent)
-        views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
+		// Home
+		action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+		pendingIntent = PendingIntent.getActivity(context, 0, action, 0)
+		views.setOnClickPendingIntent(R.id.image, pendingIntent)
+		views.setOnClickPendingIntent(R.id.media_titles, pendingIntent)
 
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
+		// Previous track
+		pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
+		views.setOnClickPendingIntent(R.id.button_prev, pendingIntent)
 
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
+		// Play and pause
+		pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
+		views.setOnClickPendingIntent(R.id.button_toggle_play_pause, pendingIntent)
 
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
-    }
+		// Next track
+		pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
+		views.setOnClickPendingIntent(R.id.button_next, pendingIntent)
+	}
 
-    override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
-        val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_text)
+	override fun performUpdate(service: MusicService, appWidgetIds: IntArray?) {
+		val appWidgetView = RemoteViews(service.packageName, R.layout.app_widget_text)
 
-        val isPlaying = service.isPlaying
-        val song = service.currentSong
+		val isPlaying = service.isPlaying
+		val song = service.currentSong
 
-        // Set the titles and artwork
-        if (song.title.isEmpty() && song.artistName.isEmpty()) {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
-        } else {
-            appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
-            appWidgetView.setTextViewText(R.id.title, song.title)
-            appWidgetView.setTextViewText(R.id.text, song.artistName)
-        }
-        // Link actions buttons to intents
-        linkButtons(service, appWidgetView)
+		// Set the titles and artwork
+		if (TextUtils.isEmpty(song.title) && TextUtils.isEmpty(song.artistName)) {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.INVISIBLE)
+		} else {
+			appWidgetView.setViewVisibility(R.id.media_titles, View.VISIBLE)
+			appWidgetView.setTextViewText(R.id.title, song.title)
+			appWidgetView.setTextViewText(R.id.text, song.artistName)
+		}
+		// Link actions buttons to intents
+		linkButtons(service, appWidgetView)
 
-        // Set correct drawable for pause state
-        val playPauseRes = if (isPlaying) R.drawable.ic_pause
-        else R.drawable.ic_play_arrow_white_32dp
-        appWidgetView.setImageViewBitmap(
-            R.id.button_toggle_play_pause,
-            service.getTintedDrawable(playPauseRes, ContextCompat.getColor(
-                service, code.name.monkey.appthemehelper.R.color.md_white_1000)
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_next,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_next,
-                ContextCompat.getColor(
-                    service,
-                    code.name.monkey.appthemehelper.R.color.md_white_1000
-                )
-            ).toBitmap()
-        )
-        appWidgetView.setImageViewBitmap(
-            R.id.button_prev,
-            service.getTintedDrawable(
-                R.drawable.ic_skip_previous,
-                ContextCompat.getColor(
-                    service, code.name.monkey.appthemehelper.R.color.md_white_1000
-                )
-            ).toBitmap()
-        )
+		// Set correct drawable for pause state
+		val playPauseRes = if (isPlaying) R.drawable.ic_pause_white_24dp
+		else R.drawable.ic_play_arrow_white_32dp
+		appWidgetView.setImageViewBitmap(
+				R.id.button_toggle_play_pause, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						App.getContext(), playPauseRes, ContextCompat.getColor(
+						App.getContext(), R.color.md_white_1000
+				)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_next, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						App.getContext(),
+						R.drawable.ic_skip_next_white_24dp,
+						ContextCompat.getColor(
+								App.getContext(), R.color.md_white_1000
+						)
+				)!!, 1f
+		)
+		)
+		appWidgetView.setImageViewBitmap(
+				R.id.button_prev, createBitmap(
+				RetroUtil.getTintedVectorDrawable(
+						App.getContext(),
+						R.drawable.ic_skip_previous_white_24dp,
+						ContextCompat.getColor(
+								App.getContext(), R.color.md_white_1000
+						)
+				)!!, 1f
+		)
+		)
 
-        pushUpdate(service.applicationContext, appWidgetIds, appWidgetView)
-    }
 
-    companion object {
 
-        const val NAME: String = "app_widget_text"
+		pushUpdate(service.applicationContext, appWidgetIds, appWidgetView)
 
-        private var mInstance: AppWidgetText? = null
+	}
 
-        val instance: AppWidgetText
-            @Synchronized get() {
-                if (mInstance == null) {
-                    mInstance = AppWidgetText()
-                }
-                return mInstance!!
-            }
-    }
+	companion object {
+
+		const val NAME: String = "app_widget_text"
+
+		private var mInstance: AppWidgetText? = null
+
+		val instance: AppWidgetText
+			@Synchronized get() {
+				if (mInstance == null) {
+					mInstance = AppWidgetText()
+				}
+				return mInstance!!
+			}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt
index 079e90ae6..90a9cf8a3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/BootReceiver.kt
@@ -1,54 +1,50 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets
 
 import android.appwidget.AppWidgetManager
-import android.content.BroadcastReceiver
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.content.*
 import android.os.Build
 import code.name.monkey.retromusic.service.MusicService
 
 class BootReceiver : BroadcastReceiver() {
-    override fun onReceive(context: Context, intent: Intent) {
-        val widgetManager = AppWidgetManager.getInstance(context)
+	override fun onReceive(context: Context, intent: Intent) {
+		val widgetManager = AppWidgetManager.getInstance(context)
 
-        // Start music service if there are any existing widgets
-        if (widgetManager.getAppWidgetIds(
-                ComponentName(
-                    context, AppWidgetBig::class.java
-                )
-            ).isNotEmpty() || widgetManager.getAppWidgetIds(
-                ComponentName(
-                    context, AppWidgetClassic::class.java
-                )
-            ).isNotEmpty() || widgetManager.getAppWidgetIds(
-                ComponentName(
-                    context, AppWidgetSmall::class.java
-                )
-            ).isNotEmpty() || widgetManager.getAppWidgetIds(
-                ComponentName(
-                    context, AppWidgetCard::class.java
-                )
-            ).isNotEmpty()
-        ) {
-            val serviceIntent = Intent(context, MusicService::class.java)
-            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // not allowed on Oreo
-                context.startService(serviceIntent)
-            }
-        }
-    }
+		// Start music service if there are any existing widgets
+		if (widgetManager.getAppWidgetIds(
+						ComponentName(
+								context, AppWidgetBig::class.java
+						)
+				).isNotEmpty() || widgetManager.getAppWidgetIds(
+						ComponentName(
+								context, AppWidgetClassic::class.java
+						)
+				).isNotEmpty() || widgetManager.getAppWidgetIds(
+						ComponentName(
+								context, AppWidgetSmall::class.java
+						)
+				).isNotEmpty() || widgetManager.getAppWidgetIds(
+						ComponentName(
+								context, AppWidgetCard::class.java
+						)
+				).isNotEmpty()) {
+			val serviceIntent = Intent(context, MusicService::class.java)
+			if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) { // not allowed on Oreo
+				context.startService(serviceIntent)
+			}
+		}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt b/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt
index e460b7956..13b9347ee 100644
--- a/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/appwidgets/base/BaseAppWidget.kt
@@ -1,192 +1,184 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.appwidgets.base
 
 import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.appwidget.AppWidgetProvider
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
+import android.appwidget.*
+import android.content.*
+import android.content.res.Resources
 import android.graphics.*
-import android.graphics.drawable.BitmapDrawable
-import android.graphics.drawable.Drawable
+import android.graphics.drawable.*
+import android.os.Build
+import android.text.TextUtils
 import android.widget.RemoteViews
 import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.*
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.APP_WIDGET_UPDATE
-import code.name.monkey.retromusic.service.MusicService.Companion.EXTRA_APP_WIDGET_NAME
-import code.name.monkey.retromusic.service.MusicService.Companion.FAVORITE_STATE_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.META_CHANGED
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
+import code.name.monkey.retromusic.service.MusicService.*
 
 abstract class BaseAppWidget : AppWidgetProvider() {
 
-    /**
-     * {@inheritDoc}
-     */
-    override fun onUpdate(
-        context: Context,
-        appWidgetManager: AppWidgetManager,
-        appWidgetIds: IntArray
-    ) {
-        defaultAppWidget(context, appWidgetIds)
-        val updateIntent = Intent(APP_WIDGET_UPDATE)
-        updateIntent.putExtra(EXTRA_APP_WIDGET_NAME, NAME)
-        updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
-        updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY)
-        context.sendBroadcast(updateIntent)
-    }
+	/**
+	 * {@inheritDoc}
+	 */
+	override fun onUpdate(
+			context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray
+	) {
+		defaultAppWidget(context, appWidgetIds)
+		val updateIntent = Intent(APP_WIDGET_UPDATE)
+		updateIntent.putExtra(EXTRA_APP_WIDGET_NAME, NAME)
+		updateIntent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, appWidgetIds)
+		updateIntent.addFlags(Intent.FLAG_RECEIVER_REGISTERED_ONLY)
+		context.sendBroadcast(updateIntent)
+	}
 
-    /**
-     * Handle a change notification coming over from [MusicService]
-     */
-    fun notifyChange(service: MusicService, what: String) {
-        if (hasInstances(service)) {
-            if (META_CHANGED == what || PLAY_STATE_CHANGED == what || FAVORITE_STATE_CHANGED == what) {
-                performUpdate(service, null)
-            }
-        }
-    }
+	/**
+	 * Handle a change notification coming over from [MusicService]
+	 */
+	fun notifyChange(service: MusicService, what: String) {
+		if (hasInstances(service)) {
+			if (META_CHANGED == what || PLAY_STATE_CHANGED == what) {
+				performUpdate(service, null)
+			}
+		}
+	}
 
-    protected fun pushUpdate(
-        context: Context,
-        appWidgetIds: IntArray?,
-        views: RemoteViews
-    ) {
-        val appWidgetManager = AppWidgetManager.getInstance(context)
-        if (appWidgetIds != null) {
-            appWidgetManager.updateAppWidget(appWidgetIds, views)
-        } else {
-            appWidgetManager.updateAppWidget(ComponentName(context, javaClass), views)
-        }
-    }
+	protected fun pushUpdate(
+			context: Context, appWidgetIds: IntArray?, views: RemoteViews
+	) {
+		val appWidgetManager = AppWidgetManager.getInstance(context)
+		if (appWidgetIds != null) {
+			appWidgetManager.updateAppWidget(appWidgetIds, views)
+		} else {
+			appWidgetManager.updateAppWidget(ComponentName(context, javaClass), views)
+		}
+	}
 
-    /**
-     * Check against [AppWidgetManager] if there are any instances of this widget.
-     */
-    private fun hasInstances(context: Context): Boolean {
-        val appWidgetManager = AppWidgetManager.getInstance(context)
-        val mAppWidgetIds = appWidgetManager.getAppWidgetIds(
-            ComponentName(
-                context, javaClass
-            )
-        )
-        return mAppWidgetIds.isNotEmpty()
-    }
+	/**
+	 * Check against [AppWidgetManager] if there are any instances of this widget.
+	 */
+	private fun hasInstances(context: Context): Boolean {
+		val appWidgetManager = AppWidgetManager.getInstance(context)
+		val mAppWidgetIds = appWidgetManager.getAppWidgetIds(
+				ComponentName(
+						context, javaClass
+				)
+		)
+		return mAppWidgetIds.isNotEmpty()
+	}
 
-    protected fun buildPendingIntent(
-        context: Context,
-        action: String,
-        serviceName: ComponentName
-    ): PendingIntent {
-        val intent = Intent(action)
-        intent.component = serviceName
-        return if (VersionUtils.hasOreo()) {
-            PendingIntent.getForegroundService(context, 0, intent, PendingIntent.FLAG_IMMUTABLE)
-        } else {
-            PendingIntent.getService(
-                context, 0, intent, if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        }
-    }
+	protected fun buildPendingIntent(
+			context: Context, action: String, serviceName: ComponentName
+	): PendingIntent {
+		val intent = Intent(action)
+		intent.component = serviceName
+		return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+			PendingIntent.getForegroundService(context, 0, intent, 0)
+		} else {
+			PendingIntent.getService(context, 0, intent, 0)
+		}
+	}
 
-    protected abstract fun defaultAppWidget(context: Context, appWidgetIds: IntArray)
+	protected abstract fun defaultAppWidget(context: Context, appWidgetIds: IntArray)
 
-    abstract fun performUpdate(service: MusicService, appWidgetIds: IntArray?)
+	abstract fun performUpdate(service: MusicService, appWidgetIds: IntArray?)
 
-    protected fun getAlbumArtDrawable(context: Context, bitmap: Bitmap?): Drawable {
-        return if (bitmap == null) {
-            ContextCompat.getDrawable(context, R.drawable.default_audio_art)!!
-        } else {
-            BitmapDrawable(context.resources, bitmap)
-        }
-    }
+	protected fun getAlbumArtDrawable(resources: Resources, bitmap: Bitmap?): Drawable {
+		return if (bitmap == null) {
+			ContextCompat.getDrawable(App.getContext(), R.drawable.default_album_art)!!
+		} else {
+			BitmapDrawable(resources, bitmap)
+		}
+	}
 
-    protected fun getSongArtistAndAlbum(song: Song): String {
-        val builder = StringBuilder()
-        builder.append(song.artistName)
-        if (song.artistName.isNotEmpty() && song.albumName.isNotEmpty()) {
-            builder.append(" • ")
-        }
-        builder.append(song.albumName)
-        return builder.toString()
-    }
+	protected fun getSongArtistAndAlbum(song: Song): String {
+		val builder = StringBuilder()
+		builder.append(song.artistName)
+		if (!TextUtils.isEmpty(song.artistName) && !TextUtils.isEmpty(song.albumName)) {
+			builder.append(" • ")
+		}
+		builder.append(song.albumName)
+		return builder.toString()
+	}
 
-    companion object {
+	companion object {
 
-        const val NAME: String = "app_widget"
+		const val NAME: String = "app_widget"
 
-        fun createRoundedBitmap(
-            drawable: Drawable?,
-            width: Int,
-            height: Int,
-            tl: Float,
-            tr: Float,
-            bl: Float,
-            br: Float
-        ): Bitmap? {
-            if (drawable == null) {
-                return null
-            }
+		fun createRoundedBitmap(
+				drawable: Drawable?,
+				width: Int,
+				height: Int,
+				tl: Float,
+				tr: Float,
+				bl: Float,
+				br: Float
+		): Bitmap? {
+			if (drawable == null) {
+				return null
+			}
 
-            val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
-            val c = Canvas(bitmap)
-            drawable.setBounds(0, 0, width, height)
-            drawable.draw(c)
+			val bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+			val c = Canvas(bitmap)
+			drawable.setBounds(0, 0, width, height)
+			drawable.draw(c)
 
-            val rounded = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
+			val rounded = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888)
 
-            val canvas = Canvas(rounded)
-            val paint = Paint()
-            paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
-            paint.isAntiAlias = true
-            canvas.drawPath(
-                composeRoundedRectPath(
-                    RectF(0f, 0f, width.toFloat(), height.toFloat()), tl, tr, bl, br
-                ), paint
-            )
+			val canvas = Canvas(rounded)
+			val paint = Paint()
+			paint.shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP)
+			paint.isAntiAlias = true
+			canvas.drawPath(
+					composeRoundedRectPath(
+							RectF(0f, 0f, width.toFloat(), height.toFloat()), tl, tr, bl, br
+					), paint
+			)
 
-            return rounded
-        }
+			return rounded
+		}
 
-        protected fun composeRoundedRectPath(
-            rect: RectF,
-            tl: Float,
-            tr: Float,
-            bl: Float,
-            br: Float
-        ): Path {
-            val path = Path()
-            path.moveTo(rect.left + tl, rect.top)
-            path.lineTo(rect.right - tr, rect.top)
-            path.quadTo(rect.right, rect.top, rect.right, rect.top + tr)
-            path.lineTo(rect.right, rect.bottom - br)
-            path.quadTo(rect.right, rect.bottom, rect.right - br, rect.bottom)
-            path.lineTo(rect.left + bl, rect.bottom)
-            path.quadTo(rect.left, rect.bottom, rect.left, rect.bottom - bl)
-            path.lineTo(rect.left, rect.top + tl)
-            path.quadTo(rect.left, rect.top, rect.left + tl, rect.top)
-            path.close()
+		fun createBitmap(drawable: Drawable, sizeMultiplier: Float): Bitmap {
+			val bitmap = Bitmap.createBitmap(
+					(drawable.intrinsicWidth * sizeMultiplier).toInt(),
+					(drawable.intrinsicHeight * sizeMultiplier).toInt(),
+					Bitmap.Config.ARGB_8888
+			)
+			val c = Canvas(bitmap)
+			drawable.setBounds(0, 0, c.width, c.height)
+			drawable.draw(c)
+			return bitmap
+		}
 
-            return path
-        }
-    }
+		protected fun composeRoundedRectPath(
+				rect: RectF, tl: Float, tr: Float, bl: Float, br: Float
+		): Path {
+			val path = Path()
+			path.moveTo(rect.left + tl, rect.top)
+			path.lineTo(rect.right - tr, rect.top)
+			path.quadTo(rect.right, rect.top, rect.right, rect.top + tr)
+			path.lineTo(rect.right, rect.bottom - br)
+			path.quadTo(rect.right, rect.bottom, rect.right - br, rect.bottom)
+			path.lineTo(rect.left + bl, rect.bottom)
+			path.quadTo(rect.left, rect.bottom, rect.left, rect.bottom - bl)
+			path.lineTo(rect.left, rect.top + tl)
+			path.quadTo(rect.left, rect.top, rect.left + tl, rect.top)
+			path.close()
+
+			return path
+		}
+	}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java b/app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java
deleted file mode 100644
index 3d1f4815d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMediaIDHelper.java
+++ /dev/null
@@ -1,102 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.auto;
-
-import androidx.annotation.NonNull;
-
-/**
- * Created by Beesham Sarendranauth (Beesham)
- */
-public class AutoMediaIDHelper {
-
-    // Media IDs used on browseable items of MediaBrowser
-    public static final String MEDIA_ID_EMPTY_ROOT = "__EMPTY_ROOT__";
-    public static final String MEDIA_ID_ROOT = "__ROOT__";
-    public static final String MEDIA_ID_MUSICS_BY_SEARCH = "__BY_SEARCH__";  // TODO
-    public static final String MEDIA_ID_MUSICS_BY_HISTORY = "__BY_HISTORY__";
-    public static final String MEDIA_ID_MUSICS_BY_TOP_TRACKS = "__BY_TOP_TRACKS__";
-    public static final String MEDIA_ID_MUSICS_BY_SUGGESTIONS = "__BY_SUGGESTIONS__";
-    public static final String MEDIA_ID_MUSICS_BY_PLAYLIST = "__BY_PLAYLIST__";
-    public static final String MEDIA_ID_MUSICS_BY_ALBUM = "__BY_ALBUM__";
-    public static final String MEDIA_ID_MUSICS_BY_ARTIST = "__BY_ARTIST__";
-    public static final String MEDIA_ID_MUSICS_BY_ALBUM_ARTIST = "__BY_ALBUM_ARTIST__";
-    public static final String MEDIA_ID_MUSICS_BY_GENRE = "__BY_GENRE__";
-    public static final String MEDIA_ID_MUSICS_BY_SHUFFLE = "__BY_SHUFFLE__";
-    public static final String MEDIA_ID_MUSICS_BY_QUEUE = "__BY_QUEUE__";
-    public static final String RECENT_ROOT = "__RECENT__";
-
-    private static final String CATEGORY_SEPARATOR = "__/__";
-    private static final String LEAF_SEPARATOR = "__|__";
-
-    /**
-     * Create a String value that represents a playable or a browsable media.
-     * <p/>
-     * Encode the media browseable categories, if any, and the unique music ID, if any,
-     * into a single String mediaID.
-     * <p/>
-     * MediaIDs are of the form <categoryType>__/__<categoryValue>__|__<musicUniqueId>, to make it
-     * easy to find the category (like genre) that a music was selected from, so we
-     * can correctly build the playing queue. This is specially useful when
-     * one music can appear in more than one list, like "by genre -> genre_1"
-     * and "by artist -> artist_1".
-     *
-     * @param mediaID    Unique ID for playable items, or null for browseable items.
-     * @param categories Hierarchy of categories representing this item's browsing parents.
-     * @return A hierarchy-aware media ID.
-     */
-    public static String createMediaID(String mediaID, String... categories) {
-        StringBuilder sb = new StringBuilder();
-        if (categories != null) {
-            for (int i = 0; i < categories.length; i++) {
-                if (!isValidCategory(categories[i])) {
-                    throw new IllegalArgumentException("Invalid category: " + categories[i]);
-                }
-                sb.append(categories[i]);
-                if (i < categories.length - 1) {
-                    sb.append(CATEGORY_SEPARATOR);
-                }
-            }
-        }
-        if (mediaID != null) {
-            sb.append(LEAF_SEPARATOR).append(mediaID);
-        }
-        return sb.toString();
-    }
-
-    public static String extractCategory(@NonNull String mediaID) {
-        int pos = mediaID.indexOf(LEAF_SEPARATOR);
-        if (pos >= 0) {
-            return mediaID.substring(0, pos);
-        }
-        return mediaID;
-    }
-
-    public static String extractMusicID(@NonNull String mediaID) {
-        int pos = mediaID.indexOf(LEAF_SEPARATOR);
-        if (pos >= 0) {
-            return mediaID.substring(pos + LEAF_SEPARATOR.length());
-        }
-        return null;
-    }
-
-    public static boolean isBrowseable(@NonNull String mediaID) {
-        return !mediaID.contains(LEAF_SEPARATOR);
-    }
-
-    private static boolean isValidCategory(String category) {
-        return category == null ||
-                (!category.contains(CATEGORY_SEPARATOR) && !category.contains(LEAF_SEPARATOR));
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt b/app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt
deleted file mode 100644
index b6e267ed2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/auto/AutoMusicProvider.kt
+++ /dev/null
@@ -1,283 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.auto
-
-import android.content.Context
-import android.content.res.Resources
-import android.support.v4.media.MediaBrowserCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.*
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import java.lang.ref.WeakReference
-
-
-/**
- * Created by Beesham Sarendranauth (Beesham)
- */
-class AutoMusicProvider(
-    private val mContext: Context,
-    private val songsRepository: SongRepository,
-    private val albumsRepository: AlbumRepository,
-    private val artistsRepository: ArtistRepository,
-    private val genresRepository: GenreRepository,
-    private val playlistsRepository: PlaylistRepository,
-    private val topPlayedRepository: TopPlayedRepository
-) {
-    private var mMusicService: WeakReference<MusicService>? = null
-
-    fun setMusicService(service: MusicService) {
-        mMusicService = WeakReference(service)
-    }
-
-    fun getChildren(mediaId: String?, resources: Resources): List<MediaBrowserCompat.MediaItem> {
-        val mediaItems: MutableList<MediaBrowserCompat.MediaItem> = ArrayList()
-        when (mediaId) {
-            AutoMediaIDHelper.MEDIA_ID_ROOT -> {
-                mediaItems.addAll(getRootChildren(resources))
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_PLAYLIST -> for (playlist in playlistsRepository.playlists()) {
-                mediaItems.add(
-                    AutoMediaItem.with(mContext)
-                        .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_PLAYLIST, playlist.id)
-                        .icon(R.drawable.ic_playlist_play)
-                        .title(playlist.name)
-                        .subTitle(playlist.getInfoString(mContext))
-                        .asPlayable()
-                        .build()
-                )
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM -> for (album in albumsRepository.albums()) {
-                mediaItems.add(
-                    AutoMediaItem.with(mContext)
-                        .path(mediaId, album.id)
-                        .title(album.title)
-                        .subTitle(album.albumArtist ?: album.artistName)
-                        .icon(MusicUtil.getMediaStoreAlbumCoverUri(album.id))
-                        .asPlayable()
-                        .build()
-                )
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ARTIST -> for (artist in artistsRepository.artists()) {
-                mediaItems.add(
-                    AutoMediaItem.with(mContext)
-                        .asPlayable()
-                        .path(mediaId, artist.id)
-                        .title(artist.name)
-                        .build()
-                )
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM_ARTIST -> for (artist in artistsRepository.albumArtists()) {
-                mediaItems.add(
-                    AutoMediaItem.with(mContext)
-                        .asPlayable()
-                        // we just pass album id here as we don't have album artist id's
-                        .path(mediaId, artist.safeGetFirstAlbum().id)
-                        .title(artist.name)
-                        .build()
-                )
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE -> for (genre in genresRepository.genres()) {
-                mediaItems.add(
-                    AutoMediaItem.with(mContext)
-                        .asPlayable()
-                        .path(mediaId, genre.id)
-                        .title(genre.name)
-                        .build()
-                )
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_QUEUE ->
-                mMusicService?.get()?.playingQueue
-                    ?.let {
-                        for (song in it) {
-                            mediaItems.add(
-                                AutoMediaItem.with(mContext)
-                                    .asPlayable()
-                                    .path(mediaId, song.id)
-                                    .title(song.title)
-                                    .subTitle(song.artistName)
-                                    .icon(MusicUtil.getMediaStoreAlbumCoverUri(song.albumId))
-                                    .build()
-                            )
-                        }
-                    }
-            else -> {
-                getPlaylistChildren(mediaId, mediaItems)
-            }
-        }
-        return mediaItems
-    }
-
-    private fun getPlaylistChildren(
-        mediaId: String?,
-        mediaItems: MutableList<MediaBrowserCompat.MediaItem>
-    ) {
-        val songs = when (mediaId) {
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_TOP_TRACKS -> {
-                topPlayedRepository.topTracks()
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY -> {
-                topPlayedRepository.recentlyPlayedTracks()
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS -> {
-                topPlayedRepository.notRecentlyPlayedTracks().take(8)
-            }
-            else -> {
-                emptyList()
-            }
-        }
-        songs.forEach { song ->
-            mediaItems.add(
-                getPlayableSong(mediaId, song)
-            )
-        }
-    }
-
-    private fun getRootChildren(resources: Resources): List<MediaBrowserCompat.MediaItem> {
-        val mediaItems: MutableList<MediaBrowserCompat.MediaItem> = ArrayList()
-        val libraryCategories = PreferenceUtil.libraryCategory
-        libraryCategories.forEach {
-            if (it.visible) {
-                when (it.category) {
-                    CategoryInfo.Category.Albums -> {
-                        mediaItems.add(
-                            AutoMediaItem.with(mContext)
-                                .asBrowsable()
-                                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM)
-                                .gridLayout(true)
-                                .icon(R.drawable.ic_album)
-                                .title(resources.getString(R.string.albums)).build()
-                        )
-                    }
-                    CategoryInfo.Category.Artists -> {
-                        if (PreferenceUtil.albumArtistsOnly) {
-                            mediaItems.add(
-                                AutoMediaItem.with(mContext)
-                                    .asBrowsable()
-                                    .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM_ARTIST)
-                                    .icon(R.drawable.ic_album_artist)
-                                    .title(resources.getString(R.string.album_artist)).build()
-                            )
-                        } else {
-                            mediaItems.add(
-                                AutoMediaItem.with(mContext)
-                                    .asBrowsable()
-                                    .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ARTIST)
-                                    .icon(R.drawable.ic_artist)
-                                    .title(resources.getString(R.string.artists)).build()
-                            )
-                        }
-                    }
-                    CategoryInfo.Category.Genres -> {
-                        mediaItems.add(
-                            AutoMediaItem.with(mContext)
-                                .asBrowsable()
-                                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE)
-                                .icon(R.drawable.ic_guitar)
-                                .title(resources.getString(R.string.genres)).build()
-                        )
-                    }
-                    CategoryInfo.Category.Playlists -> {
-                        mediaItems.add(
-                            AutoMediaItem.with(mContext)
-                                .asBrowsable()
-                                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_PLAYLIST)
-                                .icon(R.drawable.ic_playlist_play)
-                                .title(resources.getString(R.string.playlists)).build()
-                        )
-                    }
-                    else -> {
-                    }
-                }
-            }
-        }
-        mediaItems.add(
-            AutoMediaItem.with(mContext)
-                .asPlayable()
-                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SHUFFLE)
-                .icon(R.drawable.ic_shuffle)
-                .title(resources.getString(R.string.action_shuffle_all))
-                .subTitle(MusicUtil.getPlaylistInfoString(mContext, songsRepository.songs()))
-                .build()
-        )
-        mediaItems.add(
-            AutoMediaItem.with(mContext)
-                .asBrowsable()
-                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_QUEUE)
-                .icon(R.drawable.ic_queue_music)
-                .title(resources.getString(R.string.queue))
-                .subTitle(MusicUtil.getPlaylistInfoString(mContext, MusicPlayerRemote.playingQueue))
-                .asBrowsable().build()
-        )
-        mediaItems.add(
-            AutoMediaItem.with(mContext)
-                .asBrowsable()
-                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_TOP_TRACKS)
-                .icon(R.drawable.ic_trending_up)
-                .title(resources.getString(R.string.my_top_tracks))
-                .subTitle(
-                    MusicUtil.getPlaylistInfoString(
-                        mContext,
-                        topPlayedRepository.topTracks()
-                    )
-                )
-                .asBrowsable().build()
-        )
-        mediaItems.add(
-            AutoMediaItem.with(mContext)
-                .asBrowsable()
-                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS)
-                .icon(R.drawable.ic_face)
-                .title(resources.getString(R.string.suggestion_songs))
-                .subTitle(
-                    MusicUtil.getPlaylistInfoString(
-                        mContext,
-                        topPlayedRepository.notRecentlyPlayedTracks().takeIf {
-                            it.size > 9
-                        } ?: emptyList()
-                    )
-                )
-                .asBrowsable().build()
-        )
-        mediaItems.add(
-            AutoMediaItem.with(mContext)
-                .asBrowsable()
-                .path(AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY)
-                .icon(R.drawable.ic_history)
-                .title(resources.getString(R.string.history))
-                .subTitle(
-                    MusicUtil.getPlaylistInfoString(
-                        mContext,
-                        topPlayedRepository.recentlyPlayedTracks()
-                    )
-                )
-                .asBrowsable().build()
-        )
-        return mediaItems
-    }
-
-    private fun getPlayableSong(mediaId: String?, song: Song): MediaBrowserCompat.MediaItem {
-        return AutoMediaItem.with(mContext)
-            .asPlayable()
-            .path(mediaId, song.id)
-            .title(song.title)
-            .subTitle(song.artistName)
-            .icon(MusicUtil.getMediaStoreAlbumCoverUri(song.albumId))
-            .build()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt b/app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt
deleted file mode 100644
index 534b0ec52..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/auto/MediaItemBuilder.kt
+++ /dev/null
@@ -1,100 +0,0 @@
-package code.name.monkey.retromusic.auto
-
-import android.content.Context
-import android.net.Uri
-import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaDescriptionCompat
-import androidx.core.content.res.ResourcesCompat
-import androidx.core.graphics.drawable.toBitmap
-import androidx.core.os.bundleOf
-
-
-internal object AutoMediaItem {
-    fun with(context: Context): Builder {
-        return Builder(context)
-    }
-
-    internal class Builder(private val mContext: Context) {
-        private var mBuilder: MediaDescriptionCompat.Builder?
-        private var mFlags = 0
-        fun path(fullPath: String): Builder {
-            mBuilder?.setMediaId(fullPath)
-            return this
-        }
-
-        fun path(path: String?, id: Long): Builder {
-            return path(AutoMediaIDHelper.createMediaID(id.toString(), path))
-        }
-
-        fun title(title: String): Builder {
-            mBuilder?.setTitle(title)
-            return this
-        }
-
-        fun subTitle(subTitle: String): Builder {
-            mBuilder?.setSubtitle(subTitle)
-            return this
-        }
-
-        fun icon(uri: Uri?): Builder {
-            mBuilder?.setIconUri(uri)
-            return this
-        }
-
-        fun icon(iconDrawableId: Int): Builder {
-            mBuilder?.setIconBitmap(
-                    ResourcesCompat.getDrawable(
-                        mContext.resources,
-                        iconDrawableId,
-                        mContext.theme
-                    )?.toBitmap()
-            )
-            return this
-        }
-
-        fun gridLayout(isGrid: Boolean): Builder {
-
-            val hints = bundleOf(
-                CONTENT_STYLE_SUPPORTED to true,
-                CONTENT_STYLE_BROWSABLE_HINT to
-                        if (isGrid) CONTENT_STYLE_GRID_ITEM_HINT_VALUE
-                        else CONTENT_STYLE_LIST_ITEM_HINT_VALUE,
-                CONTENT_STYLE_PLAYABLE_HINT to
-                        if (isGrid) CONTENT_STYLE_GRID_ITEM_HINT_VALUE
-                        else CONTENT_STYLE_LIST_ITEM_HINT_VALUE
-            )
-            mBuilder?.setExtras(hints)
-            return this
-        }
-
-        fun asBrowsable(): Builder {
-            mFlags = mFlags or MediaBrowserCompat.MediaItem.FLAG_BROWSABLE
-            return this
-        }
-
-        fun asPlayable(): Builder {
-            mFlags = mFlags or MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-            return this
-        }
-
-        fun build(): MediaBrowserCompat.MediaItem {
-            val result = MediaBrowserCompat.MediaItem(mBuilder!!.build(), mFlags)
-            mBuilder = null
-            mFlags = 0
-            return result
-        }
-
-        init {
-            mBuilder = MediaDescriptionCompat.Builder()
-        }
-        companion  object{
-            // Hints - see https://developer.android.com/training/cars/media#default-content-style
-            const val CONTENT_STYLE_SUPPORTED = "android.media.browse.CONTENT_STYLE_SUPPORTED"
-            const val CONTENT_STYLE_BROWSABLE_HINT = "android.media.browse.CONTENT_STYLE_BROWSABLE_HINT"
-            const val CONTENT_STYLE_PLAYABLE_HINT = "android.media.browse.CONTENT_STYLE_PLAYABLE_HINT"
-            const val CONTENT_STYLE_LIST_ITEM_HINT_VALUE = 1
-            const val CONTENT_STYLE_GRID_ITEM_HINT_VALUE = 2
-        }
-
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt
new file mode 100644
index 000000000..3945f16af
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/MusicComponent.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger
+
+import code.name.monkey.retromusic.activities.*
+import code.name.monkey.retromusic.album.AlbumDetailsFragment
+import code.name.monkey.retromusic.dagger.module.*
+import code.name.monkey.retromusic.fragments.mainactivity.*
+import code.name.monkey.retromusic.fragments.mainactivity.home.BannerHomeFragment
+import dagger.Component
+import javax.inject.Singleton
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Singleton
+@Component(modules = [
+    RepositoryModule::class,
+    AlbumModule::class,
+    ArtistModule::class,
+    GenreModule::class,
+    HomeModule::class,
+    PlaylistModule::class,
+    SearchModule::class,
+    SongModule::class,
+    ActivityModule::class
+])
+interface MusicComponent {
+
+    fun inject(songsFragment: SongsFragment)
+
+    fun inject(albumsFragment: AlbumsFragment)
+
+    fun inject(artistsFragment: ArtistsFragment)
+
+    fun inject(genresFragment: GenresFragment)
+
+    fun inject(playlistsFragment: PlaylistsFragment)
+
+    fun inject(artistDetailActivity: ArtistDetailActivity)
+
+    fun inject(albumDetailsActivity: AlbumDetailsActivity)
+
+    fun inject(playlistDetailActivity: PlaylistDetailActivity)
+
+    fun inject(genreDetailsActivity: GenreDetailsActivity)
+
+    fun inject(searchActivity: SearchActivity)
+
+    fun inject(bannerHomeFragment: BannerHomeFragment)
+
+    fun inject(albumDetailsFragment: AlbumDetailsFragment)
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/ActivityModule.kt
similarity index 57%
rename from app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt
rename to app/src/main/java/code/name/monkey/retromusic/dagger/module/ActivityModule.kt
index d8e3003ab..ed94f4510 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/ActivityModule.kt
@@ -11,18 +11,24 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.util
 
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.helper.M3UWriter.writeIO
-import java.io.File
-import java.io.IOException
+package code.name.monkey.retromusic.dagger.module
 
-object PlaylistsUtil {
-    @Throws(IOException::class)
-    fun savePlaylistWithSongs(playlist: PlaylistWithSongs?): File {
-        return writeIO(
-            File(getExternalStorageDirectory(), "Playlists"), playlist!!
-        )
+import android.app.Activity
+
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class ActivityModule(private val activity: Activity) {
+
+    @Provides
+    @Singleton
+    fun provideActivity(): Activity {
+        return activity
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/AlbumModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/AlbumModule.kt
new file mode 100644
index 000000000..80fcd1ca5
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/AlbumModule.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.AlbumDetailsPresenter.AlbumDetailsPresenterImpl
+import code.name.monkey.retromusic.mvp.presenter.AlbumsPresenter
+import code.name.monkey.retromusic.mvp.presenter.AlbumsPresenter.AlbumsPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class AlbumModule {
+
+    @Provides
+    fun providesAlbumsPresenter(presenter: AlbumsPresenterImpl): AlbumsPresenter {
+        return presenter
+    }
+
+    @Provides
+    fun providesAlbumDetailsPresenter(presenter: AlbumDetailsPresenterImpl): AlbumDetailsPresenter {
+        return presenter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt
new file mode 100644
index 000000000..db7958473
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/AppModule.kt
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import android.content.Context
+
+import dagger.Module
+import dagger.Provides
+import javax.inject.Singleton
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class AppModule(private val context: Context) {
+
+    @Provides
+    @Singleton
+    fun provideContext(): Context {
+        return context
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/ArtistModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/ArtistModule.kt
new file mode 100644
index 000000000..0d9ecfec5
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/ArtistModule.kt
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.ArtistDetailsPresenter.ArtistDetailsPresenterImpl
+import code.name.monkey.retromusic.mvp.presenter.ArtistsPresenter
+import code.name.monkey.retromusic.mvp.presenter.ArtistsPresenter.ArtistsPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class ArtistModule {
+
+    @Provides
+    fun providesArtistDetailsPresenter(presenter: ArtistDetailsPresenterImpl): ArtistDetailsPresenter {
+        return presenter
+    }
+
+    @Provides
+    fun providesArtistsPresenter(presenter: ArtistsPresenterImpl): ArtistsPresenter {
+        return presenter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/GenreModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/GenreModule.kt
new file mode 100644
index 000000000..6fc027cc0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/GenreModule.kt
@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter
+import code.name.monkey.retromusic.mvp.presenter.GenreDetailsPresenter.GenreDetailsPresenterImpl
+import code.name.monkey.retromusic.mvp.presenter.GenresPresenter
+import code.name.monkey.retromusic.mvp.presenter.GenresPresenter.GenresPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class GenreModule {
+
+    @Provides
+    fun providesGenresPresenter(presenter: GenresPresenterImpl): GenresPresenter {
+        return presenter
+    }
+
+
+    @Provides
+    fun providesGenreDetailsPresenter(presenter: GenreDetailsPresenterImpl): GenreDetailsPresenter {
+        return presenter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/HomeModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/HomeModule.kt
new file mode 100644
index 000000000..51b6eadde
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/HomeModule.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.HomePresenter
+import code.name.monkey.retromusic.mvp.presenter.HomePresenter.HomePresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class HomeModule {
+
+    @Provides
+    fun providesHomePresenter(presenter: HomePresenterImpl): HomePresenter {
+        return presenter
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/PlaylistModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/PlaylistModule.kt
new file mode 100644
index 000000000..2995fe5d5
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/PlaylistModule.kt
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter
+import code.name.monkey.retromusic.mvp.presenter.PlaylistSongsPresenter.PlaylistSongsPresenterImpl
+import code.name.monkey.retromusic.mvp.presenter.PlaylistsPresenter
+import code.name.monkey.retromusic.mvp.presenter.PlaylistsPresenter.PlaylistsPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class PlaylistModule {
+    @Provides
+    fun providesPlaylistSongPresenter(presenter: PlaylistSongsPresenterImpl): PlaylistSongsPresenter {
+        return presenter
+    }
+
+    @Provides
+    fun providesPlaylistsPresenter(presenter: PlaylistsPresenterImpl): PlaylistsPresenter {
+        return presenter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/RepositoryModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/RepositoryModule.kt
new file mode 100644
index 000000000..71e48d80a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/RepositoryModule.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import android.content.Context
+import code.name.monkey.retromusic.providers.RepositoryImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module(includes = [AppModule::class])
+class RepositoryModule {
+
+    @Provides
+    fun providesRepository(context: Context): Repository {
+        return RepositoryImpl(context)
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/SearchModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/SearchModule.kt
new file mode 100644
index 000000000..0eafe55ac
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/SearchModule.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.SearchPresenter
+import code.name.monkey.retromusic.mvp.presenter.SearchPresenter.SearchPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class SearchModule {
+
+    @Provides
+    fun providesSearchPresenter(presenter: SearchPresenterImpl): SearchPresenter {
+        return presenter
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dagger/module/SongModule.kt b/app/src/main/java/code/name/monkey/retromusic/dagger/module/SongModule.kt
new file mode 100644
index 000000000..a78a864e0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dagger/module/SongModule.kt
@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dagger.module
+
+import code.name.monkey.retromusic.mvp.presenter.SongPresenter
+import code.name.monkey.retromusic.mvp.presenter.SongPresenter.SongPresenterImpl
+import dagger.Module
+import dagger.Provides
+
+/**
+ * Created by hemanths on 2019-09-04.
+ */
+@Module
+class SongModule {
+    @Provides
+    fun providesSongPresenter(presenter: SongPresenterImpl): SongPresenter {
+        return presenter
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt
deleted file mode 100644
index 0bf40b736..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreDao.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.*
-
-@Dao
-interface BlackListStoreDao {
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    fun insertBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertBlacklistPath(blackListStoreEntities: List<BlackListStoreEntity>)
-
-    @Delete
-    suspend fun deleteBlacklistPath(blackListStoreEntity: BlackListStoreEntity)
-
-    @Query("DELETE FROM BlackListStoreEntity")
-    suspend fun clearBlacklist()
-
-    @Query("SELECT * FROM BlackListStoreEntity")
-    fun blackListPaths(): List<BlackListStoreEntity>
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt
deleted file mode 100644
index 8592442a2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/BlackListStoreEntity.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-class BlackListStoreEntity(
-    @PrimaryKey
-    val path: String
-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
deleted file mode 100644
index 2ceb309db..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/HistoryDao.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.lifecycle.LiveData
-import androidx.room.*
-
-@Dao
-interface HistoryDao {
-    companion object {
-        private const val HISTORY_LIMIT = 100
-    }
-
-    @Upsert
-    suspend fun upsertSongInHistory(historyEntity: HistoryEntity)
-
-    @Query("DELETE FROM HistoryEntity WHERE id= :songId")
-    fun deleteSongInHistory(songId: Long)
-
-    @Query("SELECT * FROM HistoryEntity ORDER BY time_played DESC LIMIT $HISTORY_LIMIT")
-    fun historySongs(): List<HistoryEntity>
-
-    @Query("SELECT * FROM HistoryEntity ORDER BY time_played DESC LIMIT $HISTORY_LIMIT")
-    fun observableHistorySongs(): LiveData<List<HistoryEntity>>
-
-    @Query("DELETE FROM HistoryEntity")
-    suspend fun clearHistory()
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt
deleted file mode 100644
index 535a37964..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/HistoryEntity.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-class HistoryEntity(
-    @PrimaryKey
-    val id: Long,
-    val title: String,
-    @ColumnInfo(name = "track_number")
-    val trackNumber: Int,
-    val year: Int,
-    val duration: Long,
-    val data: String,
-    @ColumnInfo(name = "date_modified")
-    val dateModified: Long,
-    @ColumnInfo(name = "album_id")
-    val albumId: Long,
-    @ColumnInfo(name = "album_name")
-    val albumName: String,
-    @ColumnInfo(name = "artist_id")
-    val artistId: Long,
-    @ColumnInfo(name = "artist_name")
-    val artistName: String,
-    val composer: String?,
-    @ColumnInfo(name = "album_artist")
-    val albumArtist: String?,
-    @ColumnInfo(name = "time_played")
-    val timePlayed: Long
-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt
deleted file mode 100644
index fa14b1aca..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/LyricsDao.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.*
-
-@Dao
-interface LyricsDao {
-    @Query("SELECT * FROM LyricsEntity WHERE songId =:songId LIMIT 1")
-    fun lyricsWithSongId(songId: Int): LyricsEntity?
-
-    @Insert
-    fun insertLyrics(lyricsEntity: LyricsEntity)
-
-    @Delete
-    fun deleteLyrics(lyricsEntity: LyricsEntity)
-
-    @Update
-    fun updateLyrics(lyricsEntity: LyricsEntity)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt
deleted file mode 100644
index 91d987d62..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/LyricsEntity.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-class LyricsEntity(
-    @PrimaryKey val songId: Int,
-    val lyrics: String
-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
deleted file mode 100644
index 087ae4faf..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountDao.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.*
-
-@Dao
-interface PlayCountDao {
-
-    @Upsert
-    fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
-
-    @Delete
-    fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
-
-    @Query("SELECT * FROM PlayCountEntity WHERE id =:songId LIMIT 1")
-    fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
-
-    @Query("SELECT * FROM PlayCountEntity ORDER BY play_count DESC")
-    fun playCountSongs(): List<PlayCountEntity>
-
-    @Query("DELETE FROM SongEntity WHERE id =:songId")
-    fun deleteSong(songId: Long)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt
deleted file mode 100644
index 2fa41b227..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlayCountEntity.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-
-@Entity
-class PlayCountEntity(
-    @PrimaryKey
-    val id: Long,
-    val title: String,
-    @ColumnInfo(name = "track_number")
-    val trackNumber: Int,
-    val year: Int,
-    val duration: Long,
-    val data: String,
-    @ColumnInfo(name = "date_modified")
-    val dateModified: Long,
-    @ColumnInfo(name = "album_id")
-    val albumId: Long,
-    @ColumnInfo(name = "album_name")
-    val albumName: String,
-    @ColumnInfo(name = "artist_id")
-    val artistId: Long,
-    @ColumnInfo(name = "artist_name")
-    val artistName: String,
-    val composer: String?,
-    @ColumnInfo(name = "album_artist")
-    val albumArtist: String?,
-    @ColumnInfo(name = "time_played")
-    val timePlayed: Long,
-    @ColumnInfo(name = "play_count")
-    var playCount: Int
-)
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
deleted file mode 100644
index dea1e6b7d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistDao.kt
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.lifecycle.LiveData
-import androidx.room.*
-
-@Dao
-interface PlaylistDao {
-    @Insert
-    suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
-
-    @Query("UPDATE PlaylistEntity SET playlist_name = :name WHERE playlist_id = :playlistId")
-    suspend fun renamePlaylist(playlistId: Long, name: String)
-
-    @Query("SELECT * FROM PlaylistEntity WHERE playlist_name = :name")
-    fun playlist(name: String): List<PlaylistEntity>
-
-    @Query("SELECT * FROM PlaylistEntity")
-    suspend fun playlists(): List<PlaylistEntity>
-
-    @Query("DELETE FROM SongEntity WHERE playlist_creator_id = :playlistId")
-    suspend fun deletePlaylistSongs(playlistId: Long)
-
-    @Query("DELETE FROM SongEntity WHERE playlist_creator_id = :playlistId AND id = :songId")
-    suspend fun deleteSongFromPlaylist(playlistId: Long, songId: Long)
-
-    @Transaction
-    @Query("SELECT * FROM PlaylistEntity")
-    suspend fun playlistsWithSongs(): List<PlaylistWithSongs>
-
-    @Transaction
-    @Query("SELECT * FROM PlaylistEntity WHERE playlist_id= :playlistId")
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
-
-    @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertSongsToPlaylist(songEntities: List<SongEntity>)
-
-    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id = :playlistId AND id = :songId")
-    suspend fun isSongExistsInPlaylist(playlistId: Long, songId: Long): List<SongEntity>
-
-    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id = :playlistId ORDER BY song_key asc")
-    fun songsFromPlaylist(playlistId: Long): LiveData<List<SongEntity>>
-
-    @Delete
-    suspend fun deletePlaylist(playlistEntity: PlaylistEntity)
-
-    @Delete
-    suspend fun deletePlaylists(playlistEntities: List<PlaylistEntity>)
-
-    @Delete
-    suspend fun deletePlaylistSongs(songs: List<SongEntity>)
-
-    @RewriteQueriesToDropUnusedColumns
-    @Query("SELECT * FROM SongEntity ,(SELECT playlist_id FROM PlaylistEntity WHERE playlist_name= :playlistName LIMIT 1) AS playlist WHERE playlist_creator_id= playlist.playlist_id")
-    fun favoritesSongsLiveData(playlistName: String): LiveData<List<SongEntity>>
-
-    @Query("SELECT * FROM SongEntity WHERE playlist_creator_id= :playlistId")
-    fun favoritesSongs(playlistId: Long): List<SongEntity>
-
-    @Query("SELECT EXISTS(SELECT * FROM PlaylistEntity WHERE playlist_id = :playlistId)")
-    fun checkPlaylistExists(playlistId: Long): LiveData<Boolean>
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt
deleted file mode 100644
index 5493b1155..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistEntity.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import android.os.Parcelable
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.PrimaryKey
-import kotlinx.parcelize.Parcelize
-
-@Entity
-@Parcelize
-class PlaylistEntity(
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = "playlist_id")
-    val playListId: Long = 0,
-    @ColumnInfo(name = "playlist_name")
-    val playlistName: String
-) : Parcelable
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt b/app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt
deleted file mode 100644
index da80d8228..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/PlaylistWithSongs.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import android.os.Parcelable
-import androidx.room.Embedded
-import androidx.room.Relation
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class PlaylistWithSongs(
-    @Embedded val playlistEntity: PlaylistEntity,
-    @Relation(
-        parentColumn = "playlist_id",
-        entityColumn = "playlist_creator_id"
-    )
-    val songs: List<SongEntity>
-) : Parcelable
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt b/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
deleted file mode 100644
index 6401766aa..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/RetroDatabase.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import androidx.room.Database
-import androidx.room.RoomDatabase
-
-@Database(
-    entities = [PlaylistEntity::class, SongEntity::class, HistoryEntity::class, PlayCountEntity::class],
-    version = 24,
-    exportSchema = false
-)
-abstract class RetroDatabase : RoomDatabase() {
-    abstract fun playlistDao(): PlaylistDao
-    abstract fun playCountDao(): PlayCountDao
-    abstract fun historyDao(): HistoryDao
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt b/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt
deleted file mode 100644
index b8b383c31..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/RoomMigrations.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package code.name.monkey.retromusic.db
-
-import androidx.room.migration.Migration
-import androidx.sqlite.db.SupportSQLiteDatabase
-
-val MIGRATION_23_24 = object : Migration(23, 24) {
-    override fun migrate(database: SupportSQLiteDatabase) {
-        database.execSQL("DROP TABLE LyricsEntity")
-        database.execSQL("DROP TABLE BlackListStoreEntity")
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt b/app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt
deleted file mode 100644
index 206c91e27..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/SongEntity.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import android.os.Parcelable
-import androidx.room.ColumnInfo
-import androidx.room.Entity
-import androidx.room.Index
-import androidx.room.PrimaryKey
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-@Entity(indices = [Index(value = ["playlist_creator_id", "id"], unique = true)])
-class SongEntity(
-    @PrimaryKey(autoGenerate = true)
-    @ColumnInfo(name = "song_key")
-    val songPrimaryKey: Long = 0L,
-    @ColumnInfo(name = "playlist_creator_id")
-    val playlistCreatorId: Long,
-    val id: Long,
-    val title: String,
-    @ColumnInfo(name = "track_number")
-    val trackNumber: Int,
-    val year: Int,
-    val duration: Long,
-    val data: String,
-    @ColumnInfo(name = "date_modified")
-    val dateModified: Long,
-    @ColumnInfo(name = "album_id")
-    val albumId: Long,
-    @ColumnInfo(name = "album_name")
-    val albumName: String,
-    @ColumnInfo(name = "artist_id")
-    val artistId: Long,
-    @ColumnInfo(name = "artist_name")
-    val artistName: String,
-    val composer: String?,
-    @ColumnInfo(name = "album_artist")
-    val albumArtist: String?
-) : Parcelable
diff --git a/app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt b/app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt
deleted file mode 100644
index d6fe11b05..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/db/SongExtension.kt
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.db
-
-import code.name.monkey.retromusic.model.Song
-
-fun List<HistoryEntity>.fromHistoryToSongs(): List<Song> {
-    return map {
-        it.toSong()
-    }
-}
-
-fun List<SongEntity>.toSongs(): List<Song> {
-    return map {
-        it.toSong()
-    }
-}
-
-fun Song.toHistoryEntity(timePlayed: Long): HistoryEntity {
-    return HistoryEntity(
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist,
-        timePlayed = timePlayed
-    )
-}
-
-fun Song.toSongEntity(playListId: Long): SongEntity {
-    return SongEntity(
-        playlistCreatorId = playListId,
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist
-    )
-}
-
-fun SongEntity.toSong(): Song {
-    return Song(
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist
-    )
-}
-
-fun PlayCountEntity.toSong(): Song {
-    return Song(
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist
-    )
-}
-
-fun HistoryEntity.toSong(): Song {
-    return Song(
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist
-    )
-}
-
-fun Song.toPlayCount(): PlayCountEntity {
-    return PlayCountEntity(
-        id = id,
-        title = title,
-        trackNumber = trackNumber,
-        year = year,
-        duration = duration,
-        data = data,
-        dateModified = dateModified,
-        albumId = albumId,
-        albumName = albumName,
-        artistId = artistId,
-        artistName = artistName,
-        composer = composer,
-        albumArtist = albumArtist,
-        timePlayed = System.currentTimeMillis(),
-        playCount = 1
-    )
-}
-
-fun List<Song>.toSongsEntity(playlistEntity: PlaylistEntity): List<SongEntity> {
-    return map {
-        it.toSongEntity(playlistEntity.playListId)
-    }
-}
-
-fun List<Song>.toSongsEntity(playlistId: Long): List<SongEntity> {
-    return map {
-        it.toSongEntity(playlistId)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt b/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt
new file mode 100644
index 000000000..ff9b9a8d3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerApiService.kt
@@ -0,0 +1,68 @@
+package code.name.monkey.retromusic.deezer
+
+import android.content.Context
+import okhttp3.Cache
+import okhttp3.Interceptor
+import okhttp3.OkHttpClient
+import retrofit2.Call
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.create
+import retrofit2.http.GET
+import retrofit2.http.Query
+import java.io.File
+import java.util.*
+
+private const val BASE_QUERY_ARTIST = "search/artist"
+private const val BASE_URL = "https://api.deezer.com/"
+
+interface DeezerApiService {
+
+    @GET("$BASE_QUERY_ARTIST&limit=1")
+    fun getArtistImage(
+            @Query("q") artistName: String
+    ): Call<DeezerResponse>
+
+    companion object {
+        operator fun invoke(
+                client: okhttp3.Call.Factory
+        ): DeezerApiService {
+            return Retrofit.Builder()
+                    .baseUrl(BASE_URL)
+                    .callFactory(client)
+                    .addConverterFactory(GsonConverterFactory.create())
+                    .build()
+                    .create()
+        }
+
+        fun createDefaultOkHttpClient(
+                context: Context
+        ): OkHttpClient.Builder =
+                OkHttpClient.Builder()
+                        .cache(createDefaultCache(context))
+                        .addInterceptor(createCacheControlInterceptor())
+
+        private fun createDefaultCache(
+                context: Context
+        ): Cache? {
+            val cacheDir = File(context.applicationContext.cacheDir.absolutePath, "/okhttp-deezer/")
+            if (cacheDir.mkdir() or cacheDir.isDirectory) {
+                return Cache(cacheDir, 1024 * 1024 * 10)
+            }
+            return null
+        }
+
+        private fun createCacheControlInterceptor(): Interceptor {
+            return Interceptor { chain ->
+                val modifiedRequest = chain.request().newBuilder()
+                        .addHeader("Cache-Control",
+                                String.format(
+                                        Locale.getDefault(),
+                                        "max-age=31536000, max-stale=31536000"
+                                )
+                        ).build()
+                chain.proceed(modifiedRequest)
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerResponse.kt b/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerResponse.kt
new file mode 100644
index 000000000..4a076112c
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/deezer/DeezerResponse.kt
@@ -0,0 +1,31 @@
+package code.name.monkey.retromusic.deezer
+
+import com.google.gson.annotations.SerializedName
+
+data class Data(
+        val id: String,
+        val link: String,
+        val name: String,
+        @SerializedName("nb_album")
+        val nbAlbum: Int,
+        @SerializedName("nb_fan")
+        val nbFan: Int,
+        val picture: String,
+        @SerializedName("picture_big")
+        val pictureBig: String,
+        @SerializedName("picture_medium")
+        val pictureMedium: String,
+        @SerializedName("picture_small")
+        val pictureSmall: String,
+        @SerializedName("picture_xl")
+        val pictureXl: String,
+        val radio: Boolean,
+        val tracklist: String,
+        val type: String
+)
+
+data class DeezerResponse(
+        val data: List<Data>,
+        val next: String,
+        val total: Int
+)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
index aa47f0fe2..0cf5f072f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/AddToPlaylistDialog.kt
@@ -1,77 +1,75 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLISTS
-import code.name.monkey.retromusic.EXTRA_SONG
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.loaders.PlaylistLoader
 import code.name.monkey.retromusic.model.Song
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
+
 
 class AddToPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+
+    override fun onCreateDialog(
+            savedInstanceState: Bundle?
+    ): Dialog {
+        val playlists = PlaylistLoader.getAllPlaylists(requireContext())
+        val playlistNames: MutableList<String> = mutableListOf()
+        playlistNames.add(requireContext().resources.getString(R.string.action_new_playlist))
+        for (p in playlists) {
+            playlistNames.add(p.name)
+        }
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            title(R.string.add_playlist_title)
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            listItems(items = playlistNames) { dialog, index, _ ->
+                val songs = arguments!!.getParcelableArrayList<Song>("songs") ?: return@listItems
+                if (index == 0) {
+                    dialog.dismiss()
+                    activity?.supportFragmentManager?.let { CreatePlaylistDialog.create(songs).show(it, "ADD_TO_PLAYLIST") }
+                } else {
+                    dialog.dismiss()
+                    PlaylistsUtil.addToPlaylist(requireContext(), songs, playlists[index - 1].id, true)
+                }
+            }
+        }
+    }
 
     companion object {
-        fun create(playlistEntities: List<PlaylistEntity>, song: Song): AddToPlaylistDialog {
-            val list: MutableList<Song> = mutableListOf()
+
+        fun create(song: Song): AddToPlaylistDialog {
+            val list = ArrayList<Song>()
             list.add(song)
-            return create(playlistEntities, list)
+            return create(list)
         }
 
-        fun create(playlistEntities: List<PlaylistEntity>, songs: List<Song>): AddToPlaylistDialog {
-            return AddToPlaylistDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_SONG to songs,
-                    EXTRA_PLAYLISTS to playlistEntities
-                )
-            }
+        fun create(songs: ArrayList<Song>): AddToPlaylistDialog {
+            val dialog = AddToPlaylistDialog()
+            val args = Bundle()
+            args.putParcelableArrayList("songs", songs)
+            dialog.arguments = args
+            return dialog
         }
     }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val playlistEntities = extraNotNull<List<PlaylistEntity>>(EXTRA_PLAYLISTS).value
-        val songs = extraNotNull<List<Song>>(EXTRA_SONG).value
-        val playlistNames = mutableListOf<String>()
-        playlistNames.add(requireContext().resources.getString(R.string.action_new_playlist))
-        for (entity: PlaylistEntity in playlistEntities) {
-            playlistNames.add(entity.playlistName)
-        }
-        return materialDialog(R.string.add_playlist_title)
-            .setItems(playlistNames.toTypedArray()) { dialog, which ->
-                if (which == 0) {
-                    showCreateDialog(songs)
-                } else {
-                    libraryViewModel.addToPlaylist(requireContext(), playlistNames[which], songs)
-                }
-                dialog.dismiss()
-            }
-            .setNegativeButton(R.string.action_cancel, null)
-            .create()
-            .colorButtons()
-    }
-
-    private fun showCreateDialog(songs: List<Song>) {
-        CreatePlaylistDialog.create(songs).show(requireActivity().supportFragmentManager, "Dialog")
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
index 5701d858b..be3b01d30 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/BlacklistFolderChooserDialog.kt
@@ -1,138 +1,177 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.Manifest
 import android.app.Dialog
-import android.content.Context
 import android.content.pm.PackageManager
+import android.os.Build
 import android.os.Bundle
+import android.os.Environment
 import androidx.core.app.ActivityCompat
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.appthemehelper.util.VersionUtils
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
 import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
-import com.afollestad.materialdialogs.list.updateListItems
 import java.io.File
+import java.util.*
+import kotlin.collections.ArrayList
 
 class BlacklistFolderChooserDialog : DialogFragment() {
-    private var initialPath: String = getExternalStorageDirectory().absolutePath
+
+    private val initialPath = Environment.getExternalStorageDirectory().absolutePath
     private var parentFolder: File? = null
     private var parentContents: Array<File>? = null
     private var canGoUp = false
     private var callback: FolderCallback? = null
-    private val contentsArray: Array<String?>
-        get() {
-            if (parentContents == null) {
-                return if (canGoUp) {
-                    arrayOf("..")
-                } else arrayOf()
-            }
-            val results = arrayOfNulls<String>(parentContents!!.size + if (canGoUp) 1 else 0)
-            if (canGoUp) {
-                results[0] = ".."
-            }
-            for (i in parentContents!!.indices) {
-                results[if (canGoUp) i + 1 else i] = parentContents?.getOrNull(i)?.name
-            }
-            return results
+
+
+    private fun contentsArray(): List<String> {
+        if (parentContents == null) {
+            return if (canGoUp) {
+                return listOf("..")
+            } else listOf()
         }
 
+        val results = arrayOfNulls<String>(parentContents!!.size + if (canGoUp) 1 else 0)
+        if (canGoUp) {
+            results[0] = ".."
+        }
+        for (i in parentContents!!.indices) {
+            results[if (canGoUp) i + 1 else i] = parentContents!![i].name
+        }
+
+        val data = ArrayList<String>()
+        for (i in results) {
+            data.add(i!!)
+        }
+        return data
+    }
+
     private fun listFiles(): Array<File>? {
-        val results = mutableListOf<File>()
-        parentFolder?.listFiles()?.let { files ->
-            files.forEach { file -> if (file.isDirectory) results.add(file) }
-            return results.sortedBy { it.name }.toTypedArray()
+        val contents = parentFolder!!.listFiles()
+        val results = ArrayList<File>()
+        if (contents != null) {
+            for (fi in contents) {
+                if (fi.isDirectory) {
+                    results.add(fi)
+                }
+            }
+            Collections.sort(results, FolderSorter())
+            return results.toTypedArray()
         }
         return null
     }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        var mSavedInstanceState = savedInstanceState
-        if (VersionUtils.hasMarshmallow()
-            && ActivityCompat.checkSelfPermission(
-                requireActivity(), Manifest.permission.READ_EXTERNAL_STORAGE
-            )
-            != PackageManager.PERMISSION_GRANTED
-        ) {
-            return materialDialog().show {
-                title(res = R.string.md_error_label)
-                message(res = R.string.md_storage_perm_error)
-                positiveButton(res = android.R.string.ok)
+        var savedInstanceStateFinal = savedInstanceState
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M &&
+                ActivityCompat.checkSelfPermission(requireActivity(), Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
+            return MaterialDialog(requireActivity(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                title(R.string.md_error_label)
+                cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                message(R.string.md_storage_perm_error)
+                positiveButton(android.R.string.ok)
             }
         }
-        if (mSavedInstanceState == null) {
-            mSavedInstanceState = Bundle()
+        if (savedInstanceStateFinal == null) {
+            savedInstanceStateFinal = Bundle()
         }
-        if (!mSavedInstanceState.containsKey("current_path")) {
-            mSavedInstanceState.putString("current_path", initialPath)
+        if (!savedInstanceStateFinal.containsKey("current_path")) {
+            savedInstanceStateFinal.putString("current_path", initialPath)
         }
-        parentFolder = File(mSavedInstanceState.getString("current_path", File.pathSeparator))
+        parentFolder = File(savedInstanceStateFinal.getString("current_path", File.pathSeparator))
         checkIfCanGoUp()
         parentContents = listFiles()
-        return materialDialog()
-            .title(text = parentFolder?.absolutePath)
-            .listItems(
-                items = contentsArray.toCharSequence(),
-                waitForPositiveButton = false
-            ) { _: MaterialDialog, i: Int, _: CharSequence ->
-                onSelection(i)
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            title(text = parentFolder!!.absolutePath)
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            listItems(items = contentsArray(), waitForPositiveButton = false) { _, index, _ ->
+                onSelection(index)
             }
-            .noAutoDismiss()
-            .positiveButton(res = R.string.add_action) {
-                callback?.onFolderSelection(requireContext(), parentFolder!!)
+            noAutoDismiss()
+            positiveButton(R.string.add_action) {
+                dismiss()
+                callback!!.onFolderSelection(this@BlacklistFolderChooserDialog, parentFolder!!)
+            }
+            negativeButton(android.R.string.cancel) {
                 dismiss()
             }
-            .negativeButton(res = android.R.string.cancel) { dismiss() }
+        }
     }
 
     private fun onSelection(i: Int) {
         if (canGoUp && i == 0) {
-            parentFolder = parentFolder?.parentFile
-            if (parentFolder?.absolutePath == "/storage/emulated") {
-                parentFolder = parentFolder?.parentFile
+            parentFolder = parentFolder!!.parentFile
+            if (parentFolder!!.absolutePath == "/storage/emulated") {
+                parentFolder = parentFolder!!.parentFile
             }
             checkIfCanGoUp()
         } else {
-            parentFolder = parentContents?.getOrNull(if (canGoUp) i - 1 else i)
+            parentFolder = parentContents!![if (canGoUp) i - 1 else i]
             canGoUp = true
-            if (parentFolder?.absolutePath == "/storage/emulated") {
-                parentFolder = getExternalStorageDirectory()
+            if (parentFolder!!.absolutePath == "/storage/emulated") {
+                parentFolder = Environment.getExternalStorageDirectory()
             }
         }
         reload()
     }
 
     private fun checkIfCanGoUp() {
-        canGoUp = parentFolder?.parent != null
+        canGoUp = parentFolder!!.parent != null
     }
 
     private fun reload() {
         parentContents = listFiles()
         val dialog = dialog as MaterialDialog?
-        dialog?.setTitle(parentFolder?.absolutePath)
-        dialog?.updateListItems(items = contentsArray.toCharSequence())
-    }
 
-    private fun Array<String?>.toCharSequence(): List<CharSequence> {
-        return map { it as CharSequence }
+        dialog?.apply {
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            setTitle(parentFolder!!.absolutePath)
+            listItems(items = contentsArray()) { _, index, _ ->
+                onSelection(index)
+            }
+        }
     }
 
     override fun onSaveInstanceState(outState: Bundle) {
         super.onSaveInstanceState(outState)
-        outState.putString("current_path", parentFolder?.absolutePath)
+        outState.putString("current_path", parentFolder!!.absolutePath)
     }
 
-    fun setCallback(callback: FolderCallback?) {
+    fun setCallback(callback: FolderCallback) {
         this.callback = callback
     }
 
     interface FolderCallback {
-        fun onFolderSelection(context: Context, folder: File)
+        fun onFolderSelection(dialog: BlacklistFolderChooserDialog, folder: File)
+    }
+
+    private class FolderSorter : Comparator<File> {
+
+        override fun compare(lhs: File, rhs: File): Int {
+            return lhs.name.compareTo(rhs.name)
+        }
     }
 
     companion object {
+
         fun create(): BlacklistFolderChooserDialog {
             return BlacklistFolderChooserDialog()
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.kt
new file mode 100644
index 000000000..8e61964c7
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/ClearSmartPlaylistDialog.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.Html
+import androidx.fragment.app.DialogFragment
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+
+
+class ClearSmartPlaylistDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val playlist = arguments!!.getParcelable<AbsSmartPlaylist>("playlist")
+        val title = R.string.clear_playlist_title
+
+        val content = Html.fromHtml(getString(R.string.clear_playlist_x, playlist!!.name))
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            title(title)
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            message(text = content)
+            positiveButton(R.string.clear_action) {
+                if (activity == null) {
+                    return@positiveButton
+                }
+                playlist.clear(activity!!)
+            }
+            negativeButton { (android.R.string.cancel) }
+        }
+    }
+
+    companion object {
+
+        fun create(playlist: AbsSmartPlaylist): ClearSmartPlaylistDialog {
+            val dialog = ClearSmartPlaylistDialog()
+            val args = Bundle()
+            args.putParcelable("playlist", playlist)
+            dialog.arguments = args
+            return dialog
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
index 7d7a01c90..0ccb5a695 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/CreatePlaylistDialog.kt
@@ -1,81 +1,98 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import android.text.TextUtils
-import androidx.core.os.bundleOf
+import android.provider.MediaStore
+import android.widget.TextView
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogPlaylistBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extra
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
+import code.name.monkey.retromusic.R.layout
+import code.name.monkey.retromusic.R.string
+import code.name.monkey.retromusic.extensions.appHandleColor
 import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+
 
 class CreatePlaylistDialog : DialogFragment() {
-    private var _binding: DialogPlaylistBinding? = null
-    private val binding get() = _binding!!
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+
+    private lateinit var playlistView: TextInputEditText
+    private lateinit var actionNewPlaylistContainer: TextInputLayout
+
+    override fun onCreateDialog(
+            savedInstanceState: Bundle?
+    ): Dialog {
+        val materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    title(string.new_playlist_title)
+                    customView(layout.dialog_playlist)
+                    negativeButton(android.R.string.cancel)
+                    positiveButton(string.create_action) {
+                        if (activity == null) {
+                            return@positiveButton
+                        }
+                        val songs = arguments?.getParcelableArrayList<Song>("songs")
+                                ?: return@positiveButton
+
+                        if (playlistView.text.toString().trim { it <= ' ' }.isNotEmpty()) {
+                            val playlistId = PlaylistsUtil.createPlaylist(requireContext(), playlistView.text.toString())
+                            if (playlistId != -1 && activity != null) {
+                                PlaylistsUtil.addToPlaylist(requireContext(), songs, playlistId, true)
+                            }
+                        }
+                    }
+                }
+
+        val dialogView = materialDialog.getCustomView()
+        playlistView = dialogView.findViewById(R.id.actionNewPlaylist)
+        actionNewPlaylistContainer = dialogView.findViewById(R.id.actionNewPlaylistContainer)
+
+        MaterialUtil.setTint(actionNewPlaylistContainer, false)
+
+        val playlistId = arguments!!.getLong(MediaStore.Audio.Playlists.Members.PLAYLIST_ID)
+        playlistView.appHandleColor().setText(PlaylistsUtil.getNameForPlaylist(requireContext(), playlistId), TextView.BufferType.EDITABLE)
+        return materialDialog
+    }
 
     companion object {
-        fun create(song: Song): CreatePlaylistDialog {
-            val list = mutableListOf<Song>()
-            list.add(song)
+        @JvmOverloads
+        fun create(song: Song? = null): CreatePlaylistDialog {
+            val list = ArrayList<Song>()
+            if (song != null) {
+                list.add(song)
+            }
             return create(list)
         }
 
-        fun create(songs: List<Song>): CreatePlaylistDialog {
-            return CreatePlaylistDialog().apply {
-                arguments = bundleOf(EXTRA_SONG to songs)
-            }
+        fun create(songs: ArrayList<Song>): CreatePlaylistDialog {
+            val dialog = CreatePlaylistDialog()
+            val args = Bundle()
+            args.putParcelableArrayList("songs", songs)
+            dialog.arguments = args
+            return dialog
         }
     }
-
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        _binding = DialogPlaylistBinding.inflate(layoutInflater)
-
-        val songs: List<Song> = extra<List<Song>>(EXTRA_SONG).value ?: emptyList()
-        val playlistView: TextInputEditText = binding.actionNewPlaylist
-        val playlistContainer: TextInputLayout = binding.actionNewPlaylistContainer
-        return materialDialog(R.string.new_playlist_title)
-            .setView(binding.root)
-            .setPositiveButton(
-                R.string.create_action
-            ) { _, _ ->
-                val playlistName = playlistView.text.toString()
-                if (!TextUtils.isEmpty(playlistName)) {
-                    libraryViewModel.addToPlaylist(requireContext(), playlistName, songs)
-                } else {
-                    playlistContainer.error = "Playlist name can't be empty"
-                }
-            }
-            .setNegativeButton(R.string.action_cancel, null)
-            .create()
-            .colorButtons()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt
index 30675d88a..312b27814 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeletePlaylistDialog.kt
@@ -1,79 +1,79 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
+import android.text.Html
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import code.name.monkey.retromusic.R.string
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import java.util.*
+
 
 class DeletePlaylistDialog : DialogFragment() {
 
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val playlists = arguments!!.getParcelableArrayList<Playlist>("playlist")
+        val title: Int
+        val content: CharSequence
+        //noinspection ConstantConditions
+        if (playlists!!.size > 1) {
+            title = string.delete_playlists_title
+            content = Html.fromHtml(getString(string.delete_x_playlists, playlists.size))
+        } else {
+            title = string.delete_playlist_title
+            content = Html.fromHtml(getString(string.delete_playlist_x, playlists[0].name))
+        }
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    title(title)
+                    message(text = content)
+                    negativeButton(android.R.string.cancel)
+                    positiveButton(R.string.action_delete) {
+                        if (activity == null)
+                            return@positiveButton
+                        PlaylistsUtil.deletePlaylists(activity!!, playlists)
+                    }
+                    negativeButton(android.R.string.cancel)
+                }
+    }
 
     companion object {
 
-        fun create(playlist: PlaylistEntity): DeletePlaylistDialog {
-            val list = mutableListOf<PlaylistEntity>()
+        fun create(playlist: Playlist): DeletePlaylistDialog {
+            val list = ArrayList<Playlist>()
             list.add(playlist)
             return create(list)
         }
 
-        fun create(playlists: List<PlaylistEntity>): DeletePlaylistDialog {
-            return DeletePlaylistDialog().apply {
-                arguments = bundleOf(EXTRA_PLAYLIST to playlists)
-            }
+        fun create(playlist: ArrayList<Playlist>): DeletePlaylistDialog {
+            val dialog = DeletePlaylistDialog()
+            val args = Bundle()
+            args.putParcelableArrayList("playlist", playlist)
+            dialog.arguments = args
+            return dialog
         }
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val playlists = extraNotNull<List<PlaylistEntity>>(EXTRA_PLAYLIST).value
-        val title: Int
-        val message: CharSequence
-        //noinspection ConstantConditions
-        if (playlists.size > 1) {
-            title = R.string.delete_playlists_title
-            message =
-                String.format(getString(R.string.delete_x_playlists), playlists.size).parseAsHtml()
-        } else {
-            title = R.string.delete_playlist_title
-            message =
-                String.format(getString(R.string.delete_playlist_x), playlists[0].playlistName)
-                    .parseAsHtml()
-        }
-
-        return materialDialog(title)
-            .setTitle(title)
-            .setMessage(message)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.action_delete) { _, _ ->
-                libraryViewModel.deleteSongsFromPlaylist(playlists)
-                libraryViewModel.deleteRoomPlaylist(playlists)
-                libraryViewModel.forceReload(ReloadType.Playlists)
-            }
-            .create()
-            .colorButtons()
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsAsyncTask.java
new file mode 100644
index 000000000..27b307d7d
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsAsyncTask.java
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dialogs;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Build;
+import android.util.Log;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentActivity;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.List;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.saf.SAFGuideActivity;
+import code.name.monkey.retromusic.misc.DialogAsyncTask;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.util.SAFUtil;
+
+/**
+ * Created by hemanths on 2019-07-31.
+ */
+public class DeleteSongsAsyncTask extends DialogAsyncTask<DeleteSongsAsyncTask.LoadingInfo, Integer, Void> {
+    private WeakReference<DeleteSongsDialog> dialogReference;
+    private WeakReference<FragmentActivity> activityWeakReference;
+
+
+    public DeleteSongsAsyncTask(@NonNull DeleteSongsDialog dialog) {
+        super(dialog.getActivity());
+        this.dialogReference = new WeakReference<>(dialog);
+        this.activityWeakReference = new WeakReference<>(dialog.getActivity());
+    }
+
+    @NonNull
+    @Override
+    protected Dialog createDialog(@NonNull Context context) {
+        return new MaterialAlertDialogBuilder(context)
+                .setTitle(R.string.deleting_songs)
+                .setView(R.layout.loading)
+                .setCancelable(false)
+                .create();
+    }
+
+    @Nullable
+    @Override
+    protected Void doInBackground(@NonNull LoadingInfo... loadingInfos) {
+        try {
+            LoadingInfo info = loadingInfos[0];
+            DeleteSongsDialog dialog = this.dialogReference.get();
+            FragmentActivity fragmentActivity = this.activityWeakReference.get();
+
+            if (dialog == null || fragmentActivity == null) {
+                return null;
+            }
+
+            if (!info.isIntent) {
+                if (!SAFUtil.isSAFRequiredForSongs(info.songs)) {
+                    dialog.deleteSongs(info.songs, null);
+                } else {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                        if (SAFUtil.isSDCardAccessGranted(fragmentActivity)) {
+                            dialog.deleteSongs(info.songs, null);
+                        } else {
+                            dialog.startActivityForResult(new Intent(fragmentActivity, SAFGuideActivity.class), SAFGuideActivity.REQUEST_CODE_SAF_GUIDE);
+                        }
+                    } else {
+                        Log.i("Hmm", "doInBackground: kitkat delete songs");
+                    }
+                }
+            } else {
+                switch (info.requestCode) {
+                    case SAFUtil.REQUEST_SAF_PICK_TREE:
+                        if (info.resultCode == Activity.RESULT_OK) {
+                            SAFUtil.saveTreeUri(fragmentActivity, info.intent);
+                            if (dialog.songsToRemove != null) {
+                                dialog.deleteSongs(dialog.songsToRemove, null);
+                            }
+                        }
+                        break;
+                    case SAFUtil.REQUEST_SAF_PICK_FILE:
+                        if (info.resultCode == Activity.RESULT_OK) {
+                            dialog.deleteSongs(Collections.singletonList(dialog.currentSong), Collections.singletonList(info.intent.getData()));
+                        }
+                        break;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    public static class LoadingInfo {
+        public boolean isIntent;
+
+        public List<Song> songs;
+        public List<Uri> safUris;
+
+        public int requestCode;
+        public int resultCode;
+        public Intent intent;
+
+        public LoadingInfo(List<Song> songs, List<Uri> safUris) {
+            this.isIntent = false;
+            this.songs = songs;
+            this.safUris = safUris;
+        }
+
+        public LoadingInfo(int requestCode, int resultCode, Intent intent) {
+            this.isIntent = true;
+            this.requestCode = requestCode;
+            this.resultCode = resultCode;
+            this.intent = intent;
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt
index 5fd45b060..d06b269f3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/DeleteSongsDialog.kt
@@ -1,162 +1,118 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
-import android.app.Activity
 import android.app.Dialog
 import android.content.Intent
+import android.net.Uri
 import android.os.Bundle
-import android.provider.MediaStore
-import androidx.activity.result.IntentSenderRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
+import android.text.Html
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_SONG
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
+import code.name.monkey.retromusic.activities.saf.SAFGuideActivity
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.SAFUtil
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.koin.androidx.viewmodel.ext.android.getViewModel
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+
 
 class DeleteSongsDialog : DialogFragment() {
-    lateinit var libraryViewModel: LibraryViewModel
+    @JvmField
+    var currentSong: Song? = null
+    @JvmField
+    var songsToRemove: List<Song>? = null
 
-    companion object {
-        fun create(song: Song): DeleteSongsDialog {
-            val list = ArrayList<Song>()
-            list.add(song)
-            return create(list)
-        }
+    private var deleteSongsAsyncTask: DeleteSongsAsyncTask? = null
 
-        fun create(songs: List<Song>): DeleteSongsDialog {
-            return DeleteSongsDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_SONG to ArrayList(songs)
-                )
-            }
-        }
-    }
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        libraryViewModel = activity?.getViewModel() as LibraryViewModel
-        val songs = extraNotNull<List<Song>>(EXTRA_SONG).value
-        if (VersionUtils.hasR()) {
-            val deleteResultLauncher =
-                registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) { result ->
-                    if (result.resultCode == Activity.RESULT_OK) {
-                        if ((songs.size == 1) && MusicPlayerRemote.isPlaying(songs[0])) {
-                            MusicPlayerRemote.playNextSong()
-                        }
-                        MusicPlayerRemote.removeFromQueue(songs)
-                        reloadTabs()
-                    }
-                    dismiss()
-                }
-            val pendingIntent =
-                MediaStore.createDeleteRequest(requireActivity().contentResolver, songs.map {
-                    MusicUtil.getSongFileUri(it.id)
-                })
-            deleteResultLauncher.launch(
-                IntentSenderRequest.Builder(pendingIntent.intentSender).build()
-            )
-            return super.onCreateDialog(savedInstanceState)
-        } else {
-            val pair = if (songs.size > 1) {
-                Pair(
-                    R.string.delete_songs_title,
-                    String.format(getString(R.string.delete_x_songs), songs.size).parseAsHtml()
-                )
+        val songs: ArrayList<Song>? = arguments?.getParcelableArrayList("songs")
+        var title = 0
+        var content: CharSequence = ""
+        if (songs != null) {
+            if (songs.size > 1) {
+                title = R.string.delete_songs_title
+                content = Html.fromHtml(getString(R.string.delete_x_songs, songs.size))
             } else {
-                Pair(
-                    R.string.delete_song_title,
-                    String.format(getString(R.string.delete_song_x), songs[0].title).parseAsHtml()
-                )
+                title = R.string.delete_song_title
+                content = Html.fromHtml(getString(R.string.delete_song_x, songs[0].title))
             }
+        }
 
-            return materialDialog()
-                .title(pair.first)
-                .message(text = pair.second)
-                .noAutoDismiss()
-                .negativeButton(android.R.string.cancel)
-                {
-                    dismiss()
-                }
-                .positiveButton(R.string.action_delete)
-                {
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            title(title)
+            message(text = content)
+            negativeButton(android.R.string.cancel) {
+                dismiss()
+            }
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            noAutoDismiss()
+            positiveButton(R.string.action_delete) {
+                if (songs != null) {
                     if ((songs.size == 1) && MusicPlayerRemote.isPlaying(songs[0])) {
                         MusicPlayerRemote.playNextSong()
                     }
-                    if (!SAFUtil.isSAFRequiredForSongs(songs)) {
-                        CoroutineScope(Dispatchers.IO).launch {
-                            dismiss()
-                            MusicUtil.deleteTracks(requireContext(), songs)
-                            reloadTabs()
-                        }
-                    } else {
-                        if (SAFUtil.isSDCardAccessGranted(requireActivity())) {
-                            deleteSongs(songs)
-                        } else {
-                            startActivityForResult(
-                                Intent(requireActivity(), code.name.monkey.retromusic.activities.saf.SAFGuideActivity::class.java),
-                                code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE
-                            )
-                        }
-                    }
                 }
+
+                songsToRemove = songs
+                deleteSongsAsyncTask = DeleteSongsAsyncTask(this@DeleteSongsDialog)
+                deleteSongsAsyncTask?.execute(DeleteSongsAsyncTask.LoadingInfo(songs, null))
+            }
         }
     }
 
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         super.onActivityResult(requestCode, resultCode, data)
         when (requestCode) {
-            code.name.monkey.retromusic.activities.saf.SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
+            SAFGuideActivity.REQUEST_CODE_SAF_GUIDE -> {
                 SAFUtil.openTreePicker(this)
             }
             SAFUtil.REQUEST_SAF_PICK_TREE,
             SAFUtil.REQUEST_SAF_PICK_FILE -> {
-                if (resultCode == Activity.RESULT_OK) {
-                    SAFUtil.saveTreeUri(requireActivity(), data)
-                    val songs = extraNotNull<List<Song>>(EXTRA_SONG).value
-                    deleteSongs(songs)
+                if (deleteSongsAsyncTask != null) {
+                    deleteSongsAsyncTask?.cancel(true)
                 }
+                deleteSongsAsyncTask = DeleteSongsAsyncTask(this)
+                deleteSongsAsyncTask?.execute(DeleteSongsAsyncTask.LoadingInfo(requestCode, resultCode, data))
             }
         }
     }
 
-    fun deleteSongs(songs: List<Song>) {
-        CoroutineScope(Dispatchers.IO).launch {
-            dismiss()
-            MusicUtil.deleteTracks(requireActivity(), songs, null, null)
-            reloadTabs()
-        }
+    fun deleteSongs(songs: List<Song>, safUris: List<Uri>?) {
+        MusicUtil.deleteTracks(activity!!, songs, safUris) { this.dismiss() }
     }
 
-    private fun reloadTabs() {
-        libraryViewModel.forceReload(ReloadType.Songs)
-        libraryViewModel.forceReload(ReloadType.HomeSections)
-        libraryViewModel.forceReload(ReloadType.Artists)
-        libraryViewModel.forceReload(ReloadType.Albums)
+    companion object {
+
+        fun create(song: Song): DeleteSongsDialog {
+            val list = ArrayList<Song>()
+            list.add(song)
+            return create(list)
+        }
+
+        fun create(songs: ArrayList<Song>): DeleteSongsDialog {
+            val dialog = DeleteSongsDialog()
+            val args = Bundle()
+            args.putParcelableArrayList("songs", songs)
+            dialog.arguments = args
+            return dialog
+        }
     }
 }
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt
deleted file mode 100644
index 87e3b6dbd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/ImportPlaylistDialog.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-
-class ImportPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return materialDialog(R.string.import_playlist)
-            .setMessage(R.string.import_playlist_message)
-            .setPositiveButton(R.string.import_label) { _, _ ->
-                try {
-                    libraryViewModel.importPlaylists()
-                } catch (e: Exception) {
-                    e.printStackTrace()
-                }
-            }
-            .create()
-            .colorButtons()
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
new file mode 100644
index 000000000..1ccba1a24
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.DialogFragment
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.MainActivity
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.views.OptionMenuItemView
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
+
+class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
+
+    override fun onClick(view: View) {
+        val mainActivity = activity as MainActivity? ?: return
+        when (view.id) {
+            R.id.actionFolders -> mainActivity.setMusicChooser(MainActivity.FOLDER)
+            R.id.actionLibrary -> mainActivity.setMusicChooser(MainActivity.LIBRARY)
+            R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity)
+            R.id.actionRate -> NavigationUtil.goToPlayStore(mainActivity)
+        }
+        materialDialog.dismiss()
+    }
+
+    private lateinit var actionSettings: OptionMenuItemView
+    private lateinit var actionLibrary: OptionMenuItemView
+    private lateinit var actionFolders: OptionMenuItemView
+    private lateinit var actionRate: OptionMenuItemView
+    private lateinit var materialDialog: MaterialDialog
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+
+        val layout = LayoutInflater.from(context).inflate(R.layout.fragment_main_options, null)
+        actionSettings = layout.findViewById(R.id.actionSettings)
+        actionRate = layout.findViewById(R.id.actionRate)
+        actionLibrary = layout.findViewById(R.id.actionLibrary)
+        actionFolders = layout.findViewById(R.id.actionFolders)
+
+
+        when (arguments?.getInt(WHICH_ONE)) {
+            LIBRARY -> actionLibrary.isSelected = true
+            FOLDER -> actionFolders.isSelected = true
+        }
+
+        actionSettings.setOnClickListener(this)
+        actionRate.setOnClickListener(this)
+        actionLibrary.setOnClickListener(this)
+        actionFolders.setOnClickListener(this)
+
+
+        materialDialog = MaterialDialog(requireActivity(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    icon(R.mipmap.ic_launcher_round)
+                    title(R.string.app_name)
+                    customView(view = layout, scrollable = true)
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                }
+        return materialDialog
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        dialog?.window?.let {
+            (requireActivity() as MainActivity).setNavigationbarColorAuto()
+            (requireActivity() as MainActivity).setLightNavigationBar(true)
+        }
+
+        return super.onCreateView(inflater, container, savedInstanceState)
+    }
+
+    companion object {
+
+        private const val WHICH_ONE = "which_one"
+        @JvmField
+        var LIBRARY: Int = 0
+        @JvmField
+        var FOLDER: Int = 1
+
+        fun newInstance(selectedId: Int): OptionsSheetDialogFragment {
+            val bundle = Bundle()
+            bundle.putInt(WHICH_ONE, selectedId)
+            val fragment = OptionsSheetDialogFragment()
+            fragment.arguments = bundle
+            return fragment
+        }
+
+        fun newInstance(): OptionsSheetDialogFragment {
+            return OptionsSheetDialogFragment()
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt
deleted file mode 100644
index 6965d0831..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/PlaybackSpeedDialog.kt
+++ /dev/null
@@ -1,58 +0,0 @@
-package code.name.monkey.retromusic.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogPlaybackSpeedBinding
-import code.name.monkey.retromusic.extensions.accent
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.slider.Slider
-
-class PlaybackSpeedDialog : DialogFragment() {
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = DialogPlaybackSpeedBinding.inflate(layoutInflater)
-        binding.playbackSpeedSlider.accent()
-        binding.playbackPitchSlider.accent()
-        binding.playbackSpeedSlider.addOnChangeListener(Slider.OnChangeListener { _, value, _ ->
-            binding.speedValue.text = "$value"
-        })
-        binding.playbackPitchSlider.addOnChangeListener(Slider.OnChangeListener { _, value, _ ->
-            binding.pitchValue.text = "$value"
-        })
-        binding.playbackSpeedSlider.value = PreferenceUtil.playbackSpeed
-        binding.playbackPitchSlider.value = PreferenceUtil.playbackPitch
-
-        return materialDialog(R.string.playback_settings)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.save) { _, _ ->
-                updatePlaybackAndPitch(
-                    binding.playbackSpeedSlider.value,
-                    binding.playbackPitchSlider.value
-                )
-            }
-            .setNeutralButton(R.string.reset_action) {_, _ ->
-                updatePlaybackAndPitch(
-                    1F,
-                    1F
-                )
-            }
-            .setView(binding.root)
-            .create()
-            .colorButtons()
-    }
-
-    private fun updatePlaybackAndPitch(speed: Float, pitch: Float) {
-        PreferenceUtil.playbackSpeed = speed
-        PreferenceUtil.playbackPitch = pitch
-    }
-
-    companion object {
-        fun newInstance(): PlaybackSpeedDialog {
-            return PlaybackSpeedDialog()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt
new file mode 100644
index 000000000..e2eaf495b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveFromPlaylistDialog.kt
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.dialogs
+
+import android.app.Dialog
+import android.os.Bundle
+import android.text.Html
+import androidx.fragment.app.DialogFragment
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.PlaylistSong
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+
+
+class RemoveFromPlaylistDialog : DialogFragment() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val songs = arguments!!.getParcelableArrayList<PlaylistSong>("songs")
+
+        var title = 0
+        var content: CharSequence = ""
+        if (songs != null) {
+            if (songs.size > 1) {
+                title = R.string.remove_songs_from_playlist_title
+                content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_x_songs_from_playlist, songs.size))
+            } else {
+                title = R.string.remove_song_from_playlist_title
+                content = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.remove_song_x_from_playlist, songs[0].title))
+            }
+        }
+
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    title(title)
+                    message(text = content)
+                    negativeButton(android.R.string.cancel)
+                    positiveButton(R.string.remove_action) {
+                        if (activity == null)
+                            return@positiveButton
+                        PlaylistsUtil.removeFromPlaylist(activity!!, songs as MutableList<PlaylistSong>)
+                    }
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                }
+
+    }
+
+    companion object {
+
+        fun create(song: PlaylistSong): RemoveFromPlaylistDialog {
+            val list = ArrayList<PlaylistSong>()
+            list.add(song)
+            return create(list)
+        }
+
+        fun create(songs: ArrayList<PlaylistSong>): RemoveFromPlaylistDialog {
+            val dialog = RemoveFromPlaylistDialog()
+            val args = Bundle()
+            args.putParcelableArrayList("songs", songs)
+            dialog.arguments = args
+            return dialog
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt
deleted file mode 100644
index cd94bc480..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RemoveSongFromPlaylistDialog.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.dialogs
-
-import android.app.Dialog
-import android.os.Bundle
-import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
-import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-
-class RemoveSongFromPlaylistDialog : DialogFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
-
-    companion object {
-        fun create(song: SongEntity): RemoveSongFromPlaylistDialog {
-            val list = mutableListOf<SongEntity>()
-            list.add(song)
-            return create(list)
-        }
-
-        fun create(songs: List<SongEntity>): RemoveSongFromPlaylistDialog {
-            return RemoveSongFromPlaylistDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_SONG to songs
-                )
-            }
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val songs = extraNotNull<List<SongEntity>>(EXTRA_SONG).value
-        val pair = if (songs.size > 1) {
-            Pair(
-                R.string.remove_songs_from_playlist_title,
-                String.format(getString(R.string.remove_x_songs_from_playlist), songs.size)
-                    .parseAsHtml()
-            )
-        } else {
-            Pair(
-                R.string.remove_song_from_playlist_title,
-                String.format(
-                    getString(R.string.remove_song_x_from_playlist),
-                    songs[0].title
-                ).parseAsHtml()
-            )
-        }
-        return materialDialog(pair.first)
-            .setMessage(pair.second)
-            .setPositiveButton(R.string.remove_action) { _, _ ->
-                libraryViewModel.deleteSongsInPlaylist(songs)
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .create()
-            .colorButtons()
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt
index 803315277..cd39a301d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/RenamePlaylistDialog.kt
@@ -1,70 +1,78 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.os.Bundle
-import androidx.core.os.bundleOf
+import android.provider.MediaStore.Audio.Playlists.Members.PLAYLIST_ID
+import android.widget.TextView
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_PLAYLIST_ID
+import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.extraNotNull
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
+import code.name.monkey.retromusic.R.layout
+import code.name.monkey.retromusic.R.string
+import code.name.monkey.retromusic.extensions.appHandleColor
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
 import com.google.android.material.textfield.TextInputEditText
 import com.google.android.material.textfield.TextInputLayout
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+
 
 class RenamePlaylistDialog : DialogFragment() {
-
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
-
-    companion object {
-        fun create(playlistEntity: PlaylistEntity): RenamePlaylistDialog {
-            return RenamePlaylistDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_PLAYLIST_ID to playlistEntity
-                )
-            }
-        }
-    }
+    private lateinit var playlistView: TextInputEditText
+    private lateinit var actionNewPlaylistContainer: TextInputLayout
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val playlistEntity = extraNotNull<PlaylistEntity>(EXTRA_PLAYLIST_ID).value
-        val layout = layoutInflater.inflate(R.layout.dialog_playlist, null)
-        val inputEditText: TextInputEditText = layout.findViewById(R.id.actionNewPlaylist)
-        val nameContainer: TextInputLayout = layout.findViewById(R.id.actionNewPlaylistContainer)
-        nameContainer.accentColor()
-        inputEditText.setText(playlistEntity.playlistName)
-        return materialDialog(R.string.rename_playlist_title)
-            .setView(layout)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.action_rename) { _, _ ->
-                val name = inputEditText.text.toString()
-                if (name.isNotEmpty()) {
-                    libraryViewModel.renameRoomPlaylist(playlistEntity.playListId, name)
-                    libraryViewModel.forceReload(ReloadType.Playlists)
-                } else {
-                    nameContainer.error = "Playlist name should'nt be empty"
+        val materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    title(string.rename_playlist_title)
+                    customView(layout.dialog_playlist)
+                    negativeButton(android.R.string.cancel)
+                    positiveButton(string.action_rename) {
+                        if (playlistView.toString().trim { it <= ' ' } != "") {
+                            val playlistId = arguments!!.getLong(PLAYLIST_ID)
+                            PlaylistsUtil.renamePlaylist(context, playlistId, playlistView.text!!.toString())
+                        }
+                    }
                 }
-            }
-            .create()
-            .colorButtons()
+
+        val dialogView = materialDialog.getCustomView()
+        playlistView = dialogView.findViewById(R.id.actionNewPlaylist)
+        actionNewPlaylistContainer = dialogView.findViewById(R.id.actionNewPlaylistContainer)
+
+        MaterialUtil.setTint(actionNewPlaylistContainer, false)
+
+        val playlistId = arguments!!.getLong(PLAYLIST_ID)
+        playlistView.appHandleColor().setText(PlaylistsUtil.getNameForPlaylist(context!!, playlistId), TextView.BufferType.EDITABLE)
+        return materialDialog
     }
-}
+
+    companion object {
+
+        fun create(playlistId: Long): RenamePlaylistDialog {
+            val dialog = RenamePlaylistDialog()
+            val args = Bundle()
+            args.putLong(PLAYLIST_ID, playlistId)
+            dialog.arguments = args
+            return dialog
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
deleted file mode 100644
index 157a1b221..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SavePlaylistDialog.kt
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.dialogs
-
-import android.app.Dialog
-import android.media.MediaScannerConnection
-import android.os.Bundle
-import android.widget.Toast
-import androidx.core.os.bundleOf
-import androidx.fragment.app.DialogFragment
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_PLAYLIST
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.helper.M3UWriter
-import code.name.monkey.retromusic.util.PlaylistsUtil
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class SavePlaylistDialog : DialogFragment() {
-    companion object {
-        fun create(playlistWithSongs: PlaylistWithSongs): SavePlaylistDialog {
-            return SavePlaylistDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_PLAYLIST to playlistWithSongs
-                )
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val playlistWithSongs = extraNotNull<PlaylistWithSongs>(EXTRA_PLAYLIST).value
-
-        if (VersionUtils.hasR()) {
-            createNewFile(
-                "audio/mpegurl",
-                playlistWithSongs.playlistEntity.playlistName
-            ) { outputStream, data ->
-                try {
-                    if (outputStream != null) {
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            M3UWriter.writeIO(
-                                outputStream,
-                                playlistWithSongs
-                            )
-                            withContext(Dispatchers.Main) {
-                                showToast(
-                                    requireContext().getString(R.string.saved_playlist_to,
-                                        data?.lastPathSegment),
-                                    Toast.LENGTH_LONG
-                                )
-                                dismiss()
-                            }
-                        }
-                    }
-                } catch (e: Exception) {
-                    showToast(
-                        "Something went wrong : " + e.message
-                    )
-                }
-            }
-        } else {
-            lifecycleScope.launch(Dispatchers.IO) {
-                val file = PlaylistsUtil.savePlaylistWithSongs(playlistWithSongs)
-                MediaScannerConnection.scanFile(
-                    requireActivity(),
-                    arrayOf<String>(file.path),
-                    null
-                ) { _, _ ->
-                }
-                withContext(Dispatchers.Main) {
-                    showToast(
-                        getString(R.string.saved_playlist_to, file),
-                        Toast.LENGTH_LONG
-                    )
-                    dismiss()
-                }
-            }
-        }
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        return materialDialog(R.string.save_playlist_title)
-            .setView(R.layout.loading)
-            .create().colorButtons()
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
index 32de5ba6c..34781f5ca 100755
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SleepTimerDialog.kt
@@ -1,23 +1,23 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.AlarmManager
 import android.app.Dialog
 import android.app.PendingIntent
-import android.content.DialogInterface
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.os.CountDownTimer
@@ -26,52 +26,103 @@ import android.widget.CheckBox
 import android.widget.SeekBar
 import android.widget.TextView
 import android.widget.Toast
-import androidx.appcompat.app.AlertDialog
-import androidx.core.content.getSystemService
-import androidx.core.view.isVisible
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogSleepTimerBinding
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PENDING_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
+import code.name.monkey.retromusic.service.MusicService.ACTION_PENDING_QUIT
+import code.name.monkey.retromusic.service.MusicService.ACTION_QUIT
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.WhichButton
+import com.afollestad.materialdialogs.actions.getActionButton
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.callbacks.onShow
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
+
 
 class SleepTimerDialog : DialogFragment() {
 
     private var seekArcProgress: Int = 0
     private lateinit var timerUpdater: TimerUpdater
-    private lateinit var dialog: AlertDialog
-
-    private var _binding: DialogSleepTimerBinding? = null
-    private val binding get() = _binding!!
-
-    private val shouldFinishLastSong: CheckBox get() = binding.shouldFinishLastSong
-    private val seekBar: SeekBar get() = binding.seekBar
-    private val timerDisplay: TextView get() = binding.timerDisplay
+    private lateinit var materialDialog: MaterialDialog
+    private lateinit var shouldFinishLastSong: CheckBox
+    private lateinit var seekBar: SeekBar
+    private lateinit var timerDisplay: TextView
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         timerUpdater = TimerUpdater()
-        _binding = DialogSleepTimerBinding.inflate(layoutInflater)
 
-        val finishMusic = PreferenceUtil.isSleepTimerFinishMusic
-        shouldFinishLastSong.apply {
-            addAccentColor()
-            isChecked = finishMusic
-        }
-        seekBar.apply {
-            addAccentColor()
-            seekArcProgress = PreferenceUtil.lastSleepTimerValue
-            updateTimeDisplayTime()
-            progress = seekArcProgress
+        materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .title(R.string.action_sleep_timer)
+                .cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                .positiveButton(R.string.action_set) {
+                    PreferenceUtil.getInstance(requireContext()).sleepTimerFinishMusic = shouldFinishLastSong.isChecked
+
+                    val minutes = seekArcProgress
+
+                    val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
+
+                    val nextSleepTimerElapsedTime = SystemClock.elapsedRealtime() + minutes * 60 * 1000
+                    PreferenceUtil.getInstance(requireContext()).setNextSleepTimerElapsedRealtime(nextSleepTimerElapsedTime)
+                    val am = activity!!.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+                    am.set(AlarmManager.ELAPSED_REALTIME_WAKEUP, nextSleepTimerElapsedTime, pi)
+
+                    Toast.makeText(activity, activity!!.resources.getString(R.string.sleep_timer_set, minutes), Toast.LENGTH_SHORT).show()
+                }
+                .negativeButton(android.R.string.cancel) {
+                    if (activity == null) {
+                        return@negativeButton
+                    }
+                    val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
+                    if (previous != null) {
+                        val am = activity!!.getSystemService(Context.ALARM_SERVICE) as AlarmManager
+                        am.cancel(previous)
+                        previous.cancel()
+                        Toast.makeText(activity, activity!!.resources.getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show()
+                    }
+
+                    val musicService = MusicPlayerRemote.musicService
+                    if (musicService != null && musicService.pendingQuit) {
+                        musicService.pendingQuit = false
+                        Toast.makeText(activity, activity!!.resources.getString(R.string.sleep_timer_canceled), Toast.LENGTH_SHORT).show()
+                    }
+                }
+                .customView(R.layout.dialog_sleep_timer, scrollable = false)
+                .show {
+                    onShow {
+                        if (makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE) != null) {
+                            timerUpdater.start()
+                        }
+                    }
+                }
+
+        if (activity == null || materialDialog.getCustomView() == null) {
+            return materialDialog
         }
 
-        binding.seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
+        shouldFinishLastSong = materialDialog.getCustomView().findViewById(R.id.shouldFinishLastSong)
+        seekBar = materialDialog.getCustomView().findViewById(R.id.seekBar)
+        timerDisplay = materialDialog.getCustomView().findViewById(R.id.timerDisplay)
+        TintHelper.setTintAuto(shouldFinishLastSong, ThemeStore.accentColor(requireContext()), false)
+
+        val finishMusic = PreferenceUtil.getInstance(requireContext()).sleepTimerFinishMusic
+        shouldFinishLastSong.isChecked = finishMusic
+
+
+        seekArcProgress = PreferenceUtil.getInstance(requireContext()).lastSleepTimerValue
+        updateTimeDisplayTime()
+        seekBar.progress = seekArcProgress
+
+        setProgressBarColor(ThemeStore.accentColor(requireContext()))
+
+        seekBar.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
             override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
                 if (i < 1) {
                     seekBar.progress = 1
@@ -82,108 +133,57 @@ class SleepTimerDialog : DialogFragment() {
             }
 
             override fun onStartTrackingTouch(seekBar: SeekBar) {
+
             }
 
             override fun onStopTrackingTouch(seekBar: SeekBar) {
-                PreferenceUtil.lastSleepTimerValue = seekArcProgress
+                PreferenceUtil.getInstance(requireContext()).lastSleepTimerValue = seekArcProgress
             }
         })
 
-        materialDialog(R.string.action_sleep_timer).apply {
-            if (PreferenceUtil.nextSleepTimerElapsedRealTime > System.currentTimeMillis()) {
-                seekBar.isVisible = false
-                shouldFinishLastSong.isVisible = false
-                timerUpdater.start()
-                setPositiveButton(android.R.string.ok, null)
-                setNegativeButton(R.string.action_cancel) { _, _ ->
-                    timerUpdater.cancel()
-                    val previous = makeTimerPendingIntent(PendingIntent.FLAG_NO_CREATE)
-                    if (previous != null) {
-                        val am = requireContext().getSystemService<AlarmManager>()
-                        am?.cancel(previous)
-                        previous.cancel()
-                        Toast.makeText(
-                            requireContext(),
-                            requireContext().resources.getString(R.string.sleep_timer_canceled),
-                            Toast.LENGTH_SHORT
-                        ).show()
-                        val musicService = MusicPlayerRemote.musicService
-                        if (musicService != null && musicService.pendingQuit) {
-                            musicService.pendingQuit = false
-                            Toast.makeText(
-                                requireContext(),
-                                requireContext().resources.getString(R.string.sleep_timer_canceled),
-                                Toast.LENGTH_SHORT
-                            ).show()
-                        }
-                    }
-                }
-            } else {
-                seekBar.isVisible = true
-                shouldFinishLastSong.isVisible = true
-                setPositiveButton(R.string.action_set) { _, _ ->
-                    PreferenceUtil.isSleepTimerFinishMusic = shouldFinishLastSong.isChecked
-                    val minutes = seekArcProgress
-                    val pi = makeTimerPendingIntent(PendingIntent.FLAG_CANCEL_CURRENT)
-                    val nextSleepTimerElapsedTime =
-                        SystemClock.elapsedRealtime() + minutes * 60 * 1000
-                    PreferenceUtil.nextSleepTimerElapsedRealTime = nextSleepTimerElapsedTime.toInt()
-                    val am = requireContext().getSystemService<AlarmManager>()
-                    am?.setExact(
-                        AlarmManager.ELAPSED_REALTIME_WAKEUP,
-                        nextSleepTimerElapsedTime,
-                        pi
-                    )
-
-                    Toast.makeText(
-                        requireContext(),
-                        requireContext().resources.getString(R.string.sleep_timer_set, minutes),
-                        Toast.LENGTH_SHORT
-                    ).show()
-                }
-            }
-            setView(binding.root)
-            dialog = create()
-
-        }
-        return dialog
+        return materialDialog
     }
 
     private fun updateTimeDisplayTime() {
         timerDisplay.text = "$seekArcProgress min"
     }
 
+
     private fun makeTimerPendingIntent(flag: Int): PendingIntent? {
-        return PendingIntent.getService(
-            requireActivity(), 0, makeTimerIntent(), flag or if (VersionUtils.hasMarshmallow())
-                PendingIntent.FLAG_IMMUTABLE
-            else 0
-        )
+        return PendingIntent.getService(activity, 0, makeTimerIntent(), flag)
     }
 
     private fun makeTimerIntent(): Intent {
-        val intent = Intent(requireActivity(), MusicService::class.java)
+        val intent = Intent(activity, MusicService::class.java)
         return if (shouldFinishLastSong.isChecked) {
             intent.setAction(ACTION_PENDING_QUIT)
         } else intent.setAction(ACTION_QUIT)
     }
 
-    override fun onDismiss(dialog: DialogInterface) {
-        super.onDismiss(dialog)
-        timerUpdater.cancel()
-        _binding = null
+
+    private fun updateCancelButton() {
+        val musicService = MusicPlayerRemote.musicService
+        if (musicService != null && musicService.pendingQuit) {
+            materialDialog.getActionButton(WhichButton.NEGATIVE).text = materialDialog.context.getString(R.string.cancel_current_timer)
+        } else {
+            materialDialog.getActionButton(WhichButton.NEGATIVE).text = null
+        }
     }
 
-    private inner class TimerUpdater :
-        CountDownTimer(
-            PreferenceUtil.nextSleepTimerElapsedRealTime - SystemClock.elapsedRealtime(),
-            1000
-        ) {
+    private inner class TimerUpdater internal constructor() : CountDownTimer(PreferenceUtil.getInstance(requireContext()).nextSleepTimerElapsedRealTime - SystemClock.elapsedRealtime(), 1000) {
 
         override fun onTick(millisUntilFinished: Long) {
-            timerDisplay.text = MusicUtil.getReadableDurationString(millisUntilFinished)
+            materialDialog.getActionButton(WhichButton.NEGATIVE).text =
+                    String.format("%s %s", materialDialog.context.getString(R.string.cancel_current_timer),
+                            " (" + MusicUtil.getReadableDurationString(millisUntilFinished) + ")")
         }
 
-        override fun onFinish() {}
+        override fun onFinish() {
+            updateCancelButton()
+        }
     }
-}
+
+    private fun setProgressBarColor(dark: Int) {
+        ViewUtil.setProgressDrawable(progressSlider = seekBar, newColor = dark)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
index 19995db30..975a0104e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongDetailDialog.kt
@@ -1,138 +1,143 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.content.Context
 import android.os.Bundle
+import android.text.Html
 import android.text.Spanned
 import android.util.Log
-import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
-import androidx.core.text.parseAsHtml
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.NonNull
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.DialogFileDetailsBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
+import code.name.monkey.retromusic.R.string
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
+import com.afollestad.materialdialogs.customview.getCustomView
 import org.jaudiotagger.audio.AudioFileIO
+import org.jaudiotagger.audio.exceptions.CannotReadException
+import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException
+import org.jaudiotagger.audio.exceptions.ReadOnlyFileException
+import org.jaudiotagger.tag.TagException
 import java.io.File
+import java.io.IOException
+
+
+inline fun ViewGroup.forEach(action: (View) -> Unit) {
+    for (i in 0 until childCount) {
+        action(getChildAt(i))
+    }
+}
 
 class SongDetailDialog : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val context: Context = requireContext()
-        val binding = DialogFileDetailsBinding.inflate(layoutInflater)
+        val song = arguments!!.getParcelable<Song>("song")
 
-        val song = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
-        with(binding) {
-            fileName.text = makeTextWithTitle(context, R.string.label_file_name, "-")
-            filePath.text = makeTextWithTitle(context, R.string.label_file_path, "-")
-            fileSize.text = makeTextWithTitle(context, R.string.label_file_size, "-")
-            fileFormat.text = makeTextWithTitle(context, R.string.label_file_format, "-")
-            trackLength.text = makeTextWithTitle(context, R.string.label_track_length, "-")
-            bitrate.text = makeTextWithTitle(context, R.string.label_bit_rate, "-")
-            samplingRate.text = makeTextWithTitle(context, R.string.label_sampling_rate, "-")
-        }
+        val materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+                    customView(R.layout.dialog_file_details,
+                            scrollable = true)
+                    positiveButton(android.R.string.ok)
+                    title(string.action_details)
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                }
+        val dialogView = materialDialog.getCustomView()
 
+        val fileName: TextView = dialogView.findViewById(R.id.fileName)
+        val filePath: TextView = dialogView.findViewById(R.id.filePath)
+        val fileSize: TextView = dialogView.findViewById(R.id.fileSize)
+        val fileFormat: TextView = dialogView.findViewById(R.id.fileFormat)
+        val trackLength: TextView = dialogView.findViewById(R.id.trackLength)
+        val bitRate: TextView = dialogView.findViewById(R.id.bitrate)
+        val samplingRate: TextView = dialogView.findViewById(R.id.samplingRate)
+
+        fileName.text = makeTextWithTitle(context, string.label_file_name, "-")
+        filePath.text = makeTextWithTitle(context, string.label_file_path, "-")
+        fileSize.text = makeTextWithTitle(context, string.label_file_size, "-")
+        fileFormat.text = makeTextWithTitle(context, string.label_file_format, "-")
+        trackLength.text = makeTextWithTitle(context, string.label_track_length, "-")
+        bitRate.text = makeTextWithTitle(context, string.label_bit_rate, "-")
+        samplingRate.text = makeTextWithTitle(context, string.label_sampling_rate, "-")
         if (song != null) {
             val songFile = File(song.data)
             if (songFile.exists()) {
-                binding.fileName.text =
-                    makeTextWithTitle(context, R.string.label_file_name, songFile.name)
-                binding.filePath.text =
-                    makeTextWithTitle(context, R.string.label_file_path, songFile.absolutePath)
-
-                binding.dateModified.text = makeTextWithTitle(
-                    context, R.string.label_last_modified,
-                    MusicUtil.getDateModifiedString(songFile.lastModified())
-                )
-
-                binding.fileSize.text =
-                    makeTextWithTitle(
-                        context,
-                        R.string.label_file_size,
-                        getFileSizeString(songFile.length())
-                    )
+                fileName.text = makeTextWithTitle(context, string.label_file_name, songFile.name)
+                filePath.text = makeTextWithTitle(context, string.label_file_path, songFile.absolutePath)
+                fileSize.text = makeTextWithTitle(context, string.label_file_size, getFileSizeString(songFile.length()))
                 try {
                     val audioFile = AudioFileIO.read(songFile)
                     val audioHeader = audioFile.audioHeader
 
-                    binding.fileFormat.text =
-                        makeTextWithTitle(context, R.string.label_file_format, audioHeader.format)
-                    binding.trackLength.text = makeTextWithTitle(
-                        context,
-                        R.string.label_track_length,
-                        MusicUtil.getReadableDurationString((audioHeader.trackLength * 1000).toLong())
-                    )
-                    binding.bitrate.text = makeTextWithTitle(
-                        context,
-                        R.string.label_bit_rate,
-                        audioHeader.bitRate + " kb/s"
-                    )
-                    binding.samplingRate.text =
-                        makeTextWithTitle(
-                            context,
-                            R.string.label_sampling_rate,
-                            audioHeader.sampleRate + " Hz"
-                        )
-                } catch (e: Exception) {
+                    fileFormat.text = makeTextWithTitle(context, string.label_file_format, audioHeader.format)
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString((audioHeader.trackLength * 1000).toLong()))
+                    bitRate.text = makeTextWithTitle(context, string.label_bit_rate, audioHeader.bitRate + " kb/s")
+                    samplingRate.text = makeTextWithTitle(context, string.label_sampling_rate, audioHeader.sampleRate + " Hz")
+                } catch (@NonNull e: CannotReadException) {
                     Log.e(TAG, "error while reading the song file", e)
                     // fallback
-                    binding.trackLength.text = makeTextWithTitle(
-                        context,
-                        R.string.label_track_length,
-                        MusicUtil.getReadableDurationString(song.duration)
-                    )
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
+                } catch (@NonNull e: IOException) {
+                    Log.e(TAG, "error while reading the song file", e)
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
+                } catch (@NonNull e: TagException) {
+                    Log.e(TAG, "error while reading the song file", e)
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
+                } catch (@NonNull e: ReadOnlyFileException) {
+                    Log.e(TAG, "error while reading the song file", e)
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
+                } catch (@NonNull e: InvalidAudioFrameException) {
+                    Log.e(TAG, "error while reading the song file", e)
+                    trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
                 }
+
             } else {
                 // fallback
-                binding.fileName.text =
-                    makeTextWithTitle(context, R.string.label_file_name, song.title)
-                binding.trackLength.text = makeTextWithTitle(
-                    context,
-                    R.string.label_track_length,
-                    MusicUtil.getReadableDurationString(song.duration)
-                )
+                fileName.text = makeTextWithTitle(context, string.label_file_name, song.title)
+                trackLength.text = makeTextWithTitle(context, string.label_track_length, MusicUtil.getReadableDurationString(song.duration))
             }
         }
-        return materialDialog(R.string.action_details)
-            .setPositiveButton(android.R.string.ok, null)
-            .setView(binding.root)
-            .create()
-            .colorButtons()
+
+        return materialDialog
     }
 
     companion object {
 
         val TAG: String = SongDetailDialog::class.java.simpleName
 
+
         fun create(song: Song): SongDetailDialog {
-            return SongDetailDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_SONG to song
-                )
-            }
+            val dialog = SongDetailDialog()
+            val args = Bundle()
+            args.putParcelable("song", song)
+            dialog.arguments = args
+            return dialog
         }
 
         private fun makeTextWithTitle(context: Context, titleResId: Int, text: String?): Spanned {
-            return ("<b>" + context.resources.getString(titleResId) + ": " + "</b>" + text)
-                .parseAsHtml()
+            return Html.fromHtml("<b>" + context.resources.getString(titleResId) + ": " + "</b>" + text)
         }
 
         private fun getFileSizeString(sizeInBytes: Long): String {
diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
index fcfad5a5d..b7ab8555f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/SongShareDialog.kt
@@ -1,105 +1,71 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
 import android.content.Intent
 import android.os.Bundle
-import androidx.core.os.BundleCompat
-import androidx.core.os.bundleOf
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.retromusic.EXTRA_SONG
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.ShareInstagramStory
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
+
 
 class SongShareDialog : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val song: Song? = BundleCompat.getParcelable(requireArguments(), EXTRA_SONG, Song::class.java)
-        val listening: String =
-            String.format(
-                getString(R.string.currently_listening_to_x_by_x),
-                song?.title,
-                song?.artistName
-            )
-        return materialDialog(R.string.what_do_you_want_to_share)
-            .setItems(
-                arrayOf(
-                    getString(R.string.the_audio_file),
-                    "\u201C" + listening + "\u201D",
-                    getString(R.string.social_stories)
-                )
-            ) { _, which ->
-                withAction(which, song, listening)
-            }
-            .setNegativeButton(R.string.action_cancel, null)
-            .create()
-            .colorButtons()
-    }
+        val song: Song? = arguments!!.getParcelable("song")
+        val currentlyListening: String = getString(R.string.currently_listening_to_x_by_x, song?.title, song?.artistName)
 
-    private fun withAction(
-        which: Int,
-        song: Song?,
-        currentlyListening: String
-    ) {
-        when (which) {
-            0 -> {
-                startActivity(Intent.createChooser(song?.let {
-                    MusicUtil.createShareSongFileIntent(
-                        requireContext(), it
-                    )
-                }, null))
-            }
-            1 -> {
-                startActivity(
-                    Intent.createChooser(
-                        Intent()
-                            .setAction(Intent.ACTION_SEND)
-                            .putExtra(Intent.EXTRA_TEXT, currentlyListening)
-                            .setType("text/plain"),
-                        null
-                    )
-                )
-            }
-            2 -> {
-                if (song != null) {
-                    startActivity(
-                        Intent(
-                            requireContext(),
-                            ShareInstagramStory::class.java
-                        ).putExtra(
-                            ShareInstagramStory.EXTRA_SONG,
-                            song
-                        )
-                    )
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .title(R.string.what_do_you_want_to_share)
+                .show {
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    listItems(items = listOf(getString(code.name.monkey.retromusic.R.string.the_audio_file), "\u201C" + currentlyListening + "\u201D")) { dialog, index, text ->
+                        when (index) {
+                            0 -> {
+                                startActivity(Intent.createChooser(song?.let { MusicUtil.createShareSongFileIntent(it, context) }, null))
+                            }
+                            1 -> {
+                                activity!!.startActivity(
+                                        Intent.createChooser(
+                                                Intent()
+                                                        .setAction(Intent.ACTION_SEND)
+                                                        .putExtra(Intent.EXTRA_TEXT, currentlyListening)
+                                                        .setType("text/plain"),
+                                                null
+                                        )
+                                )
+                            }
+                        }
+                    }
                 }
-            }
-        }
     }
 
     companion object {
 
         fun create(song: Song): SongShareDialog {
-            return SongShareDialog().apply {
-                arguments = bundleOf(
-                    EXTRA_SONG to song
-                )
-            }
+            val dialog = SongShareDialog()
+            val args = Bundle()
+            args.putParcelable("song", song)
+            dialog.arguments = args
+            return dialog
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityEx.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityEx.kt
new file mode 100644
index 000000000..bc1827c75
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityEx.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.extensions
+
+import android.content.res.ColorStateList
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
+import code.name.monkey.retromusic.R
+
+fun AppCompatActivity.applyToolbar(toolbar: Toolbar) {
+    toolbar.apply {
+        setNavigationOnClickListener { onBackPressed() }
+        setNavigationIcon(R.drawable.ic_keyboard_backspace_black_24dp)
+        ToolbarContentTintHelper.colorBackButton(toolbar)
+        backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(this@applyToolbar, R.attr.colorSurface))
+    }
+    setSupportActionBar(toolbar)
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
deleted file mode 100644
index bf3d9d8cd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityExtensions.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.app.Activity
-import android.content.Intent
-import android.view.View
-import android.view.ViewGroup
-import androidx.annotation.DimenRes
-import androidx.appcompat.app.AppCompatActivity
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import com.google.android.material.appbar.MaterialToolbar
-
-fun AppCompatActivity.applyToolbar(toolbar: MaterialToolbar) {
-    ToolbarContentTintHelper.colorBackButton(toolbar)
-    setSupportActionBar(toolbar)
-}
-
-inline fun <reified T : Any> Activity.extra(key: String, default: T? = null) = lazy {
-    val value = intent?.extras?.get(key)
-    if (value is T) value else default
-}
-
-inline fun <reified T : Any> Intent.extra(key: String, default: T? = null) = lazy {
-    val value = extras?.get(key)
-    if (value is T) value else default
-}
-
-inline fun <reified T : Any> Activity.extraNotNull(key: String, default: T? = null) = lazy {
-    val value = intent?.extras?.get(key)
-    requireNotNull(if (value is T) value else default) { key }
-}
-
-fun Activity.dip(@DimenRes id: Int): Int {
-    return resources.getDimensionPixelSize(id)
-}
-
-inline val Activity.rootView: View get() = findViewById<ViewGroup>(android.R.id.content).getChildAt(0)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
deleted file mode 100644
index d6c5a559d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ActivityThemeExtensions.kt
+++ /dev/null
@@ -1,235 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.app.ActivityManager
-import android.graphics.Color
-import android.os.Build
-import android.view.View
-import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-import android.view.WindowManager
-import android.view.inputmethod.InputMethodManager
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.content.getSystemService
-import androidx.core.view.*
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-fun AppCompatActivity.maybeSetScreenOn() {
-    if (PreferenceUtil.isScreenOnEnabled) {
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    } else {
-        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    }
-}
-
-fun AppCompatActivity.keepScreenOn(keepScreenOn: Boolean) {
-    if (keepScreenOn) {
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    } else {
-        window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    }
-}
-
-fun AppCompatActivity.setEdgeToEdgeOrImmersive() {
-    if (PreferenceUtil.isFullScreenMode) {
-        setImmersiveFullscreen()
-    } else {
-        setDrawBehindSystemBars()
-    }
-}
-
-fun AppCompatActivity.setImmersiveFullscreen() {
-    if (PreferenceUtil.isFullScreenMode) {
-        WindowInsetsControllerCompat(window, window.decorView).apply {
-            systemBarsBehavior =
-                WindowInsetsControllerCompat.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE
-            hide(WindowInsetsCompat.Type.systemBars())
-        }
-        if (VersionUtils.hasP()) {
-            window.attributes.layoutInDisplayCutoutMode =
-                WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_SHORT_EDGES
-        }
-        ViewCompat.setOnApplyWindowInsetsListener(window.decorView) { _, insets ->
-            if (insets.displayCutout != null) {
-                insets
-            } else {
-                // Consume insets if display doesn't have a Cutout
-                WindowInsetsCompat.CONSUMED
-            }
-        }
-    }
-}
-
-fun AppCompatActivity.exitFullscreen() {
-    WindowInsetsControllerCompat(window, window.decorView).apply {
-        show(WindowInsetsCompat.Type.systemBars())
-    }
-}
-
-fun AppCompatActivity.hideStatusBar() {
-    hideStatusBar(PreferenceUtil.isFullScreenMode)
-}
-
-private fun AppCompatActivity.hideStatusBar(fullscreen: Boolean) {
-    val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
-    if (statusBar != null) {
-        statusBar.isGone = fullscreen
-    }
-}
-
-fun AppCompatActivity.setDrawBehindSystemBars() {
-    if (VersionUtils.hasOreo()) {
-        WindowCompat.setDecorFitsSystemWindows(window, false)
-        window.navigationBarColor = Color.TRANSPARENT
-        window.statusBarColor = Color.TRANSPARENT
-        if (VersionUtils.hasQ()) {
-            window.isNavigationBarContrastEnforced = false
-        }
-    } else {
-        setNavigationBarColorPreOreo(surfaceColor())
-        if (VersionUtils.hasMarshmallow()) {
-            setStatusBarColor(Color.TRANSPARENT)
-        } else {
-            setStatusBarColor(Color.BLACK)
-        }
-    }
-}
-
-fun FragmentActivity.setTaskDescriptionColor(color: Int) {
-    var colorFinal = color
-    // Task description requires fully opaque color
-    colorFinal = ColorUtil.stripAlpha(colorFinal)
-    // Sets color of entry in the system recents page
-    if (VersionUtils.hasP()) {
-        setTaskDescription(
-            ActivityManager.TaskDescription(
-                title as String?,
-                -1,
-                colorFinal
-            )
-        )
-    } else {
-        setTaskDescription(ActivityManager.TaskDescription(title as String?))
-    }
-}
-
-fun AppCompatActivity.setTaskDescriptionColorAuto() {
-    setTaskDescriptionColor(surfaceColor())
-}
-
-@Suppress("Deprecation")
-fun AppCompatActivity.setLightStatusBar(enabled: Boolean) {
-    if (VersionUtils.hasMarshmallow()) {
-        val decorView = window.decorView
-        val systemUiVisibility = decorView.systemUiVisibility
-        if (enabled) {
-            decorView.systemUiVisibility =
-                systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
-        } else {
-            decorView.systemUiVisibility =
-                systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
-        }
-    }
-}
-
-fun AppCompatActivity.setLightStatusBarAuto() {
-    setLightStatusBar(surfaceColor().isColorLight)
-}
-
-fun AppCompatActivity.setLightStatusBarAuto(bgColor: Int) {
-    setLightStatusBar(bgColor.isColorLight)
-}
-
-@Suppress("Deprecation")
-fun AppCompatActivity.setLightNavigationBar(enabled: Boolean) {
-    if (VersionUtils.hasOreo()) {
-        val decorView = window.decorView
-        var systemUiVisibility = decorView.systemUiVisibility
-        systemUiVisibility = if (enabled) {
-            systemUiVisibility or SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-        } else {
-            systemUiVisibility and SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
-        }
-        decorView.systemUiVisibility = systemUiVisibility
-    }
-}
-
-fun AppCompatActivity.setLightNavigationBarAuto() {
-    setLightNavigationBar(surfaceColor().isColorLight)
-}
-
-fun AppCompatActivity.setLightNavigationBarAuto(bgColor: Int) {
-    setLightNavigationBar(bgColor.isColorLight)
-}
-
-
-/**
- * This will set the color of the view with the id "status_bar" on KitKat and Lollipop. On
- * Lollipop if no such view is found it will set the statusbar color using the native method.
- *
- * @param color the new statusbar color (will be shifted down on Lollipop and above)
- */
-fun AppCompatActivity.setStatusBarColor(color: Int) {
-    val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
-    if (statusBar != null) {
-        when {
-            VersionUtils.hasMarshmallow() -> statusBar.setBackgroundColor(color)
-            else -> statusBar.setBackgroundColor(
-                ColorUtil.darkenColor(
-                    color
-                )
-            )
-        }
-    } else {
-        when {
-            VersionUtils.hasMarshmallow() -> window.statusBarColor = color
-            else -> window.statusBarColor = ColorUtil.darkenColor(color)
-        }
-    }
-    setLightStatusBarAuto(surfaceColor())
-}
-
-fun AppCompatActivity.setStatusBarColorAuto() {
-    // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
-    setStatusBarColor(surfaceColor())
-    setLightStatusBarAuto(surfaceColor())
-}
-
-fun AppCompatActivity.setNavigationBarColor(color: Int) {
-    if (VersionUtils.hasOreo()) {
-        window.navigationBarColor = color
-    } else {
-        window.navigationBarColor = ColorUtil.darkenColor(color)
-    }
-    setLightNavigationBarAuto(color)
-}
-
-fun AppCompatActivity.setNavigationBarColorPreOreo(color: Int) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
-        window.navigationBarColor = ColorUtil.darkenColor(color)
-    }
-}
-
-fun AppCompatActivity.setStatusBarColorPreMarshmallow(color: Int) {
-    val statusBar = window.decorView.rootView.findViewById<View>(R.id.status_bar)
-    if (statusBar != null) {
-        statusBar.setBackgroundColor(
-            ColorUtil.darkenColor(
-                color
-            )
-        )
-    } else {
-        window.statusBarColor = ColorUtil.darkenColor(color)
-    }
-}
-
-fun AppCompatActivity.hideSoftKeyboard() {
-    val currentFocus: View? = currentFocus
-    if (currentFocus != null) {
-        val inputMethodManager =
-            getSystemService<InputMethodManager>()
-        inputMethodManager?.hideSoftInputFromWindow(currentFocus.windowToken, 0)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt
new file mode 100644
index 000000000..4966d9915
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExt.kt
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.extensions
+
+import android.content.Context
+import android.graphics.Color
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.retromusic.R
+
+fun Int.ripAlpha(): Int {
+    return ColorUtil.stripAlpha(this)
+}
+
+fun Any.surfaceColor(context: Context): Int {
+    return ATHUtil.resolveColor(context, R.attr.colorSurface, Color.WHITE)
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
deleted file mode 100644
index b1ae4bec8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ColorExtensions.kt
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.app.Dialog
-import android.content.Context
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.widget.Button
-import android.widget.CheckBox
-import android.widget.SeekBar
-import androidx.annotation.AttrRes
-import androidx.annotation.CheckResult
-import androidx.annotation.ColorInt
-import androidx.annotation.ColorRes
-import androidx.appcompat.widget.AppCompatImageView
-import androidx.appcompat.widget.Toolbar
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.ColorUtils
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.fragment.app.Fragment
-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.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil.materialYou
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-import com.google.android.material.floatingactionbutton.FloatingActionButton
-import com.google.android.material.progressindicator.CircularProgressIndicator
-import com.google.android.material.slider.Slider
-import com.google.android.material.textfield.TextInputLayout
-
-fun Int.ripAlpha(): Int {
-    return ColorUtil.stripAlpha(this)
-}
-
-fun Dialog.colorControlNormal() = resolveColor(android.R.attr.colorControlNormal)
-
-fun Toolbar.backgroundTintList() {
-    val surfaceColor = ATHUtil.resolveColor(context, com.google.android.material.R.attr.colorSurface, Color.BLACK)
-    val colorStateList = ColorStateList.valueOf(surfaceColor)
-    backgroundTintList = colorStateList
-}
-
-fun Context.accentColor() = ThemeStore.accentColor(this)
-
-fun Fragment.accentColor() = ThemeStore.accentColor(requireContext())
-
-fun Context.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
-
-fun Fragment.surfaceColor() = resolveColor(com.google.android.material.R.attr.colorSurface, Color.WHITE)
-
-fun Context.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
-
-fun Fragment.surfaceColor(fallBackColor: Int) = resolveColor(com.google.android.material.R.attr.colorSurface, fallBackColor)
-
-fun Context.textColorSecondary() = resolveColor(android.R.attr.textColorSecondary)
-
-fun Fragment.textColorSecondary() = resolveColor(android.R.attr.textColorSecondary)
-
-fun Context.colorControlNormal() = resolveColor(android.R.attr.colorControlNormal)
-
-fun Fragment.colorControlNormal() = resolveColor(android.R.attr.colorControlNormal)
-
-fun Context.colorBackground() = resolveColor(android.R.attr.colorBackground)
-
-fun Fragment.colorBackground() = resolveColor(android.R.attr.colorBackground)
-
-fun Context.textColorPrimary() = resolveColor(android.R.attr.textColorPrimary)
-
-fun Fragment.textColorPrimary() = resolveColor(android.R.attr.textColorPrimary)
-
-fun Context.defaultFooterColor() = resolveColor(R.attr.defaultFooterColor)
-
-fun Fragment.defaultFooterColor() = resolveColor(R.attr.defaultFooterColor)
-
-fun Context.resolveColor(@AttrRes attr: Int, fallBackColor: Int = 0) =
-    ATHUtil.resolveColor(this, attr, fallBackColor)
-
-fun Fragment.resolveColor(@AttrRes attr: Int, fallBackColor: Int = 0) =
-    ATHUtil.resolveColor(requireContext(), attr, fallBackColor)
-
-fun Dialog.resolveColor(@AttrRes attr: Int, fallBackColor: Int = 0) =
-    ATHUtil.resolveColor(context, attr, fallBackColor)
-
-// Don't apply accent colors if Material You is enabled
-// Material Components will take care of applying material you colors
-fun CheckBox.addAccentColor() {
-    if (materialYou) return
-    buttonTintList = ColorStateList.valueOf(ThemeStore.accentColor(context))
-}
-
-fun SeekBar.addAccentColor() {
-    if (materialYou) return
-    val colorState = ColorStateList.valueOf(ThemeStore.accentColor(context))
-    progressTintList = colorState
-    thumbTintList = colorState
-}
-
-fun Slider.addAccentColor() {
-    if (materialYou) return
-    val accentColor = ThemeStore.accentColor(context)
-    trackActiveTintList = accentColor.colorStateList
-    trackInactiveTintList = ColorUtil.withAlpha(accentColor, 0.5F).colorStateList
-    thumbTintList = accentColor.colorStateList
-}
-
-fun Slider.accent() {
-    if (materialYou) return
-    val accentColor = context.accentColor()
-    thumbTintList = accentColor.colorStateList
-    trackActiveTintList = accentColor.colorStateList
-    trackInactiveTintList = ColorUtil.withAlpha(accentColor, 0.1F).colorStateList
-}
-
-fun Button.accentTextColor() {
-    if (materialYou) return
-    setTextColor(context.accentColor())
-}
-
-fun MaterialButton.accentBackgroundColor() {
-    if (materialYou) return
-    backgroundTintList = ColorStateList(
-        arrayOf(intArrayOf(android.R.attr.state_enabled), intArrayOf()),
-            intArrayOf(context.accentColor(), context.accentColor().addAlpha(0.12f)))
-}
-
-fun MaterialButton.accentOutlineColor() {
-    if (materialYou) return
-    val color = ThemeStore.accentColor(context)
-    val colorStateList = ColorStateList.valueOf(color)
-    iconTint = colorStateList
-    strokeColor = colorStateList
-    setTextColor(colorStateList)
-    rippleColor = colorStateList
-}
-
-fun MaterialButton.elevatedAccentColor() {
-    if (materialYou) return
-    val color = context.darkAccentColorVariant()
-    rippleColor = ColorStateList.valueOf(color)
-    setBackgroundColor(color)
-    setTextColor(MaterialValueHelper.getPrimaryTextColor(context, color.isColorLight))
-    iconTint = ColorStateList.valueOf(context.accentColor())
-}
-
-fun SeekBar.applyColor(@ColorInt color: Int) {
-    thumbTintList = ColorStateList.valueOf(color)
-    progressTintList = ColorStateList.valueOf(color)
-    progressBackgroundTintList = ColorStateList.valueOf(color)
-}
-
-fun Slider.applyColor(@ColorInt color: Int) {
-    ColorStateList.valueOf(color).run {
-        thumbTintList = this
-        trackActiveTintList = this
-        trackInactiveTintList = ColorStateList.valueOf(color.addAlpha(0.1f))
-        haloTintList = this
-    }
-}
-
-fun ExtendedFloatingActionButton.accentColor() {
-    if (materialYou) return
-    val color = ThemeStore.accentColor(context)
-    val textColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(color))
-    val colorStateList = ColorStateList.valueOf(color)
-    val textColorStateList = ColorStateList.valueOf(textColor)
-    backgroundTintList = colorStateList
-    setTextColor(textColorStateList)
-    iconTint = textColorStateList
-}
-
-fun FloatingActionButton.accentColor() {
-    if (materialYou) return
-    val color = ThemeStore.accentColor(context)
-    val textColor = MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(color))
-    backgroundTintList = ColorStateList.valueOf(color)
-    imageTintList = ColorStateList.valueOf(textColor)
-}
-
-fun MaterialButton.applyColor(color: Int) {
-    val backgroundColorStateList = ColorStateList.valueOf(color)
-    val textColorColorStateList = ColorStateList.valueOf(
-        MaterialValueHelper.getPrimaryTextColor(
-            context,
-            ColorUtil.isColorLight(color)
-        )
-    )
-    backgroundTintList = backgroundColorStateList
-    setTextColor(textColorColorStateList)
-    iconTint = textColorColorStateList
-}
-
-fun MaterialButton.accentColor() {
-    if (materialYou) return
-    applyColor(ThemeStore.accentColor(context))
-}
-
-fun MaterialButton.applyOutlineColor(color: Int) {
-    val colorStateList = ColorStateList.valueOf(color)
-    iconTint = colorStateList
-    strokeColor = colorStateList
-    setTextColor(colorStateList)
-    rippleColor = colorStateList
-}
-
-fun TextInputLayout.accentColor() {
-    if (materialYou) return
-    val accentColor = ThemeStore.accentColor(context)
-    val colorState = ColorStateList.valueOf(accentColor)
-    boxStrokeColor = accentColor
-    defaultHintTextColor = colorState
-    isHintAnimationEnabled = true
-}
-
-fun CircularProgressIndicator.accentColor() {
-    if (materialYou) return
-    val color = ThemeStore.accentColor(context)
-    setIndicatorColor(color)
-    trackColor = ColorUtil.withAlpha(color, 0.2f)
-}
-
-fun CircularProgressIndicator.applyColor(color: Int) {
-    setIndicatorColor(color)
-    trackColor = ColorUtil.withAlpha(color, 0.2f)
-}
-
-fun AppCompatImageView.accentColor(): Int = ThemeStore.accentColor(context)
-
-fun TextInputLayout.setTint(background: Boolean = true) {
-    if (materialYou) return
-    val accentColor = ThemeStore.accentColor(context)
-    val colorState = ColorStateList.valueOf(accentColor)
-
-    if (background) {
-        backgroundTintList = colorState
-        defaultHintTextColor = colorState
-    } else {
-        boxStrokeColor = accentColor
-        defaultHintTextColor = colorState
-        isHintAnimationEnabled = true
-    }
-}
-
-@CheckResult
-fun Drawable.tint(@ColorInt color: Int): Drawable {
-    val tintedDrawable = DrawableCompat.wrap(this).mutate()
-    setTint(color)
-    return tintedDrawable
-}
-
-@CheckResult
-fun Drawable.tint(context: Context, @ColorRes color: Int): Drawable =
-    tint(context.getColorCompat(color))
-
-@ColorInt
-fun Context.getColorCompat(@ColorRes colorRes: Int): Int {
-    return ContextCompat.getColor(this, colorRes)
-}
-
-@ColorInt
-fun Context.darkAccentColor(): Int {
-    return ColorUtils.blendARGB(
-        accentColor(),
-        surfaceColor(),
-        if (surfaceColor().isColorLight) 0.9f else 0.92f
-    )
-}
-
-@ColorInt
-fun Context.darkAccentColorVariant(): Int {
-    return ColorUtils.blendARGB(
-        accentColor(),
-        surfaceColor(),
-        if (surfaceColor().isColorLight) 0.9f else 0.95f
-    )
-}
-
-@ColorInt
-fun Context.accentColorVariant(): Int {
-    return if (surfaceColor().isColorLight) {
-        accentColor().darkerColor
-    } else {
-        accentColor().lighterColor
-    }
-}
-
-inline val @receiver:ColorInt Int.isColorLight
-    get() = ColorUtil.isColorLight(this)
-
-inline val @receiver:ColorInt Int.lightColor
-    get() = ColorUtil.withAlpha(this, 0.5F)
-
-inline val @receiver:ColorInt Int.lighterColor
-    get() = ColorUtil.lightenColor(this)
-
-inline val @receiver:ColorInt Int.darkerColor
-    get() = ColorUtil.darkenColor(this)
-
-inline val Int.colorStateList: ColorStateList
-    get() = ColorStateList.valueOf(this)
-
-fun @receiver:ColorInt Int.addAlpha(alpha: Float): Int {
-    return ColorUtil.withAlpha(this, alpha)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt
deleted file mode 100644
index a479903d7..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ContextExtensions.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.drawable.Drawable
-import android.widget.Toast
-import androidx.annotation.ColorInt
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import androidx.core.content.ContextCompat
-
-fun Context.showToast(@StringRes stringRes: Int, duration: Int = Toast.LENGTH_SHORT) {
-    showToast(getString(stringRes), duration)
-}
-
-fun Context.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(this, message, duration).show()
-}
-
-val Context.isLandscape: Boolean get() = resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-
-val Context.isTablet: Boolean get() = resources.configuration.smallestScreenWidthDp >= 600
-
-fun Context.getTintedDrawable(@DrawableRes id: Int, @ColorInt color: Int): Drawable {
-    return ContextCompat.getDrawable(this, id)?.tint(color)!!
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt
deleted file mode 100644
index 531c2e0bb..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/CursorExtensions.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.database.Cursor
-
-// exception is rethrown manually in order to have a readable stacktrace
-
-internal fun Cursor.getInt(columnName: String): Int {
-    try {
-        return getInt(getColumnIndexOrThrow(columnName))
-    } catch (ex: Throwable) {
-        throw IllegalStateException("invalid column $columnName", ex)
-    }
-}
-
-internal fun Cursor.getLong(columnName: String): Long {
-    try {
-        return getLong(getColumnIndexOrThrow(columnName))
-    } catch (ex: Throwable) {
-        throw IllegalStateException("invalid column $columnName", ex)
-    }
-}
-
-internal fun Cursor.getString(columnName: String): String {
-    try {
-        return getString(getColumnIndexOrThrow(columnName))
-    } catch (ex: Throwable) {
-        throw IllegalStateException("invalid column $columnName", ex)
-    }
-}
-
-internal fun Cursor.getStringOrNull(columnName: String): String? {
-    try {
-        return getString(getColumnIndexOrThrow(columnName))
-    } catch (ex: Throwable) {
-        throw IllegalStateException("invalid column $columnName", ex)
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
deleted file mode 100644
index ffd894af4..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DialogExtension.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import androidx.appcompat.app.AlertDialog
-import androidx.fragment.app.Fragment
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
-import com.afollestad.materialdialogs.MaterialDialog
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-
-fun Fragment.materialDialog(title: Int): MaterialAlertDialogBuilder {
-    return if (BuildConfig.DEBUG) {
-        MaterialAlertDialogBuilder(
-            requireContext(),
-            R.style.MaterialAlertDialogTheme
-        )
-    } else {
-        MaterialAlertDialogBuilder(
-            requireContext()
-        )
-    }.setTitle(title)
-}
-
-fun AlertDialog.colorButtons(): AlertDialog {
-    setOnShowListener {
-        getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor()
-        getButton(AlertDialog.BUTTON_NEGATIVE).accentTextColor()
-        getButton(AlertDialog.BUTTON_NEUTRAL).accentTextColor()
-    }
-    return this
-}
-
-fun Fragment.materialDialog(): MaterialDialog {
-    return MaterialDialog(requireContext())
-        .cornerRadius(res = R.dimen.m3_dialog_corner_size)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt
deleted file mode 100644
index 6e5cdeccc..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DimenExtension.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.app.Activity
-import androidx.annotation.DimenRes
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-
-fun AppCompatActivity.dimToPixel(@DimenRes dimenRes: Int): Int {
-    return resources.getDimensionPixelSize(dimenRes)
-}
-
-fun Activity.dipToPix(dpInFloat: Float): Float {
-    val scale = resources.displayMetrics.density
-    return dpInFloat * scale + 0.5f
-}
-
-fun Fragment.dipToPix(dpInFloat: Float): Float {
-    val scale = resources.displayMetrics.density
-    return dpInFloat * scale + 0.5f
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt
similarity index 59%
rename from app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
rename to app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt
index c23f0e979..8e5bcd941 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/DrawableExt.kt
@@ -1,34 +1,28 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.extensions
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.graphics.Canvas
 import android.graphics.drawable.BitmapDrawable
 import android.graphics.drawable.Drawable
 import androidx.annotation.DimenRes
 import androidx.annotation.DrawableRes
-import androidx.core.graphics.drawable.toBitmap
 
-fun Context.scaledDrawableResources(
-    @DrawableRes id: Int,
-    @DimenRes width: Int,
-    @DimenRes height: Int,
-): Drawable {
+fun Context.scaledDrawableResources(@DrawableRes id: Int, @DimenRes width: Int, @DimenRes height: Int): Drawable {
     val w = resources.getDimension(width).toInt()
     val h = resources.getDimension(height).toInt()
     return scaledDrawable(id, w, h)
@@ -40,13 +34,3 @@ fun Context.scaledDrawable(@DrawableRes id: Int, width: Int, height: Int): Drawa
     return BitmapDrawable(resources, bmpScaled)
 }
 
-fun Drawable.toBitmap(scaleFactor: Float, config: Bitmap.Config? = null): Bitmap {
-    return toBitmap((intrinsicHeight*scaleFactor).toInt(), (intrinsicWidth*scaleFactor).toInt(), config)
-}
-
-fun Drawable.getBitmapDrawable(): Bitmap {
-    val bmp = Bitmap.createBitmap(bounds.width(), bounds.height(), Bitmap.Config.ARGB_8888)
-    val canvas = Canvas(bmp)
-    draw(canvas)
-    return bmp
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt
deleted file mode 100644
index 5c4df1a37..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FileExtensions.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import java.io.BufferedOutputStream
-import java.util.zip.ZipOutputStream
-
-fun BufferedOutputStream.zipOutputStream(): ZipOutputStream = ZipOutputStream(this)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExt.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExt.kt
new file mode 100644
index 000000000..ade2e5d12
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExt.kt
@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.extensions
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+
+/**
+ * Created by hemanths on 2019-12-15.
+ */
+
+inline fun <T : Fragment> T.withArgs(argsBuilder: Bundle.() -> Unit): T = this.apply { arguments = Bundle().apply(argsBuilder) }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
deleted file mode 100644
index b1e8f5930..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentExtensions.kt
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.drawable.Drawable
-import android.os.PowerManager
-import android.widget.Toast
-import androidx.annotation.*
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.core.content.getSystemService
-import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.NavHostFragment
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.appbar.MaterialToolbar
-
-fun Fragment.getIntRes(@IntegerRes int: Int): Int {
-    return resources.getInteger(int)
-}
-
-fun Context.getIntRes(@IntegerRes int: Int): Int {
-    return resources.getInteger(int)
-}
-
-val Context.generalThemeValue
-    get() = PreferenceUtil.getGeneralThemeValue(isSystemDarkModeEnabled())
-
-fun Context.isSystemDarkModeEnabled(): Boolean {
-    val isBatterySaverEnabled =
-        (getSystemService<PowerManager>())?.isPowerSaveMode ?: false
-    val isDarkModeEnabled =
-        (resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES
-    return isBatterySaverEnabled or isDarkModeEnabled
-}
-
-inline fun <reified T : Any> Fragment.extra(key: String, default: T? = null) = lazy {
-    val value = arguments?.get(key)
-    if (value is T) value else default
-}
-
-inline fun <reified T : Any> Fragment.extraNotNull(key: String, default: T? = null) = lazy {
-    val value = arguments?.get(key)
-    requireNotNull(if (value is T) value else default) { key }
-}
-
-fun AppCompatActivity.currentFragment(navHostId: Int): Fragment? {
-    val navHostFragment: NavHostFragment =
-        supportFragmentManager.findFragmentById(navHostId) as NavHostFragment
-    return navHostFragment.childFragmentManager.fragments.firstOrNull()
-}
-
-@Suppress("UNCHECKED_CAST")
-fun <T> AppCompatActivity.whichFragment(@IdRes id: Int): T {
-    return supportFragmentManager.findFragmentById(id) as T
-}
-
-@Suppress("UNCHECKED_CAST")
-fun <T> Fragment.whichFragment(@IdRes id: Int): T {
-    return childFragmentManager.findFragmentById(id) as T
-}
-
-fun Fragment.showToast(@StringRes stringRes: Int, duration: Int = Toast.LENGTH_SHORT) {
-    showToast(getString(stringRes), duration)
-}
-
-fun Fragment.showToast(message: String, duration: Int = Toast.LENGTH_SHORT) {
-    Toast.makeText(requireContext(), message, duration).show()
-}
-
-fun Context.getDrawableCompat(@DrawableRes drawableRes: Int): Drawable {
-    return AppCompatResources.getDrawable(this, drawableRes)!!
-}
-
-fun Fragment.getDrawableCompat(@DrawableRes drawableRes: Int): Drawable {
-    return AppCompatResources.getDrawable(requireContext(), drawableRes)!!
-}
-
-fun Fragment.applyToolbar(toolbar: MaterialToolbar) {
-    (requireActivity() as AppCompatActivity).applyToolbar(toolbar)
-}
-
-fun Fragment.dip(@DimenRes id: Int): Int {
-    return resources.getDimensionPixelSize(id)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt
deleted file mode 100644
index ac35af672..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/FragmentMusicExtensions.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.webkit.MimeTypeMap
-import androidx.core.net.toUri
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.RetroUtil
-import org.jaudiotagger.audio.AudioFileIO
-import java.io.File
-import java.net.URLEncoder
-
-fun getSongInfo(song: Song): String {
-    val file = File(song.data)
-    if (file.exists()) {
-        return try {
-            val audioHeader = AudioFileIO.read(File(song.data)).audioHeader
-            val string: StringBuilder = StringBuilder()
-            val uriFile = file.toUri()
-            string.append(getMimeType(uriFile.toString())).append(" • ")
-            string.append(audioHeader.bitRate).append(" kb/s").append(" • ")
-            string.append(RetroUtil.frequencyCount(audioHeader.sampleRate.toInt()))
-                .append(" kHz")
-            string.toString()
-        } catch (er: Exception) {
-            " - "
-        }
-    }
-    return "-"
-}
-
-private fun getMimeType(url: String): String {
-    var type: String? = MimeTypeMap.getFileExtensionFromUrl(
-        URLEncoder.encode(url, "utf-8")
-    ).uppercase()
-    if (type == null) {
-        type = url.substring(url.lastIndexOf(".") + 1)
-    }
-    return type
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt
deleted file mode 100644
index 70c8a10f4..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/InsetsExtensions.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import androidx.core.view.WindowInsetsCompat
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-
-fun WindowInsetsCompat?.getBottomInsets(): Int {
-    return if (PreferenceUtil.isFullScreenMode) {
-        return 0
-    } else {
-        this?.getInsets(WindowInsetsCompat.Type.systemBars())?.bottom ?: RetroUtil.navigationBarHeight
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt
deleted file mode 100644
index e91e81347..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/IntentExtensions.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.net.toUri
-import androidx.fragment.app.Fragment
-import java.io.OutputStream
-
-fun Fragment.createNewFile(
-    mimeType: String,
-    fileName: String,
-    write: (outputStream: OutputStream?, data: Uri?) -> Unit
-) {
-    val intent = Intent(Intent.ACTION_CREATE_DOCUMENT)
-    intent.addCategory(Intent.CATEGORY_OPENABLE)
-    intent.type = mimeType
-    intent.putExtra(Intent.EXTRA_TITLE, fileName)
-    val startForResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult())
-        { result: ActivityResult ->
-            if (result.resultCode == Activity.RESULT_OK) {
-                write(
-                    context?.contentResolver?.openOutputStream(result.data?.data!!),
-                    result.data?.data
-                )
-            }
-
-        }
-    startForResult.launch(intent)
-}
-
-fun Context.openUrl(url: String) {
-    val i = Intent(Intent.ACTION_VIEW)
-    i.data = url.toUri()
-    i.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-    startActivity(i)
-}
-
-
-fun Fragment.openUrl(url: String) {
-    requireContext().openUrl(url)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ListEx.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ListEx.kt
new file mode 100644
index 000000000..8711599f1
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ListEx.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.extensions
+
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.model.Song
+
+/**
+ * Created by hemanths on 2019-11-01.
+ */
+
+
+fun ArrayList<Song>.lastElement(): Boolean {
+    println("${this.size} ${this.indexOf(MusicPlayerRemote.currentSong)}")
+    return this.size - 1 == this.indexOf(MusicPlayerRemote.currentSong)
+}
+
+fun ArrayList<Song>.fistElement(): Boolean {
+    return 0 == this.indexOf(MusicPlayerRemote.currentSong)
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt
deleted file mode 100644
index fc1f938d5..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/NavigationExtensions.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import androidx.annotation.IdRes
-import androidx.appcompat.app.AppCompatActivity
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.findNavController
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.navOptions
-
-fun Fragment.navigate(@IdRes id: Int) = findNavController().navigate(id)
-
-fun Fragment.findNavController(@IdRes id: Int): NavController {
-    val fragment = childFragmentManager.findFragmentById(id) as NavHostFragment
-    return fragment.navController
-}
-
-fun Fragment.findActivityNavController(@IdRes id: Int): NavController {
-    return requireActivity().findNavController(id)
-}
-
-fun AppCompatActivity.findNavController(@IdRes id: Int): NavController {
-    val fragment = supportFragmentManager.findFragmentById(id) as NavHostFragment
-    return fragment.navController
-}
-
-val fadeNavOptions
-    get() = navOptions {
-        anim {
-            enter = android.R.anim.fade_in
-            exit = android.R.anim.fade_out
-            popEnter = android.R.anim.fade_in
-            popExit = android.R.anim.fade_out
-        }
-    }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt
deleted file mode 100644
index dae607bf4..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/PaletteExtensions.kt
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import androidx.annotation.ColorInt
-import androidx.core.graphics.ColorUtils
-import androidx.palette.graphics.Palette
-
-fun getSuitableColorFor(palette: Palette, i: Int, i2: Int): Int {
-    val dominantSwatch = palette.dominantSwatch
-    if (dominantSwatch != null) {
-        if (hasEnoughContrast(i, dominantSwatch.rgb)) {
-            return dominantSwatch.rgb
-        }
-    }
-    val vibrantSwatch = palette.vibrantSwatch
-    if (vibrantSwatch != null) {
-        if (hasEnoughContrast(i, vibrantSwatch.rgb)) {
-            return vibrantSwatch.rgb
-        }
-    }
-    val darkVibrantSwatch = palette.darkVibrantSwatch
-    if (darkVibrantSwatch != null) {
-        if (hasEnoughContrast(i, darkVibrantSwatch.rgb)) {
-            return darkVibrantSwatch.rgb
-        }
-    }
-    val lightVibrantSwatch = palette.lightVibrantSwatch
-    if (lightVibrantSwatch != null) {
-        if (hasEnoughContrast(i, lightVibrantSwatch.rgb)) {
-            return lightVibrantSwatch.rgb
-        }
-    }
-    val darkMutedSwatch = palette.darkMutedSwatch
-    if (darkMutedSwatch != null) {
-        if (hasEnoughContrast(i, darkMutedSwatch.rgb)) {
-            return darkMutedSwatch.rgb
-        }
-    }
-    val lightMutedSwatch = palette.lightMutedSwatch
-    if (lightMutedSwatch != null) {
-        if (hasEnoughContrast(i, lightMutedSwatch.rgb)) {
-            return lightMutedSwatch.rgb
-        }
-    }
-    val mutedSwatch = palette.mutedSwatch
-    if (mutedSwatch != null) {
-        if (hasEnoughContrast(i, mutedSwatch.rgb)) {
-            return mutedSwatch.rgb
-        }
-    }
-    return i2
-}
-
-fun hasEnoughContrast(i: Int, i2: Int): Boolean {
-    return ColorUtils.calculateContrast(i2, i) >= 2.toDouble()
-}
-
-fun hasEnoughLuminance(i: Int): Boolean {
-    return ColorUtils.calculateLuminance(i) >= 0.4f.toDouble()
-}
-
-fun isBlack(fArr: FloatArray): Boolean {
-    return fArr[2] <= 0.035f
-}
-
-fun isNearRedLine(fArr: FloatArray): Boolean {
-    val f = fArr[0]
-    return f in 10.0f..37.0f && fArr[1] <= 0.82f
-}
-
-fun isDark(@ColorInt i: Int): Boolean {
-    return ColorUtils.calculateLuminance(i) < 0.5
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt
deleted file mode 100644
index 317844afd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/PreferenceExtensions.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.extensions
-
-import android.content.SharedPreferences
-
-fun SharedPreferences.getStringOrDefault(key: String, default: String): String {
-    return getString(key, default) ?: default
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt
deleted file mode 100644
index f28f05624..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/SongExtensions.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.extensions
-
-import android.support.v4.media.MediaDescriptionCompat
-import android.support.v4.media.session.MediaSessionCompat.QueueItem
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-
-val Song.uri get() = MusicUtil.getSongFileUri(songId = id)
-
-val Song.albumArtUri get() = MusicUtil.getMediaStoreAlbumCoverUri(albumId)
-
-fun ArrayList<Song>.toMediaSessionQueue(): List<QueueItem> {
-    return map { song ->
-        val mediaDescription = MediaDescriptionCompat.Builder()
-            .setMediaId(song.id.toString())
-            .setTitle(song.title)
-            .setSubtitle(song.artistName)
-            .setIconUri(song.albumArtUri)
-            .build()
-        QueueItem(mediaDescription, song.hashCode().toLong())
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
index 114ecf6d5..64e400dca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/extensions/ViewExtensions.kt
@@ -1,49 +1,27 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
+
 package code.name.monkey.retromusic.extensions
 
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.animation.ValueAnimator
-import android.content.res.ColorStateList
-import android.graphics.drawable.BitmapDrawable
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.view.ViewTreeObserver
-import android.view.animation.AnimationUtils
-import android.view.inputmethod.InputMethodManager
 import android.widget.EditText
-import androidx.annotation.ColorInt
 import androidx.annotation.LayoutRes
-import androidx.annotation.Px
-import androidx.core.animation.doOnEnd
-import androidx.core.animation.doOnStart
-import androidx.core.content.getSystemService
-import androidx.core.view.*
 import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.card.MaterialCardView
-import com.google.android.material.navigation.NavigationBarView
-import com.google.android.material.navigationrail.NavigationRailView
-import dev.chrisbanes.insetter.applyInsetter
 
-const val ANIM_DURATION = 300L
 
 @Suppress("UNCHECKED_CAST")
 fun <T : View> ViewGroup.inflate(@LayoutRes layout: Int): T {
@@ -51,275 +29,20 @@ fun <T : View> ViewGroup.inflate(@LayoutRes layout: Int): T {
 }
 
 fun View.show() {
-    isVisible = true
+    visibility = View.VISIBLE
 }
 
 fun View.hide() {
-    isVisible = false
+    visibility = View.GONE
 }
 
 fun View.hidden() {
-    isInvisible = true
+    visibility = View.INVISIBLE
 }
 
+fun View.showOrHide(show: Boolean) = if (show) show() else hide()
+
 fun EditText.appHandleColor(): EditText {
-    if (PreferenceUtil.materialYou) return this
     TintHelper.colorHandles(this, ThemeStore.accentColor(context))
     return this
-}
-
-fun NavigationBarView.setItemColors(@ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
-    val csl = ColorStateList(
-        arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
-        intArrayOf(normalColor, selectedColor)
-    )
-    itemIconTintList = csl
-    itemTextColor = csl
-}
-
-/**
- * Potentially animate showing a [BottomNavigationView].
- *
- * Abruptly changing the visibility leads to a re-layout of main content, animating
- * `translationY` leaves a gap where the view was that content does not fill.
- *
- * Instead, take a snapshot of the view, and animate this in, only changing the visibility (and
- * thus layout) when the animation completes.
- */
-fun NavigationBarView.show() {
-    if (this is NavigationRailView) return
-    if (isVisible) return
-
-    val parent = parent as ViewGroup
-    // View needs to be laid out to create a snapshot & know position to animate. If view isn't
-    // laid out yet, need to do this manually.
-    if (!isLaidOut) {
-        measure(
-            View.MeasureSpec.makeMeasureSpec(parent.width, View.MeasureSpec.EXACTLY),
-            View.MeasureSpec.makeMeasureSpec(parent.height, View.MeasureSpec.AT_MOST)
-        )
-        layout(parent.left, parent.height - measuredHeight, parent.right, parent.height)
-    }
-
-    val drawable = BitmapDrawable(context.resources, drawToBitmap())
-    drawable.setBounds(left, parent.height, right, parent.height + height)
-    parent.overlay.add(drawable)
-    ValueAnimator.ofInt(parent.height, top).apply {
-        duration = ANIM_DURATION
-        interpolator = AnimationUtils.loadInterpolator(
-            context,
-            android.R.interpolator.accelerate_decelerate
-        )
-        addUpdateListener {
-            val newTop = it.animatedValue as Int
-            drawable.setBounds(left, newTop, right, newTop + height)
-        }
-        doOnEnd {
-            parent.overlay.remove(drawable)
-            isVisible = true
-        }
-        start()
-    }
-}
-
-/**
- * Potentially animate hiding a [BottomNavigationView].
- *
- * Abruptly changing the visibility leads to a re-layout of main content, animating
- * `translationY` leaves a gap where the view was that content does not fill.
- *
- * Instead, take a snapshot, instantly hide the view (so content lays out to fill), then animate
- * out the snapshot.
- */
-fun NavigationBarView.hide() {
-    if (this is NavigationRailView) return
-    if (isGone) return
-
-    if (!isLaidOut) {
-        isGone = true
-        return
-    }
-
-    val drawable = BitmapDrawable(context.resources, drawToBitmap())
-    val parent = parent as ViewGroup
-    drawable.setBounds(left, top, right, bottom)
-    parent.overlay.add(drawable)
-    isGone = true
-    ValueAnimator.ofInt(top, parent.height).apply {
-        duration = ANIM_DURATION
-        interpolator = AnimationUtils.loadInterpolator(
-            context,
-            android.R.interpolator.accelerate_decelerate
-        )
-        addUpdateListener {
-            val newTop = it.animatedValue as Int
-            drawable.setBounds(left, newTop, right, newTop + height)
-        }
-        doOnEnd {
-            parent.overlay.remove(drawable)
-        }
-        start()
-    }
-}
-
-fun View.translateYAnimate(value: Float): Animator {
-    return ObjectAnimator.ofFloat(this, "translationY", value)
-        .apply {
-            duration = 300
-            doOnStart {
-                show()
-                bringToFront()
-            }
-            doOnEnd {
-                isGone = (value != 0f)
-            }
-            start()
-        }
-}
-
-fun BottomSheetBehavior<*>.peekHeightAnimate(value: Int): Animator {
-    return ObjectAnimator.ofInt(this, "peekHeight", value)
-        .apply {
-            duration = ANIM_DURATION
-            start()
-        }
-}
-
-fun MaterialCardView.animateRadius(cornerRadius: Float, pause: Boolean = true) {
-    ValueAnimator.ofFloat(radius, cornerRadius).apply {
-        addUpdateListener { radius = animatedValue as Float }
-        start()
-    }
-    ValueAnimator.ofInt(measuredWidth, if (pause) (height * 1.5).toInt() else height).apply {
-        addUpdateListener {
-            updateLayoutParams<ViewGroup.LayoutParams> { width = animatedValue as Int }
-        }
-        start()
-    }
-}
-
-fun MaterialCardView.animateToCircle() {
-    animateRadius(measuredHeight / 2F, pause = false)
-}
-
-fun View.focusAndShowKeyboard() {
-    /**
-     * This is to be called when the window already has focus.
-     */
-    fun View.showTheKeyboardNow() {
-        if (isFocused) {
-            post {
-                // We still post the call, just in case we are being notified of the windows focus
-                // but InputMethodManager didn't get properly setup yet.
-                val imm =
-                    context.getSystemService<InputMethodManager>()
-                imm?.showSoftInput(this, InputMethodManager.SHOW_IMPLICIT)
-            }
-        }
-    }
-
-    requestFocus()
-    if (hasWindowFocus()) {
-        // No need to wait for the window to get focus.
-        showTheKeyboardNow()
-    } else {
-        // We need to wait until the window gets focus.
-        viewTreeObserver.addOnWindowFocusChangeListener(
-            object : ViewTreeObserver.OnWindowFocusChangeListener {
-                override fun onWindowFocusChanged(hasFocus: Boolean) {
-                    // This notification will arrive just before the InputMethodManager gets set up.
-                    if (hasFocus) {
-                        this@focusAndShowKeyboard.showTheKeyboardNow()
-                        // It’s very important to remove this listener once we are done.
-                        viewTreeObserver.removeOnWindowFocusChangeListener(this)
-                    }
-                }
-            })
-    }
-}
-
-/**
- * This will draw our view above the navigation bar instead of behind it by adding margins.
- */
-fun View.drawAboveSystemBars(onlyPortrait: Boolean = true) {
-    if (PreferenceUtil.isFullScreenMode) return
-    if (onlyPortrait && RetroUtil.isLandscape) return
-    applyInsetter {
-        type(navigationBars = true) {
-            margin()
-        }
-    }
-}
-
-/**
- * This will draw our view above the navigation bar instead of behind it by adding padding.
- */
-fun View.drawAboveSystemBarsWithPadding() {
-    if (PreferenceUtil.isFullScreenMode) return
-    applyInsetter {
-        type(navigationBars = true) {
-            padding()
-        }
-    }
-}
-
-fun View.drawNextToNavbar() {
-    if (PreferenceUtil.isFullScreenMode) return
-    applyInsetter {
-        type(statusBars = true, navigationBars = true) {
-            padding(horizontal = true)
-        }
-    }
-}
-
-fun View.updateMargin(
-    @Px left: Int = marginLeft,
-    @Px top: Int = marginTop,
-    @Px right: Int = marginRight,
-    @Px bottom: Int = marginBottom,
-) {
-    (layoutParams as ViewGroup.MarginLayoutParams).updateMargins(left, top, right, bottom)
-}
-
-fun View.applyBottomInsets() {
-    if (PreferenceUtil.isFullScreenMode) return
-    val initialPadding = recordInitialPaddingForView(this)
-
-    ViewCompat.setOnApplyWindowInsetsListener(
-        (this)
-    ) { v: View, windowInsets: WindowInsetsCompat ->
-        val insets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars())
-        v.updatePadding(
-            bottom = initialPadding.bottom + insets.bottom
-        )
-        windowInsets
-    }
-    requestApplyInsetsWhenAttached()
-}
-
-fun View.requestApplyInsetsWhenAttached() {
-    if (isAttachedToWindow) {
-        // We're already attached, just request as normal
-        requestApplyInsets()
-    } else {
-        // We're not attached to the hierarchy, add a listener to
-        // request when we are
-        addOnAttachStateChangeListener(object : View.OnAttachStateChangeListener {
-            override fun onViewAttachedToWindow(v: View) {
-                v.removeOnAttachStateChangeListener(this)
-                v.requestApplyInsets()
-            }
-
-            override fun onViewDetachedFromWindow(v: View) = Unit
-        })
-    }
-}
-
-data class InitialPadding(
-    val left: Int, val top: Int,
-    val right: Int, val bottom: Int,
-)
-
-fun recordInitialPaddingForView(view: View) = InitialPadding(
-    view.paddingLeft, view.paddingTop, view.paddingRight, view.paddingBottom
-)
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
index d797c50fb..48764425c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/AlbumCoverStyle.kt
@@ -1,32 +1,19 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import code.name.monkey.retromusic.R
 
-enum class AlbumCoverStyle(
-    @StringRes val titleRes: Int,
-    @DrawableRes val drawableResId: Int,
-    val id: Int
-) {
-    Card(R.string.card, R.drawable.np_blur_card, 3),
-    Circle(R.string.circular, R.drawable.np_circle, 2),
-    Flat(R.string.flat, R.drawable.np_flat, 1),
-    FullCard(R.string.full_card, R.drawable.np_adaptive, 5),
-    Full(R.string.full, R.drawable.np_full, 4),
-    Normal(R.string.normal, R.drawable.np_normal, 0),
+
+enum class AlbumCoverStyle(@param:StringRes @field:StringRes
+                           val titleRes: Int,
+                           @param:DrawableRes @field:DrawableRes
+                           val drawableResId: Int, val id: Int) {
+    NORMAL(R.string.normal, R.drawable.np_normal, 0),
+    FLAT(R.string.flat, R.drawable.np_flat, 1),
+    CIRCLE(R.string.circular, R.drawable.np_circle, 2),
+    MATERIAL(R.string.material, R.drawable.np_material, 3),
+    CARD(R.string.card, R.drawable.np_blur_card, 4),
+    FULL(R.string.full, R.drawable.np_full, 5),
+    FULL_CARD(R.string.full_card, R.drawable.np_adaptive, 6)
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt
deleted file mode 100644
index 505564a1c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/GridStyle.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.fragments
-
-import androidx.annotation.LayoutRes
-import code.name.monkey.retromusic.R
-
-enum class GridStyle constructor(
-    @param:LayoutRes @field:LayoutRes val layoutResId: Int,
-    val id: Int
-) {
-    Grid(R.layout.item_grid, 0),
-    Card(R.layout.item_card, 1),
-    ColoredCard(R.layout.item_card_color, 2),
-    Circular(R.layout.item_grid_circle, 3),
-    Image(R.layout.image, 4),
-    GradientImage(R.layout.item_image_gradient, 5)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
deleted file mode 100644
index 3e6b01b88..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/LibraryViewModel.kt
+++ /dev/null
@@ -1,383 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments
-
-import android.animation.ValueAnimator
-import android.content.Context
-import androidx.core.animation.doOnEnd
-import androidx.lifecycle.*
-import code.name.monkey.retromusic.RECENT_ALBUMS
-import code.name.monkey.retromusic.RECENT_ARTISTS
-import code.name.monkey.retromusic.TOP_ALBUMS
-import code.name.monkey.retromusic.TOP_ARTISTS
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.fragments.ReloadType.*
-import code.name.monkey.retromusic.fragments.search.Filter
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.DensityUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logD
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-
-class LibraryViewModel(
-    private val repository: RealRepository,
-) : ViewModel(), IMusicServiceEventListener {
-
-    private val _paletteColor = MutableLiveData<Int>()
-    private val home = MutableLiveData<List<Home>>()
-    private val suggestions = MutableLiveData<List<Song>>()
-    private val albums = MutableLiveData<List<Album>>()
-    private val songs = MutableLiveData<List<Song>>()
-    private val artists = MutableLiveData<List<Artist>>()
-    private val playlists = MutableLiveData<List<PlaylistWithSongs>>()
-    private val genres = MutableLiveData<List<Genre>>()
-    private val searchResults = MutableLiveData<List<Any>>()
-    private val fabMargin = MutableLiveData(0)
-    private val songHistory = MutableLiveData<List<Song>>()
-    private var previousSongHistory = ArrayList<HistoryEntity>()
-    val paletteColor: LiveData<Int> = _paletteColor
-
-    init {
-        loadLibraryContent()
-    }
-
-    private fun loadLibraryContent() = viewModelScope.launch(IO) {
-        fetchHomeSections()
-        fetchSuggestions()
-        fetchSongs()
-        fetchAlbums()
-        fetchArtists()
-        fetchGenres()
-        fetchPlaylists()
-    }
-
-    fun getSearchResult(): LiveData<List<Any>> = searchResults
-
-    fun getSongs(): LiveData<List<Song>> = songs
-
-    fun getAlbums(): LiveData<List<Album>> = albums
-
-    fun getArtists(): LiveData<List<Artist>> = artists
-
-    fun getPlaylists(): LiveData<List<PlaylistWithSongs>> = playlists
-
-    fun getGenre(): LiveData<List<Genre>> = genres
-
-    fun getHome(): LiveData<List<Home>> = home
-
-    fun getSuggestions(): LiveData<List<Song>> = suggestions
-
-    fun getFabMargin(): LiveData<Int> = fabMargin
-
-    private suspend fun fetchSongs() {
-        songs.postValue(repository.allSongs())
-    }
-
-    private suspend fun fetchAlbums() {
-        albums.postValue(repository.fetchAlbums())
-    }
-
-    private suspend fun fetchArtists() {
-        if (PreferenceUtil.albumArtistsOnly) {
-            artists.postValue(repository.albumArtists())
-        } else {
-            artists.postValue(repository.fetchArtists())
-        }
-    }
-
-    private suspend fun fetchPlaylists() {
-        playlists.postValue(repository.fetchPlaylistWithSongs())
-    }
-
-    private suspend fun fetchGenres() {
-        genres.postValue(repository.fetchGenres())
-    }
-
-    private suspend fun fetchHomeSections() {
-        home.postValue(repository.homeSections())
-    }
-
-    private suspend fun fetchSuggestions() {
-        suggestions.postValue(repository.suggestions())
-    }
-
-    fun search(query: String?, filter: Filter) =
-        viewModelScope.launch(IO) {
-            val result = repository.search(query, filter)
-            searchResults.postValue(result)
-        }
-
-    fun forceReload(reloadType: ReloadType) = viewModelScope.launch(IO) {
-        when (reloadType) {
-            Songs -> fetchSongs()
-            Albums -> fetchAlbums()
-            Artists -> fetchArtists()
-            HomeSections -> fetchHomeSections()
-            Playlists -> fetchPlaylists()
-            Genres -> fetchGenres()
-            Suggestions -> fetchSuggestions()
-        }
-    }
-
-    fun updateColor(newColor: Int) {
-        _paletteColor.postValue(newColor)
-    }
-
-    override fun onMediaStoreChanged() {
-        logD("onMediaStoreChanged")
-        loadLibraryContent()
-    }
-
-    override fun onServiceConnected() {
-        logD("onServiceConnected")
-    }
-
-    override fun onServiceDisconnected() {
-        logD("onServiceDisconnected")
-    }
-
-    override fun onQueueChanged() {
-        logD("onQueueChanged")
-    }
-
-    override fun onPlayingMetaChanged() {
-        logD("onPlayingMetaChanged")
-    }
-
-    override fun onPlayStateChanged() {
-        logD("onPlayStateChanged")
-    }
-
-    override fun onRepeatModeChanged() {
-        logD("onRepeatModeChanged")
-    }
-
-    override fun onShuffleModeChanged() {
-        logD("onShuffleModeChanged")
-    }
-
-    override fun onFavoriteStateChanged() {
-        logD("onFavoriteStateChanged")
-    }
-
-    fun shuffleSongs() = viewModelScope.launch(IO) {
-        val songs = repository.allSongs()
-        withContext(Main) {
-            MusicPlayerRemote.openAndShuffleQueue(songs, true)
-        }
-    }
-
-    fun renameRoomPlaylist(playListId: Long, name: String) = viewModelScope.launch(IO) {
-        repository.renameRoomPlaylist(playListId, name)
-    }
-
-    fun deleteSongsInPlaylist(songs: List<SongEntity>) {
-        viewModelScope.launch(IO) {
-            repository.deleteSongsInPlaylist(songs)
-            forceReload(Playlists)
-        }
-    }
-
-    fun deleteSongsFromPlaylist(playlists: List<PlaylistEntity>) = viewModelScope.launch(IO) {
-        repository.deletePlaylistSongs(playlists)
-    }
-
-    fun deleteRoomPlaylist(playlists: List<PlaylistEntity>) = viewModelScope.launch(IO) {
-        repository.deleteRoomPlaylist(playlists)
-    }
-
-    fun albumById(id: Long) = repository.albumById(id)
-    suspend fun artistById(id: Long) = repository.artistById(id)
-    suspend fun favoritePlaylist() = repository.favoritePlaylist()
-    suspend fun isFavoriteSong(song: SongEntity) = repository.isFavoriteSong(song)
-    suspend fun isSongFavorite(songId: Long) = repository.isSongFavorite(songId)
-    suspend fun insertSongs(songs: List<SongEntity>) = repository.insertSongs(songs)
-    suspend fun removeSongFromPlaylist(songEntity: SongEntity) =
-        repository.removeSongFromPlaylist(songEntity)
-
-    private suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity> =
-        repository.checkPlaylistExists(playlistName)
-
-    private suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long =
-        repository.createPlaylist(playlistEntity)
-
-    fun importPlaylists() = viewModelScope.launch(IO) {
-        val playlists = repository.fetchLegacyPlaylist()
-        playlists.forEach { playlist ->
-            val playlistEntity = repository.checkPlaylistExists(playlist.name).firstOrNull()
-            if (playlistEntity != null) {
-                val songEntities = playlist.getSongs().map {
-                    it.toSongEntity(playlistEntity.playListId)
-                }
-                repository.insertSongs(songEntities)
-            } else {
-                if (playlist != Playlist.empty) {
-                    val playListId = createPlaylist(PlaylistEntity(playlistName = playlist.name))
-                    val songEntities = playlist.getSongs().map {
-                        it.toSongEntity(playListId)
-                    }
-                    repository.insertSongs(songEntities)
-                }
-            }
-            forceReload(Playlists)
-        }
-    }
-
-    fun recentSongs(): LiveData<List<Song>> = liveData(IO) {
-        emit(repository.recentSongs())
-    }
-
-    fun playCountSongs(): LiveData<List<Song>> = liveData(IO) {
-        repository.playCountSongs().forEach { song ->
-            if (!File(song.data).exists() || song.id == -1L) {
-                repository.deleteSongInPlayCount(song)
-            }
-        }
-        emit(repository.playCountSongs().map {
-            it.toSong()
-        })
-    }
-
-    fun artists(type: Int): LiveData<List<Artist>> = liveData(IO) {
-        when (type) {
-            TOP_ARTISTS -> emit(repository.topArtists())
-            RECENT_ARTISTS -> {
-                emit(repository.recentArtists())
-            }
-        }
-    }
-
-    fun albums(type: Int): LiveData<List<Album>> = liveData(IO) {
-        when (type) {
-            TOP_ALBUMS -> emit(repository.topAlbums())
-            RECENT_ALBUMS -> {
-                emit(repository.recentAlbums())
-            }
-        }
-    }
-
-    fun artist(artistId: Long): LiveData<Artist> = liveData(IO) {
-        emit(repository.artistById(artistId))
-    }
-
-    fun observableHistorySongs(): LiveData<List<Song>> {
-        viewModelScope.launch(IO) {
-            repository.historySong().forEach { song ->
-                if (!File(song.data).exists() || song.id == -1L) {
-                    repository.deleteSongInHistory(song.id)
-                }
-            }
-
-            songHistory.postValue(repository.historySong().map {
-                it.toSong()
-            })
-        }
-        return songHistory
-    }
-
-    fun clearHistory() {
-        viewModelScope.launch(IO) {
-            previousSongHistory = repository.historySong() as ArrayList<HistoryEntity>
-
-            repository.clearSongHistory()
-        }
-        songHistory.value = emptyList()
-    }
-
-
-    fun restoreHistory() {
-        viewModelScope.launch(IO) {
-            if (previousSongHistory.isNotEmpty()) {
-                val history = ArrayList<Song>()
-                for (song in previousSongHistory) {
-                    repository.upsertSongInHistory(song.toSong())
-                    history.add(song.toSong())
-                }
-                songHistory.postValue(history)
-            }
-        }
-    }
-
-    fun favorites() = repository.favorites()
-
-    fun clearSearchResult() {
-        searchResults.value = emptyList()
-    }
-
-    fun addToPlaylist(context: Context, playlistName: String, songs: List<Song>) {
-        viewModelScope.launch(IO) {
-            val playlists = checkPlaylistExists(playlistName)
-            if (playlists.isEmpty()) {
-                val playlistId: Long =
-                    createPlaylist(PlaylistEntity(playlistName = playlistName))
-                insertSongs(songs.map { it.toSongEntity(playlistId) })
-                withContext(Main) {
-                    context.showToast(context.getString(R.string.playlist_created_sucessfully,
-                        playlistName))
-                }
-            } else {
-                val playlist = playlists.firstOrNull()
-                if (playlist != null) {
-                    insertSongs(songs.map {
-                        it.toSongEntity(playListId = playlist.playListId)
-                    })
-                }
-            }
-            forceReload(Playlists)
-            withContext(Main) {
-                context.showToast(
-                    context.getString(
-                        R.string.added_song_count_to_playlist,
-                        songs.size,
-                        playlistName))
-            }
-        }
-    }
-
-    fun setFabMargin(context: Context, bottomMargin: Int) {
-        val currentValue = DensityUtil.dip2px(context, 16F) +
-                bottomMargin
-        ValueAnimator.ofInt(fabMargin.value!!, currentValue).apply {
-            addUpdateListener {
-                fabMargin.postValue(
-                    (it.animatedValue as Int)
-                )
-            }
-            doOnEnd {
-                fabMargin.postValue(currentValue)
-            }
-            start()
-        }
-    }
-}
-
-enum class ReloadType {
-    Songs,
-    Albums,
-    Artists,
-    HomeSections,
-    Playlists,
-    Genres,
-    Suggestions
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
new file mode 100644
index 000000000..c33e6b8fa
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/MiniPlayerFragment.kt
@@ -0,0 +1,164 @@
+package code.name.monkey.retromusic.fragments
+
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
+import android.content.Context
+import android.os.Bundle
+import android.text.SpannableString
+import android.text.SpannableStringBuilder
+import android.text.style.ForegroundColorSpan
+import android.view.*
+import android.view.animation.DecelerateInterpolator
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+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.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_mini_player.*
+import kotlin.math.abs
+
+open class MiniPlayerFragment : AbsMusicServiceFragment(), MusicProgressViewUpdateHelper.Callback, View.OnClickListener {
+
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_mini_player, container, false)
+    }
+
+    override fun onClick(view: View) {
+        when (view.id) {
+            R.id.actionPlayingQueue -> NavigationUtil.goToPlayingQueue(requireActivity())
+            R.id.actionNext -> MusicPlayerRemote.playNextSong()
+            R.id.actionPrevious -> MusicPlayerRemote.back()
+        }
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        view.setOnTouchListener(FlingPlayBackController(requireContext()))
+        setUpMiniPlayer()
+
+        if (RetroUtil.isTablet()) {
+            actionNext.visibility = View.VISIBLE
+            actionPrevious.visibility = View.VISIBLE
+            actionNext?.visibility = View.VISIBLE
+            actionPrevious?.visibility = View.VISIBLE
+            actionPlayingQueue.visibility = View.VISIBLE
+        } else {
+            actionNext.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
+            actionPlayingQueue.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.GONE else View.VISIBLE
+            actionPrevious.visibility = if (PreferenceUtil.getInstance(requireContext()).isExtraControls) View.VISIBLE else View.GONE
+        }
+
+        actionPlayingQueue.setOnClickListener(this)
+        actionNext.setOnClickListener(this)
+        actionPrevious.setOnClickListener(this)
+        actionNext?.setOnClickListener(this)
+        actionPrevious?.setOnClickListener(this)
+
+    }
+
+    private fun setUpMiniPlayer() {
+        setUpPlayPauseButton()
+        ViewUtil.setProgressDrawable(progressBar, ThemeStore.accentColor(requireContext()))
+    }
+
+    private fun setUpPlayPauseButton() {
+        miniPlayerPlayPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
+    private fun updateSongTitle() {
+        val builder = SpannableStringBuilder()
+
+        val song = MusicPlayerRemote.currentSong
+        val title = SpannableString(song.title)
+        title.setSpan(ForegroundColorSpan(ThemeStore.textColorPrimary(requireContext())), 0, title.length, 0)
+
+        val text = SpannableString(song.artistName)
+        text.setSpan(ForegroundColorSpan(ThemeStore.textColorSecondary(requireContext())), 0, text.length, 0)
+
+        builder.append(title).append(" • ").append(text)
+
+        miniPlayerTitle.isSelected = true
+        miniPlayerTitle.text = builder
+    }
+
+    override fun onServiceConnected() {
+        updateSongTitle()
+        updatePlayPauseDrawableState()
+    }
+
+    override fun onPlayingMetaChanged() {
+        updateSongTitle()
+    }
+
+    override fun onPlayStateChanged() {
+        updatePlayPauseDrawableState()
+    }
+
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressBar.max = total
+        val animator = ObjectAnimator.ofInt(progressBar, "progress", progress)
+        animator.duration = 1000
+        animator.interpolator = DecelerateInterpolator()
+        animator.start()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
+
+    protected fun updatePlayPauseDrawableState() {
+        if (MusicPlayerRemote.isPlaying) {
+            miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_pause_white_24dp)
+        } else {
+            miniPlayerPlayPauseButton!!.setImageResource(R.drawable.ic_play_arrow_white_24dp)
+        }
+    }
+
+    class FlingPlayBackController(context: Context) : View.OnTouchListener {
+
+        private var flingPlayBackController: GestureDetector
+
+        init {
+            flingPlayBackController = GestureDetector(context,
+                    object : GestureDetector.SimpleOnGestureListener() {
+                        override fun onFling(e1: MotionEvent, e2: MotionEvent, velocityX: Float,
+                                             velocityY: Float): Boolean {
+                            if (abs(velocityX) > abs(velocityY)) {
+                                if (velocityX < 0) {
+                                    MusicPlayerRemote.playNextSong()
+                                    return true
+                                } else if (velocityX > 0) {
+                                    MusicPlayerRemote.playPreviousSong()
+                                    return true
+                                }
+                            }
+                            return false
+                        }
+                    })
+        }
+
+        @SuppressLint("ClickableViewAccessibility")
+        override fun onTouch(v: View, event: MotionEvent): Boolean {
+            return flingPlayBackController.onTouchEvent(event)
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt
deleted file mode 100644
index 946b34e21..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/MusicSeekSkipTouchListener.kt
+++ /dev/null
@@ -1,79 +0,0 @@
-package code.name.monkey.retromusic.fragments
-
-import android.annotation.SuppressLint
-import android.view.MotionEvent
-import android.view.View
-import android.view.ViewConfiguration
-import androidx.fragment.app.FragmentActivity
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import kotlinx.coroutines.*
-import kotlin.math.abs
-
-/**
- * @param activity, Activity
- * @param next, if the button is next, if false then it's considered previous
- */
-class MusicSeekSkipTouchListener(val activity: FragmentActivity, val next: Boolean) :
-    View.OnTouchListener {
-
-    private var job: Job? = null
-    private var counter = 0
-    private var wasSeeking = false
-
-    private var startX = 0f
-    private var startY = 0f
-
-    private val scaledTouchSlop = ViewConfiguration.get(activity).scaledTouchSlop
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouch(v: View?, event: MotionEvent?): Boolean {
-        when (event?.actionMasked) {
-            MotionEvent.ACTION_DOWN -> {
-                startX = event.x
-                startY = event.y
-                job = activity.lifecycleScope.launch(Dispatchers.Default) {
-                    counter = 0
-                    while (isActive) {
-                        delay(500)
-                        wasSeeking = true
-                        var seekingDuration = MusicPlayerRemote.songProgressMillis
-                        if (next) {
-                            seekingDuration += 5000 * (counter.floorDiv(2) + 1)
-                        } else {
-                            seekingDuration -= 5000 * (counter.floorDiv(2) + 1)
-                        }
-                        withContext(Dispatchers.Main) {
-                            MusicPlayerRemote.seekTo(seekingDuration)
-                        }
-                        counter += 1
-                    }
-                }
-            }
-            MotionEvent.ACTION_UP -> {
-                job?.cancel()
-                val endX = event.x
-                val endY = event.y
-                if (!wasSeeking && isAClick(startX, endX, startY, endY)) {
-                    if (next) {
-                        MusicPlayerRemote.playNextSong()
-                    } else {
-                        MusicPlayerRemote.back()
-                    }
-                }
-
-                wasSeeking = false
-            }
-            MotionEvent.ACTION_CANCEL -> {
-                job?.cancel()
-            }
-        }
-        return false
-    }
-
-    private fun isAClick(startX: Float, endX: Float, startY: Float, endY: Float): Boolean {
-        val differenceX = abs(startX - endX)
-        val differenceY = abs(startY - endY)
-        return !(differenceX > scaledTouchSlop || differenceY > scaledTouchSlop)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
index 0b2e6b1ff..5adafd1db 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/NowPlayingScreen.kt
@@ -1,48 +1,27 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments
 
 import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
 import code.name.monkey.retromusic.R
 
-enum class NowPlayingScreen constructor(
-    @param:StringRes @field:StringRes
-    val titleRes: Int,
-    @param:DrawableRes @field:DrawableRes val drawableResId: Int,
-    val id: Int,
-    val defaultCoverTheme: AlbumCoverStyle?
-) {
-    // Some Now playing themes look better with particular Album cover theme
 
-    Adaptive(R.string.adaptive, R.drawable.np_adaptive, 10, AlbumCoverStyle.FullCard),
-    Blur(R.string.blur, R.drawable.np_blur, 4, AlbumCoverStyle.Normal),
-    BlurCard(R.string.blur_card, R.drawable.np_blur_card, 9, AlbumCoverStyle.Card),
-    Card(R.string.card, R.drawable.np_card, 6, AlbumCoverStyle.Full),
-    Circle(R.string.circle, R.drawable.np_minimalistic_circle, 15, null),
-    Classic(R.string.classic, R.drawable.np_classic, 16, AlbumCoverStyle.Full),
-    Color(R.string.color, R.drawable.np_color, 5, AlbumCoverStyle.Normal),
-    Fit(R.string.fit, R.drawable.np_fit, 12, AlbumCoverStyle.Full),
-    Flat(R.string.flat, R.drawable.np_flat, 1, AlbumCoverStyle.Flat),
-    Full(R.string.full, R.drawable.np_full, 2, AlbumCoverStyle.Full),
-    Gradient(R.string.gradient, R.drawable.np_gradient, 17, AlbumCoverStyle.Full),
-    Material(R.string.material, R.drawable.np_material, 11, AlbumCoverStyle.Normal),
-    MD3(R.string.md3, R.drawable.np_normal, 18, AlbumCoverStyle.Normal),
-    Normal(R.string.normal, R.drawable.np_normal, 0, AlbumCoverStyle.Normal),
-    Peek(R.string.peek, R.drawable.np_peek, 14, AlbumCoverStyle.Normal),
-    Plain(R.string.plain, R.drawable.np_plain, 3, AlbumCoverStyle.Normal),
-    Simple(R.string.simple, R.drawable.np_simple, 8, AlbumCoverStyle.Normal),
-    Tiny(R.string.tiny, R.drawable.np_tiny, 7, null),
+enum class NowPlayingScreen constructor(@param:StringRes @field:StringRes
+                                        val titleRes: Int,
+                                        @param:DrawableRes @field:DrawableRes val drawableResId: Int,
+                                        val id: Int) {
+    ADAPTIVE(R.string.adaptive, R.drawable.np_adaptive, 10),
+    BLUR(R.string.blur, R.drawable.np_blur, 4),
+    BLUR_CARD(R.string.blur_card, R.drawable.np_blur_card, 9),
+    CARD(R.string.card, R.drawable.np_card, 6),
+    COLOR(R.string.color, R.drawable.np_color, 5),
+    FIT(R.string.fit, R.drawable.np_fit, 12),
+    FLAT(R.string.flat, R.drawable.np_flat, 1),
+    FULL(R.string.full, R.drawable.np_full, 2),
+    MATERIAL(R.string.material, R.drawable.np_material, 11),
+    NORMAL(R.string.normal, R.drawable.np_normal, 0),
+    PLAIN(R.string.plain, R.drawable.np_plain, 3),
+    TINY(R.string.tiny, R.drawable.np_tiny, 7),
+    SIMPLE(R.string.simple, R.drawable.np_simple, 8),
+    PEAK(R.string.peak, R.drawable.np_peak, 14)
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
new file mode 100755
index 000000000..bfa10fb96
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/VolumeFragment.kt
@@ -0,0 +1,138 @@
+package code.name.monkey.retromusic.fragments
+
+import android.content.Context
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.media.AudioManager
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.SeekBar
+import androidx.fragment.app.Fragment
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import code.name.monkey.retromusic.volume.AudioVolumeObserver
+import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
+import kotlinx.android.synthetic.main.fragment_volume.*
+
+class VolumeFragment : Fragment(), SeekBar.OnSeekBarChangeListener, OnAudioVolumeChangedListener, View.OnClickListener {
+
+	private var audioVolumeObserver: AudioVolumeObserver? = null
+
+	private val audioManager: AudioManager?
+		get() = requireContext().getSystemService(Context.AUDIO_SERVICE) as AudioManager
+
+	override fun onCreateView(
+			inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
+	): View? {
+		return inflater.inflate(R.layout.fragment_volume, container, false)
+	}
+
+	override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+		super.onViewCreated(view, savedInstanceState)
+		setTintable(ThemeStore.accentColor(requireContext()))
+		volumeDown.setOnClickListener(this)
+		volumeUp.setOnClickListener(this)
+	}
+
+	override fun onResume() {
+		super.onResume()
+		if (audioVolumeObserver == null) {
+			audioVolumeObserver = AudioVolumeObserver(requireActivity())
+		}
+		audioVolumeObserver!!.register(AudioManager.STREAM_MUSIC, this)
+
+		val audioManager = audioManager
+		if (audioManager != null) {
+			volumeSeekBar.max = audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC)
+			volumeSeekBar.progress = audioManager.getStreamVolume(AudioManager.STREAM_MUSIC)
+		}
+		volumeSeekBar.setOnSeekBarChangeListener(this)
+	}
+
+	override fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int) {
+		if (volumeSeekBar == null) {
+			return
+		}
+
+		volumeSeekBar.max = maxVolume
+		volumeSeekBar.progress = currentVolume
+		volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp)
+	}
+
+	override fun onDestroyView() {
+		super.onDestroyView()
+		if (audioVolumeObserver != null) {
+			audioVolumeObserver!!.unregister()
+		}
+	}
+
+	override fun onProgressChanged(seekBar: SeekBar, i: Int, b: Boolean) {
+		val audioManager = audioManager
+		audioManager?.setStreamVolume(AudioManager.STREAM_MUSIC, i, 0)
+		setPauseWhenZeroVolume(i < 1)
+		volumeDown?.setImageResource(if (i == 0) R.drawable.ic_volume_off_white_24dp else R.drawable.ic_volume_down_white_24dp)
+
+	}
+
+	override fun onStartTrackingTouch(seekBar: SeekBar) {
+
+	}
+
+	override fun onStopTrackingTouch(seekBar: SeekBar) {
+
+	}
+
+	override fun onClick(view: View) {
+		val audioManager = audioManager
+		when (view.id) {
+			R.id.volumeDown -> audioManager?.adjustStreamVolume(
+					AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, 0
+			)
+			R.id.volumeUp   -> audioManager?.adjustStreamVolume(
+					AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, 0
+			)
+		}
+	}
+
+	fun tintWhiteColor() {
+		val iconColor = Color.WHITE
+		volumeDown.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
+		volumeUp.setColorFilter(iconColor, PorterDuff.Mode.SRC_IN)
+
+		ViewUtil.setProgressDrawable(volumeSeekBar, iconColor, true)
+
+	}
+
+	fun setTintable(color: Int) {
+		ViewUtil.setProgressDrawable(volumeSeekBar, color, true)
+	}
+
+	fun removeThumb() {
+		volumeSeekBar.thumb = null
+	}
+
+	private fun setPauseWhenZeroVolume(pauseWhenZeroVolume: Boolean) {
+		if (PreferenceUtil.getInstance(requireContext()).pauseOnZeroVolume()) if (MusicPlayerRemote.isPlaying && pauseWhenZeroVolume) {
+			MusicPlayerRemote.pauseSong()
+		}
+	}
+
+	fun setTintableColor(color: Int) {
+		volumeDown.setColorFilter(color, PorterDuff.Mode.SRC_IN)
+		volumeUp.setColorFilter(color, PorterDuff.Mode.SRC_IN)
+		//TintHelper.setTint(volumeSeekBar, color, false)
+		ViewUtil.setProgressDrawable(volumeSeekBar, color, true)
+	}
+
+	companion object {
+
+		fun newInstance(): VolumeFragment {
+			return VolumeFragment()
+		}
+	}
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
deleted file mode 100644
index 89edeb1af..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/about/AboutFragment.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.about
-
-import android.content.pm.PackageManager
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAboutBinding
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.util.NavigationUtil
-import dev.chrisbanes.insetter.applyInsetter
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-
-class AboutFragment : Fragment(R.layout.fragment_about), View.OnClickListener {
-    private var _binding: FragmentAboutBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentAboutBinding.bind(view)
-        binding.aboutContent.cardRetroInfo.version.setSummary(getAppVersion())
-        setUpView()
-
-        binding.aboutContent.root.applyInsetter {
-            type(navigationBars = true) {
-                padding(vertical = true)
-            }
-        }
-    }
-
-    private fun setUpView() {
-        binding.aboutContent.cardRetroInfo.appGithub.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.faqLink.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.appTranslation.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.bugReportLink.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.changelog.setOnClickListener(this)
-        binding.aboutContent.cardRetroInfo.openSource.setOnClickListener(this)
-    }
-
-    override fun onClick(view: View) {
-        when (view.id) {
-            R.id.faqLink -> openUrl(Constants.FAQ_LINK)
-            R.id.appGithub -> openUrl(Constants.GITHUB_PROJECT)
-            R.id.appTranslation -> openUrl(Constants.TRANSLATE)
-            R.id.changelog -> NavigationUtil.gotoWhatNews(requireActivity())
-            R.id.openSource -> NavigationUtil.goToOpenSource(requireActivity())
-            R.id.bugReportLink -> NavigationUtil.bugReport(requireActivity())
-        }
-    }
-
-    private fun getAppVersion(): String {
-        return try {
-            requireActivity().packageManager.getPackageInfo(requireActivity().packageName, 0).versionName
-        } catch (e: PackageManager.NameNotFoundException) {
-            e.printStackTrace()
-            "0.0.0"
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
deleted file mode 100644
index 5b8dc638c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsFragment.kt
+++ /dev/null
@@ -1,403 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.albums
-
-import android.app.ActivityOptions
-import android.content.Intent
-import android.graphics.Color
-import android.os.Bundle
-import android.view.*
-import androidx.appcompat.app.AppCompatActivity
-import androidx.core.os.bundleOf
-import androidx.core.view.doOnPreDraw
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_NAME
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.activities.tageditor.AlbumTagEditorActivity
-import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentAlbumDetailsBinding
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.albumCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.SingleColorTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_A_Z
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_DURATION
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_TRACK_LIST
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder.Companion.SONG_Z_A
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.*
-import com.bumptech.glide.Glide
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.transition.MaterialArcMotion
-import com.google.android.material.transition.MaterialContainerTransform
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-import java.text.Collator
-
-class AlbumDetailsFragment : AbsMainActivityFragment(R.layout.fragment_album_details),
-    IAlbumClickListener {
-
-    private var _binding: FragmentAlbumDetailsBinding? = null
-    private val binding get() = _binding!!
-
-    private val arguments by navArgs<AlbumDetailsFragmentArgs>()
-    private val detailsViewModel by viewModel<AlbumDetailsViewModel> {
-        parametersOf(arguments.extraAlbumId)
-    }
-
-    private lateinit var simpleSongAdapter: SimpleSongAdapter
-    private lateinit var album: Album
-    private var albumArtistExists = false
-
-    private val savedSortOrder: String
-        get() = PreferenceUtil.albumDetailSongSortOrder
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedElementEnterTransition = MaterialContainerTransform().apply {
-            drawingViewId = R.id.fragment_container
-            scrimColor = Color.TRANSPARENT
-            setAllContainerColors(surfaceColor())
-            setPathMotion(MaterialArcMotion())
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentAlbumDetailsBinding.bind(view)
-        mainActivity.addMusicServiceEventListener(detailsViewModel)
-        mainActivity.setSupportActionBar(binding.toolbar)
-
-        binding.toolbar.title = " "
-        binding.albumCoverContainer.transitionName = arguments.extraAlbumId.toString()
-        postponeEnterTransition()
-        detailsViewModel.getAlbum().observe(viewLifecycleOwner) { album ->
-            view.doOnPreDraw {
-                startPostponedEnterTransition()
-            }
-            albumArtistExists = !album.albumArtist.isNullOrEmpty()
-            showAlbum(album)
-            binding.artistImage.transitionName = if (albumArtistExists) {
-                album.albumArtist
-            } else {
-                album.artistId.toString()
-            }
-        }
-
-        setupRecyclerView()
-        binding.artistImage.setOnClickListener { artistView ->
-            if (albumArtistExists) {
-                findActivityNavController(R.id.fragment_container)
-                    .navigate(
-                        R.id.albumArtistDetailsFragment,
-                        bundleOf(EXTRA_ARTIST_NAME to album.albumArtist),
-                        null,
-                        FragmentNavigatorExtras(artistView to album.albumArtist.toString())
-                    )
-            } else {
-                findActivityNavController(R.id.fragment_container)
-                    .navigate(
-                        R.id.artistDetailsFragment,
-                        bundleOf(EXTRA_ARTIST_ID to album.artistId),
-                        null,
-                        FragmentNavigatorExtras(artistView to album.artistId.toString())
-                    )
-            }
-
-        }
-        binding.fragmentAlbumContent.playAction.setOnClickListener {
-            MusicPlayerRemote.openQueue(album.songs, 0, true)
-        }
-        binding.fragmentAlbumContent.shuffleAction.setOnClickListener {
-            MusicPlayerRemote.openAndShuffleQueue(
-                album.songs,
-                true
-            )
-        }
-
-        binding.appBarLayout?.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        serviceActivity?.removeMusicServiceEventListener(detailsViewModel)
-    }
-
-    private fun setupRecyclerView() {
-        simpleSongAdapter = SimpleSongAdapter(
-            requireActivity() as AppCompatActivity,
-            ArrayList(),
-            R.layout.item_song
-        )
-        binding.fragmentAlbumContent.recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            itemAnimator = DefaultItemAnimator()
-            isNestedScrollingEnabled = false
-            adapter = simpleSongAdapter
-        }
-    }
-
-    private fun showAlbum(album: Album) {
-        if (album.songs.isEmpty()) {
-            findNavController().navigateUp()
-            return
-        }
-        this.album = album
-
-        binding.albumTitle.text = album.title
-        val songText = resources.getQuantityString(
-            R.plurals.albumSongs,
-            album.songCount,
-            album.songCount
-        )
-        binding.fragmentAlbumContent.songTitle.text = songText
-        if (MusicUtil.getYearString(album.year) == "-") {
-            binding.albumText.text = String.format(
-                "%s • %s",
-                if (albumArtistExists) album.albumArtist else album.artistName,
-                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(album.songs))
-            )
-        } else {
-            binding.albumText.text = String.format(
-                "%s • %s • %s",
-                album.artistName,
-                MusicUtil.getYearString(album.year),
-                MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(album.songs))
-            )
-        }
-        loadAlbumCover(album)
-        simpleSongAdapter.swapDataSet(album.songs)
-        if (albumArtistExists) {
-            detailsViewModel.getAlbumArtist(album.albumArtist.toString())
-                .observe(viewLifecycleOwner) {
-                    loadArtistImage(it)
-                }
-        } else {
-            detailsViewModel.getArtist(album.artistId).observe(viewLifecycleOwner) {
-                loadArtistImage(it)
-            }
-        }
-    }
-
-    private fun moreAlbums(albums: List<Album>) {
-        binding.fragmentAlbumContent.moreTitle.show()
-        binding.fragmentAlbumContent.moreRecyclerView.show()
-        binding.fragmentAlbumContent.moreTitle.text =
-            String.format(getString(R.string.label_more_from), album.artistName)
-
-        val albumAdapter =
-            HorizontalAlbumAdapter(requireActivity() as AppCompatActivity, albums, this)
-        binding.fragmentAlbumContent.moreRecyclerView.layoutManager = GridLayoutManager(
-            requireContext(),
-            1,
-            GridLayoutManager.HORIZONTAL,
-            false
-        )
-        binding.fragmentAlbumContent.moreRecyclerView.adapter = albumAdapter
-    }
-
-    private fun loadArtistImage(artist: Artist) {
-        detailsViewModel.getMoreAlbums(artist).observe(viewLifecycleOwner) {
-            moreAlbums(it)
-        }
-        Glide.with(requireContext())
-            //.forceDownload(PreferenceUtil.isAllowedToDownloadMetadata())
-            .load(
-                RetroGlideExtension.getArtistModel(artist)
-            )
-            .artistImageOptions(artist)
-            .dontAnimate()
-            .dontTransform()
-            .into(binding.artistImage)
-    }
-
-    private fun loadAlbumCover(album: Album) {
-        Glide.with(requireContext())
-            .asBitmapPalette()
-            .albumCoverOptions(album.safeGetFirstSong())
-            //.checkIgnoreMediaStore()
-            .load(RetroGlideExtension.getSongModel(album.safeGetFirstSong()))
-            .into(object : SingleColorTarget(binding.image) {
-                override fun onColorReady(color: Int) {
-                    setColors(color)
-                }
-            })
-    }
-
-    private fun setColors(color: Int) {
-        _binding?.fragmentAlbumContent?.apply {
-            shuffleAction.applyColor(color)
-            playAction.applyOutlineColor(color)
-        }
-    }
-
-    override fun onAlbumClick(albumId: Long, view: View) {
-        findNavController().navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to albumId),
-            null,
-            FragmentNavigatorExtras(
-                view to albumId.toString()
-            )
-        )
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_album_detail, menu)
-        val sortOrder = menu.findItem(R.id.action_sort_order)
-        setUpSortOrderMenu(sortOrder.subMenu!!)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(),
-            binding.toolbar,
-            menu,
-            getToolbarBackgroundColor(binding.toolbar)
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        return handleSortOrderMenuItem(item)
-    }
-
-    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
-        var sortOrder: String? = null
-        val songs = simpleSongAdapter.dataSet
-        when (item.itemId) {
-            android.R.id.home -> findNavController().navigateUp()
-            R.id.action_play_next -> {
-                MusicPlayerRemote.playNext(songs)
-                return true
-            }
-
-            R.id.action_add_to_current_playing -> {
-                MusicPlayerRemote.enqueue(songs)
-                return true
-            }
-
-            R.id.action_add_to_playlist -> {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, songs)
-                            .show(childFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
-                return true
-            }
-
-            R.id.action_delete_from_device -> {
-                DeleteSongsDialog.create(songs).show(childFragmentManager, "DELETE_SONGS")
-                return true
-            }
-
-            R.id.action_tag_editor -> {
-                val intent = Intent(requireContext(), AlbumTagEditorActivity::class.java)
-                intent.putExtra(AbsTagEditorActivity.EXTRA_ID, album.id)
-                val options = ActivityOptions.makeSceneTransitionAnimation(
-                    requireActivity(),
-                    binding.albumCoverContainer,
-                    "${getString(R.string.transition_album_art)}_${album.id}"
-                )
-                startActivity(
-                    intent, options.toBundle()
-                )
-                return true
-            }
-
-            R.id.action_sort_order_title -> sortOrder = SONG_A_Z
-            R.id.action_sort_order_title_desc -> sortOrder = SONG_Z_A
-            R.id.action_sort_order_track_list -> sortOrder = SONG_TRACK_LIST
-            R.id.action_sort_order_artist_song_duration -> sortOrder = SONG_DURATION
-        }
-        if (sortOrder != null) {
-            item.isChecked = true
-            setSaveSortOrder(sortOrder)
-        }
-        return true
-    }
-
-    private fun setUpSortOrderMenu(sortOrder: SubMenu) {
-        when (savedSortOrder) {
-            SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked = true
-            SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked = true
-            SONG_TRACK_LIST ->
-                sortOrder.findItem(R.id.action_sort_order_track_list).isChecked = true
-
-            SONG_DURATION ->
-                sortOrder.findItem(R.id.action_sort_order_artist_song_duration).isChecked = true
-        }
-    }
-
-    private fun setSaveSortOrder(sortOrder: String) {
-        PreferenceUtil.albumDetailSongSortOrder = sortOrder
-        val songs = when (sortOrder) {
-            SONG_TRACK_LIST -> album.songs.sortedWith { o1, o2 ->
-                o1.trackNumber.compareTo(
-                    o2.trackNumber
-                )
-            }
-
-            SONG_A_Z -> {
-                val collator = Collator.getInstance()
-                album.songs.sortedWith { o1, o2 -> collator.compare(o1.title, o2.title) }
-            }
-
-            SONG_Z_A -> {
-                val collator = Collator.getInstance()
-                album.songs.sortedWith { o1, o2 -> collator.compare(o2.title, o1.title) }
-            }
-
-            SONG_DURATION -> album.songs.sortedWith { o1, o2 ->
-                o1.duration.compareTo(
-                    o2.duration
-                )
-            }
-
-            else -> throw IllegalArgumentException("invalid $sortOrder")
-        }
-        album = album.copy(songs = songs)
-        simpleSongAdapter.swapDataSet(album.songs)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
deleted file mode 100644
index 261df90a6..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumDetailsViewModel.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.albums
-
-import androidx.lifecycle.*
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
-
-class AlbumDetailsViewModel(
-    private val repository: RealRepository,
-    private val albumId: Long
-) : ViewModel(), IMusicServiceEventListener {
-    private val albumDetails = MutableLiveData<Album>()
-
-    init {
-        fetchAlbum()
-    }
-
-    private fun fetchAlbum() {
-        viewModelScope.launch(IO) {
-            albumDetails.postValue(repository.albumByIdAsync(albumId))
-        }
-    }
-
-    fun getAlbum(): LiveData<Album> = albumDetails
-
-    fun getArtist(artistId: Long): LiveData<Artist> = liveData(IO) {
-        val artist = repository.artistById(artistId)
-        emit(artist)
-    }
-
-    fun getAlbumArtist(artistName: String): LiveData<Artist> = liveData(IO) {
-        val artist = repository.albumArtistByName(artistName)
-        emit(artist)
-    }
-
-    fun getMoreAlbums(artist: Artist): LiveData<List<Album>> = liveData(IO) {
-        artist.albums.filter { item -> item.id != albumId }.let { albums ->
-            if (albums.isNotEmpty()) emit(albums)
-        }
-    }
-
-    override fun onMediaStoreChanged() {
-        fetchAlbum()
-    }
-
-    override fun onServiceConnected() {}
-    override fun onServiceDisconnected() {}
-    override fun onQueueChanged() {}
-    override fun onPlayingMetaChanged() {}
-    override fun onPlayStateChanged() {}
-    override fun onRepeatModeChanged() {}
-    override fun onShuffleModeChanged() {}
-    override fun onFavoriteStateChanged() {}
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
deleted file mode 100644
index 1b021bdf2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumsFragment.kt
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.albums
-
-import android.os.Bundle
-import android.view.*
-import androidx.core.os.bundleOf
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.AlbumSortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-
-class AlbumsFragment : AbsRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(),
-    IAlbumClickListener {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getAlbums().observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                adapter?.swapDataSet(it)
-            else
-                adapter?.swapDataSet(listOf())
-        }
-    }
-
-    override val titleRes: Int
-        get() = R.string.albums
-
-    override val emptyMessage: Int
-        get() = R.string.no_albums
-
-    override val isShuffleVisible: Boolean
-        get() = true
-
-    override fun onShuffleClicked() {
-        libraryViewModel.getAlbums().value?.let {
-            MusicPlayerRemote.setShuffleMode(MusicService.SHUFFLE_MODE_NONE)
-            MusicPlayerRemote.openQueue(
-                queue = it.shuffled().flatMap { album -> album.songs },
-                startPosition = 0,
-                startPlaying = true
-            )
-        }
-    }
-
-    override fun createLayoutManager(): GridLayoutManager {
-        return GridLayoutManager(requireActivity(), getGridSize())
-    }
-
-    override fun createAdapter(): AlbumAdapter {
-        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-        return AlbumAdapter(
-            requireActivity(),
-            dataSet,
-            itemLayoutRes(),
-            this
-        )
-    }
-
-    override fun setGridSize(gridSize: Int) {
-        layoutManager?.spanCount = gridSize
-        adapter?.notifyDataSetChanged()
-    }
-
-    override fun loadSortOrder(): String {
-        return PreferenceUtil.albumSortOrder
-    }
-
-    override fun saveSortOrder(sortOrder: String) {
-        PreferenceUtil.albumSortOrder = sortOrder
-    }
-
-    override fun loadGridSize(): Int {
-        return PreferenceUtil.albumGridSize
-    }
-
-    override fun saveGridSize(gridColumns: Int) {
-        PreferenceUtil.albumGridSize = gridColumns
-    }
-
-    override fun loadGridSizeLand(): Int {
-        return PreferenceUtil.albumGridSizeLand
-    }
-
-    override fun saveGridSizeLand(gridColumns: Int) {
-        PreferenceUtil.albumGridSizeLand = gridColumns
-    }
-
-    override fun setSortOrder(sortOrder: String) {
-        libraryViewModel.forceReload(ReloadType.Albums)
-    }
-
-    override fun loadLayoutRes(): Int {
-        return PreferenceUtil.albumGridStyle.layoutResId
-    }
-
-    override fun saveLayoutRes(layoutRes: Int) {
-        PreferenceUtil.albumGridStyle = GridStyle.values().first { gridStyle ->
-            gridStyle.layoutResId == layoutRes
-        }
-    }
-
-    companion object {
-        fun newInstance(): AlbumsFragment {
-            return AlbumsFragment()
-        }
-    }
-
-    override fun onAlbumClick(albumId: Long, view: View) {
-        findNavController().navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to albumId),
-            null,
-            FragmentNavigatorExtras(
-                view to albumId.toString()
-            )
-        )
-        reenterTransition = null
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateMenu(menu, inflater)
-        val gridSizeItem: MenuItem = menu.findItem(R.id.action_grid_size)
-        if (RetroUtil.isLandscape) {
-            gridSizeItem.setTitle(R.string.action_grid_size_land)
-        }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
-        val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
-    }
-
-    private fun setUpSortOrderMenu(
-        sortOrderMenu: SubMenu
-    ) {
-        val currentSortOrder: String? = getSortOrder()
-        sortOrderMenu.clear()
-        sortOrderMenu.add(
-            0,
-            R.id.action_album_sort_order_asc,
-            0,
-            R.string.sort_order_a_z
-        ).isChecked =
-            currentSortOrder.equals(AlbumSortOrder.ALBUM_A_Z)
-        sortOrderMenu.add(
-            0,
-            R.id.action_album_sort_order_desc,
-            1,
-            R.string.sort_order_z_a
-        ).isChecked =
-            currentSortOrder.equals(AlbumSortOrder.ALBUM_Z_A)
-        sortOrderMenu.add(
-            0,
-            R.id.action_album_sort_order_artist,
-            2,
-            R.string.sort_order_album_artist
-        ).isChecked =
-            currentSortOrder.equals(AlbumSortOrder.ALBUM_ARTIST)
-        sortOrderMenu.add(
-            0,
-            R.id.action_album_sort_order_year,
-            3,
-            R.string.sort_order_year
-        ).isChecked =
-            currentSortOrder.equals(AlbumSortOrder.ALBUM_YEAR)
-        sortOrderMenu.add(
-            0,
-            R.id.action_album_sort_order_num_songs,
-            4,
-            R.string.sort_order_num_songs
-        ).isChecked =
-            currentSortOrder.equals(AlbumSortOrder.ALBUM_NUMBER_OF_SONGS)
-
-        sortOrderMenu.setGroupCheckable(0, true, true)
-    }
-
-    private fun setupLayoutMenu(
-        subMenu: SubMenu
-    ) {
-        when (itemLayoutRes()) {
-            R.layout.item_card -> subMenu.findItem(R.id.action_layout_card).isChecked = true
-            R.layout.item_grid -> subMenu.findItem(R.id.action_layout_normal).isChecked = true
-            R.layout.item_card_color ->
-                subMenu.findItem(R.id.action_layout_colored_card).isChecked = true
-            R.layout.item_grid_circle ->
-                subMenu.findItem(R.id.action_layout_circular).isChecked = true
-            R.layout.image -> subMenu.findItem(R.id.action_layout_image).isChecked = true
-            R.layout.item_image_gradient ->
-                subMenu.findItem(R.id.action_layout_gradient_image).isChecked = true
-        }
-    }
-
-    private fun setUpGridSizeMenu(
-        gridSizeMenu: SubMenu
-    ) {
-        when (getGridSize()) {
-            1 -> gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked =
-                true
-            2 -> gridSizeMenu.findItem(R.id.action_grid_size_2).isChecked = true
-            3 -> gridSizeMenu.findItem(R.id.action_grid_size_3).isChecked = true
-            4 -> gridSizeMenu.findItem(R.id.action_grid_size_4).isChecked = true
-            5 -> gridSizeMenu.findItem(R.id.action_grid_size_5).isChecked = true
-            6 -> gridSizeMenu.findItem(R.id.action_grid_size_6).isChecked = true
-            7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true
-            8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true
-        }
-        val gridSize: Int = maxGridSize
-        if (gridSize < 8) {
-            gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false
-        }
-        if (gridSize < 7) {
-            gridSizeMenu.findItem(R.id.action_grid_size_7).isVisible = false
-        }
-        if (gridSize < 6) {
-            gridSizeMenu.findItem(R.id.action_grid_size_6).isVisible = false
-        }
-        if (gridSize < 5) {
-            gridSizeMenu.findItem(R.id.action_grid_size_5).isVisible = false
-        }
-        if (gridSize < 4) {
-            gridSizeMenu.findItem(R.id.action_grid_size_4).isVisible = false
-        }
-        if (gridSize < 3) {
-            gridSizeMenu.findItem(R.id.action_grid_size_3).isVisible = false
-        }
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        if (handleGridSizeMenuItem(item)) {
-            return true
-        }
-        if (handleLayoutResType(item)) {
-            return true
-        }
-        if (handleSortOrderMenuItem(item)) {
-            return true
-        }
-        return super.onMenuItemSelected(item)
-    }
-
-    private fun handleSortOrderMenuItem(
-        item: MenuItem
-    ): Boolean {
-        val sortOrder: String = when (item.itemId) {
-            R.id.action_album_sort_order_asc -> AlbumSortOrder.ALBUM_A_Z
-            R.id.action_album_sort_order_desc -> AlbumSortOrder.ALBUM_Z_A
-            R.id.action_album_sort_order_artist -> AlbumSortOrder.ALBUM_ARTIST
-            R.id.action_album_sort_order_year -> AlbumSortOrder.ALBUM_YEAR
-            R.id.action_album_sort_order_num_songs -> AlbumSortOrder.ALBUM_NUMBER_OF_SONGS
-            else -> PreferenceUtil.albumSortOrder
-        }
-        if (sortOrder != PreferenceUtil.albumSortOrder) {
-            item.isChecked = true
-            setAndSaveSortOrder(sortOrder)
-            return true
-        }
-        return false
-    }
-
-    private fun handleLayoutResType(
-        item: MenuItem
-    ): Boolean {
-        val layoutRes = when (item.itemId) {
-            R.id.action_layout_normal -> R.layout.item_grid
-            R.id.action_layout_card -> R.layout.item_card
-            R.id.action_layout_colored_card -> R.layout.item_card_color
-            R.id.action_layout_circular -> R.layout.item_grid_circle
-            R.id.action_layout_image -> R.layout.image
-            R.id.action_layout_gradient_image -> R.layout.item_image_gradient
-            else -> PreferenceUtil.albumGridStyle.layoutResId
-        }
-        if (layoutRes != PreferenceUtil.albumGridStyle.layoutResId) {
-            item.isChecked = true
-            setAndSaveLayoutRes(layoutRes)
-            return true
-        }
-        return false
-    }
-
-    private fun handleGridSizeMenuItem(
-        item: MenuItem
-    ): Boolean {
-        val gridSize = when (item.itemId) {
-            R.id.action_grid_size_1 -> 1
-            R.id.action_grid_size_2 -> 2
-            R.id.action_grid_size_3 -> 3
-            R.id.action_grid_size_4 -> 4
-            R.id.action_grid_size_5 -> 5
-            R.id.action_grid_size_6 -> 6
-            R.id.action_grid_size_7 -> 7
-            R.id.action_grid_size_8 -> 8
-            else -> 0
-        }
-        if (gridSize > 0) {
-            item.isChecked = true
-            setAndSaveGridSize(gridSize)
-            return true
-        }
-        return false
-    }
-
-    override fun onResume() {
-        super.onResume()
-        libraryViewModel.forceReload(ReloadType.Albums)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        adapter?.actionMode?.finish()
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
deleted file mode 100644
index 7eb541485..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AbsArtistDetailsFragment.kt
+++ /dev/null
@@ -1,288 +0,0 @@
-package code.name.monkey.retromusic.fragments.artists
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.activity.result.PickVisualMediaRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.os.bundleOf
-import androidx.core.view.doOnPreDraw
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.HorizontalAlbumAdapter
-import code.name.monkey.retromusic.adapter.song.SimpleSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentArtistDetailsBinding
-import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.SingleColorTarget
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.*
-import com.bumptech.glide.Glide
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.transition.MaterialContainerTransform
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.android.ext.android.get
-import java.util.*
-
-abstract class AbsArtistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_artist_details),
-    IAlbumClickListener {
-    private var _binding: FragmentArtistDetailsBinding? = null
-    private val binding get() = _binding!!
-
-    abstract val detailsViewModel: ArtistDetailsViewModel
-    abstract val artistId: Long?
-    abstract val artistName: String?
-    private lateinit var artist: Artist
-    private lateinit var songAdapter: SimpleSongAdapter
-    private lateinit var albumAdapter: HorizontalAlbumAdapter
-    private var forceDownload: Boolean = false
-
-    private val savedSongSortOrder: String
-        get() = PreferenceUtil.artistDetailSongSortOrder
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedElementEnterTransition = MaterialContainerTransform().apply {
-            drawingViewId = R.id.fragment_container
-            scrimColor = Color.TRANSPARENT
-            setAllContainerColors(surfaceColor())
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentArtistDetailsBinding.bind(view)
-        mainActivity.addMusicServiceEventListener(detailsViewModel)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        binding.toolbar.title = null
-        binding.artistCoverContainer.transitionName = (artistId ?: artistName).toString()
-        postponeEnterTransition()
-        detailsViewModel.getArtist().observe(viewLifecycleOwner) {
-            view.doOnPreDraw {
-                startPostponedEnterTransition()
-            }
-            showArtist(it)
-        }
-        setupRecyclerView()
-
-        binding.fragmentArtistContent.playAction.apply {
-            setOnClickListener { MusicPlayerRemote.openQueue(artist.sortedSongs, 0, true) }
-        }
-        binding.fragmentArtistContent.shuffleAction.apply {
-            setOnClickListener { MusicPlayerRemote.openAndShuffleQueue(artist.songs, true) }
-        }
-
-        setupSongSortButton()
-        binding.appBarLayout?.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun setupRecyclerView() {
-        albumAdapter = HorizontalAlbumAdapter(requireActivity(), ArrayList(), this)
-        binding.fragmentArtistContent.albumRecyclerView.apply {
-            itemAnimator = DefaultItemAnimator()
-            layoutManager = GridLayoutManager(this.context, 1, GridLayoutManager.HORIZONTAL, false)
-            adapter = albumAdapter
-        }
-        songAdapter = SimpleSongAdapter(requireActivity(), ArrayList(), R.layout.item_song)
-        binding.fragmentArtistContent.recyclerView.apply {
-            itemAnimator = DefaultItemAnimator()
-            layoutManager = LinearLayoutManager(this.context)
-            adapter = songAdapter
-        }
-    }
-
-    private fun showArtist(artist: Artist) {
-        if (artist.songCount == 0) {
-            findNavController().navigateUp()
-            return
-        }
-        this.artist = artist
-        loadArtistImage(artist)
-        binding.artistTitle.text = artist.name
-        binding.text.text = String.format(
-            "%s • %s",
-            MusicUtil.getArtistInfoString(requireContext(), artist),
-            MusicUtil.getReadableDurationString(MusicUtil.getTotalDuration(artist.songs))
-        )
-        val songText = resources.getQuantityString(
-            R.plurals.albumSongs, artist.songCount, artist.songCount
-        )
-        val albumText = resources.getQuantityString(
-            R.plurals.albums, artist.songCount, artist.songCount
-        )
-        binding.fragmentArtistContent.songTitle.text = songText
-        binding.fragmentArtistContent.albumTitle.text = albumText
-        songAdapter.swapDataSet(artist.sortedSongs)
-        albumAdapter.swapDataSet(artist.albums)
-    }
-
-    private fun loadArtistImage(artist: Artist) {
-        Glide.with(requireContext()).asBitmapPalette().artistImageOptions(artist)
-            .load(RetroGlideExtension.getArtistModel(artist)).dontAnimate()
-            .into(object : SingleColorTarget(binding.image) {
-                override fun onColorReady(color: Int) {
-                    setColors(color)
-                }
-            })
-    }
-
-    private fun setColors(color: Int) {
-        if (_binding != null) {
-            binding.fragmentArtistContent.shuffleAction.applyColor(color)
-            binding.fragmentArtistContent.playAction.applyOutlineColor(color)
-        }
-    }
-
-    override fun onAlbumClick(albumId: Long, view: View) {
-        findNavController().navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to albumId),
-            null,
-            FragmentNavigatorExtras(
-                view to albumId.toString()
-            )
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        return handleSortOrderMenuItem(item)
-    }
-
-    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
-        val songs = artist.songs
-        when (item.itemId) {
-            android.R.id.home -> findNavController().navigateUp()
-            R.id.action_play_next -> {
-                MusicPlayerRemote.playNext(songs)
-                return true
-            }
-
-            R.id.action_add_to_current_playing -> {
-                MusicPlayerRemote.enqueue(songs)
-                return true
-            }
-
-            R.id.action_add_to_playlist -> {
-                lifecycleScope.launch(Dispatchers.IO) {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, songs)
-                            .show(childFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
-                return true
-            }
-
-            R.id.action_set_artist_image -> {
-                selectImageLauncher.launch(
-                    PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly)
-                )
-                return true
-            }
-
-            R.id.action_reset_artist_image -> {
-                showToast(resources.getString(R.string.updating))
-                lifecycleScope.launch {
-                    CustomArtistImageUtil.getInstance(requireContext())
-                        .resetCustomArtistImage(artist)
-                }
-                forceDownload = true
-                return true
-            }
-        }
-        return true
-    }
-
-    private fun setupSongSortButton() {
-        binding.fragmentArtistContent.songSortOrder.setOnClickListener {
-            PopupMenu(requireContext(), binding.fragmentArtistContent.songSortOrder).apply {
-                inflate(R.menu.menu_artist_song_sort_order)
-                setUpSortOrderMenu(menu)
-                setOnMenuItemClickListener { item ->
-                    val sortOrder = when (item.itemId) {
-                        R.id.action_sort_order_title -> SortOrder.ArtistSongSortOrder.SONG_A_Z
-                        R.id.action_sort_order_title_desc -> SortOrder.ArtistSongSortOrder.SONG_Z_A
-                        R.id.action_sort_order_album -> SortOrder.ArtistSongSortOrder.SONG_ALBUM
-                        R.id.action_sort_order_year -> SortOrder.ArtistSongSortOrder.SONG_YEAR
-                        R.id.action_sort_order_song_duration -> SortOrder.ArtistSongSortOrder.SONG_DURATION
-                        else -> {
-                            throw IllegalArgumentException("invalid ${item.title}")
-                        }
-                    }
-                    item.isChecked = true
-                    setSaveSortOrder(sortOrder)
-                    return@setOnMenuItemClickListener true
-                }
-                show()
-            }
-        }
-    }
-
-    private fun setSaveSortOrder(sortOrder: String) {
-        PreferenceUtil.artistDetailSongSortOrder = sortOrder
-        songAdapter.swapDataSet(artist.sortedSongs)
-    }
-
-    private fun setUpSortOrderMenu(sortOrder: Menu) {
-        when (savedSongSortOrder) {
-            SortOrder.ArtistSongSortOrder.SONG_A_Z -> sortOrder.findItem(R.id.action_sort_order_title).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_Z_A -> sortOrder.findItem(R.id.action_sort_order_title_desc).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_ALBUM -> sortOrder.findItem(R.id.action_sort_order_album).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_YEAR -> sortOrder.findItem(R.id.action_sort_order_year).isChecked =
-                true
-
-            SortOrder.ArtistSongSortOrder.SONG_DURATION -> sortOrder.findItem(R.id.action_sort_order_song_duration).isChecked =
-                true
-
-            else -> {
-                throw IllegalArgumentException("invalid $savedSongSortOrder")
-            }
-        }
-    }
-
-    private val selectImageLauncher =
-        registerForActivityResult(ActivityResultContracts.PickVisualMedia()) { uri ->
-            lifecycleScope.launch {
-                if (uri != null) {
-                    CustomArtistImageUtil.getInstance(requireContext())
-                        .setCustomArtistImage(artist, uri)
-                }
-            }
-        }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_artist_detail, menu)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt
deleted file mode 100644
index 3480ac15e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/AlbumArtistDetailsFragment.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.artists
-
-import androidx.navigation.fragment.navArgs
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class AlbumArtistDetailsFragment : AbsArtistDetailsFragment() {
-
-    private val arguments by navArgs<AlbumArtistDetailsFragmentArgs>()
-
-    override val detailsViewModel: ArtistDetailsViewModel by viewModel {
-        parametersOf(null, arguments.extraArtistName)
-    }
-    override val artistId: Long?
-        get() = null
-    override val artistName: String
-        get() = arguments.extraArtistName
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
deleted file mode 100644
index 6e556a24e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsFragment.kt
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.artists
-
-import androidx.navigation.fragment.navArgs
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class ArtistDetailsFragment : AbsArtistDetailsFragment() {
-    private val arguments by navArgs<ArtistDetailsFragmentArgs>()
-    override val detailsViewModel: ArtistDetailsViewModel by viewModel {
-        parametersOf(arguments.extraArtistId, null)
-    }
-    override val artistId: Long
-        get() = arguments.extraArtistId
-    override val artistName: String?
-        get() = null
-
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
deleted file mode 100644
index b89aa88df..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistDetailsViewModel.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.artists
-
-import androidx.lifecycle.*
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.launch
-
-class ArtistDetailsViewModel(
-    private val realRepository: RealRepository,
-    private val artistId: Long?,
-    private val artistName: String?
-) : ViewModel(), IMusicServiceEventListener {
-    private val artistDetails = MutableLiveData<Artist>()
-
-    init {
-        fetchArtist()
-    }
-
-    private fun fetchArtist() {
-        viewModelScope.launch(IO) {
-            artistId?.let { artistDetails.postValue(realRepository.artistById(it)) }
-
-            artistName?.let { artistDetails.postValue(realRepository.albumArtistByName(it)) }
-        }
-    }
-
-    fun getArtist(): LiveData<Artist> = artistDetails
-
-    override fun onMediaStoreChanged() {
-        fetchArtist()
-    }
-
-    override fun onServiceConnected() {}
-    override fun onServiceDisconnected() {}
-    override fun onQueueChanged() {}
-    override fun onPlayingMetaChanged() {}
-    override fun onPlayStateChanged() {}
-    override fun onRepeatModeChanged() {}
-    override fun onShuffleModeChanged() {}
-    override fun onFavoriteStateChanged() {}
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt
deleted file mode 100644
index 81d0f35f5..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistsFragment.kt
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.artists
-
-import android.os.Bundle
-import android.view.*
-import androidx.core.os.bundleOf
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_NAME
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.SortOrder.ArtistSortOrder
-import code.name.monkey.retromusic.interfaces.IAlbumArtistClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-
-class ArtistsFragment : AbsRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(),
-    IArtistClickListener, IAlbumArtistClickListener {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getArtists().observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                adapter?.swapDataSet(it)
-            else
-                adapter?.swapDataSet(listOf())
-        }
-    }
-
-    override val titleRes: Int
-        get() = R.string.artists
-
-    override val emptyMessage: Int
-        get() = R.string.no_artists
-
-    override val isShuffleVisible: Boolean
-        get() = true
-
-    override fun onShuffleClicked() {
-        libraryViewModel.getArtists().value?.let {
-            MusicPlayerRemote.setShuffleMode(MusicService.SHUFFLE_MODE_NONE)
-            MusicPlayerRemote.openQueue(
-                queue = it.shuffled().flatMap { artist -> artist.songs },
-                startPosition = 0,
-                startPlaying = true
-            )
-        }
-    }
-
-    override fun setSortOrder(sortOrder: String) {
-        libraryViewModel.forceReload(ReloadType.Artists)
-    }
-
-    override fun createLayoutManager(): GridLayoutManager {
-        return GridLayoutManager(requireActivity(), getGridSize())
-    }
-
-    override fun createAdapter(): ArtistAdapter {
-        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-        return ArtistAdapter(
-            requireActivity(),
-            dataSet,
-            itemLayoutRes(),
-            this,
-            this
-        )
-    }
-
-    override fun loadGridSize(): Int {
-        return PreferenceUtil.artistGridSize
-    }
-
-    override fun saveGridSize(gridColumns: Int) {
-        PreferenceUtil.artistGridSize = gridColumns
-    }
-
-    override fun loadGridSizeLand(): Int {
-        return PreferenceUtil.artistGridSizeLand
-    }
-
-    override fun saveGridSizeLand(gridColumns: Int) {
-        PreferenceUtil.artistGridSizeLand = gridColumns
-    }
-
-    override fun setGridSize(gridSize: Int) {
-        layoutManager?.spanCount = gridSize
-        adapter?.notifyDataSetChanged()
-    }
-
-    override fun loadSortOrder(): String {
-        return PreferenceUtil.artistSortOrder
-    }
-
-    override fun saveSortOrder(sortOrder: String) {
-        PreferenceUtil.artistSortOrder = sortOrder
-    }
-
-    override fun loadLayoutRes(): Int {
-        return PreferenceUtil.artistGridStyle.layoutResId
-    }
-
-    override fun saveLayoutRes(layoutRes: Int) {
-        PreferenceUtil.artistGridStyle = GridStyle.values().first { gridStyle ->
-            gridStyle.layoutResId == layoutRes
-        }
-    }
-
-    companion object {
-
-        fun newInstance(): ArtistsFragment {
-            return ArtistsFragment()
-        }
-    }
-
-    override fun onArtist(artistId: Long, view: View) {
-        findNavController().navigate(
-            R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to artistId),
-            null,
-            FragmentNavigatorExtras(view to artistId.toString())
-        )
-        reenterTransition = null
-    }
-
-    override fun onAlbumArtist(artistName: String, view: View) {
-        findNavController().navigate(
-            R.id.albumArtistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_NAME to artistName),
-            null,
-            FragmentNavigatorExtras(view to artistName)
-        )
-        reenterTransition = null
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateMenu(menu, inflater)
-        val gridSizeItem: MenuItem = menu.findItem(R.id.action_grid_size)
-        if (RetroUtil.isLandscape) {
-            gridSizeItem.setTitle(R.string.action_grid_size_land)
-        }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
-        val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
-        setupAlbumArtistMenu(menu)
-    }
-
-    private fun setupAlbumArtistMenu(menu: Menu) {
-        menu.add(0, R.id.action_album_artist, 0, R.string.show_album_artists).apply {
-            isCheckable = true
-            isChecked = PreferenceUtil.albumArtistsOnly
-        }
-    }
-
-    private fun setUpSortOrderMenu(
-        sortOrderMenu: SubMenu
-    ) {
-        val currentSortOrder: String? = getSortOrder()
-        sortOrderMenu.clear()
-        sortOrderMenu.add(
-            0,
-            R.id.action_artist_sort_order_asc,
-            0,
-            R.string.sort_order_a_z
-        ).isChecked = currentSortOrder.equals(ArtistSortOrder.ARTIST_A_Z)
-        sortOrderMenu.add(
-            0,
-            R.id.action_artist_sort_order_desc,
-            1,
-            R.string.sort_order_z_a
-        ).isChecked = currentSortOrder.equals(ArtistSortOrder.ARTIST_Z_A)
-        sortOrderMenu.setGroupCheckable(0, true, true)
-    }
-
-    private fun setupLayoutMenu(
-        subMenu: SubMenu
-    ) {
-        when (itemLayoutRes()) {
-            R.layout.item_card -> subMenu.findItem(R.id.action_layout_card).isChecked = true
-            R.layout.item_grid -> subMenu.findItem(R.id.action_layout_normal).isChecked = true
-            R.layout.item_card_color -> subMenu.findItem(R.id.action_layout_colored_card).isChecked =
-                true
-            R.layout.item_grid_circle -> subMenu.findItem(R.id.action_layout_circular).isChecked =
-                true
-            R.layout.image -> subMenu.findItem(R.id.action_layout_image).isChecked = true
-            R.layout.item_image_gradient -> subMenu.findItem(R.id.action_layout_gradient_image).isChecked =
-                true
-        }
-    }
-
-    private fun setUpGridSizeMenu(
-        gridSizeMenu: SubMenu
-    ) {
-        when (getGridSize()) {
-            1 -> gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked =
-                true
-            2 -> gridSizeMenu.findItem(R.id.action_grid_size_2).isChecked = true
-            3 -> gridSizeMenu.findItem(R.id.action_grid_size_3).isChecked = true
-            4 -> gridSizeMenu.findItem(R.id.action_grid_size_4).isChecked = true
-            5 -> gridSizeMenu.findItem(R.id.action_grid_size_5).isChecked = true
-            6 -> gridSizeMenu.findItem(R.id.action_grid_size_6).isChecked = true
-            7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true
-            8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true
-        }
-        val gridSize: Int = maxGridSize
-        if (gridSize < 8) {
-            gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false
-        }
-        if (gridSize < 7) {
-            gridSizeMenu.findItem(R.id.action_grid_size_7).isVisible = false
-        }
-        if (gridSize < 6) {
-            gridSizeMenu.findItem(R.id.action_grid_size_6).isVisible = false
-        }
-        if (gridSize < 5) {
-            gridSizeMenu.findItem(R.id.action_grid_size_5).isVisible = false
-        }
-        if (gridSize < 4) {
-            gridSizeMenu.findItem(R.id.action_grid_size_4).isVisible = false
-        }
-        if (gridSize < 3) {
-            gridSizeMenu.findItem(R.id.action_grid_size_3).isVisible = false
-        }
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        if (handleGridSizeMenuItem(item)) {
-            return true
-        }
-        if (handleLayoutResType(item)) {
-            return true
-        }
-        if (handleSortOrderMenuItem(item)) {
-            return true
-        }
-        if (handleAlbumArtistMenu(item)) {
-            return true
-        }
-        return super.onMenuItemSelected(item)
-    }
-
-    private fun handleAlbumArtistMenu(item: MenuItem): Boolean {
-        return if (item.itemId == R.id.action_album_artist) {
-            PreferenceUtil.albumArtistsOnly = !item.isChecked
-            item.isChecked = !item.isChecked
-            libraryViewModel.forceReload(ReloadType.Artists)
-            true
-        } else {
-            false
-        }
-    }
-
-    private fun handleSortOrderMenuItem(
-        item: MenuItem
-    ): Boolean {
-        val sortOrder: String = when (item.itemId) {
-            R.id.action_artist_sort_order_asc -> ArtistSortOrder.ARTIST_A_Z
-            R.id.action_artist_sort_order_desc -> ArtistSortOrder.ARTIST_Z_A
-            else -> PreferenceUtil.artistSortOrder
-        }
-        if (sortOrder != PreferenceUtil.artistSortOrder) {
-            item.isChecked = true
-            setAndSaveSortOrder(sortOrder)
-            return true
-        }
-        return false
-    }
-
-    private fun handleLayoutResType(
-        item: MenuItem
-    ): Boolean {
-        val layoutRes = when (item.itemId) {
-            R.id.action_layout_normal -> R.layout.item_grid
-            R.id.action_layout_card -> R.layout.item_card
-            R.id.action_layout_colored_card -> R.layout.item_card_color
-            R.id.action_layout_circular -> R.layout.item_grid_circle
-            R.id.action_layout_image -> R.layout.image
-            R.id.action_layout_gradient_image -> R.layout.item_image_gradient
-            else -> PreferenceUtil.artistGridStyle.layoutResId
-        }
-        if (layoutRes != PreferenceUtil.artistGridStyle.layoutResId) {
-            item.isChecked = true
-            setAndSaveLayoutRes(layoutRes)
-            return true
-        }
-        return false
-    }
-
-    private fun handleGridSizeMenuItem(
-        item: MenuItem
-    ): Boolean {
-        val gridSize = when (item.itemId) {
-            R.id.action_grid_size_1 -> 1
-            R.id.action_grid_size_2 -> 2
-            R.id.action_grid_size_3 -> 3
-            R.id.action_grid_size_4 -> 4
-            R.id.action_grid_size_5 -> 5
-            R.id.action_grid_size_6 -> 6
-            R.id.action_grid_size_7 -> 7
-            R.id.action_grid_size_8 -> 8
-            else -> 0
-        }
-        if (gridSize > 0) {
-            item.isChecked = true
-            setAndSaveGridSize(gridSize)
-            return true
-        }
-        return false
-    }
-
-    override fun onResume() {
-        super.onResume()
-        libraryViewModel.forceReload(ReloadType.Artists)
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
deleted file mode 100644
index bb4a57ecb..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupFragment.kt
+++ /dev/null
@@ -1,162 +0,0 @@
-package code.name.monkey.retromusic.fragments.backup
-
-import android.annotation.SuppressLint
-import android.content.Intent
-import android.os.Bundle
-import android.view.MenuItem
-import android.view.View
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.net.toUri
-import androidx.core.view.isVisible
-import androidx.fragment.app.Fragment
-import androidx.fragment.app.viewModels
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.backup.BackupAdapter
-import code.name.monkey.retromusic.databinding.FragmentBackupBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.BackupHelper
-import code.name.monkey.retromusic.helper.sanitize
-import code.name.monkey.retromusic.util.Share
-import com.afollestad.materialdialogs.input.input
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-
-class BackupFragment : Fragment(R.layout.fragment_backup), BackupAdapter.BackupClickedListener {
-
-    private val backupViewModel by viewModels<BackupViewModel>()
-    private var backupAdapter: BackupAdapter? = null
-
-    private var _binding: FragmentBackupBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentBackupBinding.bind(view)
-        initAdapter()
-        setupRecyclerview()
-        backupViewModel.backupsLiveData.observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                backupAdapter?.swapDataset(it)
-            else
-                backupAdapter?.swapDataset(listOf())
-        }
-        backupViewModel.loadBackups()
-        val openFilePicker = registerForActivityResult(ActivityResultContracts.OpenDocument()) {
-            lifecycleScope.launch(Dispatchers.IO) {
-                it?.let {
-                    startActivity(Intent(context, RestoreActivity::class.java).apply {
-                        data = it
-                    })
-                }
-            }
-        }
-        binding.createBackup.accentOutlineColor()
-        binding.restoreBackup.accentColor()
-        binding.createBackup.setOnClickListener {
-            showCreateBackupDialog()
-        }
-        binding.restoreBackup.setOnClickListener {
-            openFilePicker.launch(arrayOf("application/octet-stream"))
-        }
-    }
-
-    private fun initAdapter() {
-        backupAdapter = BackupAdapter(requireActivity(), ArrayList(), this)
-        backupAdapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                super.onChanged()
-                checkIsEmpty()
-            }
-        })
-    }
-
-    private fun checkIsEmpty() {
-        val isEmpty = backupAdapter?.itemCount == 0
-        binding.backupTitle.isVisible = !isEmpty
-        binding.backupRecyclerview.isVisible = !isEmpty
-    }
-
-    fun setupRecyclerview() {
-        binding.backupRecyclerview.apply {
-            layoutManager = LinearLayoutManager(context)
-            adapter = backupAdapter
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    private fun showCreateBackupDialog() {
-        materialDialog().show {
-            title(res = R.string.action_rename)
-            input(prefill = BackupHelper.getTimeStamp()) { _, text ->
-                // Text submitted with the action button
-                lifecycleScope.launch {
-                    BackupHelper.createBackup(requireContext(), text.sanitize())
-                    backupViewModel.loadBackups()
-                }
-            }
-            positiveButton(android.R.string.ok)
-            negativeButton(R.string.action_cancel)
-            setTitle(R.string.title_new_backup)
-        }
-    }
-
-    override fun onBackupClicked(file: File) {
-        lifecycleScope.launch {
-            startActivity(Intent(context, RestoreActivity::class.java).apply {
-                data = file.toUri()
-            })
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    override fun onBackupMenuClicked(file: File, menuItem: MenuItem): Boolean {
-        when (menuItem.itemId) {
-            R.id.action_delete -> {
-                try {
-                    file.delete()
-                } catch (exception: SecurityException) {
-                    showToast(R.string.error_delete_backup)
-                }
-                backupViewModel.loadBackups()
-                return true
-            }
-            R.id.action_share -> {
-                Share.shareFile(requireContext(), file, "*/*")
-                return true
-            }
-            R.id.action_rename -> {
-                materialDialog().show {
-                    title(res = R.string.action_rename)
-                    input(prefill = file.nameWithoutExtension) { _, text ->
-                        // Text submitted with the action button
-                        val renamedFile =
-                            File(file.parent, "$text${BackupHelper.APPEND_EXTENSION}")
-                        if (!renamedFile.exists()) {
-                            file.renameTo(renamedFile)
-                            backupViewModel.loadBackups()
-                        } else {
-                            showToast(R.string.file_already_exists)
-                        }
-                    }
-                    positiveButton(android.R.string.ok)
-                    negativeButton(R.string.action_cancel)
-                    setTitle(R.string.action_rename)
-                }
-                return true
-            }
-        }
-        return false
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
deleted file mode 100644
index f3b67abec..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/BackupViewModel.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package code.name.monkey.retromusic.fragments.backup
-
-import android.app.Activity
-import android.content.Intent
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.helper.BackupContent
-import code.name.monkey.retromusic.helper.BackupHelper
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.InputStream
-import kotlin.system.exitProcess
-
-
-class BackupViewModel : ViewModel() {
-    private val backupsMutableLiveData = MutableLiveData<List<File>>()
-    val backupsLiveData: LiveData<List<File>> = backupsMutableLiveData
-
-    fun loadBackups() {
-        BackupHelper.getBackupRoot().listFiles { _, name ->
-            return@listFiles name.endsWith(BackupHelper.BACKUP_EXTENSION)
-        }?.toList()?.let {
-            backupsMutableLiveData.value = it
-        }
-    }
-
-    suspend fun restoreBackup(activity: Activity, inputStream: InputStream?, contents: List<BackupContent>) {
-        BackupHelper.restoreBackup(activity, inputStream, contents)
-        if (contents.contains(BackupContent.SETTINGS) or contents.contains(BackupContent.CUSTOM_ARTIST_IMAGES)) {
-            // We have to restart App when Preferences i.e. Settings or Artist Images are to be restored
-            withContext(Dispatchers.Main) {
-                val intent = Intent(
-                    activity,
-                    MainActivity::class.java
-                )
-                activity.startActivity(intent)
-                exitProcess(0)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
deleted file mode 100644
index 03cb17fb3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/backup/RestoreActivity.kt
+++ /dev/null
@@ -1,105 +0,0 @@
-package code.name.monkey.retromusic.fragments.backup
-
-import android.content.ContentResolver
-import android.net.Uri
-import android.os.Bundle
-import android.provider.MediaStore
-import android.view.ViewGroup
-import androidx.activity.viewModels
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
-import code.name.monkey.retromusic.databinding.ActivityRestoreBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.helper.BackupContent
-import code.name.monkey.retromusic.helper.BackupContent.*
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.getNightMode
-import com.google.android.material.color.DynamicColors
-import com.google.android.material.color.DynamicColorsOptions
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-
-
-class RestoreActivity : AppCompatActivity() {
-
-    lateinit var binding: ActivityRestoreBinding
-    private val backupViewModel: BackupViewModel by viewModels()
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        updateTheme()
-        super.onCreate(savedInstanceState)
-        binding = ActivityRestoreBinding.inflate(layoutInflater)
-        setContentView(binding.root)
-        setWidth()
-        val backupUri = intent?.data
-        binding.backupName.setText(getFileName(backupUri))
-        binding.cancelButton.accentOutlineColor()
-        binding.cancelButton.setOnClickListener {
-            finish()
-        }
-        binding.restoreButton.accentColor()
-        binding.checkArtistImages.addAccentColor()
-        binding.checkPlaylists.addAccentColor()
-        binding.checkSettings.addAccentColor()
-        binding.checkUserImages.addAccentColor()
-        binding.restoreButton.setOnClickListener {
-            val backupContents = mutableListOf<BackupContent>()
-            if (binding.checkPlaylists.isChecked) backupContents.add(PLAYLISTS)
-            if (binding.checkArtistImages.isChecked) backupContents.add(CUSTOM_ARTIST_IMAGES)
-            if (binding.checkSettings.isChecked) backupContents.add(SETTINGS)
-            if (binding.checkUserImages.isChecked) backupContents.add(USER_IMAGES)
-            lifecycleScope.launch(Dispatchers.IO) {
-                if (backupUri != null) {
-                    contentResolver.openInputStream(backupUri)?.use {
-                        backupViewModel.restoreBackup(this@RestoreActivity, it, backupContents)
-                    }
-                }
-            }
-        }
-    }
-
-    private fun updateTheme() {
-        AppCompatDelegate.setDefaultNightMode(getNightMode())
-
-        // Apply dynamic colors to activity if enabled
-        if (PreferenceUtil.materialYou) {
-            DynamicColors.applyToActivityIfAvailable(
-                this,
-                DynamicColorsOptions.Builder()
-                    .setThemeOverlay(com.google.android.material.R.style.ThemeOverlay_Material3_DynamicColors_DayNight)
-                    .build()
-            )
-        }
-    }
-
-    private fun getFileName(uri: Uri?): String? {
-        when (uri?.scheme) {
-            ContentResolver.SCHEME_FILE -> {
-                return uri.lastPathSegment
-            }
-            ContentResolver.SCHEME_CONTENT -> {
-                val proj = arrayOf(MediaStore.Files.FileColumns.DISPLAY_NAME)
-                contentResolver.query(
-                    uri, proj, null, null, null
-                )?.use { cursor ->
-                    if (cursor.count != 0) {
-                        val columnIndex: Int =
-                            cursor.getColumnIndexOrThrow(MediaStore.Files.FileColumns.DISPLAY_NAME)
-                        cursor.moveToFirst()
-                        return cursor.getString(columnIndex)
-                    }
-                }
-            }
-        }
-        return "Backup"
-    }
-
-    private fun setWidth() {
-        val width = resources.displayMetrics.widthPixels * 0.8
-        binding.root.updateLayoutParams<ViewGroup.LayoutParams> { this.width = width.toInt() }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt
new file mode 100644
index 000000000..c1ceaefce
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerFragment.kt
@@ -0,0 +1,16 @@
+package code.name.monkey.retromusic.fragments.base
+
+import android.os.Bundle
+import code.name.monkey.retromusic.fragments.mainactivity.LibraryFragment
+
+open class AbsLibraryPagerFragment : AbsMusicServiceFragment() {
+
+
+    val libraryFragment: LibraryFragment
+        get() = parentFragment as LibraryFragment
+
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        setHasOptionsMenu(true)
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
new file mode 100644
index 000000000..09c8361bc
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewCustomGridSizeFragment.kt
@@ -0,0 +1,154 @@
+package code.name.monkey.retromusic.fragments.base
+
+import android.os.Bundle
+import android.view.View
+import androidx.annotation.LayoutRes
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.util.RetroUtil
+
+
+abstract class AbsLibraryPagerRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> : AbsLibraryPagerRecyclerViewFragment<A, LM>() {
+
+    private var gridSize: Int = 0
+    private var sortOrder: String? = null
+
+    private var usePaletteInitialized: Boolean = false
+    private var usePalette: Boolean = false
+    private var currentLayoutRes: Int = 0
+
+    val maxGridSize: Int
+        get() = if (isLandscape) {
+            resources.getInteger(R.integer.max_columns_land)
+        } else {
+            resources.getInteger(R.integer.max_columns)
+        }
+
+    /**
+     * Override to customize which item layout currentLayoutRes should be used. You might also want to
+     * override [.canUsePalette] then.
+     *
+     * @see .getGridSize
+     */
+    protected val itemLayoutRes: Int
+        get() = if (getGridSize() > maxGridSizeForList) {
+            R.layout.item_grid
+        } else R.layout.item_list
+
+    protected val maxGridSizeForList: Int
+        get() = if (isLandscape) {
+            activity!!.resources.getInteger(R.integer.default_list_columns_land)
+        } else activity!!.resources.getInteger(R.integer.default_list_columns)
+
+    private val isLandscape: Boolean
+        get() = RetroUtil.isLandscape()
+
+    fun getGridSize(): Int {
+        if (gridSize == 0) {
+            gridSize = if (isLandscape) {
+                loadGridSizeLand()
+            } else {
+                loadGridSize()
+            }
+        }
+        return gridSize
+    }
+
+    protected abstract fun setGridSize(gridSize: Int)
+
+    fun getSortOrder(): String? {
+        if (sortOrder == null) {
+            sortOrder = loadSortOrder()
+        }
+        return sortOrder
+    }
+
+    protected abstract fun setSortOrder(sortOrder: String)
+
+    fun setAndSaveSortOrder(sortOrder: String) {
+        this.sortOrder = sortOrder
+        saveSortOrder(sortOrder)
+        setSortOrder(sortOrder)
+    }
+
+    /**
+     * @return whether the palette should be used at all or not
+     */
+    fun usePalette(): Boolean {
+        if (!usePaletteInitialized) {
+            usePalette = loadUsePalette()
+            usePaletteInitialized = true
+        }
+        return usePalette
+    }
+
+    fun setAndSaveGridSize(gridSize: Int) {
+        val oldLayoutRes = itemLayoutRes
+        this.gridSize = gridSize
+        if (isLandscape) {
+            saveGridSizeLand(gridSize)
+        } else {
+            saveGridSize(gridSize)
+        }
+        // only recreate the adapter and layout manager if the layout currentLayoutRes has changed
+        if (oldLayoutRes != itemLayoutRes) {
+            invalidateLayoutManager()
+            invalidateAdapter()
+        } else {
+            setGridSize(gridSize)
+        }
+    }
+
+    fun setAndSaveUsePalette(usePalette: Boolean) {
+        this.usePalette = usePalette
+        saveUsePalette(usePalette)
+        setUsePalette(usePalette)
+    }
+
+    /**
+     * @return whether the palette option should be available for the current item layout or not
+     */
+    fun canUsePalette(): Boolean {
+        return itemLayoutRes == R.layout.item_card_color
+    }
+
+    protected fun notifyLayoutResChanged(@LayoutRes res: Int) {
+        this.currentLayoutRes = res
+        val recyclerView = recyclerView()
+        applyRecyclerViewPaddingForLayoutRes(recyclerView, currentLayoutRes)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        applyRecyclerViewPaddingForLayoutRes(recyclerView(), currentLayoutRes)
+    }
+
+    private fun applyRecyclerViewPaddingForLayoutRes(recyclerView: RecyclerView, res: Int) {
+        val padding: Int = if (res == R.layout.item_grid) {
+            (resources.displayMetrics.density * 2).toInt()
+        } else {
+            0
+        }
+        recyclerView.setPadding(padding, padding, padding, padding)
+    }
+
+    protected abstract fun loadSortOrder(): String
+
+    protected abstract fun saveSortOrder(sortOrder: String)
+
+    protected abstract fun loadGridSize(): Int
+
+    protected abstract fun saveGridSize(gridColumns: Int)
+
+    protected abstract fun loadGridSizeLand(): Int
+
+    protected abstract fun saveGridSizeLand(gridColumns: Int)
+
+    protected abstract fun saveUsePalette(usePalette: Boolean)
+
+    protected abstract fun loadUsePalette(): Boolean
+
+    protected abstract fun setUsePalette(usePalette: Boolean)
+
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
new file mode 100644
index 000000000..835a8861b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsLibraryPagerRecyclerViewFragment.kt
@@ -0,0 +1,125 @@
+package code.name.monkey.retromusic.fragments.base
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.util.DensityUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import com.google.android.material.appbar.AppBarLayout
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+import kotlinx.android.synthetic.main.fragment_main_activity_recycler_view.*
+
+abstract class AbsLibraryPagerRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> : AbsLibraryPagerFragment(), AppBarLayout.OnOffsetChangedListener {
+
+    protected var adapter: A? = null
+
+    protected var layoutManager: LM? = null
+
+    protected abstract fun createLayoutManager(): LM
+
+    protected abstract fun createAdapter(): A
+
+    protected open val emptyMessage: Int
+        get() = R.string.empty
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_main_activity_recycler_view, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        libraryFragment.addOnAppBarOffsetChangedListener(this)
+        initLayoutManager()
+        initAdapter()
+        setUpRecyclerView()
+    }
+
+    private fun setUpRecyclerView() {
+        if (recyclerView is FastScrollRecyclerView) {
+            ViewUtil.setUpFastScrollRecyclerViewColor(requireActivity(), recyclerView as FastScrollRecyclerView)
+        }
+        recyclerView.layoutManager = layoutManager
+        recyclerView.adapter = adapter
+    }
+
+    private fun initAdapter() {
+        adapter = createAdapter()
+        adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
+            override fun onChanged() {
+                super.onChanged()
+                checkIsEmpty()
+                checkForPadding()
+            }
+        })
+    }
+
+
+    private fun getEmojiByUnicode(unicode: Int): String {
+        return String(Character.toChars(unicode))
+    }
+
+    private fun checkIsEmpty() {
+        emptyEmoji.text = getEmojiByUnicode(0x1F631)
+        emptyText.setText(emptyMessage)
+        empty.visibility = if (adapter!!.itemCount == 0) View.VISIBLE else View.GONE
+    }
+
+    private fun checkForPadding() {
+        val itemCount: Int = adapter?.itemCount ?: 0
+        val params = container.layoutParams as ViewGroup.MarginLayoutParams
+        if (itemCount > 0 && MusicPlayerRemote.playingQueue.isNotEmpty()) {
+            val height = DensityUtil.dip2px(requireContext(), 104f)
+            params.bottomMargin = height
+        } else {
+            val height = DensityUtil.dip2px(requireContext(), 52f)
+            params.bottomMargin = height
+        }
+    }
+
+    private fun initLayoutManager() {
+        layoutManager = createLayoutManager()
+    }
+
+
+    override fun onOffsetChanged(p0: AppBarLayout?, i: Int) {
+        container.setPadding(
+                container.paddingLeft,
+                container.paddingTop,
+                container.paddingRight,
+                libraryFragment.totalAppBarScrollingRange + i)
+    }
+
+    override fun onQueueChanged() {
+        super.onQueueChanged()
+        checkForPadding()
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        checkForPadding()
+    }
+
+    protected fun invalidateLayoutManager() {
+        initLayoutManager()
+        recyclerView.layoutManager = layoutManager
+    }
+
+    protected fun invalidateAdapter() {
+        initAdapter()
+        checkIsEmpty()
+        recyclerView.adapter = adapter
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        libraryFragment.removeOnAppBarOffsetChangedListener(this)
+    }
+
+    fun recyclerView(): RecyclerView {
+        return recyclerView
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
index a97e96129..7979397f0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
@@ -1,39 +1,53 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.base
 
 import android.os.Bundle
 import android.view.View
-import androidx.annotation.LayoutRes
-import androidx.core.view.MenuHost
-import androidx.core.view.MenuProvider
-import androidx.lifecycle.Lifecycle
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.VersionUtils
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
 
-abstract class AbsMainActivityFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
-    MenuProvider {
-    val libraryViewModel: LibraryViewModel by activityViewModel()
+abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
 
     val mainActivity: MainActivity
         get() = activity as MainActivity
 
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val menuHost: MenuHost = requireActivity() as MenuHost
-        menuHost.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.STARTED)
+    override fun onActivityCreated(savedInstanceState: Bundle?) {
+        super.onActivityCreated(savedInstanceState)
+        setHasOptionsMenu(true)
+
+        mainActivity.setNavigationbarColorAuto()
+        mainActivity.setLightNavigationBar(true)
+        mainActivity.setTaskDescriptionColorAuto()
+        mainActivity.hideStatusBar()
+        mainActivity.setBottomBarVisibility(View.VISIBLE)
+    }
+
+    private fun setStatusBarColor(view: View, color: Int) {
+        val statusBar = view.findViewById<View>(R.id.status_bar)
+        if (statusBar != null) {
+            if (VersionUtils.hasMarshmallow()) {
+                statusBar.setBackgroundColor(color)
+                mainActivity.setLightStatusbarAuto(color)
+            } else {
+                statusBar.setBackgroundColor(color)
+            }
+        }
+    }
+
+    fun setStatusBarColorAuto(view: View) {
+        val colorPrimary = ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)
+        // we don't want to use statusbar color because we are doing the color darkening on our own to support KitKat
+        if (VersionUtils.hasMarshmallow()) {
+            setStatusBarColor(view, colorPrimary)
+        } else {
+            setStatusBarColor(view, ColorUtil.darkenColor(colorPrimary))
+        }
+    }
+
+    protected fun showMainMenu(option: Int) {
+        OptionsSheetDialogFragment.newInstance(option).show(childFragmentManager, "Main_Menu")
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
index 19dfc7b85..ddc847afc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMusicServiceFragment.kt
@@ -1,56 +1,25 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.base
 
 import android.content.Context
 import android.os.Bundle
 import android.view.View
-import androidx.annotation.CallSuper
-import androidx.annotation.LayoutRes
 import androidx.fragment.app.Fragment
-import androidx.navigation.navOptions
-import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.base.AbsMusicServiceActivity
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
+import code.name.monkey.retromusic.interfaces.MusicServiceEventListener
 
 /**
  * Created by hemanths on 18/08/17.
  */
 
-open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
-    IMusicServiceEventListener {
+open class AbsMusicServiceFragment : Fragment(), MusicServiceEventListener {
 
-    val navOptions by lazy {
-        navOptions {
-            launchSingleTop = false
-            anim {
-                enter = R.anim.retro_fragment_open_enter
-                exit = R.anim.retro_fragment_open_exit
-                popEnter = R.anim.retro_fragment_close_enter
-                popExit = R.anim.retro_fragment_close_exit
-            }
-        }
-    }
-
-    var serviceActivity: AbsMusicServiceActivity? = null
+    var playerActivity: AbsMusicServiceActivity? = null
         private set
 
     override fun onAttach(context: Context) {
         super.onAttach(context)
         try {
-            serviceActivity = context as AbsMusicServiceActivity?
+            playerActivity = context as AbsMusicServiceActivity?
         } catch (e: ClassCastException) {
             throw RuntimeException(context.javaClass.simpleName + " must be an instance of " + AbsMusicServiceActivity::class.java.simpleName)
         }
@@ -58,45 +27,49 @@ open class AbsMusicServiceFragment(@LayoutRes layout: Int) : Fragment(layout),
 
     override fun onDetach() {
         super.onDetach()
-        serviceActivity = null
+        playerActivity = null
     }
 
-    @CallSuper
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        serviceActivity?.addMusicServiceEventListener(this)
+        playerActivity?.addMusicServiceEventListener(this)
+
     }
 
-    @CallSuper
     override fun onDestroyView() {
         super.onDestroyView()
-        serviceActivity?.removeMusicServiceEventListener(this)
-    }
-
-    override fun onFavoriteStateChanged() {
+        playerActivity?.removeMusicServiceEventListener(this)
     }
 
     override fun onPlayingMetaChanged() {
+
     }
 
     override fun onServiceConnected() {
+
     }
 
     override fun onServiceDisconnected() {
+
     }
 
     override fun onQueueChanged() {
+
     }
 
     override fun onPlayStateChanged() {
+
     }
 
     override fun onRepeatModeChanged() {
+
     }
 
     override fun onShuffleModeChanged() {
+
     }
 
     override fun onMediaStoreChanged() {
+
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
index 52a0b124c..e112ed755 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerControlsFragment.kt
@@ -1,188 +1,56 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.base
 
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.graphics.PorterDuff
 import android.os.Bundle
 import android.view.View
 import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
-import android.view.animation.LinearInterpolator
-import android.widget.ImageButton
-import android.widget.SeekBar
-import android.widget.TextView
-import androidx.annotation.LayoutRes
-import androidx.core.view.isVisible
-import androidx.fragment.app.commit
-import androidx.fragment.app.replace
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.fragments.VolumeFragment
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+
 
 /**
  * Created by hemanths on 24/09/17.
  */
 
-abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
-    MusicProgressViewUpdateHelper.Callback {
+abstract class AbsPlayerControlsFragment : AbsMusicServiceFragment(), MusicProgressViewUpdateHelper.Callback {
 
     protected abstract fun show()
 
     protected abstract fun hide()
 
-    abstract fun setColor(color: MediaNotificationProcessor)
+    protected abstract fun updateShuffleState()
 
-    var lastPlaybackControlsColor: Int = 0
+    protected abstract fun updateRepeatState()
 
-    var lastDisabledPlaybackControlsColor: Int = 0
+    protected abstract fun setUpProgressSlider()
 
-    private var isSeeking = false
+    abstract fun setDark(color: Int)
 
-    open val progressSlider: Slider? = null
+    fun showBonceAnimation(view: View) {
+        view.apply {
+            clearAnimation()
+            scaleX = 0.9f
+            scaleY = 0.9f
+            visibility = View.VISIBLE
+            pivotX = (view.width / 2).toFloat()
+            pivotY = (view.height / 2).toFloat()
 
-    open val seekBar: SeekBar? = null
-
-    abstract val shuffleButton: ImageButton
-
-    abstract val repeatButton: ImageButton
-
-    open val nextButton: ImageButton? = null
-
-    open val previousButton: ImageButton? = null
-
-    open val songTotalTime: TextView? = null
-
-    open val songCurrentProgress: TextView? = null
-
-    private var progressAnimator: ObjectAnimator? = null
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        if (seekBar == null) {
-            progressSlider?.valueTo = total.toFloat()
-
-            progressSlider?.value =
-                progress.toFloat().coerceIn(progressSlider?.valueFrom, progressSlider?.valueTo)
-        } else {
-            seekBar?.max = total
-
-            if (isSeeking) {
-                seekBar?.progress = progress
-            } else {
-                progressAnimator =
-                    ObjectAnimator.ofInt(seekBar, "progress", progress).apply {
-                        duration = SLIDER_ANIMATION_TIME
-                        interpolator = LinearInterpolator()
-                        start()
+            animate().setDuration(200)
+                    .setInterpolator(DecelerateInterpolator())
+                    .scaleX(1.1f)
+                    .scaleY(1.1f)
+                    .withEndAction {
+                        animate().setDuration(200)
+                                .setInterpolator(AccelerateInterpolator())
+                                .scaleX(1f)
+                                .scaleY(1f)
+                                .alpha(1f)
+                                .start()
                     }
-
-            }
-        }
-        songTotalTime?.text = MusicUtil.getReadableDurationString(total.toLong())
-        songCurrentProgress?.text = MusicUtil.getReadableDurationString(progress.toLong())
-    }
-
-    private fun setUpProgressSlider() {
-        progressSlider?.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            onProgressChange(value.toInt(), fromUser)
-        })
-        progressSlider?.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                onStartTrackingTouch()
-            }
-
-            override fun onStopTrackingTouch(slider: Slider) {
-                onStopTrackingTouch(slider.value.toInt())
-            }
-        })
-
-        seekBar?.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
-            override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                onProgressChange(progress, fromUser)
-            }
-
-            override fun onStartTrackingTouch(seekBar: SeekBar?) {
-                onStartTrackingTouch()
-            }
-
-            override fun onStopTrackingTouch(seekBar: SeekBar?) {
-                onStopTrackingTouch(seekBar?.progress ?: 0)
-            }
-        })
-    }
-
-    private fun onProgressChange(value: Int, fromUser: Boolean) {
-        if (fromUser) {
-            onUpdateProgressViews(value, MusicPlayerRemote.songDurationMillis)
-        }
-    }
-
-    private fun onStartTrackingTouch() {
-        isSeeking = true
-        progressViewUpdateHelper.stop()
-        progressAnimator?.cancel()
-    }
-
-    private fun onStopTrackingTouch(value: Int) {
-        isSeeking = false
-        MusicPlayerRemote.seekTo(value)
-        progressViewUpdateHelper.start()
-    }
-
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-        if (PreferenceUtil.circlePlayButton) {
-            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
-        } else {
-            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
-        }
-    }
-
-    fun View.showBounceAnimation() {
-        clearAnimation()
-        scaleX = 0.9f
-        scaleY = 0.9f
-        isVisible = true
-        pivotX = (width / 2).toFloat()
-        pivotY = (height / 2).toFloat()
-
-        animate().setDuration(200)
-            .setInterpolator(DecelerateInterpolator())
-            .scaleX(1.1f)
-            .scaleY(1.1f)
-            .withEndAction {
-                animate().setDuration(200)
-                    .setInterpolator(AccelerateInterpolator())
-                    .scaleX(1f)
-                    .scaleY(1f)
-                    .alpha(1f)
                     .start()
-            }
-            .start()
+        }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -190,91 +58,19 @@ abstract class AbsPlayerControlsFragment(@LayoutRes layout: Int) : AbsMusicServi
         hideVolumeIfAvailable()
     }
 
-    override fun onStart() {
-        super.onStart()
-        setUpProgressSlider()
-        setUpPrevNext()
-        setUpShuffleButton()
-        setUpRepeatButton()
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setUpPrevNext() {
-        nextButton?.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true))
-        previousButton?.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), false))
-    }
-
-    private fun setUpShuffleButton() {
-        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
-    }
-
-    private fun setUpRepeatButton() {
-        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
-    }
-
-    fun updatePrevNextColor() {
-        nextButton?.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
-        previousButton?.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
-    }
-
-    fun updateShuffleState() {
-        shuffleButton.setColorFilter(
-            when (MusicPlayerRemote.shuffleMode) {
-                MusicService.SHUFFLE_MODE_SHUFFLE -> lastPlaybackControlsColor
-                else -> lastDisabledPlaybackControlsColor
-            }, PorterDuff.Mode.SRC_IN
-        )
-    }
-
-    fun updateRepeatState() {
-        when (MusicPlayerRemote.repeatMode) {
-            MusicService.REPEAT_MODE_NONE -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat)
-                repeatButton.setColorFilter(
-                    lastDisabledPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-            MusicService.REPEAT_MODE_ALL -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat)
-                repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-            MusicService.REPEAT_MODE_THIS -> {
-                repeatButton.setImageResource(R.drawable.ic_repeat_one)
-                repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-        }
-    }
-
     protected var volumeFragment: VolumeFragment? = null
 
     private fun hideVolumeIfAvailable() {
-        if (PreferenceUtil.isVolumeVisibilityMode) {
-            childFragmentManager.commit {
-                replace<VolumeFragment>(R.id.volumeFragmentContainer)
-            }
+        if (PreferenceUtil.getInstance(requireContext()).volumeToggle) {
+            childFragmentManager.beginTransaction().replace(R.id.volumeFragmentContainer, VolumeFragment()).commit()
             childFragmentManager.executePendingTransactions()
+            volumeFragment = childFragmentManager.findFragmentById(R.id.volumeFragmentContainer) as VolumeFragment?
         }
-        volumeFragment = whichFragment(R.id.volumeFragmentContainer)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        progressViewUpdateHelper.stop()
     }
 
     companion object {
         const val SLIDER_ANIMATION_TIME: Long = 400
     }
+
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
index 6a72de41e..36b066aba 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsPlayerFragment.kt
@@ -1,465 +1,276 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.base
 
 import android.annotation.SuppressLint
-import android.app.Activity
 import android.content.ContentUris
 import android.content.Context
 import android.content.Intent
-import android.graphics.drawable.AnimatedVectorDrawable
 import android.media.MediaMetadataRetriever
+import android.os.AsyncTask
+import android.os.Build
 import android.os.Bundle
 import android.provider.MediaStore
-import android.view.GestureDetector
+import android.text.TextUtils
 import android.view.MenuItem
-import android.view.MotionEvent
 import android.view.View
-import android.widget.RelativeLayout
-import androidx.annotation.LayoutRes
+import android.widget.Toast
 import androidx.appcompat.widget.Toolbar
-import androidx.core.os.bundleOf
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.findNavController
-import androidx.navigation.navOptions
-import androidx.viewpager.widget.ViewPager
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
-import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
 import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
 import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.dialogs.*
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.ReloadType
+import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IPaletteColorHolder
+import code.name.monkey.retromusic.interfaces.PaletteColorHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.NavigationUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RingtoneManager
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.android.ext.android.get
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-import kotlin.math.abs
+import code.name.monkey.retromusic.model.lyrics.Lyrics
+import code.name.monkey.retromusic.util.*
+import kotlinx.android.synthetic.main.shadow_statusbar_toolbar.*
+import java.io.FileNotFoundException
 
-abstract class AbsPlayerFragment(@LayoutRes layout: Int) : AbsMusicServiceFragment(layout),
-    Toolbar.OnMenuItemClickListener, IPaletteColorHolder, PlayerAlbumCoverFragment.Callbacks {
-
-    val libraryViewModel: LibraryViewModel by activityViewModel()
-
-    val mainActivity: MainActivity
-        get() = activity as MainActivity
+abstract class AbsPlayerFragment : AbsMusicServiceFragment(),
+        Toolbar.OnMenuItemClickListener,
+        PaletteColorHolder,
+        PlayerAlbumCoverFragment.Callbacks {
 
+    var callbacks: Callbacks? = null
+        private set
+    private var updateIsFavoriteTask: AsyncTask<*, *, *>? = null
+    private var updateLyricsAsyncTask: AsyncTask<*, *, *>? = null
     private var playerAlbumCoverFragment: PlayerAlbumCoverFragment? = null
 
+    override fun onAttach(
+            context: Context
+    ) {
+        super.onAttach(context)
+        try {
+            callbacks = context as Callbacks?
+        } catch (e: ClassCastException) {
+            throw RuntimeException(context.javaClass.simpleName + " must implement " + Callbacks::class.java.simpleName)
+        }
+    }
+
+    override fun onDetach() {
+        super.onDetach()
+        callbacks = null
+    }
+
     override fun onMenuItemClick(
-        item: MenuItem,
+            item: MenuItem
     ): Boolean {
         val song = MusicPlayerRemote.currentSong
         when (item.itemId) {
-            R.id.action_playback_speed -> {
-                PlaybackSpeedDialog.newInstance().show(childFragmentManager, "PLAYBACK_SETTINGS")
-                return true
-            }
-
-            R.id.action_toggle_lyrics -> {
-                PreferenceUtil.showLyrics = !PreferenceUtil.showLyrics
-                showLyricsIcon(item)
-                if (PreferenceUtil.lyricsScreenOn && PreferenceUtil.showLyrics) {
-                    mainActivity.keepScreenOn(true)
-                } else if (!PreferenceUtil.isScreenOnEnabled && !PreferenceUtil.showLyrics) {
-                    mainActivity.keepScreenOn(false)
-                }
-                return true
-            }
-
-            R.id.action_go_to_lyrics -> {
-                goToLyrics(requireActivity())
-                return true
-            }
-
             R.id.action_toggle_favorite -> {
                 toggleFavorite(song)
                 return true
             }
-
             R.id.action_share -> {
-                SongShareDialog.create(song).show(childFragmentManager, "SHARE_SONG")
+                SongShareDialog.create(song).show(requireFragmentManager(), "SHARE_SONG")
                 return true
             }
-
-            R.id.action_go_to_drive_mode -> {
-                NavigationUtil.gotoDriveMode(requireActivity())
-                return true
-            }
-
             R.id.action_delete_from_device -> {
-                DeleteSongsDialog.create(song).show(childFragmentManager, "DELETE_SONGS")
+                DeleteSongsDialog.create(song).show(requireFragmentManager(), "DELETE_SONGS")
                 return true
             }
-
             R.id.action_add_to_playlist -> {
-                lifecycleScope.launch(IO) {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Main) {
-                        AddToPlaylistDialog.create(playlists, song)
-                            .show(childFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
+                AddToPlaylistDialog.create(song).show(requireFragmentManager(), "ADD_PLAYLIST")
                 return true
             }
-
             R.id.action_clear_playing_queue -> {
                 MusicPlayerRemote.clearQueue()
                 return true
             }
-
             R.id.action_save_playing_queue -> {
-                CreatePlaylistDialog.create(ArrayList(MusicPlayerRemote.playingQueue))
-                    .show(childFragmentManager, "ADD_TO_PLAYLIST")
+                CreatePlaylistDialog.create(MusicPlayerRemote.playingQueue)
+                        .show(requireFragmentManager(), "ADD_TO_PLAYLIST")
                 return true
             }
-
             R.id.action_tag_editor -> {
                 val intent = Intent(activity, SongTagEditorActivity::class.java)
                 intent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id)
                 startActivity(intent)
                 return true
             }
-
             R.id.action_details -> {
-                SongDetailDialog.create(song).show(childFragmentManager, "SONG_DETAIL")
+                SongDetailDialog.create(song).show(requireFragmentManager(), "SONG_DETAIL")
                 return true
             }
-
             R.id.action_go_to_album -> {
-                //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
-                mainActivity.setBottomNavVisibility(false)
-                mainActivity.collapsePanel()
-                requireActivity().findNavController(R.id.fragment_container).navigate(
-                    R.id.albumDetailsFragment,
-                    bundleOf(EXTRA_ALBUM_ID to song.albumId)
-                )
+                NavigationUtil.goToAlbum(requireActivity(), song.albumId)
                 return true
             }
-
             R.id.action_go_to_artist -> {
-                goToArtist(requireActivity())
+                NavigationUtil.goToArtist(requireActivity(), song.artistId)
                 return true
             }
-
             R.id.now_playing -> {
-                requireActivity().findNavController(R.id.fragment_container).navigate(
-                    R.id.playing_queue_fragment,
-                    null,
-                    navOptions { launchSingleTop = true }
-                )
-                mainActivity.collapsePanel()
+                NavigationUtil.goToPlayingQueue(requireActivity())
                 return true
             }
-
             R.id.action_show_lyrics -> {
-                goToLyrics(requireActivity())
+                NavigationUtil.goToLyrics(requireActivity())
                 return true
             }
-
             R.id.action_equalizer -> {
                 NavigationUtil.openEqualizer(requireActivity())
                 return true
             }
-
             R.id.action_sleep_timer -> {
-                SleepTimerDialog().show(parentFragmentManager, "SLEEP_TIMER")
+                SleepTimerDialog().show(requireFragmentManager(), TAG)
                 return true
             }
-
             R.id.action_set_as_ringtone -> {
-                requireContext().run {
-                    if (RingtoneManager.requiresDialog(this)) {
-                        RingtoneManager.showDialog(this)
-                    } else {
-                        RingtoneManager.setRingtone(this, song)
-                    }
+                if (RingtoneManager.requiresDialog(requireActivity())) {
+                    RingtoneManager.getDialog(requireActivity())
                 }
-
+                val ringtoneManager = RingtoneManager(requireActivity())
+                ringtoneManager.setRingtone(song)
                 return true
             }
-
             R.id.action_go_to_genre -> {
                 val retriever = MediaMetadataRetriever()
-                val trackUri =
-                    ContentUris.withAppendedId(
-                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                        song.id
-                    )
+                val trackUri = ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, song.id.toLong())
                 retriever.setDataSource(activity, trackUri)
-                var genre: String? =
-                    retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE)
+                var genre: String? = retriever.extractMetadata(MediaMetadataRetriever.METADATA_KEY_GENRE)
                 if (genre == null) {
                     genre = "Not Specified"
                 }
-                showToast(genre)
+                Toast.makeText(context, genre, Toast.LENGTH_SHORT).show()
                 return true
             }
         }
         return false
     }
 
-    private fun showLyricsIcon(item: MenuItem) {
-        val icon =
-            if (PreferenceUtil.showLyrics) R.drawable.ic_lyrics else R.drawable.ic_lyrics_outline
-        val drawable = requireContext().getTintedDrawable(
-            icon,
-            toolbarIconColor()
-        )
-        item.isChecked = PreferenceUtil.showLyrics
-        item.icon = drawable
+    protected open fun toggleFavorite(song: Song) {
+        MusicUtil.toggleFavorite(requireActivity(), song)
     }
 
-    abstract fun playerToolbar(): Toolbar?
+    abstract fun playerToolbar(): Toolbar
 
     abstract fun onShow()
 
     abstract fun onHide()
 
+    abstract fun onBackPressed(): Boolean
+
     abstract fun toolbarIconColor(): Int
 
     override fun onServiceConnected() {
         updateIsFavorite()
+        updateLyrics()
     }
 
     override fun onPlayingMetaChanged() {
         updateIsFavorite()
+        updateLyrics()
     }
 
-    override fun onFavoriteStateChanged() {
-        updateIsFavorite(animate = true)
-    }
-
-    protected open fun toggleFavorite(song: Song) {
-        lifecycleScope.launch(IO) {
-            val playlist: PlaylistEntity = libraryViewModel.favoritePlaylist()
-            val songEntity = song.toSongEntity(playlist.playListId)
-            val isFavorite = libraryViewModel.isSongFavorite(song.id)
-            if (isFavorite) {
-                libraryViewModel.removeSongFromPlaylist(songEntity)
-            } else {
-                libraryViewModel.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
-            }
-            libraryViewModel.forceReload(ReloadType.Playlists)
-            requireContext().sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
+    override fun onDestroyView() {
+        if (updateIsFavoriteTask != null && !updateIsFavoriteTask!!.isCancelled) {
+            updateIsFavoriteTask!!.cancel(true)
         }
+        if (updateLyricsAsyncTask != null && !updateLyricsAsyncTask!!.isCancelled) {
+            updateLyricsAsyncTask!!.cancel(true)
+        }
+        super.onDestroyView()
     }
 
-    fun updateIsFavorite(animate: Boolean = false) {
-        lifecycleScope.launch(IO) {
-            val isFavorite: Boolean =
-                libraryViewModel.isSongFavorite(MusicPlayerRemote.currentSong.id)
-            withContext(Main) {
-                val icon = if (animate && VersionUtils.hasMarshmallow()) {
-                    if (isFavorite) R.drawable.avd_favorite else R.drawable.avd_unfavorite
-                } else {
-                    if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-                }
-                val drawable = requireContext().getTintedDrawable(
-                    icon,
-                    toolbarIconColor()
-                )
-                if (playerToolbar() != null) {
-                    playerToolbar()?.menu?.findItem(R.id.action_toggle_favorite)?.apply {
-                        setIcon(drawable)
-                        title =
-                            if (isFavorite) getString(R.string.action_remove_from_favorites)
-                            else getString(R.string.action_add_to_favorites)
-                        getIcon().also {
-                            if (it is AnimatedVectorDrawable) {
-                                it.start()
-                            }
+    @SuppressLint("StaticFieldLeak")
+    fun updateIsFavorite() {
+        if (updateIsFavoriteTask != null) {
+            updateIsFavoriteTask!!.cancel(false)
+        }
+        updateIsFavoriteTask = object : AsyncTask<Song, Void, Boolean>() {
+            override fun doInBackground(vararg params: Song): Boolean {
+                return MusicUtil.isFavorite(requireActivity(), params[0])
+            }
+
+            override fun onPostExecute(isFavorite: Boolean) {
+                val res = if (isFavorite)
+                    R.drawable.ic_favorite_white_24dp
+                else
+                    R.drawable.ic_favorite_border_white_24dp
+
+                val drawable = RetroUtil.getTintedVectorDrawable(requireContext(), res, toolbarIconColor())
+                if (playerToolbar().menu.findItem(R.id.action_toggle_favorite) != null)
+                    playerToolbar().menu.findItem(R.id.action_toggle_favorite).setIcon(drawable).title = if (isFavorite) getString(R.string.action_remove_from_favorites) else getString(R.string.action_add_to_favorites)
+
+            }
+        }.execute(MusicPlayerRemote.currentSong)
+    }
+
+    @SuppressLint("StaticFieldLeak")
+    private fun updateLyrics() {
+        if (updateLyricsAsyncTask != null) updateLyricsAsyncTask!!.cancel(false)
+
+        updateLyricsAsyncTask = object : AsyncTask<Song, Void, Lyrics>() {
+            override fun onPreExecute() {
+                super.onPreExecute()
+                setLyrics(null)
+            }
+
+            override fun doInBackground(vararg params: Song): Lyrics? {
+                try {
+                    var data: String? = LyricUtil.getStringFromFile(params[0].data, params[0].artistName)
+                    return if (TextUtils.isEmpty(data)) {
+                        data = MusicUtil.getLyrics(params[0])
+                        return if (TextUtils.isEmpty(data)) {
+                            null
+                        } else {
+                            Lyrics.parse(params[0], data)
                         }
-                    }
+                    } else Lyrics.parse(params[0], data!!)
+                } catch (err: FileNotFoundException) {
+                    return null
                 }
             }
-        }
+
+            override fun onPostExecute(l: Lyrics?) {
+                setLyrics(l)
+            }
+
+            override fun onCancelled(s: Lyrics?) {
+                onPostExecute(null)
+            }
+        }.execute(MusicPlayerRemote.currentSong)
     }
 
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        if (PreferenceUtil.circlePlayButton) {
-            requireContext().theme.applyStyle(R.style.CircleFABOverlay, true)
-        } else {
-            requireContext().theme.applyStyle(R.style.RoundedFABOverlay, true)
-        }
+    open fun setLyrics(l: Lyrics?) {
+
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        if (PreferenceUtil.isFullScreenMode &&
-            view.findViewById<View>(R.id.status_bar) != null
-        ) {
-            view.findViewById<View>(R.id.status_bar).isVisible = false
+        view.setBackgroundColor(ATHUtil.resolveColor(requireContext(), R.attr.colorSecondary))
+        if (PreferenceUtil.getInstance(requireContext()).fullScreenMode &&
+                view.findViewById<View>(R.id.status_bar) != null) {
+            view.findViewById<View>(R.id.status_bar).visibility = View.GONE
         }
-        playerAlbumCoverFragment = whichFragment(R.id.playerAlbumCoverFragment)
+        playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment?
         playerAlbumCoverFragment?.setCallbacks(this)
 
-        if (VersionUtils.hasMarshmallow())
-            view.findViewById<RelativeLayout>(R.id.statusBarShadow)?.hide()
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+            statusBarShadow?.hide()
     }
 
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onResume() {
-        super.onResume()
-        val nps = PreferenceUtil.nowPlayingScreen
+    interface Callbacks {
 
-        if (nps == NowPlayingScreen.Circle || nps == NowPlayingScreen.Peek || nps == NowPlayingScreen.Tiny) {
-            playerToolbar()?.menu?.removeItem(R.id.action_toggle_lyrics)
-        } else {
-            playerToolbar()?.menu?.findItem(R.id.action_toggle_lyrics)?.apply {
-                isChecked = PreferenceUtil.showLyrics
-                showLyricsIcon(this)
-            }
-        }
-    }
-
-    override fun onStart() {
-        super.onStart()
-        addSwipeDetector()
-    }
-
-    fun addSwipeDetector() {
-        view?.setOnTouchListener(
-            if (PreferenceUtil.swipeAnywhereToChangeSong) {
-                SwipeDetector(
-                    requireContext(),
-                    playerAlbumCoverFragment?.viewPager,
-                    requireView()
-                )
-            } else null
-        )
-    }
-
-    class SwipeDetector(val context: Context, val viewPager: ViewPager?, val view: View) :
-        View.OnTouchListener {
-        private var flingPlayBackController: GestureDetector = GestureDetector(
-            context,
-            object : GestureDetector.SimpleOnGestureListener() {
-                override fun onScroll(
-                    e1: MotionEvent,
-                    e2: MotionEvent,
-                    distanceX: Float,
-                    distanceY: Float,
-                ): Boolean {
-                    return when {
-                        abs(distanceX) > abs(distanceY) -> {
-                            // Disallow Intercept Touch Event so that parent(BottomSheet) doesn't consume the events
-                            view.parent.requestDisallowInterceptTouchEvent(true)
-                            true
-                        }
-
-                        else -> {
-                            false
-                        }
-                    }
-                }
-            })
-
-        @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
-            viewPager?.dispatchTouchEvent(event)
-            return flingPlayBackController.onTouchEvent(event)
-        }
+        fun onPaletteColorChanged()
     }
 
     companion object {
         val TAG: String = AbsPlayerFragment::class.java.simpleName
         const val VISIBILITY_ANIM_DURATION: Long = 300
     }
-}
 
-fun goToArtist(activity: Activity) {
-    if (activity !is MainActivity) return
-    val song = MusicPlayerRemote.currentSong
-    activity.apply {
+    protected fun getUpNextAndQueueTime(): String {
+        val duration = MusicPlayerRemote.getQueueDurationMillis(MusicPlayerRemote.position)
 
-        // Remove exit transition of current fragment so
-        // it doesn't exit with a weird transition
-        currentFragment(R.id.fragment_container)?.exitTransition = null
-
-        //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
-        setBottomNavVisibility(false)
-        if (getBottomSheetBehavior().state == BottomSheetBehavior.STATE_EXPANDED) {
-            collapsePanel()
-        }
-
-        findNavController(R.id.fragment_container).navigate(
-            R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to song.artistId)
+        return MusicUtil.buildInfoString(
+                resources.getString(R.string.up_next),
+                MusicUtil.getReadableDurationString(duration)
         )
     }
 }
-
-fun goToAlbum(activity: Activity) {
-    if (activity !is MainActivity) return
-    val song = MusicPlayerRemote.currentSong
-    activity.apply {
-        currentFragment(R.id.fragment_container)?.exitTransition = null
-
-        //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
-        setBottomNavVisibility(false)
-        if (getBottomSheetBehavior().state == BottomSheetBehavior.STATE_EXPANDED) {
-            collapsePanel()
-        }
-
-        findNavController(R.id.fragment_container).navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to song.albumId)
-        )
-    }
-}
-
-fun goToLyrics(activity: Activity) {
-    if (activity !is MainActivity) return
-    activity.apply {
-        //Hide Bottom Bar First, else Bottom Sheet doesn't collapse fully
-        setBottomNavVisibility(false)
-        if (getBottomSheetBehavior().state == BottomSheetBehavior.STATE_EXPANDED) {
-            collapsePanel()
-        }
-
-        findNavController(R.id.fragment_container).navigate(
-            R.id.lyrics_fragment,
-            null,
-            navOptions { launchSingleTop = true }
-        )
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
deleted file mode 100644
index 86fd7296f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewCustomGridSizeFragment.kt
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.base
-
-import androidx.core.view.isVisible
-import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.TransitionManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.RetroUtil
-import code.name.monkey.retromusic.util.logD
-import com.google.android.material.transition.MaterialFade
-
-abstract class AbsRecyclerViewCustomGridSizeFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
-    AbsRecyclerViewFragment<A, LM>() {
-
-    private var gridSize: Int = 0
-    private var sortOrder: String? = null
-    private var currentLayoutRes: Int = 0
-    private val isLandscape: Boolean
-        get() = RetroUtil.isLandscape
-
-    val maxGridSize: Int
-        get() = if (isLandscape) {
-            resources.getInteger(R.integer.max_columns_land)
-        } else {
-            resources.getInteger(R.integer.max_columns)
-        }
-
-    fun itemLayoutRes(): Int {
-        return if (getGridSize() > maxGridSizeForList) {
-            loadLayoutRes()
-        } else R.layout.item_list
-    }
-
-    fun setAndSaveLayoutRes(layoutRes: Int) {
-        saveLayoutRes(layoutRes)
-        invalidateAdapter()
-    }
-
-    private val maxGridSizeForList: Int
-        get() = if (isLandscape) {
-            resources.getInteger(R.integer.default_list_columns_land)
-        } else resources.getInteger(R.integer.default_list_columns)
-
-    fun getGridSize(): Int {
-        if (gridSize == 0) {
-            gridSize = if (isLandscape) {
-                loadGridSizeLand()
-            } else {
-                loadGridSize()
-            }
-        }
-        return gridSize
-    }
-
-    fun getSortOrder(): String? {
-        if (sortOrder == null) {
-            sortOrder = loadSortOrder()
-        }
-        return sortOrder
-    }
-
-    fun setAndSaveSortOrder(sortOrder: String) {
-        this.sortOrder = sortOrder
-        logD(sortOrder)
-        saveSortOrder(sortOrder)
-        setSortOrder(sortOrder)
-    }
-
-    fun setAndSaveGridSize(gridSize: Int) {
-        val oldLayoutRes = itemLayoutRes()
-        this.gridSize = gridSize
-        if (isLandscape) {
-            saveGridSizeLand(gridSize)
-        } else {
-            saveGridSize(gridSize)
-        }
-        recyclerView.isVisible = false
-        invalidateLayoutManager()
-        // only recreate the adapter and layout manager if the layout currentLayoutRes has changed
-        if (oldLayoutRes != itemLayoutRes()) {
-            invalidateAdapter()
-        } else {
-            setGridSize(gridSize)
-        }
-        val transition = MaterialFade().apply {
-            addTarget(recyclerView)
-        }
-        TransitionManager.beginDelayedTransition(container, transition)
-        recyclerView.isVisible = true
-    }
-
-    protected abstract fun setGridSize(gridSize: Int)
-
-    protected abstract fun setSortOrder(sortOrder: String)
-
-    protected abstract fun loadSortOrder(): String
-
-    protected abstract fun saveSortOrder(sortOrder: String)
-
-    protected abstract fun loadGridSize(): Int
-
-    protected abstract fun saveGridSize(gridColumns: Int)
-
-    protected abstract fun loadGridSizeLand(): Int
-
-    protected abstract fun saveGridSizeLand(gridColumns: Int)
-
-    protected abstract fun loadLayoutRes(): Int
-
-    protected abstract fun saveLayoutRes(layoutRes: Int)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
deleted file mode 100644
index 80089a097..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsRecyclerViewFragment.kt
+++ /dev/null
@@ -1,234 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.base
-
-import android.os.Bundle
-import android.view.*
-import androidx.annotation.NonNull
-import androidx.annotation.StringRes
-import androidx.appcompat.widget.Toolbar
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.base.AbsMultiSelectAdapter
-import code.name.monkey.retromusic.databinding.FragmentMainRecyclerBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller.create
-import com.google.android.material.transition.MaterialFadeThrough
-import me.zhanghai.android.fastscroll.FastScroller
-import me.zhanghai.android.fastscroll.FastScrollerBuilder
-
-abstract class AbsRecyclerViewFragment<A : RecyclerView.Adapter<*>, LM : RecyclerView.LayoutManager> :
-    AbsMainActivityFragment(R.layout.fragment_main_recycler), IScrollHelper {
-
-    private var _binding: FragmentMainRecyclerBinding? = null
-    private val binding get() = _binding!!
-    protected var adapter: A? = null
-    protected var layoutManager: LM? = null
-    val shuffleButton get() = binding.shuffleButton
-    abstract val isShuffleVisible: Boolean
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMainRecyclerBinding.bind(view)
-        postponeEnterTransition()
-        view.doOnPreDraw { startPostponedEnterTransition() }
-        enterTransition = MaterialFadeThrough().addTarget(binding.recyclerView)
-        reenterTransition = MaterialFadeThrough().addTarget(binding.recyclerView)
-        mainActivity.setSupportActionBar(toolbar)
-        mainActivity.supportActionBar?.title = null
-        initLayoutManager()
-        initAdapter()
-        checkForMargins()
-        setUpRecyclerView()
-        setupToolbar()
-        binding.shuffleButton.fitsSystemWindows = PreferenceUtil.isFullScreenMode
-        // Add listeners when shuffle is visible
-        if (isShuffleVisible) {
-            binding.recyclerView.addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrolled(recyclerView, dx, dy)
-                    if (dy > 0) {
-                        binding.shuffleButton.hide()
-                    } else if (dy < 0) {
-                        binding.shuffleButton.show()
-                    }
-
-                }
-            })
-            binding.shuffleButton.apply {
-                setOnClickListener {
-                    onShuffleClicked()
-                }
-                accentColor()
-            }
-        } else {
-            binding.shuffleButton.isVisible = false
-        }
-        libraryViewModel.getFabMargin().observe(viewLifecycleOwner) {
-            binding.shuffleButton.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = it
-            }
-        }
-    }
-
-    open fun onShuffleClicked() {
-    }
-
-    val toolbar: Toolbar get() = binding.appBarLayout.toolbar
-
-    private fun setupToolbar() {
-        toolbar.setNavigationOnClickListener {
-            findNavController().navigate(
-                R.id.action_search,
-                null,
-                navOptions
-            )
-        }
-        val appName = resources.getString(titleRes)
-        binding.appBarLayout.title = appName
-    }
-
-    abstract val titleRes: Int
-
-    private fun setUpRecyclerView() {
-        binding.recyclerView.apply {
-            layoutManager = this@AbsRecyclerViewFragment.layoutManager
-            adapter = this@AbsRecyclerViewFragment.adapter
-            create(this)
-        }
-    }
-
-    protected open fun createFastScroller(recyclerView: RecyclerView): FastScroller {
-        return FastScrollerBuilder(recyclerView).useMd2Style().build()
-    }
-
-    private fun initAdapter() {
-        adapter = createAdapter()
-        adapter?.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                super.onChanged()
-                checkIsEmpty()
-            }
-        })
-    }
-
-    protected open val emptyMessage: Int
-        @StringRes get() = R.string.empty
-
-    private fun getEmojiByUnicode(unicode: Int): String {
-        return String(Character.toChars(unicode))
-    }
-
-    private fun checkIsEmpty() {
-        binding.emptyText.setText(emptyMessage)
-        binding.empty.isVisible = adapter!!.itemCount == 0
-    }
-
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
-    private fun initLayoutManager() {
-        layoutManager = createLayoutManager()
-    }
-
-    protected abstract fun createLayoutManager(): LM
-
-    @NonNull
-    protected abstract fun createAdapter(): A
-
-    protected fun invalidateLayoutManager() {
-        initLayoutManager()
-        binding.recyclerView.layoutManager = layoutManager
-    }
-
-    protected fun invalidateAdapter() {
-        initAdapter()
-        checkIsEmpty()
-        binding.recyclerView.adapter = adapter
-    }
-
-    val recyclerView get() = binding.recyclerView
-
-    val container get() = binding.root
-
-    override fun scrollToTop() {
-        recyclerView.scrollToPosition(0)
-        binding.appBarLayout.setExpanded(true, true)
-    }
-
-    override fun onPrepareMenu(menu: Menu) {
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), toolbar)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_main, menu)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(),
-            toolbar,
-            menu,
-            ATHToolbarActivity.getToolbarBackgroundColor(toolbar)
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
-                null,
-                navOptions
-            )
-            R.id.action_import_playlist -> ImportPlaylistDialog().show(
-                childFragmentManager,
-                "ImportPlaylist"
-            )
-            R.id.action_add_to_playlist -> CreatePlaylistDialog.create(emptyList()).show(
-                childFragmentManager,
-                "ShowCreatePlaylistDialog"
-            )
-        }
-        return false
-    }
-
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onPause() {
-        super.onPause()
-        (adapter as? AbsMultiSelectAdapter<*, *>)?.actionMode?.finish()
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
deleted file mode 100644
index f57aa8863..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/folder/FoldersFragment.kt
+++ /dev/null
@@ -1,657 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.fragments.folder
-
-import android.content.Context
-import android.media.MediaScannerConnection
-import android.os.Bundle
-import android.os.Environment
-import android.view.*
-import android.webkit.MimeTypeMap
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.widget.PopupMenu
-import androidx.appcompat.widget.Toolbar
-import androidx.core.os.BundleCompat
-import androidx.core.text.parseAsHtml
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.lifecycle.lifecycleScope
-import androidx.loader.app.LoaderManager
-import androidx.loader.content.Loader
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.SongFileAdapter
-import code.name.monkey.retromusic.adapter.Storage
-import code.name.monkey.retromusic.adapter.StorageAdapter
-import code.name.monkey.retromusic.adapter.StorageClickListener
-import code.name.monkey.retromusic.databinding.FragmentFolderBinding
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.textColorPrimary
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.openQueue
-import code.name.monkey.retromusic.helper.menu.SongMenuHelper
-import code.name.monkey.retromusic.helper.menu.SongsMenuHelper
-import code.name.monkey.retromusic.interfaces.ICallbacks
-import code.name.monkey.retromusic.interfaces.IMainActivityFragmentCallbacks
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-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.providers.BlacklistStore
-import code.name.monkey.retromusic.util.FileUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.startDirectory
-import code.name.monkey.retromusic.util.ThemedFastScroller.create
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
-import code.name.monkey.retromusic.views.BreadCrumbLayout
-import code.name.monkey.retromusic.views.BreadCrumbLayout.Crumb
-import code.name.monkey.retromusic.views.BreadCrumbLayout.SelectionCallback
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialFadeThrough
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import java.io.File
-import java.io.FileFilter
-import java.io.IOException
-import java.lang.ref.WeakReference
-import java.util.*
-
-class FoldersFragment : AbsMainActivityFragment(R.layout.fragment_folder),
-    IMainActivityFragmentCallbacks, SelectionCallback, ICallbacks,
-    LoaderManager.LoaderCallbacks<List<File>>, StorageClickListener, IScrollHelper {
-    private var _binding: FragmentFolderBinding? = null
-    private val binding get() = _binding!!
-
-    val toolbar: Toolbar get() = binding.appBarLayout.toolbar
-
-    private var adapter: SongFileAdapter? = null
-    private var storageAdapter: StorageAdapter? = null
-    private val fileComparator = Comparator { lhs: File, rhs: File ->
-        if (lhs.isDirectory && !rhs.isDirectory) {
-            return@Comparator -1
-        } else if (!lhs.isDirectory && rhs.isDirectory) {
-            return@Comparator 1
-        } else {
-            return@Comparator lhs.name.compareTo(rhs.name, ignoreCase = true)
-        }
-    }
-    private var storageItems = ArrayList<Storage>()
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFolderBinding.bind(view)
-        mainActivity.addMusicServiceEventListener(libraryViewModel)
-        mainActivity.setSupportActionBar(toolbar)
-        mainActivity.supportActionBar?.title = null
-        enterTransition = MaterialFadeThrough()
-        reenterTransition = MaterialFadeThrough()
-
-        setUpBreadCrumbs()
-        checkForMargins()
-        setUpRecyclerView()
-        setUpAdapter()
-        setUpTitle()
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    if (!handleBackPress()) {
-                        remove()
-                        requireActivity().onBackPressedDispatcher.onBackPressed()
-                    }
-                }
-            })
-        if (savedInstanceState == null) {
-            switchToFileAdapter()
-            setCrumb(
-                Crumb(
-                    FileUtil.safeGetCanonicalFile(startDirectory)
-                ),
-                true
-            )
-        } else {
-            binding.breadCrumbs.restoreFromStateWrapper(
-                BundleCompat.getParcelable(
-                    savedInstanceState,
-                    CRUMBS,
-                    BreadCrumbLayout.SavedStateWrapper::class.java
-                )
-            )
-            LoaderManager.getInstance(this).initLoader(LOADER_ID, null, this)
-        }
-    }
-
-    override fun onSaveInstanceState(outState: Bundle) {
-        super.onSaveInstanceState(outState)
-        if (_binding != null) {
-            outState.putParcelable(CRUMBS, binding.breadCrumbs.stateWrapper)
-        }
-    }
-
-    private fun setUpTitle() {
-        toolbar.setNavigationOnClickListener {
-            findNavController().navigate(R.id.action_search, null, navOptions)
-        }
-        binding.appBarLayout.title = resources.getString(R.string.folders)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        saveScrollPosition()
-        adapter?.actionMode?.finish()
-    }
-
-    override fun handleBackPress(): Boolean {
-        if (binding.breadCrumbs.popHistory()) {
-            setCrumb(binding.breadCrumbs.lastHistory(), false)
-            return true
-        }
-        return false
-    }
-
-    override fun onCreateLoader(id: Int, args: Bundle?): Loader<List<File>> {
-        return AsyncFileLoader(this)
-    }
-
-    override fun onCrumbSelection(crumb: Crumb, index: Int) {
-        setCrumb(crumb, true)
-    }
-
-    override fun onFileMenuClicked(file: File, view: View) {
-        val popupMenu = PopupMenu(requireActivity(), view)
-        if (file.isDirectory) {
-            popupMenu.inflate(R.menu.menu_item_directory)
-            popupMenu.setOnMenuItemClickListener { item: MenuItem ->
-                when (val itemId = item.itemId) {
-                    R.id.action_play_next, R.id.action_add_to_current_playing, R.id.action_add_to_playlist, R.id.action_delete_from_device -> {
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            listSongs(
-                                requireContext(),
-                                listOf(file),
-                                AUDIO_FILE_FILTER,
-                                fileComparator
-                            ) { songs ->
-                                if (songs.isNotEmpty()) {
-                                    SongsMenuHelper.handleMenuClick(
-                                        requireActivity(), songs, itemId
-                                    )
-                                }
-                            }
-                        }
-                        return@setOnMenuItemClickListener true
-                    }
-
-                    R.id.action_add_to_blacklist -> {
-                        BlacklistStore.getInstance(requireContext()).addPath(file)
-                        return@setOnMenuItemClickListener true
-                    }
-
-                    R.id.action_set_as_start_directory -> {
-                        startDirectory = file
-                        showToast(
-                            String.format(getString(R.string.new_start_directory), file.path)
-                        )
-                        return@setOnMenuItemClickListener true
-                    }
-
-                    R.id.action_scan -> {
-                        lifecycleScope.launch {
-                            listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
-                        }
-                        return@setOnMenuItemClickListener true
-                    }
-                }
-                false
-            }
-        } else {
-            popupMenu.inflate(R.menu.menu_item_file)
-            popupMenu.setOnMenuItemClickListener { item: MenuItem ->
-                when (val itemId = item.itemId) {
-                    R.id.action_play_next, R.id.action_add_to_current_playing, R.id.action_add_to_playlist, R.id.action_go_to_album, R.id.action_go_to_artist, R.id.action_share, R.id.action_tag_editor, R.id.action_details, R.id.action_set_as_ringtone, R.id.action_delete_from_device -> {
-                        lifecycleScope.launch(Dispatchers.IO) {
-                            listSongs(
-                                requireContext(),
-                                listOf(file),
-                                AUDIO_FILE_FILTER,
-                                fileComparator
-                            ) { songs ->
-                                if (songs.isNotEmpty()) {
-                                    val song = songs.first()
-                                    SongMenuHelper.handleMenuClick(
-                                        requireActivity(), song, itemId
-                                    )
-                                }
-                            }
-                        }
-                        return@setOnMenuItemClickListener true
-                    }
-
-                    R.id.action_scan -> {
-                        lifecycleScope.launch {
-                            listPaths(file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
-                        }
-                        return@setOnMenuItemClickListener true
-                    }
-                }
-                false
-            }
-        }
-        popupMenu.show()
-    }
-
-    override fun onFileSelected(file: File) {
-        var mFile = file
-        mFile = tryGetCanonicalFile(mFile) // important as we compare the path value later
-        if (mFile.isDirectory) {
-            setCrumb(Crumb(mFile), true)
-        } else {
-            val fileFilter = FileFilter { pathname: File ->
-                !pathname.isDirectory && AUDIO_FILE_FILTER.accept(pathname)
-            }
-            lifecycleScope.launch(Dispatchers.IO) {
-                listSongs(
-                    requireContext(),
-                    listOf(mFile.parentFile),
-                    fileFilter,
-                    fileComparator
-                ) { songs ->
-                    if (songs.isNotEmpty()) {
-                        var startIndex = -1
-                        for (i in songs.indices) {
-                            if (mFile.path
-                                == songs[i].data
-                            ) { // path is already canonical here
-                                startIndex = i
-                                break
-                            }
-                        }
-                        if (startIndex > -1) {
-                            openQueue(songs, startIndex, true)
-                        } else {
-                            Snackbar.make(
-                                mainActivity.slidingPanel,
-                                String.format(
-                                    getString(R.string.not_listed_in_media_store), mFile.name
-
-                                ).parseAsHtml(),
-                                Snackbar.LENGTH_LONG
-                            )
-                                .setAction(
-                                    R.string.action_scan
-                                ) {
-                                    lifecycleScope.launch {
-                                        listPaths(mFile, AUDIO_FILE_FILTER) { paths ->
-                                            scanPaths(
-                                                paths
-                                            )
-                                        }
-                                    }
-                                }
-                                .setActionTextColor(accentColor(requireActivity()))
-                                .show()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    override fun onLoadFinished(loader: Loader<List<File>>, data: List<File>) {
-        updateAdapter(data)
-    }
-
-    override fun onLoaderReset(loader: Loader<List<File>>) {
-        updateAdapter(LinkedList())
-    }
-
-    override fun onMultipleItemAction(item: MenuItem, files: ArrayList<File>) {
-        val itemId = item.itemId
-
-        lifecycleScope.launch(Dispatchers.IO) {
-            listSongs(requireContext(), files, AUDIO_FILE_FILTER, fileComparator) { songs ->
-                if (songs.isNotEmpty()) {
-                    SongsMenuHelper.handleMenuClick(
-                        requireActivity(), songs, itemId
-                    )
-                }
-            }
-        }
-    }
-
-    override fun onPrepareMenu(menu: Menu) {
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), toolbar)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        menu.add(0, R.id.action_scan, 0, R.string.scan_media)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        menu.add(0, R.id.action_go_to_start_directory, 1, R.string.action_go_to_start_directory)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        menu.add(0, R.id.action_settings, 2, R.string.action_settings)
-            .setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        menu.removeItem(R.id.action_grid_size)
-        menu.removeItem(R.id.action_layout_type)
-        menu.removeItem(R.id.action_sort_order)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(
-                toolbar
-            )
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_go_to_start_directory -> {
-                setCrumb(
-                    Crumb(
-                        tryGetCanonicalFile(startDirectory)
-                    ),
-                    true
-                )
-                return true
-            }
-
-            R.id.action_scan -> {
-                val crumb = activeCrumb
-                if (crumb != null) {
-                    lifecycleScope.launch {
-                        listPaths(crumb.file, AUDIO_FILE_FILTER) { paths -> scanPaths(paths) }
-                    }
-                }
-                return true
-            }
-
-            R.id.action_settings -> {
-                findNavController().navigate(
-                    R.id.settings_fragment,
-                    null,
-                    navOptions
-                )
-                return true
-            }
-        }
-        return false
-    }
-
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-    }
-
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
-    private fun checkIsEmpty() {
-        if (_binding != null) {
-            binding.emptyEmoji.text = getEmojiByUnicode(0x1F631)
-            binding.empty.isVisible = adapter?.itemCount == 0
-        }
-    }
-
-    private val activeCrumb: Crumb?
-        get() = if (_binding != null) {
-            if (binding.breadCrumbs.size() > 0) binding.breadCrumbs.getCrumb(binding.breadCrumbs.activeIndex) else null
-        } else null
-
-    private fun getEmojiByUnicode(unicode: Int): String {
-        return String(Character.toChars(unicode))
-    }
-
-    private fun saveScrollPosition() {
-        activeCrumb?.scrollPosition =
-            (binding.recyclerView.layoutManager as LinearLayoutManager).findFirstVisibleItemPosition()
-    }
-
-
-    private fun scanPaths(toBeScanned: Array<String?>) {
-        if (activity == null) {
-            return
-        }
-        if (toBeScanned.isEmpty()) {
-            showToast(R.string.nothing_to_scan)
-        } else {
-            MediaScannerConnection.scanFile(
-                requireContext(),
-                toBeScanned,
-                null,
-                UpdateToastMediaScannerCompletionListener(activity, listOf(*toBeScanned))
-            )
-        }
-    }
-
-    private fun setCrumb(crumb: Crumb?, addToHistory: Boolean) {
-        if (crumb == null) {
-            return
-        }
-        val path = crumb.file.path
-        if (path == "/" || path == "/storage" || path == "/storage/emulated") {
-            switchToStorageAdapter()
-        } else {
-            saveScrollPosition()
-            binding.breadCrumbs.setActiveOrAdd(crumb, false)
-            if (addToHistory) {
-                binding.breadCrumbs.addHistory(crumb)
-            }
-            LoaderManager.getInstance(this).restartLoader(LOADER_ID, null, this)
-        }
-    }
-
-    private fun setUpAdapter() {
-        switchToFileAdapter()
-    }
-
-    private fun setUpBreadCrumbs() {
-        binding.breadCrumbs.setActivatedContentColor(
-            textColorPrimary()
-        )
-        binding.breadCrumbs.setDeactivatedContentColor(
-            textColorSecondary()
-
-        )
-        binding.breadCrumbs.setCallback(this)
-    }
-
-    private fun setUpRecyclerView() {
-        binding.recyclerView.layoutManager = LinearLayoutManager(requireContext())
-        create(
-            binding.recyclerView
-        )
-    }
-
-    private fun updateAdapter(files: List<File>) {
-        adapter?.swapDataSet(files)
-        val crumb = activeCrumb
-        if (crumb != null) {
-            (binding.recyclerView.layoutManager as LinearLayoutManager)
-                .scrollToPositionWithOffset(crumb.scrollPosition, 0)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    private suspend fun listPaths(
-        file: File,
-        fileFilter: FileFilter,
-        doOnPathListed: (paths: Array<String?>) -> Unit,
-    ) {
-        val paths = try {
-            val paths: Array<String?>
-            if (file.isDirectory) {
-                val files = FileUtil.listFilesDeep(file, fileFilter)
-                paths = arrayOfNulls(files.size)
-                for (i in files.indices) {
-                    val f = files[i]
-                    paths[i] = FileUtil.safeGetCanonicalPath(f)
-                }
-            } else {
-                paths = arrayOfNulls(1)
-                paths[0] = file.path
-            }
-            paths
-        } catch (e: Exception) {
-            e.printStackTrace()
-            arrayOf()
-        }
-        withContext(Dispatchers.Main) {
-            doOnPathListed(paths)
-        }
-    }
-
-    private class AsyncFileLoader(foldersFragment: FoldersFragment) :
-        WrappedAsyncTaskLoader<List<File>>(foldersFragment.requireActivity()) {
-        private val fragmentWeakReference: WeakReference<FoldersFragment> =
-            WeakReference(foldersFragment)
-
-        override fun loadInBackground(): List<File> {
-            val foldersFragment = fragmentWeakReference.get()
-            var directory: File? = null
-            if (foldersFragment != null) {
-                val crumb = foldersFragment.activeCrumb
-                if (crumb != null) {
-                    directory = crumb.file
-                }
-            }
-            return if (directory != null) {
-                val files = FileUtil.listFiles(
-                    directory,
-                    AUDIO_FILE_FILTER
-                )
-                Collections.sort(files, foldersFragment!!.fileComparator)
-                files
-            } else {
-                LinkedList()
-            }
-        }
-    }
-
-    private suspend fun listSongs(
-        context: Context,
-        files: List<File?>,
-        fileFilter: FileFilter,
-        fileComparator: Comparator<File>,
-        doOnSongsListed: (songs: List<Song>) -> Unit,
-    ) {
-        val songs = try {
-            val fileList = FileUtil.listFilesDeep(files, fileFilter)
-            Collections.sort(fileList, fileComparator)
-            FileUtil.matchFilesWithMediaStore(context, fileList)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            emptyList()
-        }
-        withContext(Dispatchers.Main) {
-            doOnSongsListed(songs)
-        }
-    }
-
-    override fun onStorageClicked(storage: Storage) {
-        switchToFileAdapter()
-        setCrumb(
-            Crumb(
-                FileUtil.safeGetCanonicalFile(storage.file)
-            ),
-            true
-        )
-    }
-
-    override fun scrollToTop() {
-        binding.recyclerView.scrollToPosition(0)
-        binding.appBarLayout.setExpanded(true, true)
-    }
-
-    private fun switchToFileAdapter() {
-        adapter = SongFileAdapter(mainActivity, LinkedList(), R.layout.item_list, this)
-        adapter!!.registerAdapterDataObserver(
-            object : RecyclerView.AdapterDataObserver() {
-                override fun onChanged() {
-                    super.onChanged()
-                    checkIsEmpty()
-                }
-            })
-        binding.recyclerView.adapter = adapter
-        checkIsEmpty()
-    }
-
-    private fun switchToStorageAdapter() {
-        storageItems = FileUtil.listRoots()
-        storageAdapter = StorageAdapter(storageItems, this)
-        binding.recyclerView.adapter = storageAdapter
-        binding.breadCrumbs.clearCrumbs()
-    }
-
-    companion object {
-        val TAG: String = FoldersFragment::class.java.simpleName
-        val AUDIO_FILE_FILTER = FileFilter { file: File ->
-            (!file.isHidden
-                    && (file.isDirectory
-                    || FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton())
-                    || FileUtil.fileIsMimeType(
-                file,
-                "application/opus",
-                MimeTypeMap.getSingleton()
-            )
-                    || FileUtil.fileIsMimeType(
-                file,
-                "application/ogg",
-                MimeTypeMap.getSingleton()
-            )))
-        }
-        private const val CRUMBS = "crumbs"
-        private const val LOADER_ID = 5
-
-        // root
-        val defaultStartDirectory: File
-            get() {
-                val musicDir =
-                    getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC)
-                val startFolder = if (musicDir.exists() && musicDir.isDirectory) {
-                    musicDir
-                } else {
-                    val externalStorage = getExternalStorageDirectory()
-                    if (externalStorage.exists() && externalStorage.isDirectory) {
-                        externalStorage
-                    } else {
-                        File("/") // root
-                    }
-                }
-                return startFolder
-            }
-
-        private fun tryGetCanonicalFile(file: File): File {
-            return try {
-                file.canonicalFile
-            } catch (e: IOException) {
-                e.printStackTrace()
-                file
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
deleted file mode 100644
index 65d4e8594..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsFragment.kt
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.genres
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.isVisible
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.DefaultItemAnimator
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailBinding
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.menu.GenreMenuHelper
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.transition.MaterialSharedAxis
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-class GenreDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail) {
-    private val arguments by navArgs<GenreDetailsFragmentArgs>()
-    private val detailsViewModel: GenreDetailsViewModel by viewModel {
-        parametersOf(arguments.extraGenre)
-    }
-    private lateinit var genre: Genre
-    private lateinit var songAdapter: SongAdapter
-    private var _binding: FragmentPlaylistDetailBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(view)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        _binding = FragmentPlaylistDetailBinding.bind(view)
-        mainActivity.addMusicServiceEventListener(detailsViewModel)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        binding.container.transitionName = "genre"
-        genre = arguments.extraGenre
-        binding.toolbar.title = arguments.extraGenre.name
-        setupRecyclerView()
-        detailsViewModel.getSongs().observe(viewLifecycleOwner) {
-            songs(it)
-        }
-        postponeEnterTransition()
-        view.doOnPreDraw {
-            startPostponedEnterTransition()
-        }
-        binding.appBarLayout.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun setupRecyclerView() {
-        songAdapter = SongAdapter(requireActivity(), ArrayList(), R.layout.item_list)
-        binding.recyclerView.apply {
-            itemAnimator = DefaultItemAnimator()
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = songAdapter
-        }
-        songAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                super.onChanged()
-                checkIsEmpty()
-            }
-        })
-    }
-
-    fun songs(songs: List<Song>) {
-        binding.progressIndicator.hide()
-        if (songs.isNotEmpty()) songAdapter.swapDataSet(songs)
-        else songAdapter.swapDataSet(emptyList())
-    }
-
-    private fun getEmojiByUnicode(unicode: Int): String {
-        return String(Character.toChars(unicode))
-    }
-
-    private fun checkIsEmpty() {
-        checkForPadding()
-        binding.emptyEmoji.text = getEmojiByUnicode(0x1F631)
-        binding.empty.isVisible = songAdapter.itemCount == 0
-    }
-
-    private fun checkForPadding() {
-        val height = dipToPix(52f).toInt()
-        binding.recyclerView.setPadding(0, 0, 0, height)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_genre_detail, menu)
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        return GenreMenuHelper.handleMenuClick(requireActivity(), genre, item)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt
deleted file mode 100644
index cc6918b2c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreDetailsViewModel.kt
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.genres
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.MutableLiveData
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import code.name.monkey.retromusic.interfaces.IMusicServiceEventListener
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class GenreDetailsViewModel(
-    private val realRepository: RealRepository,
-    private val genre: Genre
-) : ViewModel(), IMusicServiceEventListener {
-
-    private val _playListSongs = MutableLiveData<List<Song>>()
-    private val _genre = MutableLiveData<Genre>().apply {
-        postValue(genre)
-    }
-
-    fun getSongs(): LiveData<List<Song>> = _playListSongs
-
-    fun getGenre(): LiveData<Genre> = _genre
-
-    init {
-        loadGenreSongs(genre)
-    }
-
-    private fun loadGenreSongs(genre: Genre) = viewModelScope.launch(IO) {
-        val songs = realRepository.getGenre(genre.id)
-        withContext(Main) { _playListSongs.postValue(songs) }
-    }
-
-    override fun onMediaStoreChanged() {
-        loadGenreSongs(genre)
-    }
-
-    override fun onServiceConnected() {}
-    override fun onServiceDisconnected() {}
-    override fun onQueueChanged() {}
-    override fun onPlayingMetaChanged() {}
-    override fun onPlayStateChanged() {}
-    override fun onRepeatModeChanged() {}
-    override fun onShuffleModeChanged() {}
-    override fun onFavoriteStateChanged() {}
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt
deleted file mode 100644
index e581d7b26..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenresFragment.kt
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.genres
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.os.bundleOf
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.EXTRA_GENRE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.GenreAdapter
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
-import code.name.monkey.retromusic.interfaces.IGenreClickListener
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.util.RetroUtil
-import com.google.android.material.transition.MaterialSharedAxis
-
-class
-GenresFragment : AbsRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(),
-    IGenreClickListener {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getGenre().observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                adapter?.swapDataSet(it)
-            else
-                adapter?.swapDataSet(listOf())
-        }
-    }
-
-    override fun createLayoutManager(): LinearLayoutManager {
-        return if (RetroUtil.isLandscape) {
-            GridLayoutManager(activity, 4)
-        } else {
-            GridLayoutManager(activity, 2)
-        }
-    }
-
-    override fun createAdapter(): GenreAdapter {
-        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
-        return GenreAdapter(requireActivity(), dataSet, this)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateMenu(menu, inflater)
-        menu.removeItem(R.id.action_grid_size)
-        menu.removeItem(R.id.action_layout_type)
-        menu.removeItem(R.id.action_sort_order)
-        menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        libraryViewModel.forceReload(ReloadType.Genres)
-    }
-
-
-
-    override val titleRes: Int
-        get() = R.string.genres
-
-    override val emptyMessage: Int
-        get() = R.string.no_genres
-
-    override val isShuffleVisible: Boolean
-        get() = false
-
-    companion object {
-        @JvmField
-        val TAG: String = GenresFragment::class.java.simpleName
-
-        @JvmStatic
-        fun newInstance(): GenresFragment {
-            return GenresFragment()
-        }
-    }
-
-    override fun onClickGenre(genre: Genre, view: View) {
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(requireView())
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        findNavController().navigate(
-            R.id.genreDetailsFragment,
-            bundleOf(EXTRA_GENRE to genre)
-        )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt
deleted file mode 100644
index 6970148a3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeBinding.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.fragments.home
-
-import code.name.monkey.retromusic.databinding.FragmentHomeBinding
-
-class HomeBinding(
-    homeBinding: FragmentHomeBinding
-) {
-    val root = homeBinding.root
-    val container = homeBinding.container
-    val contentContainer = homeBinding.contentContainer
-    val appBarLayout = homeBinding.appBarLayout
-    val toolbar = homeBinding.appBarLayout.toolbar
-    val bannerImage = homeBinding.imageLayout.bannerImage
-    val userImage = homeBinding.imageLayout.userImage
-    val lastAdded = homeBinding.homeContent.absPlaylists.lastAdded
-    val topPlayed = homeBinding.homeContent.absPlaylists.topPlayed
-    val actionShuffle = homeBinding.homeContent.absPlaylists.actionShuffle
-    val history = homeBinding.homeContent.absPlaylists.history
-    val recyclerView = homeBinding.homeContent.recyclerView
-    val titleWelcome = homeBinding.imageLayout.titleWelcome
-    val suggestions = homeBinding.homeContent.suggestions
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
deleted file mode 100644
index 3942692ec..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/home/HomeFragment.kt
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.home
-
-import android.os.Bundle
-import android.view.*
-import android.view.MenuItem.SHOW_AS_ACTION_IF_ROOM
-import androidx.coordinatorlayout.widget.CoordinatorLayout
-import androidx.core.os.bundleOf
-import androidx.core.view.doOnLayout
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.isVisible
-import androidx.core.view.updateLayoutParams
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.adapter.HomeAdapter
-import code.name.monkey.retromusic.databinding.FragmentHomeBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.dip
-import code.name.monkey.retromusic.extensions.elevatedAccentColor
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IScrollHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.userName
-import com.bumptech.glide.Glide
-import com.google.android.material.transition.MaterialFadeThrough
-import com.google.android.material.transition.MaterialSharedAxis
-
-class HomeFragment :
-    AbsMainActivityFragment(R.layout.fragment_home), IScrollHelper {
-
-    private var _binding: HomeBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        val homeBinding = FragmentHomeBinding.bind(view)
-        _binding = HomeBinding(homeBinding)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        mainActivity.supportActionBar?.title = null
-        setupListeners()
-        binding.titleWelcome.text = String.format("%s", userName)
-
-        enterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
-        reenterTransition = MaterialFadeThrough().addTarget(binding.contentContainer)
-
-        checkForMargins()
-
-        val homeAdapter = HomeAdapter(mainActivity)
-        binding.recyclerView.apply {
-            layoutManager = LinearLayoutManager(mainActivity)
-            adapter = homeAdapter
-        }
-        libraryViewModel.getSuggestions().observe(viewLifecycleOwner) {
-            loadSuggestions(it)
-        }
-        libraryViewModel.getHome().observe(viewLifecycleOwner) {
-            homeAdapter.swapData(it)
-        }
-
-        loadProfile()
-        setupTitle()
-        colorButtons()
-        postponeEnterTransition()
-        view.doOnPreDraw { startPostponedEnterTransition() }
-        view.doOnLayout {
-            adjustPlaylistButtons()
-        }
-    }
-
-    private fun adjustPlaylistButtons() {
-        val buttons =
-            listOf(binding.history, binding.lastAdded, binding.topPlayed, binding.actionShuffle)
-        buttons.maxOf { it.lineCount }.let { maxLineCount ->
-            buttons.forEach { button ->
-                // Set the highest line count to every button for consistency
-                button.setLines(maxLineCount)
-            }
-        }
-    }
-
-    private fun setupListeners() {
-        binding.bannerImage?.setOnClickListener {
-            findNavController().navigate(
-                R.id.user_info_fragment, null, null, FragmentNavigatorExtras(
-                    binding.userImage to "user_image"
-                )
-            )
-            reenterTransition = null
-        }
-
-        binding.lastAdded.setOnClickListener {
-            findNavController().navigate(
-                R.id.detailListFragment,
-                bundleOf(EXTRA_PLAYLIST_TYPE to LAST_ADDED_PLAYLIST)
-            )
-            setSharedAxisYTransitions()
-        }
-
-        binding.topPlayed.setOnClickListener {
-            findNavController().navigate(
-                R.id.detailListFragment,
-                bundleOf(EXTRA_PLAYLIST_TYPE to TOP_PLAYED_PLAYLIST)
-            )
-            setSharedAxisYTransitions()
-        }
-
-        binding.actionShuffle.setOnClickListener {
-            libraryViewModel.shuffleSongs()
-        }
-
-        binding.history.setOnClickListener {
-            findNavController().navigate(
-                R.id.detailListFragment,
-                bundleOf(EXTRA_PLAYLIST_TYPE to HISTORY_PLAYLIST)
-            )
-            setSharedAxisYTransitions()
-        }
-
-        binding.userImage.setOnClickListener {
-            findNavController().navigate(
-                R.id.user_info_fragment, null, null, FragmentNavigatorExtras(
-                    binding.userImage to "user_image"
-                )
-            )
-        }
-        // Reload suggestions
-        binding.suggestions.refreshButton.setOnClickListener {
-            libraryViewModel.forceReload(
-                ReloadType.Suggestions
-            )
-        }
-    }
-
-    private fun setupTitle() {
-        binding.toolbar.setNavigationOnClickListener {
-            findNavController().navigate(R.id.action_search, null, navOptions)
-        }
-        binding.appBarLayout.title = getString(R.string.app_name)
-    }
-
-    private fun loadProfile() {
-        binding.bannerImage?.let {
-            Glide.with(requireContext())
-                .load(RetroGlideExtension.getBannerModel())
-                .profileBannerOptions(RetroGlideExtension.getBannerModel())
-                .into(it)
-        }
-        Glide.with(requireActivity())
-            .load(RetroGlideExtension.getUserModel())
-            .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext())
-            .into(binding.userImage)
-    }
-
-    fun colorButtons() {
-        binding.history.elevatedAccentColor()
-        binding.lastAdded.elevatedAccentColor()
-        binding.topPlayed.elevatedAccentColor()
-        binding.actionShuffle.elevatedAccentColor()
-    }
-
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_main, menu)
-        menu.removeItem(R.id.action_grid_size)
-        menu.removeItem(R.id.action_layout_type)
-        menu.removeItem(R.id.action_sort_order)
-        menu.findItem(R.id.action_settings).setShowAsAction(SHOW_AS_ACTION_IF_ROOM)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(),
-            binding.toolbar,
-            menu,
-            ATHToolbarActivity.getToolbarBackgroundColor(binding.toolbar)
-        )
-    }
-
-    override fun scrollToTop() {
-        binding.container.scrollTo(0, 0)
-        binding.appBarLayout.setExpanded(true)
-    }
-
-    fun setSharedAxisXTransitions() {
-        exitTransition =
-            MaterialSharedAxis(MaterialSharedAxis.X, true).addTarget(CoordinatorLayout::class.java)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-    }
-
-    private fun setSharedAxisYTransitions() {
-        exitTransition =
-            MaterialSharedAxis(MaterialSharedAxis.Y, true).addTarget(CoordinatorLayout::class.java)
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false)
-    }
-
-    private fun loadSuggestions(songs: List<Song>) {
-        if (!PreferenceUtil.homeSuggestions || songs.isEmpty()) {
-            binding.suggestions.root.isVisible = false
-            return
-        }
-        val images = listOf(
-            binding.suggestions.image1,
-            binding.suggestions.image2,
-            binding.suggestions.image3,
-            binding.suggestions.image4,
-            binding.suggestions.image5,
-            binding.suggestions.image6,
-            binding.suggestions.image7,
-            binding.suggestions.image8
-        )
-        val color = accentColor()
-        binding.suggestions.message.apply {
-            setTextColor(color)
-            setOnClickListener {
-                it.isClickable = false
-                it.postDelayed({ it.isClickable = true }, 500)
-                MusicPlayerRemote.playNext(songs.subList(0, 8))
-                if (!MusicPlayerRemote.isPlaying) {
-                    MusicPlayerRemote.playNextSong()
-                }
-            }
-        }
-        binding.suggestions.card6.setCardBackgroundColor(ColorUtil.withAlpha(color, 0.12f))
-        images.forEachIndexed { index, imageView ->
-            imageView.setOnClickListener {
-                it.isClickable = false
-                it.postDelayed({ it.isClickable = true }, 500)
-                MusicPlayerRemote.playNext(songs[index])
-                if (!MusicPlayerRemote.isPlaying) {
-                    MusicPlayerRemote.playNextSong()
-                }
-            }
-            Glide.with(this)
-                .load(RetroGlideExtension.getSongModel(songs[index]))
-                .songCoverOptions(songs[index])
-                .into(imageView)
-        }
-    }
-
-    companion object {
-
-        const val TAG: String = "BannerHomeFragment"
-
-        @JvmStatic
-        fun newInstance(): HomeFragment {
-            return HomeFragment()
-        }
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
-                null,
-                navOptions
-            )
-
-            R.id.action_import_playlist -> ImportPlaylistDialog().show(
-                childFragmentManager,
-                "ImportPlaylist"
-            )
-
-            R.id.action_add_to_playlist -> CreatePlaylistDialog.create(emptyList()).show(
-                childFragmentManager,
-                "ShowCreatePlaylistDialog"
-            )
-        }
-        return false
-    }
-
-    override fun onPrepareMenu(menu: Menu) {
-        super.onPrepareMenu(menu)
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), binding.toolbar)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-        libraryViewModel.forceReload(ReloadType.HomeSections)
-        exitTransition = null
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
deleted file mode 100644
index 2aa29e48d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/library/LibraryFragment.kt
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.library
-
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.navigation.fragment.NavHostFragment
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.ui.NavigationUI
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity.getToolbarBackgroundColor
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentLibraryBinding
-import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog
-import code.name.monkey.retromusic.dialogs.ImportPlaylistDialog
-import code.name.monkey.retromusic.extensions.whichFragment
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-class LibraryFragment : AbsMainActivityFragment(R.layout.fragment_library) {
-
-    private var _binding: FragmentLibraryBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentLibraryBinding.bind(view)
-    }
-
-    override fun onActivityCreated(savedInstanceState: Bundle?) {
-        super.onActivityCreated(savedInstanceState)
-        mainActivity.setBottomNavVisibility(true)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        mainActivity.supportActionBar?.title = null
-        binding.toolbar.setNavigationOnClickListener {
-            findNavController().navigate(
-                R.id.action_search,
-                null,
-                navOptions
-            )
-        }
-        setupNavigationController()
-        setupTitle()
-    }
-
-    private fun setupTitle() {
-        binding.appNameText.text = getText(R.string.app_name)
-    }
-
-    private fun setupNavigationController() {
-        val navHostFragment = whichFragment<NavHostFragment>(R.id.fragment_container)
-        val navController = navHostFragment.navController
-        val navInflater = navController.navInflater
-        val navGraph = navInflater.inflate(R.navigation.library_graph)
-
-        val categoryInfo: CategoryInfo = PreferenceUtil.libraryCategory.first { it.visible }
-        if (categoryInfo.visible) {
-            navGraph.setStartDestination(categoryInfo.category.id)
-        }
-        navController.graph = navGraph
-        NavigationUI.setupWithNavController(mainActivity.navigationView, navController)
-        navController.addOnDestinationChangedListener { _, _, _ ->
-            binding.appBarLayout.setExpanded(true, true)
-        }
-    }
-
-    override fun onPrepareMenu(menu: Menu) {
-        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), binding.toolbar)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_main, menu)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(),
-            binding.toolbar,
-            menu,
-            getToolbarBackgroundColor(binding.toolbar)
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_settings -> findNavController().navigate(
-                R.id.settings_fragment,
-                null,
-                navOptions
-            )
-            R.id.action_import_playlist -> ImportPlaylistDialog().show(
-                childFragmentManager,
-                "ImportPlaylist"
-            )
-            R.id.action_add_to_playlist -> CreatePlaylistDialog.create(emptyList()).show(
-                childFragmentManager,
-                "ShowCreatePlaylistDialog"
-            )
-        }
-        return false
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt
deleted file mode 100644
index a2980e382..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/lyrics/LyricsFragment.kt
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.lyrics
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.net.Uri
-import android.os.Bundle
-import android.provider.MediaStore
-import android.text.InputType
-import android.view.*
-import androidx.activity.result.ActivityResultLauncher
-import androidx.activity.result.IntentSenderRequest
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.isVisible
-import androidx.navigation.fragment.findNavController
-import androidx.transition.Fade
-import code.name.monkey.appthemehelper.common.ATHToolbarActivity
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.TagWriter
-import code.name.monkey.retromusic.databinding.FragmentLyricsBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.openUrl
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.lyrics.LrcView
-import code.name.monkey.retromusic.model.AudioTagInfo
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.FileUtils
-import code.name.monkey.retromusic.util.LyricUtil
-import code.name.monkey.retromusic.util.UriUtil
-import com.afollestad.materialdialogs.input.input
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import org.jaudiotagger.audio.AudioFileIO
-import org.jaudiotagger.tag.FieldKey
-import java.io.File
-import java.io.FileOutputStream
-import java.util.*
-import kotlin.collections.set
-
-class LyricsFragment : AbsMainActivityFragment(R.layout.fragment_lyrics),
-    MusicProgressViewUpdateHelper.Callback {
-
-    private var _binding: FragmentLyricsBinding? = null
-    private val binding get() = _binding!!
-    private lateinit var song: Song
-
-    private lateinit var normalLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
-    private lateinit var editSyncedLyricsLauncher: ActivityResultLauncher<IntentSenderRequest>
-
-    private lateinit var cacheFile: File
-    private var syncedLyrics: String = ""
-    private lateinit var syncedFileUri: Uri
-
-    private var lyricsType: LyricsType = LyricsType.NORMAL_LYRICS
-
-    private val googleSearchLrcUrl: String
-        get() {
-            var baseUrl = "http://www.google.com/search?"
-            var query = song.title + "+" + song.artistName
-            query = "q=" + query.replace(" ", "+") + " lyrics"
-            baseUrl += query
-            return baseUrl
-        }
-
-    private lateinit var updateHelper: MusicProgressViewUpdateHelper
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        // Normal lyrics launcher
-        normalLyricsLauncher =
-            registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) {
-                if (it.resultCode == Activity.RESULT_OK) {
-                    FileUtils.copyFileToUri(requireContext(), cacheFile, song.uri)
-                }
-            }
-        editSyncedLyricsLauncher =
-            registerForActivityResult(ActivityResultContracts.StartIntentSenderForResult()) {
-                if (it.resultCode == Activity.RESULT_OK) {
-                    requireContext().contentResolver.openOutputStream(syncedFileUri)?.use { os ->
-                        (os as FileOutputStream).channel.truncate(0)
-                        os.write(syncedLyrics.toByteArray())
-                        os.flush()
-                    }
-                }
-            }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        enterTransition = Fade()
-        exitTransition = Fade()
-        _binding = FragmentLyricsBinding.bind(view)
-        updateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
-        updateTitleSong()
-        setupLyricsView()
-        loadLyrics()
-
-        setupWakelock()
-        setupViews()
-        setupToolbar()
-    }
-
-    private fun setupLyricsView() {
-        binding.lyricsView.apply {
-            setCurrentColor(accentColor())
-            setTimeTextColor(accentColor())
-            setTimelineColor(accentColor())
-            setTimelineTextColor(accentColor())
-            setDraggable(true, LrcView.OnPlayClickListener {
-                MusicPlayerRemote.seekTo(it.toInt())
-                return@OnPlayClickListener true
-            })
-        }
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.lyricsView.updateTime(progress.toLong())
-    }
-
-    private fun setupViews() {
-        binding.editButton.accentColor()
-        binding.editButton.setOnClickListener {
-            when (lyricsType) {
-                LyricsType.SYNCED_LYRICS -> {
-                    editSyncedLyrics()
-                }
-                LyricsType.NORMAL_LYRICS -> {
-                    editNormalLyrics()
-                }
-            }
-        }
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateTitleSong()
-        loadLyrics()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateTitleSong()
-        loadLyrics()
-    }
-
-    private fun updateTitleSong() {
-        song = MusicPlayerRemote.currentSong
-    }
-
-    private fun setupToolbar() {
-        mainActivity.setSupportActionBar(binding.toolbar)
-        ToolbarContentTintHelper.colorBackButton(binding.toolbar)
-        binding.toolbar.setNavigationOnClickListener {
-            findNavController().navigateUp()
-        }
-    }
-
-    private fun setupWakelock() {
-        requireActivity().window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_lyrics, menu)
-        ToolbarContentTintHelper.handleOnCreateOptionsMenu(
-            requireContext(),
-            binding.toolbar,
-            menu,
-            ATHToolbarActivity.getToolbarBackgroundColor(binding.toolbar)
-        )
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        if (item.itemId == R.id.action_search) {
-            openUrl(googleSearchLrcUrl)
-        }
-        return false
-    }
-
-    @SuppressLint("CheckResult")
-    private fun editNormalLyrics(lyrics: String? = null) {
-        val file = File(song.data)
-        val content = lyrics ?: try {
-            AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            ""
-        }
-
-        val song = song
-
-        materialDialog().show {
-            title(res = R.string.edit_normal_lyrics)
-            input(
-                hintRes = R.string.paste_lyrics_here,
-                prefill = content,
-                inputType = InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_CLASS_TEXT
-            ) { _, input ->
-                val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
-                fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
-                GlobalScope.launch {
-                    if (VersionUtils.hasR()) {
-                        cacheFile = TagWriter.writeTagsToFilesR(
-                            requireContext(), AudioTagInfo(
-                                listOf(song.data), fieldKeyValueMap, null
-                            )
-                        )[0]
-                        val pendingIntent =
-                            MediaStore.createWriteRequest(
-                                requireContext().contentResolver,
-                                listOf(song.uri)
-                            )
-
-                        normalLyricsLauncher.launch(
-                            IntentSenderRequest.Builder(pendingIntent).build()
-                        )
-                    } else {
-                        TagWriter.writeTagsToFiles(
-                            requireContext(), AudioTagInfo(
-                                listOf(song.data), fieldKeyValueMap, null
-                            )
-                        )
-                    }
-                }
-            }
-            positiveButton(res = R.string.save) {
-                loadNormalLyrics()
-            }
-            negativeButton(res = android.R.string.cancel)
-        }
-    }
-
-
-    @SuppressLint("CheckResult")
-    private fun editSyncedLyrics(lyrics: String? = null) {
-        val content = lyrics ?: LyricUtil.getStringFromLrc(LyricUtil.getSyncedLyricsFile(song))
-
-        val song = song
-        materialDialog().show {
-            title(res = R.string.edit_synced_lyrics)
-            input(
-                hintRes = R.string.paste_timeframe_lyrics_here,
-                prefill = content,
-                inputType = InputType.TYPE_TEXT_FLAG_MULTI_LINE or InputType.TYPE_CLASS_TEXT
-            ) { _, input ->
-                if (VersionUtils.hasR()) {
-                    syncedLyrics = input.toString()
-                    val lrcFile = LyricUtil.getSyncedLyricsFile(song)
-                    if (lrcFile?.exists() == true) {
-                        syncedFileUri =
-                            UriUtil.getUriFromPath(requireContext(), lrcFile.absolutePath)
-                        val pendingIntent =
-                            MediaStore.createWriteRequest(
-                                requireContext().contentResolver,
-                                listOf(syncedFileUri)
-                            )
-                        editSyncedLyricsLauncher.launch(
-                            IntentSenderRequest.Builder(pendingIntent).build()
-                        )
-                    } else {
-                        val fieldKeyValueMap = EnumMap<FieldKey, String>(FieldKey::class.java)
-                        fieldKeyValueMap[FieldKey.LYRICS] = input.toString()
-                        GlobalScope.launch {
-                            cacheFile = TagWriter.writeTagsToFilesR(
-                                requireContext(),
-                                AudioTagInfo(listOf(song.data), fieldKeyValueMap, null)
-                            )[0]
-                            val pendingIntent = MediaStore.createWriteRequest(
-                                requireContext().contentResolver,
-                                listOf(song.uri)
-                            )
-
-                            normalLyricsLauncher.launch(
-                                IntentSenderRequest.Builder(pendingIntent).build()
-                            )
-                        }
-                    }
-                } else {
-                    LyricUtil.writeLrc(song, input.toString())
-                }
-            }
-            positiveButton(res = R.string.save) {
-                loadLRCLyrics()
-            }
-            negativeButton(res = android.R.string.cancel)
-        }
-    }
-
-    private fun loadNormalLyrics() {
-        val file = File(song.data)
-        val lyrics = try {
-            AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
-            e.printStackTrace()
-            ""
-        }
-        binding.normalLyrics.isVisible = !lyrics.isNullOrEmpty()
-        binding.noLyricsFound.isVisible = lyrics.isNullOrEmpty()
-        binding.normalLyrics.text = lyrics
-    }
-
-    /**
-     * @return success
-     */
-    private fun loadLRCLyrics(): Boolean {
-        val lrcFile = LyricUtil.getSyncedLyricsFile(song)
-        if (lrcFile != null) {
-            binding.lyricsView.loadLrc(lrcFile)
-        } else {
-            val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data)
-            if (embeddedLyrics != null) {
-                binding.lyricsView.loadLrc(embeddedLyrics)
-            } else {
-                binding.lyricsView.setLabel(getString(R.string.empty))
-                return false
-            }
-        }
-        return true
-    }
-
-    private fun loadLyrics() {
-        lyricsType = if (!loadLRCLyrics()) {
-            binding.lyricsView.isVisible = false
-            loadNormalLyrics()
-            LyricsType.NORMAL_LYRICS
-        } else {
-            binding.normalLyrics.isVisible = false
-            binding.noLyricsFound.isVisible = false
-            binding.lyricsView.isVisible = true
-            LyricsType.SYNCED_LYRICS
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        updateHelper.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        updateHelper.stop()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        if (MusicPlayerRemote.playingQueue.isNotEmpty())
-            mainActivity.expandPanel()
-        _binding = null
-    }
-
-    enum class LyricsType {
-        NORMAL_LYRICS,
-        SYNCED_LYRICS
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
new file mode 100644
index 000000000..7cc45b1bf
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/AlbumsFragment.kt
@@ -0,0 +1,142 @@
+package code.name.monkey.retromusic.fragments.mainactivity
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.album.AlbumDetailsFragment
+import code.name.monkey.retromusic.album.AlbumDetailsInterface
+import code.name.monkey.retromusic.album.album.AlbumAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.mvp.presenter.AlbumsPresenter
+import code.name.monkey.retromusic.mvp.presenter.AlbumsView
+import code.name.monkey.retromusic.util.PreferenceUtil
+import javax.inject.Inject
+
+open class AlbumsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<AlbumAdapter, GridLayoutManager>(), AlbumsView, AlbumDetailsInterface {
+    @Inject
+    lateinit var albumsPresenter: AlbumsPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        albumsPresenter.attachView(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            albumsPresenter.loadAlbums()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        albumsPresenter.detachView()
+    }
+
+    override fun albums(albums: java.util.ArrayList<Album>) {
+        adapter?.swapDataSet(albums)
+    }
+
+    override val emptyMessage: Int
+        get() = R.string.no_albums
+
+    override fun createLayoutManager(): GridLayoutManager {
+        return GridLayoutManager(activity, getGridSize())
+    }
+
+    override fun createAdapter(): AlbumAdapter {
+        var itemLayoutRes = itemLayoutRes
+        notifyLayoutResChanged(itemLayoutRes)
+        if (itemLayoutRes != R.layout.item_list) {
+            itemLayoutRes = PreferenceUtil.getInstance(requireContext()).getAlbumGridStyle(requireContext())
+        }
+        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
+        return AlbumAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, loadUsePalette(), libraryFragment, this)
+    }
+
+    public override fun loadUsePalette(): Boolean {
+        return PreferenceUtil.getInstance(requireContext()).albumColoredFooters()
+    }
+
+    override fun setUsePalette(usePalette: Boolean) {
+        adapter?.usePalette(usePalette)
+    }
+
+    override fun setGridSize(gridSize: Int) {
+        layoutManager?.spanCount = gridSize
+        adapter?.notifyDataSetChanged()
+    }
+
+
+    override fun loadSortOrder(): String {
+
+        return PreferenceUtil.getInstance(requireContext()).albumSortOrder
+    }
+
+    override fun saveSortOrder(sortOrder: String) {
+
+        PreferenceUtil.getInstance(requireContext()).albumSortOrder = sortOrder
+    }
+
+    override fun loadGridSize(): Int {
+
+        return PreferenceUtil.getInstance(requireContext()).getAlbumGridSize(activity!!)
+    }
+
+    override fun saveGridSize(gridColumns: Int) {
+
+        PreferenceUtil.getInstance(requireContext()).setAlbumGridSize(gridColumns)
+    }
+
+    override fun loadGridSizeLand(): Int {
+
+        return PreferenceUtil.getInstance(requireContext()).getAlbumGridSizeLand(activity!!)
+    }
+
+    override fun saveGridSizeLand(gridColumns: Int) {
+
+        PreferenceUtil.getInstance(requireContext()).setAlbumGridSizeLand(gridColumns)
+    }
+
+    override fun saveUsePalette(usePalette: Boolean) {
+
+        PreferenceUtil.getInstance(requireContext()).setAlbumColoredFooters(usePalette)
+    }
+
+    override fun onMediaStoreChanged() {
+        albumsPresenter.loadAlbums()
+    }
+
+    override fun setSortOrder(sortOrder: String) {
+        albumsPresenter.loadAlbums()
+    }
+
+
+    override fun showEmptyView() {
+        adapter?.swapDataSet(ArrayList())
+    }
+
+    companion object {
+        @JvmField
+        var TAG: String = AlbumsFragment::class.java.simpleName
+
+        fun newInstance(): AlbumsFragment {
+            val args = Bundle()
+            val fragment = AlbumsFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+
+    override fun onAlbumClick(albumId: Int) {
+        libraryFragment.mainActivity.setDetailsFragments(AlbumDetailsFragment.newInstance(albumId), "AlbumDetails")
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
new file mode 100644
index 000000000..8f16f45d8
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/ArtistsFragment.kt
@@ -0,0 +1,131 @@
+package code.name.monkey.retromusic.fragments.mainactivity
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.presenter.ArtistsPresenter
+import code.name.monkey.retromusic.mvp.presenter.ArtistsView
+import code.name.monkey.retromusic.util.PreferenceUtil
+import javax.inject.Inject
+
+class ArtistsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<ArtistAdapter, GridLayoutManager>(), ArtistsView {
+    override fun artists(artists: ArrayList<Artist>) {
+        adapter?.swapDataSet(artists)
+    }
+
+    @Inject
+    lateinit var artistsPresenter: ArtistsPresenter
+
+    override val emptyMessage: Int
+        get() = R.string.no_artists
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        artistsPresenter.attachView(this)
+    }
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            artistsPresenter.loadArtists()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        artistsPresenter.detachView()
+    }
+
+    override fun onMediaStoreChanged() {
+        artistsPresenter.loadArtists()
+    }
+
+    override fun setSortOrder(sortOrder: String) {
+        artistsPresenter.loadArtists()
+    }
+
+    override fun createLayoutManager(): GridLayoutManager {
+        return GridLayoutManager(activity, getGridSize())
+    }
+
+    override fun createAdapter(): ArtistAdapter {
+        var itemLayoutRes = itemLayoutRes
+        notifyLayoutResChanged(itemLayoutRes)
+        if (itemLayoutRes != R.layout.item_list) {
+            itemLayoutRes = PreferenceUtil.getInstance(requireContext()).getArtistGridStyle(requireContext())
+        }
+        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
+        return ArtistAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, loadUsePalette(), libraryFragment)
+    }
+
+
+    override fun loadGridSize(): Int {
+        return PreferenceUtil.getInstance(requireContext()).getArtistGridSize(activity!!)
+    }
+
+    override fun saveGridSize(gridColumns: Int) {
+        PreferenceUtil.getInstance(requireContext()).setArtistGridSize(gridColumns)
+    }
+
+    override fun loadGridSizeLand(): Int {
+        return PreferenceUtil.getInstance(requireContext()).getArtistGridSizeLand(activity!!)
+    }
+
+    override fun saveGridSizeLand(gridColumns: Int) {
+        PreferenceUtil.getInstance(requireContext()).setArtistGridSizeLand(gridColumns)
+    }
+
+    override fun saveUsePalette(usePalette: Boolean) {
+        PreferenceUtil.getInstance(requireContext()).setArtistColoredFooters(usePalette)
+    }
+
+    public override fun loadUsePalette(): Boolean {
+        return PreferenceUtil.getInstance(requireContext()).artistColoredFooters()
+    }
+
+    override fun setUsePalette(usePalette: Boolean) {
+        adapter?.usePalette(usePalette)
+    }
+
+    override fun setGridSize(gridSize: Int) {
+        layoutManager?.spanCount = gridSize
+        adapter?.notifyDataSetChanged()
+    }
+
+
+    override fun loadSortOrder(): String {
+        return PreferenceUtil.getInstance(requireContext()).artistSortOrder
+    }
+
+    override fun saveSortOrder(sortOrder: String) {
+        PreferenceUtil.getInstance(requireContext()).artistSortOrder = sortOrder
+    }
+
+
+    override fun showEmptyView() {
+        adapter?.swapDataSet(ArrayList())
+    }
+
+    companion object {
+        @JvmField
+        val TAG: String = ArtistsFragment::class.java.simpleName
+
+        fun newInstance(): ArtistsFragment {
+
+            val args = Bundle()
+
+            val fragment = ArtistsFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
new file mode 100644
index 000000000..4b66fd106
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/GenresFragment.kt
@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.fragments.mainactivity
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.GenreAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.mvp.presenter.GenresPresenter
+import code.name.monkey.retromusic.mvp.presenter.GenresView
+import javax.inject.Inject
+
+
+class GenresFragment : AbsLibraryPagerRecyclerViewFragment<GenreAdapter, LinearLayoutManager>(), GenresView {
+    override fun genres(genres: ArrayList<Genre>) {
+        adapter?.swapDataSet(genres)
+    }
+
+    override fun showEmptyView() {
+
+    }
+
+    override fun createLayoutManager(): LinearLayoutManager {
+        return LinearLayoutManager(activity)
+    }
+
+    override fun createAdapter(): GenreAdapter {
+        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
+        return GenreAdapter(libraryFragment.mainActivity, dataSet, R.layout.item_list_no_image)
+    }
+
+    override val emptyMessage: Int
+        get() = R.string.no_genres
+
+
+    @Inject
+    lateinit var genresPresenter: GenresPresenter
+
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        genresPresenter.attachView(this)
+    }
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            genresPresenter.loadGenres()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        genresPresenter.detachView()
+    }
+
+    override fun onMediaStoreChanged() {
+        genresPresenter.loadGenres()
+    }
+
+    companion object {
+        @JvmField
+        val TAG: String = GenresFragment::class.java.simpleName
+
+        fun newInstance(): GenresFragment {
+            return GenresFragment()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
new file mode 100644
index 000000000..08af71754
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
@@ -0,0 +1,461 @@
+package code.name.monkey.retromusic.fragments.mainactivity;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.res.ColorStateList;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.SubMenu;
+import android.view.View;
+import android.view.ViewGroup;
+
+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 com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.card.MaterialCardView;
+
+import org.jetbrains.annotations.NotNull;
+
+import code.name.monkey.appthemehelper.common.ATHToolbarActivity;
+import code.name.monkey.appthemehelper.util.ATHUtil;
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog;
+import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment;
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
+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.util.NavigationUtil;
+import code.name.monkey.retromusic.util.RetroColorUtil;
+import code.name.monkey.retromusic.util.RetroUtil;
+import io.reactivex.disposables.CompositeDisposable;
+
+public class LibraryFragment extends AbsMainActivityFragment implements CabHolder, MainActivityFragmentCallbacks {
+
+    public static final String TAG = "LibraryFragment";
+    private static final String CURRENT_TAB_ID = "current_tab_id";
+
+    private Toolbar toolbar;
+    private AppBarLayout appBarLayout;
+    private MaterialCardView toolbarContainer;
+
+    private MaterialCab cab;
+    private FragmentManager fragmentManager;
+    private CompositeDisposable disposable;
+
+
+    @NonNull
+    public static Fragment newInstance(int tab) {
+        Bundle args = new Bundle();
+        args.putInt(CURRENT_TAB_ID, tab);
+        LibraryFragment fragment = new LibraryFragment();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @NonNull
+    public static Fragment newInstance() {
+        return new LibraryFragment();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        disposable.dispose();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_library, container, false);
+        disposable = new CompositeDisposable();
+        appBarLayout = view.findViewById(R.id.appBarLayout);
+        toolbarContainer = view.findViewById(R.id.toolbarContainer);
+        toolbar = view.findViewById(R.id.toolbar);
+        return view;
+    }
+
+    public void setTitle(@StringRes int name) {
+        toolbar.setTitle(getString(name));
+    }
+
+    public void addOnAppBarOffsetChangedListener(@NonNull AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
+        appBarLayout.addOnOffsetChangedListener(onOffsetChangedListener);
+    }
+
+    public void removeOnAppBarOffsetChangedListener(@NonNull AppBarLayout.OnOffsetChangedListener onOffsetChangedListener) {
+        appBarLayout.removeOnOffsetChangedListener(onOffsetChangedListener);
+    }
+
+    public int getTotalAppBarScrollingRange() {
+        return appBarLayout.getTotalScrollRange();
+    }
+
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        setStatusBarColorAuto(view);
+        setupToolbar();
+        inflateFragment();
+    }
+
+    private void inflateFragment() {
+        if (getArguments() == null) {
+            selectedFragment(SongsFragment.Companion.newInstance());
+            return;
+        }
+        switch (getArguments().getInt(CURRENT_TAB_ID)) {
+            default:
+            case R.id.action_song:
+                selectedFragment(SongsFragment.Companion.newInstance());
+                break;
+            case R.id.action_album:
+                selectedFragment(AlbumsFragment.Companion.newInstance());
+                break;
+            case R.id.action_artist:
+                selectedFragment(ArtistsFragment.Companion.newInstance());
+                break;
+            case R.id.action_playlist:
+                selectedFragment(PlaylistsFragment.Companion.newInstance());
+                break;
+            case R.id.action_genre:
+                selectedFragment(GenresFragment.Companion.newInstance());
+                break;
+            case R.id.action_playing_queue:
+                selectedFragment(PlayingQueueFragment.Companion.newInstance());
+                break;
+        }
+    }
+
+    @SuppressWarnings("ConstantConditions")
+    private void setupToolbar() {
+        toolbar.setBackgroundTintList(ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)));
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setOnClickListener(v -> {
+            ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar));
+            NavigationUtil.goToSearch(getMainActivity(), options);
+        });
+        getMainActivity().setSupportActionBar(toolbar);
+        toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
+        ToolbarContentTintHelper.colorBackButton(toolbar);
+        //toolbar.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorOnSecondary));
+    }
+
+    private Fragment getCurrentFragment() {
+        if (fragmentManager == null) {
+            return SongsFragment.Companion.newInstance();
+        }
+        return fragmentManager.findFragmentByTag(LibraryFragment.TAG);
+    }
+
+    @Override
+    public boolean handleBackPress() {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+            return true;
+        }
+        return false;
+    }
+
+      void selectedFragment(Fragment fragment) {
+        fragmentManager = getChildFragmentManager();
+        FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
+        fragmentTransaction
+                .replace(R.id.fragmentContainer, fragment, LibraryFragment.TAG)
+                .commit();
+    }
+
+    @NonNull
+    @Override
+    public MaterialCab openCab(int menuRes, @NonNull MaterialCab.Callback callback) {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+        }
+
+        cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(
+                        RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
+                .start(callback);
+        return cab;
+    }
+
+
+    @Override
+    public void onCreateOptionsMenu(@NotNull Menu menu, @NonNull MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_main, menu);
+
+        Fragment currentFragment = getCurrentFragment();
+        if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+                && currentFragment.isAdded()) {
+            AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment;
+
+            MenuItem gridSizeItem = menu.findItem(R.id.action_grid_size);
+            if (RetroUtil.isLandscape()) {
+                gridSizeItem.setTitle(R.string.action_grid_size_land);
+            }
+            setUpGridSizeMenu(fragment, gridSizeItem.getSubMenu());
+
+            setUpSortOrderMenu(fragment, menu.findItem(R.id.action_sort_order).getSubMenu());
+
+        } else if (currentFragment instanceof GenresFragment) {
+            menu.removeItem(R.id.action_new_playlist);
+            menu.removeItem(R.id.action_grid_size);
+            menu.removeItem(R.id.action_sort_order);
+        } else {
+            menu.add(0, R.id.action_new_playlist, 0, R.string.new_playlist_title).setIcon(R.drawable.ic_playlist_add_white_24dp).setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menu.removeItem(R.id.action_grid_size);
+        }
+        ToolbarContentTintHelper.handleOnCreateOptionsMenu(requireActivity(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(toolbar));
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(@NonNull Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(activity, toolbar);
+    }
+
+
+    private void setUpSortOrderMenu(
+            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment,
+            @NonNull SubMenu sortOrderMenu) {
+        String currentSortOrder = fragment.getSortOrder();
+        sortOrderMenu.clear();
+
+        if (fragment instanceof AlbumsFragment) {
+            sortOrderMenu.add(0, R.id.action_album_sort_order_asc, 0, R.string.sort_order_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_A_Z));
+            sortOrderMenu.add(0, R.id.action_album_sort_order_desc, 1, R.string.sort_order_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_Z_A));
+            sortOrderMenu.add(0, R.id.action_album_sort_order_artist, 2, R.string.sort_order_artist)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_ARTIST));
+            sortOrderMenu.add(0, R.id.action_album_sort_order_year, 3, R.string.sort_order_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.AlbumSortOrder.ALBUM_YEAR));
+        } else if (fragment instanceof ArtistsFragment) {
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_asc, 0, R.string.sort_order_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_A_Z));
+            sortOrderMenu.add(0, R.id.action_artist_sort_order_desc, 1, R.string.sort_order_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.ArtistSortOrder.ARTIST_Z_A));
+        } else if (fragment instanceof SongsFragment) {
+            sortOrderMenu.add(0, R.id.action_song_sort_order_asc, 0, R.string.sort_order_a_z)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_A_Z));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_desc, 1, R.string.sort_order_z_a)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_Z_A));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_artist, 2, R.string.sort_order_artist)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ARTIST));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_album, 3, R.string.sort_order_album)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_ALBUM));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_year, 4, R.string.sort_order_year)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_YEAR));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_date, 5, R.string.sort_order_date)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.SONG_DATE));
+            sortOrderMenu.add(0, R.id.action_song_sort_order_composer, 6, R.string.sort_order_composer)
+                    .setChecked(currentSortOrder.equals(SortOrder.SongSortOrder.COMPOSER));
+        }
+
+        sortOrderMenu.setGroupCheckable(0, true, true);
+    }
+
+    private boolean handleSortOrderMenuItem(
+            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+                    fragment, @NonNull MenuItem item) {
+        String sortOrder = null;
+        if (fragment instanceof AlbumsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_album_sort_order_asc:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z;
+                    break;
+                case R.id.action_album_sort_order_desc:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_Z_A;
+                    break;
+                case R.id.action_album_sort_order_artist:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_ARTIST;
+                    break;
+                case R.id.action_album_sort_order_year:
+                    sortOrder = SortOrder.AlbumSortOrder.ALBUM_YEAR;
+                    break;
+            }
+        } else if (fragment instanceof ArtistsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_artist_sort_order_asc:
+                    sortOrder = SortOrder.ArtistSortOrder.ARTIST_A_Z;
+                    break;
+                case R.id.action_artist_sort_order_desc:
+                    sortOrder = SortOrder.ArtistSortOrder.ARTIST_Z_A;
+                    break;
+            }
+        } else if (fragment instanceof SongsFragment) {
+            switch (item.getItemId()) {
+                case R.id.action_song_sort_order_asc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_A_Z;
+                    break;
+                case R.id.action_song_sort_order_desc:
+                    sortOrder = SortOrder.SongSortOrder.SONG_Z_A;
+                    break;
+                case R.id.action_song_sort_order_artist:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ARTIST;
+                    break;
+                case R.id.action_song_sort_order_album:
+                    sortOrder = SortOrder.SongSortOrder.SONG_ALBUM;
+                    break;
+                case R.id.action_song_sort_order_year:
+                    sortOrder = SortOrder.SongSortOrder.SONG_YEAR;
+                    break;
+                case R.id.action_song_sort_order_date:
+                    sortOrder = SortOrder.SongSortOrder.SONG_DATE;
+                    break;
+                case R.id.action_song_sort_order_composer:
+                    sortOrder = SortOrder.SongSortOrder.COMPOSER;
+                    break;
+
+            }
+        }
+
+        if (sortOrder != null) {
+            item.setChecked(true);
+            fragment.setAndSaveSortOrder(sortOrder);
+            return true;
+        }
+
+        return false;
+    }
+
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        //if (pager == null) return false;
+        Fragment currentFragment = getCurrentFragment();
+        if (currentFragment instanceof AbsLibraryPagerRecyclerViewCustomGridSizeFragment) {
+            AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment = (AbsLibraryPagerRecyclerViewCustomGridSizeFragment) currentFragment;
+            if (handleGridSizeMenuItem(fragment, item)) {
+                return true;
+            }
+            if (handleSortOrderMenuItem(fragment, item)) {
+                return true;
+            }
+        }
+        int id = item.getItemId();
+        switch (id) {
+            case R.id.action_search:
+                ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar));
+                NavigationUtil.goToSearch(getMainActivity(), options);
+                break;
+            case R.id.action_new_playlist:
+                CreatePlaylistDialog.Companion.create().show(getChildFragmentManager(), "CREATE_PLAYLIST");
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+
+    private void setUpGridSizeMenu(
+            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment fragment,
+            @NonNull SubMenu gridSizeMenu) {
+        switch (fragment.getGridSize()) {
+            case 1:
+                gridSizeMenu.findItem(R.id.action_grid_size_1).setChecked(true);
+                break;
+            case 2:
+                gridSizeMenu.findItem(R.id.action_grid_size_2).setChecked(true);
+                break;
+            case 3:
+                gridSizeMenu.findItem(R.id.action_grid_size_3).setChecked(true);
+                break;
+            case 4:
+                gridSizeMenu.findItem(R.id.action_grid_size_4).setChecked(true);
+                break;
+            case 5:
+                gridSizeMenu.findItem(R.id.action_grid_size_5).setChecked(true);
+                break;
+            case 6:
+                gridSizeMenu.findItem(R.id.action_grid_size_6).setChecked(true);
+                break;
+            case 7:
+                gridSizeMenu.findItem(R.id.action_grid_size_7).setChecked(true);
+                break;
+            case 8:
+                gridSizeMenu.findItem(R.id.action_grid_size_8).setChecked(true);
+                break;
+        }
+        int maxGridSize = fragment.getMaxGridSize();
+        if (maxGridSize < 8) {
+            gridSizeMenu.findItem(R.id.action_grid_size_8).setVisible(false);
+        }
+        if (maxGridSize < 7) {
+            gridSizeMenu.findItem(R.id.action_grid_size_7).setVisible(false);
+        }
+        if (maxGridSize < 6) {
+            gridSizeMenu.findItem(R.id.action_grid_size_6).setVisible(false);
+        }
+        if (maxGridSize < 5) {
+            gridSizeMenu.findItem(R.id.action_grid_size_5).setVisible(false);
+        }
+        if (maxGridSize < 4) {
+            gridSizeMenu.findItem(R.id.action_grid_size_4).setVisible(false);
+        }
+        if (maxGridSize < 3) {
+            gridSizeMenu.findItem(R.id.action_grid_size_3).setVisible(false);
+        }
+    }
+
+
+    private boolean handleGridSizeMenuItem(
+            @NonNull AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+                    fragment, @NonNull MenuItem item) {
+        int gridSize = 0;
+        switch (item.getItemId()) {
+            case R.id.action_grid_size_1:
+                gridSize = 1;
+                break;
+            case R.id.action_grid_size_2:
+                gridSize = 2;
+                break;
+            case R.id.action_grid_size_3:
+                gridSize = 3;
+                break;
+            case R.id.action_grid_size_4:
+                gridSize = 4;
+                break;
+            case R.id.action_grid_size_5:
+                gridSize = 5;
+                break;
+            case R.id.action_grid_size_6:
+                gridSize = 6;
+                break;
+            case R.id.action_grid_size_7:
+                gridSize = 7;
+                break;
+            case R.id.action_grid_size_8:
+                gridSize = 8;
+                break;
+        }
+
+        if (gridSize > 0) {
+            item.setChecked(true);
+            fragment.setAndSaveGridSize(gridSize);
+            return true;
+        }
+        return false;
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlayingQueueFragment.kt
similarity index 69%
rename from app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt
rename to app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlayingQueueFragment.kt
index ba2199833..bc7d3203f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/PlayingQueueRVFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlayingQueueFragment.kt
@@ -1,64 +1,49 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
-package code.name.monkey.retromusic.fragments.other
+package code.name.monkey.retromusic.fragments.mainactivity
 
 import android.os.Bundle
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
-import androidx.navigation.findNavController
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewFragment
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.util.ViewUtil
 import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
 import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
 import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
 import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
 import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
+import kotlinx.android.synthetic.main.activity_playing_queue.*
 
 /**
  * Created by hemanths on 2019-12-08.
  */
-class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, LinearLayoutManager>() {
+class PlayingQueueFragment : AbsLibraryPagerRecyclerViewFragment<PlayingQueueAdapter, LinearLayoutManager>() {
 
     private lateinit var wrappedAdapter: RecyclerView.Adapter<*>
     private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null
     private var recyclerViewSwipeManager: RecyclerViewSwipeManager? = null
     private var recyclerViewTouchActionGuardManager: RecyclerViewTouchActionGuardManager? = null
-    override val titleRes: Int
-        get() = R.string.now_playing_queue
-    override val isShuffleVisible: Boolean
-        get() = false
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupRecyclerView()
-        setupToolbar()
     }
-
-    private fun setupToolbar() {
-        toolbar.apply {
-            setNavigationOnClickListener {
-                findNavController().navigateUp()
-            }
-            setNavigationIcon(R.drawable.ic_arrow_back)
-        }
-    }
-
     private fun setupRecyclerView() {
         recyclerViewTouchActionGuardManager = RecyclerViewTouchActionGuardManager()
         recyclerViewDragDropManager = RecyclerViewDragDropManager()
@@ -66,18 +51,17 @@ class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, Line
 
         val animator = DraggableItemAnimator()
         animator.supportsChangeAnimations = false
-        wrappedAdapter =
-            recyclerViewDragDropManager?.createWrappedAdapter(adapter!!) as RecyclerView.Adapter<*>
-        wrappedAdapter =
-            recyclerViewSwipeManager?.createWrappedAdapter(wrappedAdapter) as RecyclerView.Adapter<*>
-        recyclerView.layoutManager = layoutManager
-        recyclerView.adapter = wrappedAdapter
-        recyclerView.itemAnimator = animator
+        wrappedAdapter = recyclerViewDragDropManager?.createWrappedAdapter(adapter!!) as RecyclerView.Adapter<*>
+        wrappedAdapter = recyclerViewSwipeManager?.createWrappedAdapter(wrappedAdapter) as RecyclerView.Adapter<*>
+        recyclerView().layoutManager = layoutManager
+        recyclerView().adapter = wrappedAdapter
+        recyclerView().itemAnimator = animator
         recyclerViewTouchActionGuardManager?.attachRecyclerView(recyclerView)
         recyclerViewDragDropManager?.attachRecyclerView(recyclerView)
         recyclerViewSwipeManager?.attachRecyclerView(recyclerView)
 
         layoutManager?.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
+        ViewUtil.setUpFastScrollRecyclerViewColor(requireContext(), recyclerView)
     }
 
     override fun createLayoutManager(): LinearLayoutManager {
@@ -85,12 +69,7 @@ class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, Line
     }
 
     override fun createAdapter(): PlayingQueueAdapter {
-        return PlayingQueueAdapter(
-            requireActivity() as AppCompatActivity,
-            MusicPlayerRemote.playingQueue.toMutableList(),
-            MusicPlayerRemote.position,
-            R.layout.item_queue
-        )
+        return PlayingQueueAdapter(requireActivity() as AppCompatActivity, MusicPlayerRemote.playingQueue, MusicPlayerRemote.position, R.layout.item_queue)
     }
 
     override fun onServiceConnected() {
@@ -101,12 +80,10 @@ class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, Line
     override fun onQueueChanged() {
         super.onQueueChanged()
         updateQueue()
-        mainActivity.hideBottomSheet(true)
     }
 
     override fun onPlayingMetaChanged() {
         updateQueuePosition()
-        mainActivity.hideBottomSheet(true)
     }
 
     private fun updateQueuePosition() {
@@ -149,11 +126,10 @@ class PlayingQueueRVFragment : AbsRecyclerViewFragment<PlayingQueueAdapter, Line
 
     companion object {
         @JvmField
-        val TAG: String = PlayingQueueRVFragment::class.java.simpleName
+        val TAG: String = PlayingQueueFragment::class.java.simpleName
 
-        @JvmStatic
-        fun newInstance(): PlayingQueueRVFragment {
-            return PlayingQueueRVFragment()
+        fun newInstance(): PlayingQueueFragment {
+            return PlayingQueueFragment()
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
new file mode 100644
index 000000000..de76a10d9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/PlaylistsFragment.kt
@@ -0,0 +1,89 @@
+package code.name.monkey.retromusic.fragments.mainactivity
+
+import android.os.Bundle
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.View
+import androidx.recyclerview.widget.LinearLayoutManager
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewFragment
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.mvp.presenter.PlaylistView
+import code.name.monkey.retromusic.mvp.presenter.PlaylistsPresenter
+import javax.inject.Inject
+
+
+class PlaylistsFragment : AbsLibraryPagerRecyclerViewFragment<PlaylistAdapter, LinearLayoutManager>(), PlaylistView {
+
+    @Inject
+    lateinit var playlistsPresenter: PlaylistsPresenter
+
+    override val emptyMessage: Int
+        get() = R.string.no_playlists
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        playlistsPresenter.attachView(this)
+    }
+
+    override fun createLayoutManager(): LinearLayoutManager {
+        return LinearLayoutManager(activity)
+    }
+
+    override fun createAdapter(): PlaylistAdapter {
+        return PlaylistAdapter(libraryFragment.mainActivity, ArrayList(),
+                R.layout.item_list, libraryFragment)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            playlistsPresenter.playlists()
+        }
+    }
+
+    override fun onDestroyView() {
+        playlistsPresenter.detachView()
+        super.onDestroyView()
+    }
+
+    override fun onMediaStoreChanged() {
+        super.onMediaStoreChanged()
+        playlistsPresenter.playlists()
+    }
+
+    override fun showEmptyView() {
+        adapter?.swapDataSet(ArrayList())
+    }
+
+    override fun playlists(playlists: ArrayList<Playlist>) {
+        adapter?.swapDataSet(playlists)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        menu.apply {
+            removeItem(R.id.action_sort_order)
+            removeItem(R.id.action_grid_size)
+        }
+    }
+
+    companion object {
+        @JvmField
+        val TAG: String = PlaylistsFragment::class.java.simpleName
+
+        fun newInstance(): PlaylistsFragment {
+            val args = Bundle()
+            val fragment = PlaylistsFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
new file mode 100644
index 000000000..6551f194a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/SongsFragment.kt
@@ -0,0 +1,134 @@
+package code.name.monkey.retromusic.fragments.mainactivity
+
+import android.os.Bundle
+import android.view.View
+import androidx.recyclerview.widget.GridLayoutManager
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
+import code.name.monkey.retromusic.adapter.song.SongAdapter
+import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.presenter.SongPresenter
+import code.name.monkey.retromusic.mvp.presenter.SongView
+import code.name.monkey.retromusic.util.PreferenceUtil
+import java.util.*
+import javax.inject.Inject
+
+class SongsFragment : AbsLibraryPagerRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>(), SongView {
+
+    @Inject
+    lateinit var songPresenter: SongPresenter
+
+
+    override val emptyMessage: Int
+        get() = R.string.no_songs
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        App.musicComponent.inject(this)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        songPresenter.attachView(this)
+    }
+
+    override fun createLayoutManager(): GridLayoutManager {
+        return GridLayoutManager(activity, getGridSize())
+    }
+
+    override fun createAdapter(): SongAdapter {
+        val itemLayoutRes = itemLayoutRes
+        notifyLayoutResChanged(itemLayoutRes)
+        val usePalette = loadUsePalette()
+
+        val dataSet = if (adapter == null) ArrayList() else adapter!!.dataSet
+
+        return if (getGridSize() <= maxGridSizeForList) {
+            ShuffleButtonSongAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, usePalette, libraryFragment)
+        } else SongAdapter(libraryFragment.mainActivity, dataSet, itemLayoutRes, usePalette, libraryFragment)
+    }
+
+    override fun songs(songs: ArrayList<Song>) {
+        adapter?.swapDataSet(songs)
+    }
+
+    override fun onMediaStoreChanged() {
+        songPresenter.loadSongs()
+    }
+
+    override fun loadGridSize(): Int {
+        return PreferenceUtil.getInstance(requireContext()).getSongGridSize(activity!!)
+    }
+
+    override fun saveGridSize(gridColumns: Int) {
+        PreferenceUtil.getInstance(requireContext()).setSongGridSize(gridColumns)
+    }
+
+    override fun loadGridSizeLand(): Int {
+        return PreferenceUtil.getInstance(requireContext()).getSongGridSizeLand(activity!!)
+    }
+
+    override fun saveGridSizeLand(gridColumns: Int) {
+        PreferenceUtil.getInstance(requireContext()).setSongGridSizeLand(gridColumns)
+    }
+
+    public override fun saveUsePalette(usePalette: Boolean) {
+        PreferenceUtil.getInstance(requireContext()).setSongColoredFooters(usePalette)
+    }
+
+    public override fun loadUsePalette(): Boolean {
+        return PreferenceUtil.getInstance(requireContext()).songColoredFooters()
+    }
+
+    public override fun setUsePalette(usePalette: Boolean) {
+        adapter?.usePalette(usePalette)
+    }
+
+    override fun setGridSize(gridSize: Int) {
+        layoutManager?.spanCount = gridSize
+        adapter?.notifyDataSetChanged()
+    }
+
+    override fun onResume() {
+        super.onResume()
+        if (adapter!!.dataSet.isEmpty()) {
+            songPresenter.loadSongs()
+        }
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        songPresenter.detachView()
+    }
+
+    override fun showEmptyView() {
+        adapter?.swapDataSet(ArrayList())
+    }
+
+    override fun loadSortOrder(): String {
+        return PreferenceUtil.getInstance(requireContext()).songSortOrder
+    }
+
+    override fun saveSortOrder(sortOrder: String) {
+        PreferenceUtil.getInstance(requireContext()).songSortOrder = sortOrder
+    }
+
+    override fun setSortOrder(sortOrder: String) {
+        songPresenter.loadSongs()
+    }
+
+    companion object {
+
+        @JvmField
+        var TAG: String = SongsFragment::class.java.simpleName
+
+        fun newInstance(): SongsFragment {
+            val args = Bundle()
+            val fragment = SongsFragment()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
new file mode 100644
index 000000000..af55f0952
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
@@ -0,0 +1,749 @@
+package code.name.monkey.retromusic.fragments.mainactivity.folders;
+
+import android.app.ActivityOptions;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.media.MediaScannerConnection;
+import android.os.Bundle;
+import android.os.Environment;
+import android.text.Html;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.webkit.MimeTypeMap;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toast;
+
+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 com.afollestad.materialcab.MaterialCab;
+import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.card.MaterialCardView;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+import com.google.android.material.snackbar.Snackbar;
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
+
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Objects;
+
+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.ToolbarContentTintHelper;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.adapter.SongFileAdapter;
+import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment;
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
+import code.name.monkey.retromusic.helper.MusicPlayerRemote;
+import code.name.monkey.retromusic.helper.menu.SongMenuHelper;
+import code.name.monkey.retromusic.helper.menu.SongsMenuHelper;
+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.UpdateToastMediaScannerCompletionListener;
+import code.name.monkey.retromusic.misc.WrappedAsyncTaskLoader;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.util.DensityUtil;
+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;
+import code.name.monkey.retromusic.views.BreadCrumbLayout;
+
+public class FoldersFragment extends AbsMainActivityFragment implements
+        MainActivityFragmentCallbacks,
+        CabHolder, BreadCrumbLayout.SelectionCallback, SongFileAdapter.Callbacks,
+        AppBarLayout.OnOffsetChangedListener, LoaderManager.LoaderCallbacks<List<File>> {
+
+    public static final String TAG = FoldersFragment.class.getSimpleName();
+    public static final FileFilter AUDIO_FILE_FILTER = file -> !file.isHidden() && (file.isDirectory() ||
+            FileUtil.fileIsMimeType(file, "audio/*", MimeTypeMap.getSingleton()) ||
+            FileUtil.fileIsMimeType(file, "application/opus", MimeTypeMap.getSingleton()) ||
+            FileUtil.fileIsMimeType(file, "application/ogg", MimeTypeMap.getSingleton()));
+
+    private static final String PATH = "path";
+    private static final String CRUMBS = "crumbs";
+    private static final int LOADER_ID = LoaderIds.Companion.getFOLDERS_FRAGMENT();
+
+    private View coordinatorLayout, empty;
+    private TextView emojiText;
+    private MaterialCardView toolbarContainer;
+    private Toolbar toolbar;
+    private BreadCrumbLayout breadCrumbs;
+    private AppBarLayout appBarLayout;
+    private FastScrollRecyclerView recyclerView;
+
+    private Comparator<File> fileComparator = (lhs, rhs) -> {
+        if (lhs.isDirectory() && !rhs.isDirectory()) {
+            return -1;
+        } else if (!lhs.isDirectory() && rhs.isDirectory()) {
+            return 1;
+        } else {
+            return lhs.getName().compareToIgnoreCase
+                    (rhs.getName());
+        }
+    };
+    private SongFileAdapter adapter;
+    private MaterialCab cab;
+
+    public FoldersFragment() {
+    }
+
+    public static FoldersFragment newInstance(Context context) {
+        return newInstance(PreferenceUtil.getInstance(context).getStartDirectory());
+    }
+
+    public static FoldersFragment newInstance(File directory) {
+        FoldersFragment frag = new FoldersFragment();
+        Bundle b = new Bundle();
+        b.putSerializable(PATH, directory);
+        frag.setArguments(b);
+        return frag;
+    }
+
+    public static File getDefaultStartDirectory() {
+        File musicDir = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC);
+        File startFolder;
+        if (musicDir.exists() && musicDir.isDirectory()) {
+            startFolder = musicDir;
+        } else {
+            File externalStorage = Environment.getExternalStorageDirectory();
+            if (externalStorage.exists() && externalStorage.isDirectory()) {
+                startFolder = externalStorage;
+            } else {
+                startFolder = new File("/"); // root
+            }
+        }
+        return startFolder;
+    }
+
+    private static File tryGetCanonicalFile(File file) {
+        try {
+            return file.getCanonicalFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return file;
+        }
+    }
+
+    private String getEmojiByUnicode(int unicode) {
+        return new String(Character.toChars(unicode));
+    }
+
+    private void initViews(View view) {
+        coordinatorLayout = view.findViewById(R.id.coordinatorLayout);
+        toolbarContainer = view.findViewById(R.id.toolbarContainer);
+        recyclerView = view.findViewById(R.id.recyclerView);
+        appBarLayout = view.findViewById(R.id.appBarLayout);
+        breadCrumbs = view.findViewById(R.id.breadCrumbs);
+        toolbar = view.findViewById(R.id.toolbar);
+        empty = view.findViewById(android.R.id.empty);
+        emojiText = view.findViewById(R.id.emptyEmoji);
+    }
+
+    private void setCrumb(BreadCrumbLayout.Crumb crumb, boolean addToHistory) {
+        if (crumb == null) {
+            return;
+        }
+        saveScrollPosition();
+        breadCrumbs.setActiveOrAdd(crumb, false);
+        if (addToHistory) {
+            breadCrumbs.addHistory(crumb);
+        }
+        getLoaderManager().restartLoader(LOADER_ID, null, this);
+    }
+
+    private void saveScrollPosition() {
+        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+        if (crumb != null) {
+            crumb.setScrollPosition(((LinearLayoutManager) recyclerView.getLayoutManager()).findFirstVisibleItemPosition());
+        }
+    }
+
+    @Nullable
+    private BreadCrumbLayout.Crumb getActiveCrumb() {
+        return breadCrumbs != null && breadCrumbs.size() > 0 ? breadCrumbs
+                .getCrumb(breadCrumbs.getActiveIndex()) : null;
+    }
+
+    @Override
+    public void onSaveInstanceState(@NonNull Bundle outState) {
+        super.onSaveInstanceState(outState);
+        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(
+                    FileUtil.safeGetCanonicalFile((File) getArguments().getSerializable(PATH))), true);
+        } else {
+            breadCrumbs.restoreFromStateWrapper(savedInstanceState.getParcelable(CRUMBS));
+            getLoaderManager().initLoader(LOADER_ID, null, this);
+        }
+    }
+
+    @NonNull
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater,
+                             ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_folder, container, false);
+        initViews(view);
+        return view;
+    }
+
+    @Override
+    public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+        setStatusBarColorAuto(view);
+        setUpAppbarColor();
+        setUpBreadCrumbs();
+        setUpRecyclerView();
+        setUpAdapter();
+    }
+
+    private void setUpAppbarColor() {
+        int primaryColor = ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface);
+        getMainActivity().setSupportActionBar(toolbar);
+        toolbar.setBackgroundTintList(ColorStateList.valueOf(primaryColor));
+        toolbarContainer.setCardBackgroundColor(ColorStateList.valueOf(primaryColor));
+        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
+        toolbar.setNavigationOnClickListener(v -> {
+            showMainMenu(OptionsSheetDialogFragment.FOLDER);
+        });
+        breadCrumbs.setActivatedContentColor(ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorPrimary));
+        breadCrumbs.setDeactivatedContentColor(ATHUtil.INSTANCE.resolveColor(requireContext(), android.R.attr.textColorSecondary));
+        appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) -> getMainActivity().setLightStatusbar(!ATHUtil.INSTANCE.isWindowBackgroundDark(requireContext())));
+        toolbar.setOnClickListener(v -> {
+            ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(getMainActivity(), toolbarContainer, getString(R.string.transition_toolbar));
+            NavigationUtil.goToSearch(getMainActivity(), options);
+        });
+    }
+
+    private void setUpBreadCrumbs() {
+        breadCrumbs.setCallback(this);
+    }
+
+    private void setUpRecyclerView() {
+        //noinspection ConstantConditions
+        ViewUtil.INSTANCE.setUpFastScrollRecyclerViewColor(getActivity(), recyclerView,
+                ThemeStore.Companion.accentColor(getActivity()));
+        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
+        appBarLayout.addOnOffsetChangedListener(this);
+    }
+
+    private void setUpAdapter() {
+        adapter = new SongFileAdapter(getMainActivity(), new LinkedList<File>(), R.layout.item_list,
+                this, this);
+        adapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+            @Override
+            public void onChanged() {
+                super.onChanged();
+                checkIsEmpty();
+            }
+        });
+        recyclerView.setAdapter(adapter);
+        checkIsEmpty();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        saveScrollPosition();
+    }
+
+    @Override
+    public void onDestroyView() {
+        appBarLayout.removeOnOffsetChangedListener(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public boolean handleBackPress() {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+            return true;
+        }
+        if (breadCrumbs != null && breadCrumbs.popHistory()) {
+            setCrumb(breadCrumbs.lastHistory(), false);
+            return true;
+        }
+        return false;
+    }
+
+    @NonNull
+    @Override
+    public MaterialCab openCab(int menuRes, MaterialCab.Callback callback) {
+        if (cab != null && cab.isActive()) {
+            cab.finish();
+        }
+        cab = new MaterialCab(getMainActivity(), R.id.cab_stub)
+                .setMenu(menuRes)
+                .setCloseDrawableRes(R.drawable.ic_close_white_24dp)
+                .setBackgroundColor(RetroColorUtil.shiftBackgroundColorForLightText(ATHUtil.INSTANCE.resolveColor(requireContext(), R.attr.colorSurface)))
+                .start(callback);
+        return cab;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        super.onCreateOptionsMenu(menu, inflater);
+        inflater.inflate(R.menu.menu_folders, menu);
+        ToolbarContentTintHelper.handleOnCreateOptionsMenu(getActivity(), toolbar, menu,
+                ATHToolbarActivity.getToolbarBackgroundColor(toolbar));
+    }
+
+    @Override
+    public void onPrepareOptionsMenu(Menu menu) {
+        super.onPrepareOptionsMenu(menu);
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(getActivity(), toolbar);
+    }
+
+    @Override
+    public void onCrumbSelection(BreadCrumbLayout.Crumb crumb, int index) {
+        setCrumb(crumb, true);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.action_go_to_start_directory:
+                setCrumb(new BreadCrumbLayout.Crumb(tryGetCanonicalFile(PreferenceUtil.getInstance(requireContext()).getStartDirectory())), true);
+                return true;
+            case R.id.action_scan:
+                BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+                if (crumb != null) {
+                    //noinspection Convert2MethodRef
+                    new ListPathsAsyncTask(getActivity(), paths -> scanPaths(paths)).execute(new ListPathsAsyncTask.LoadingInfo(crumb.getFile(),
+                            AUDIO_FILE_FILTER));
+                }
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onFileSelected(File file) {
+        file = tryGetCanonicalFile(file); // important as we compare the path value later
+        if (file.isDirectory()) {
+            setCrumb(new BreadCrumbLayout.Crumb(file), true);
+        } else {
+            FileFilter fileFilter = pathname -> !pathname.isDirectory() && AUDIO_FILE_FILTER
+                    .accept(pathname);
+            new ListSongsAsyncTask(getActivity(), file, (songs, extra) -> {
+                File file1 = (File) extra;
+                int startIndex = -1;
+                for (int i = 0; i < songs.size(); i++) {
+                    if (file1.getPath().equals(songs.get(i).getData())) { // path is already canonical here
+                        startIndex = i;
+                        break;
+                    }
+                }
+                if (startIndex > -1) {
+                    MusicPlayerRemote.INSTANCE.openQueue(songs, startIndex, true);
+                } else {
+                    final File finalFile = file1;
+                    Snackbar.make(coordinatorLayout, Html.fromHtml(
+                            String.format(getString(R.string.not_listed_in_media_store), file1.getName())),
+                            Snackbar.LENGTH_LONG)
+                            .setAction(R.string.action_scan,
+                                    v -> new ListPathsAsyncTask(getActivity(), this::scanPaths)
+                                            .execute(new ListPathsAsyncTask.LoadingInfo(finalFile, AUDIO_FILE_FILTER)))
+                            .setActionTextColor(ThemeStore.Companion.accentColor(getActivity()))
+                            .show();
+                }
+            }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file.getParentFile()), fileFilter,
+                    getFileComparator()));
+        }
+    }
+
+    @Override
+    public void onMultipleItemAction(MenuItem item, ArrayList<File> files) {
+        final int itemId = item.getItemId();
+        new ListSongsAsyncTask(getActivity(), null,
+                (songs, extra) -> SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId))
+                .execute(new ListSongsAsyncTask.LoadingInfo(files, AUDIO_FILE_FILTER, getFileComparator()));
+    }
+
+    private ArrayList<File> toList(File file) {
+        ArrayList<File> files = new ArrayList<>(1);
+        files.add(file);
+        return files;
+    }
+
+    private Comparator<File> getFileComparator() {
+        return fileComparator;
+    }
+
+    @Override
+    public void onFileMenuClicked(final File file, View view) {
+        PopupMenu popupMenu = new PopupMenu(getActivity(), view);
+        if (file.isDirectory()) {
+            popupMenu.inflate(R.menu.menu_item_directory);
+            popupMenu.setOnMenuItemClickListener(item -> {
+                final int itemId = item.getItemId();
+                switch (itemId) {
+                    case R.id.action_play_next:
+                    case R.id.action_add_to_current_playing:
+                    case R.id.action_add_to_playlist:
+                    case R.id.action_delete_from_device:
+                        new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> {
+                            if (!songs.isEmpty()) {
+                                SongsMenuHelper.INSTANCE.handleMenuClick(getActivity(), songs, itemId);
+                            }
+                        }).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
+                                getFileComparator()));
+                        return true;
+                    case R.id.action_set_as_start_directory:
+                        PreferenceUtil.getInstance(requireContext()).setStartDirectory(file);
+                        Toast.makeText(getActivity(),
+                                String.format(getString(R.string.new_start_directory), file.getPath()),
+                                Toast.LENGTH_SHORT).show();
+                        return true;
+                    case R.id.action_scan:
+                        new ListPathsAsyncTask(getActivity(), this::scanPaths)
+                                .execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
+                        return true;
+                }
+                return false;
+            });
+        } else {
+            popupMenu.inflate(R.menu.menu_item_file);
+            popupMenu.setOnMenuItemClickListener(item -> {
+                final int itemId = item.getItemId();
+                switch (itemId) {
+                    case R.id.action_play_next:
+                    case R.id.action_add_to_current_playing:
+                    case R.id.action_add_to_playlist:
+                    case R.id.action_go_to_album:
+                    case R.id.action_go_to_artist:
+                    case R.id.action_share:
+                    case R.id.action_tag_editor:
+                    case R.id.action_details:
+                    case R.id.action_set_as_ringtone:
+                    case R.id.action_delete_from_device:
+                        new ListSongsAsyncTask(getActivity(), null, (songs, extra) -> SongMenuHelper.INSTANCE.handleMenuClick(getActivity(),
+                                songs.get(0), itemId)).execute(new ListSongsAsyncTask.LoadingInfo(toList(file), AUDIO_FILE_FILTER,
+                                getFileComparator()));
+                        return true;
+                    case R.id.action_scan:
+                        new ListPathsAsyncTask(getActivity(), this::scanPaths).execute(new ListPathsAsyncTask.LoadingInfo(file, AUDIO_FILE_FILTER));
+                        return true;
+                }
+                return false;
+            });
+        }
+        popupMenu.show();
+    }
+
+    @Override
+    public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+        recyclerView.setPadding(recyclerView.getPaddingLeft(), recyclerView.getPaddingTop(),
+                recyclerView.getPaddingRight(), DensityUtil.dip2px(requireContext(), 52f) +
+                        this.appBarLayout.getTotalScrollRange() + verticalOffset);
+    }
+
+    private void checkIsEmpty() {
+        emojiText.setText(getEmojiByUnicode(0x1F631));
+        if (empty != null) {
+            empty.setVisibility(adapter == null || adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+        }
+    }
+
+    private void scanPaths(@Nullable String[] toBeScanned) {
+        if (getActivity() == null) {
+            return;
+        }
+        if (toBeScanned == null || toBeScanned.length < 1) {
+            Toast.makeText(getActivity(), R.string.nothing_to_scan, Toast.LENGTH_SHORT).show();
+        } else {
+            MediaScannerConnection.scanFile(getActivity().getApplicationContext(), toBeScanned, null,
+                    new UpdateToastMediaScannerCompletionListener(getActivity(), toBeScanned));
+        }
+    }
+
+    private void updateAdapter(@NonNull List<File> files) {
+        adapter.swapDataSet(files);
+        BreadCrumbLayout.Crumb crumb = getActiveCrumb();
+        if (crumb != null && recyclerView != null) {
+            ((LinearLayoutManager) recyclerView.getLayoutManager()).scrollToPositionWithOffset(crumb.getScrollPosition(), 0);
+        }
+    }
+
+    @NonNull
+    @Override
+    public Loader<List<File>> onCreateLoader(int id, Bundle args) {
+        return new AsyncFileLoader(this);
+    }
+
+    @Override
+    public void onLoadFinished(@NonNull Loader<List<File>> loader, List<File> data) {
+        updateAdapter(data);
+    }
+
+    @Override
+    public void onLoaderReset(@NonNull Loader<List<File>> loader) {
+        updateAdapter(new LinkedList<File>());
+    }
+
+    private static class AsyncFileLoader extends WrappedAsyncTaskLoader<List<File>> {
+
+        private WeakReference<FoldersFragment> fragmentWeakReference;
+
+        AsyncFileLoader(FoldersFragment foldersFragment) {
+            super(Objects.requireNonNull(foldersFragment.getActivity()));
+            fragmentWeakReference = new WeakReference<>(foldersFragment);
+        }
+
+        @Override
+        public List<File> loadInBackground() {
+            FoldersFragment foldersFragment = fragmentWeakReference.get();
+            File directory = null;
+            if (foldersFragment != null) {
+                BreadCrumbLayout.Crumb crumb = foldersFragment.getActiveCrumb();
+                if (crumb != null) {
+                    directory = crumb.getFile();
+                }
+            }
+            if (directory != null) {
+                List<File> files = FileUtil.listFiles(directory, AUDIO_FILE_FILTER);
+                Collections.sort(files, foldersFragment.getFileComparator());
+                return files;
+            } else {
+                return new LinkedList<>();
+            }
+        }
+    }
+
+    private static class ListSongsAsyncTask extends ListingFilesDialogAsyncTask<ListSongsAsyncTask.LoadingInfo, Void, ArrayList<Song>> {
+
+        private final Object extra;
+        private WeakReference<Context> contextWeakReference;
+        private WeakReference<OnSongsListedCallback> callbackWeakReference;
+
+        ListSongsAsyncTask(Context context, Object extra, OnSongsListedCallback callback) {
+            super(context);
+            this.extra = extra;
+            contextWeakReference = new WeakReference<>(context);
+            callbackWeakReference = new WeakReference<>(callback);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            checkCallbackReference();
+            checkContextReference();
+        }
+
+        @Override
+        protected ArrayList<Song> doInBackground(LoadingInfo... params) {
+            try {
+                LoadingInfo info = params[0];
+                List<File> files = FileUtil.listFilesDeep(info.files, info.fileFilter);
+
+                if (isCancelled() || checkContextReference() == null
+                        || checkCallbackReference() == null) {
+                    return null;
+                }
+
+                Collections.sort(files, info.fileComparator);
+
+                Context context = checkContextReference();
+                if (isCancelled() || context == null || checkCallbackReference() == null) {
+                    return null;
+                }
+
+                return FileUtil.matchFilesWithMediaStore(context, files);
+            } catch (Exception e) {
+                e.printStackTrace();
+                cancel(false);
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(ArrayList<Song> songs) {
+            super.onPostExecute(songs);
+            OnSongsListedCallback callback = checkCallbackReference();
+            if (songs != null && callback != null) {
+                callback.onSongsListed(songs, extra);
+            }
+        }
+
+        private Context checkContextReference() {
+            Context context = contextWeakReference.get();
+            if (context == null) {
+                cancel(false);
+            }
+            return context;
+        }
+
+        private OnSongsListedCallback checkCallbackReference() {
+            OnSongsListedCallback callback = callbackWeakReference.get();
+            if (callback == null) {
+                cancel(false);
+            }
+            return callback;
+        }
+
+        public interface OnSongsListedCallback {
+
+            void onSongsListed(@NonNull ArrayList<Song> songs, Object extra);
+        }
+
+        static class LoadingInfo {
+
+            final Comparator<File> fileComparator;
+            final FileFilter fileFilter;
+            final List<File> files;
+
+            LoadingInfo(@NonNull List<File> files, @NonNull FileFilter fileFilter,
+                        @NonNull Comparator<File> fileComparator) {
+                this.fileComparator = fileComparator;
+                this.fileFilter = fileFilter;
+                this.files = files;
+            }
+        }
+    }
+
+    public static class ListPathsAsyncTask extends
+            ListingFilesDialogAsyncTask<ListPathsAsyncTask.LoadingInfo, String, String[]> {
+
+        private WeakReference<OnPathsListedCallback> onPathsListedCallbackWeakReference;
+
+        public ListPathsAsyncTask(Context context, OnPathsListedCallback callback) {
+            super(context);
+            onPathsListedCallbackWeakReference = new WeakReference<>(callback);
+        }
+
+        @Override
+        protected void onPreExecute() {
+            super.onPreExecute();
+            checkCallbackReference();
+        }
+
+        @Override
+        protected String[] doInBackground(LoadingInfo... params) {
+            try {
+                if (isCancelled() || checkCallbackReference() == null) {
+                    return null;
+                }
+
+                LoadingInfo info = params[0];
+
+                final String[] paths;
+
+                if (info.file.isDirectory()) {
+                    List<File> files = FileUtil.listFilesDeep(info.file, info.fileFilter);
+
+                    if (isCancelled() || checkCallbackReference() == null) {
+                        return null;
+                    }
+
+                    paths = new String[files.size()];
+                    for (int i = 0; i < files.size(); i++) {
+                        File f = files.get(i);
+                        paths[i] = FileUtil.safeGetCanonicalPath(f);
+
+                        if (isCancelled() || checkCallbackReference() == null) {
+                            return null;
+                        }
+                    }
+                } else {
+                    paths = new String[1];
+                    paths[0] = info.file.getPath();
+                }
+
+                return paths;
+            } catch (Exception e) {
+                e.printStackTrace();
+                cancel(false);
+                return null;
+            }
+        }
+
+        @Override
+        protected void onPostExecute(String[] paths) {
+            super.onPostExecute(paths);
+            OnPathsListedCallback callback = checkCallbackReference();
+            if (callback != null && paths != null) {
+                callback.onPathsListed(paths);
+            }
+        }
+
+        private OnPathsListedCallback checkCallbackReference() {
+            OnPathsListedCallback callback = onPathsListedCallbackWeakReference.get();
+            if (callback == null) {
+                cancel(false);
+            }
+            return callback;
+        }
+
+        public interface OnPathsListedCallback {
+
+            void onPathsListed(@NonNull String[] paths);
+        }
+
+        public static class LoadingInfo {
+
+            public final File file;
+            final FileFilter fileFilter;
+
+            public LoadingInfo(File file, FileFilter fileFilter) {
+                this.file = file;
+                this.fileFilter = fileFilter;
+            }
+        }
+    }
+
+    private static abstract class ListingFilesDialogAsyncTask<Params, Progress, Result> extends
+            DialogAsyncTask<Params, Progress, Result> {
+
+        ListingFilesDialogAsyncTask(Context context) {
+            super(context);
+        }
+
+        public ListingFilesDialogAsyncTask(Context context, int showDelay) {
+            super(context, showDelay);
+        }
+
+        @Override
+        protected Dialog createDialog(@NonNull Context context) {
+            return new MaterialAlertDialogBuilder(context)
+                    .setTitle(R.string.listing_files)
+                    .setCancelable(false)
+                    .setView(R.layout.loading)
+                    .setOnCancelListener(dialog -> cancel(false))
+                    .setOnDismissListener(dialog -> cancel(false))
+                    .create();
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
new file mode 100644
index 000000000..92fe4534b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
@@ -0,0 +1,223 @@
+package code.name.monkey.retromusic.fragments.mainactivity.home
+
+import android.app.ActivityOptions
+import android.content.res.ColorStateList
+import android.os.Bundle
+import android.util.DisplayMetrics
+import android.view.*
+import androidx.appcompat.widget.Toolbar
+import androidx.recyclerview.widget.LinearLayoutManager
+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.ToolbarContentTintHelper
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.Constants
+import code.name.monkey.retromusic.Constants.USER_BANNER
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.HomeAdapter
+import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
+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.model.Home
+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.presenter.HomePresenter
+import code.name.monkey.retromusic.mvp.presenter.HomeView
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.abs_playlists.*
+import kotlinx.android.synthetic.main.fragment_banner_home.*
+import kotlinx.android.synthetic.main.home_content.*
+import java.io.File
+import java.util.*
+import javax.inject.Inject
+
+class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallbacks, HomeView {
+    @Inject
+    lateinit var homePresenter: HomePresenter
+
+    private lateinit var homeAdapter: HomeAdapter
+    private lateinit var toolbar: Toolbar
+
+    override fun sections(sections: ArrayList<Home>) {
+        println(sections.size)
+        homeAdapter.swapData(sections)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, viewGroup: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(if (PreferenceUtil.getInstance(requireContext()).isHomeBanner) R.layout.fragment_banner_home else R.layout.fragment_home, viewGroup, false)
+    }
+
+    private fun loadImageFromStorage() {
+        Glide.with(requireContext())
+                .load(File(PreferenceUtil.getInstance(requireContext()).profileImage, Constants.USER_PROFILE))
+                .asBitmap()
+                .placeholder(R.drawable.ic_person_flat)
+                .error(R.drawable.ic_person_flat)
+                .into(userImage)
+    }
+
+    private val displayMetrics: DisplayMetrics
+        get() {
+            val display = mainActivity.windowManager.defaultDisplay
+            val metrics = DisplayMetrics()
+            display.getMetrics(metrics)
+            return metrics
+        }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setStatusBarColorAuto(view)
+        toolbar = view.findViewById(R.id.toolbar)
+
+        bannerImage?.setOnClickListener {
+            val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image))
+            NavigationUtil.goToUserInfo(requireActivity(), options)
+        }
+
+        lastAdded.setOnClickListener {
+            NavigationUtil.goToPlaylistNew(requireActivity(), LastAddedPlaylist(requireActivity()))
+        }
+
+        topPlayed.setOnClickListener {
+            NavigationUtil.goToPlaylistNew(requireActivity(), MyTopTracksPlaylist(requireActivity()))
+        }
+
+        actionShuffle.setOnClickListener {
+            MusicPlayerRemote.openAndShuffleQueue(SongLoader.getAllSongs(requireActivity()), true)
+        }
+
+        history.setOnClickListener {
+            NavigationUtil.goToPlaylistNew(requireActivity(), HistoryPlaylist(requireActivity()))
+        }
+
+        setupToolbar()
+
+        userImage?.setOnClickListener {
+            val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, userImage, getString(R.string.transition_user_image))
+            NavigationUtil.goToUserInfo(requireActivity(), options)
+        }
+        titleWelcome?.text = String.format("%s", PreferenceUtil.getInstance(requireContext()).userName)
+
+        App.musicComponent.inject(this)
+        homeAdapter = HomeAdapter(mainActivity, displayMetrics)
+
+        recyclerView.apply {
+            layoutManager = LinearLayoutManager(mainActivity)
+            adapter = homeAdapter
+        }
+        homePresenter.attachView(this)
+        homePresenter.loadSections()
+    }
+
+    private fun toolbarColor(): Int {
+        return if (PreferenceUtil.getInstance(requireContext()).isHomeBanner) {
+            ColorUtil.withAlpha(RetroColorUtil.toolbarColor(mainActivity), 0.85f)
+        } else {
+            RetroColorUtil.toolbarColor(mainActivity)
+        }
+    }
+
+    private fun setupToolbar() {
+        toolbar.apply {
+            backgroundTintList = ColorStateList.valueOf(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
+            setNavigationIcon(R.drawable.ic_menu_white_24dp)
+            setOnClickListener {
+                val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar))
+                NavigationUtil.goToSearch(requireActivity(), options)
+            }
+
+        }
+        mainActivity.setSupportActionBar(toolbar)
+        toolbar.setNavigationOnClickListener { showMainMenu(OptionsSheetDialogFragment.LIBRARY) }
+    }
+
+    override fun handleBackPress(): Boolean {
+        return false
+    }
+
+    override fun onResume() {
+        super.onResume()
+        getTimeOfTheDay()
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        homePresenter.detachView()
+    }
+
+    override fun showEmptyView() {
+        emptyContainer.show()
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.menu_search, menu)
+
+        ToolbarContentTintHelper.handleOnCreateOptionsMenu(requireActivity(), toolbar, menu, ATHToolbarActivity.getToolbarBackgroundColor(toolbar))
+    }
+
+    override fun onPrepareOptionsMenu(menu: Menu) {
+        super.onPrepareOptionsMenu(menu)
+        ToolbarContentTintHelper.handleOnPrepareOptionsMenu(requireActivity(), toolbar)
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        if (item.itemId == R.id.action_search) {
+            val options = ActivityOptions.makeSceneTransitionAnimation(mainActivity, toolbarContainer, getString(R.string.transition_toolbar))
+            NavigationUtil.goToSearch(requireActivity(), true, options)
+        }
+        return super.onOptionsItemSelected(item)
+    }
+
+    private fun getTimeOfTheDay() {
+        val c = Calendar.getInstance()
+        val timeOfDay = c.get(Calendar.HOUR_OF_DAY)
+        var images = arrayOf<String>()
+        when (timeOfDay) {
+            in 0..5 -> images = resources.getStringArray(R.array.night)
+            in 6..11 -> images = resources.getStringArray(R.array.morning)
+            in 12..15 -> images = resources.getStringArray(R.array.after_noon)
+            in 16..19 -> images = resources.getStringArray(R.array.evening)
+            in 20..23 -> images = resources.getStringArray(R.array.night)
+        }
+        val day = images[Random().nextInt(images.size)]
+        loadTimeImage(day)
+    }
+
+
+    private fun loadTimeImage(day: String) {
+        bannerImage?.let {
+            val request = Glide.with(requireContext())
+            if (PreferenceUtil.getInstance(requireContext()).bannerImage.isEmpty()) {
+                request.load(day)
+                        .placeholder(R.drawable.material_design_default)
+                        .error(R.drawable.material_design_default)
+                        .into(it)
+            } else {
+                request.load(File(PreferenceUtil.getInstance(requireContext()).bannerImage, USER_BANNER))
+                        .asBitmap()
+                        .placeholder(R.drawable.material_design_default)
+                        .error(R.drawable.material_design_default)
+                        .into(it)
+            }
+        }
+        loadImageFromStorage()
+    }
+
+    companion object {
+
+        const val TAG: String = "BannerHomeFragment"
+
+        fun newInstance(): BannerHomeFragment {
+            return BannerHomeFragment()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
deleted file mode 100644
index 53ce8f862..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/DetailListFragment.kt
+++ /dev/null
@@ -1,281 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.other
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.os.bundleOf
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.isVisible
-import androidx.navigation.fragment.FragmentNavigatorExtras
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.GridLayoutManager
-import androidx.recyclerview.widget.LinearLayoutManager
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.album.AlbumAdapter
-import code.name.monkey.retromusic.adapter.artist.ArtistAdapter
-import code.name.monkey.retromusic.adapter.song.ShuffleButtonSongAdapter
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailBinding
-import code.name.monkey.retromusic.db.toSong
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.interfaces.IAlbumClickListener
-import code.name.monkey.retromusic.interfaces.IArtistClickListener
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.util.RetroUtil
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.snackbar.Snackbar
-import com.google.android.material.transition.MaterialSharedAxis
-
-
-class DetailListFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail),
-    IArtistClickListener, IAlbumClickListener {
-    private val args by navArgs<DetailListFragmentArgs>()
-    private var _binding: FragmentPlaylistDetailBinding? = null
-    private val binding get() = _binding!!
-    private var showClearHistoryOption = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        when (args.type) {
-            TOP_ARTISTS,
-            RECENT_ARTISTS,
-            TOP_ALBUMS,
-            RECENT_ALBUMS,
-            FAVOURITES,
-            -> {
-                enterTransition = MaterialSharedAxis(MaterialSharedAxis.X, true)
-                returnTransition = MaterialSharedAxis(MaterialSharedAxis.X, false)
-            }
-            else -> {
-                enterTransition = MaterialSharedAxis(MaterialSharedAxis.Y, true)
-                returnTransition = MaterialSharedAxis(MaterialSharedAxis.Y, false)
-            }
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlaylistDetailBinding.bind(view)
-        postponeEnterTransition()
-        view.doOnPreDraw { startPostponedEnterTransition() }
-        mainActivity.setSupportActionBar(binding.toolbar)
-        binding.progressIndicator.hide()
-        when (args.type) {
-            TOP_ARTISTS -> loadArtists(R.string.top_artists, TOP_ARTISTS)
-            RECENT_ARTISTS -> loadArtists(R.string.recent_artists, RECENT_ARTISTS)
-            TOP_ALBUMS -> loadAlbums(R.string.top_albums, TOP_ALBUMS)
-            RECENT_ALBUMS -> loadAlbums(R.string.recent_albums, RECENT_ALBUMS)
-            FAVOURITES -> loadFavorite()
-            HISTORY_PLAYLIST -> {
-                loadHistory()
-                showClearHistoryOption = true // Reference to onCreateOptionsMenu
-            }
-            LAST_ADDED_PLAYLIST -> lastAddedSongs()
-            TOP_PLAYED_PLAYLIST -> topPlayed()
-        }
-
-        binding.appBarLayout.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun lastAddedSongs() {
-        binding.toolbar.setTitle(R.string.last_added)
-        val songAdapter = ShuffleButtonSongAdapter(
-            requireActivity(),
-            mutableListOf(),
-            R.layout.item_list
-        )
-        binding.recyclerView.apply {
-            adapter = songAdapter
-            layoutManager = linearLayoutManager()
-            scheduleLayoutAnimation()
-        }
-        libraryViewModel.recentSongs().observe(viewLifecycleOwner) { songs ->
-            songAdapter.swapDataSet(songs)
-        }
-    }
-
-    private fun topPlayed() {
-        binding.toolbar.setTitle(R.string.my_top_tracks)
-        val songAdapter = ShuffleButtonSongAdapter(
-            requireActivity(),
-            mutableListOf(),
-            R.layout.item_list
-        )
-        binding.recyclerView.apply {
-            adapter = songAdapter
-            layoutManager = linearLayoutManager()
-        }
-        libraryViewModel.playCountSongs().observe(viewLifecycleOwner) { songs ->
-            songAdapter.swapDataSet(songs)
-        }
-    }
-
-    private fun loadHistory() {
-        binding.toolbar.setTitle(R.string.history)
-
-        val songAdapter = ShuffleButtonSongAdapter(
-            requireActivity(),
-            mutableListOf(),
-            R.layout.item_list
-        )
-        binding.recyclerView.apply {
-            adapter = songAdapter
-            layoutManager = linearLayoutManager()
-        }
-
-        libraryViewModel.observableHistorySongs().observe(viewLifecycleOwner) {
-            songAdapter.swapDataSet(it)
-            binding.empty.isVisible = it.isEmpty()
-        }
-
-    }
-
-    private fun loadFavorite() {
-        binding.toolbar.setTitle(R.string.favorites)
-        val songAdapter = SongAdapter(
-            requireActivity(),
-            mutableListOf(),
-            R.layout.item_list
-        )
-        binding.recyclerView.apply {
-            adapter = songAdapter
-            layoutManager = linearLayoutManager()
-        }
-        libraryViewModel.favorites().observe(viewLifecycleOwner) { songEntities ->
-            val songs = songEntities.map { songEntity -> songEntity.toSong() }
-            songAdapter.swapDataSet(songs)
-        }
-    }
-
-
-    private fun loadArtists(title: Int, type: Int) {
-        binding.toolbar.setTitle(title)
-        val artistAdapter = artistAdapter(listOf())
-        binding.recyclerView.apply {
-            adapter = artistAdapter
-            layoutManager = gridLayoutManager()
-        }
-        libraryViewModel.artists(type).observe(viewLifecycleOwner) { artists ->
-            artistAdapter.swapDataSet(artists)
-        }
-    }
-
-    private fun loadAlbums(title: Int, type: Int) {
-        binding.toolbar.setTitle(title)
-        val albumAdapter = albumAdapter(listOf())
-        binding.recyclerView.apply {
-            adapter = albumAdapter
-            layoutManager = gridLayoutManager()
-        }
-        libraryViewModel.albums(type).observe(viewLifecycleOwner) { albums ->
-            albumAdapter.swapDataSet(albums)
-        }
-    }
-
-    private fun artistAdapter(artists: List<Artist>): ArtistAdapter = ArtistAdapter(
-        requireActivity(),
-        artists,
-        R.layout.item_grid_circle,
-        this
-    )
-
-    private fun albumAdapter(albums: List<Album>): AlbumAdapter = AlbumAdapter(
-        requireActivity(),
-        albums,
-        R.layout.item_grid,
-        this
-    )
-
-    private fun linearLayoutManager(): LinearLayoutManager =
-        LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
-
-    private fun gridLayoutManager(): GridLayoutManager =
-        GridLayoutManager(requireContext(), gridCount(), GridLayoutManager.VERTICAL, false)
-
-    private fun gridCount(): Int {
-        if (RetroUtil.isTablet) {
-            return if (RetroUtil.isLandscape) 6 else 4
-        }
-        return if (RetroUtil.isLandscape) 4 else 2
-    }
-
-
-    override fun onArtist(artistId: Long, view: View) {
-        findNavController().navigate(
-            R.id.artistDetailsFragment,
-            bundleOf(EXTRA_ARTIST_ID to artistId),
-            null,
-            FragmentNavigatorExtras(view to artistId.toString())
-        )
-    }
-
-    override fun onAlbumClick(albumId: Long, view: View) {
-        findNavController().navigate(
-            R.id.albumDetailsFragment,
-            bundleOf(EXTRA_ALBUM_ID to albumId),
-            null,
-            FragmentNavigatorExtras(
-                view to albumId.toString()
-            )
-        )
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_clear_history, menu)
-        if (showClearHistoryOption) {
-            menu.findItem(R.id.action_clear_history).isVisible = true // Show Clear History option
-        }
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_clear_history -> {
-                if (binding.recyclerView.adapter?.itemCount!! > 0) {
-                    libraryViewModel.clearHistory()
-
-                    val snackBar =
-                        Snackbar.make(
-                            binding.container,
-                            getString(R.string.history_cleared),
-                            Snackbar.LENGTH_LONG
-                        )
-                            .setAction(getString(R.string.history_undo_button)) {
-                                libraryViewModel.restoreHistory()
-                            }
-                            .setActionTextColor(Color.YELLOW)
-                    val snackBarView = snackBar.view
-                    snackBarView.translationY =
-                        -(resources.getDimension(R.dimen.mini_player_height))
-                    snackBar.show()
-                }
-            }
-        }
-        return false
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt
deleted file mode 100644
index 0ae18f6dd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/MiniPlayerFragment.kt
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.other
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.os.Bundle
-import android.text.SpannableStringBuilder
-import android.text.style.ForegroundColorSpan
-import android.view.GestureDetector
-import android.view.MotionEvent
-import android.view.View
-import androidx.core.text.toSpannable
-import androidx.core.view.isVisible
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMiniPlayerBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.extensions.textColorPrimary
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import com.bumptech.glide.Glide
-import kotlin.math.abs
-
-open class MiniPlayerFragment : AbsMusicServiceFragment(R.layout.fragment_mini_player),
-    MusicProgressViewUpdateHelper.Callback, View.OnClickListener {
-
-    private var _binding: FragmentMiniPlayerBinding? = null
-    private val binding get() = _binding!!
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-    }
-
-    override fun onClick(view: View) {
-        when (view.id) {
-            R.id.actionNext -> MusicPlayerRemote.playNextSong()
-            R.id.actionPrevious -> MusicPlayerRemote.back()
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMiniPlayerBinding.bind(view)
-        view.setOnTouchListener(FlingPlayBackController(requireContext()))
-        setUpMiniPlayer()
-        setUpButtons()
-    }
-
-    fun setUpButtons() {
-        if (RetroUtil.isTablet) {
-            binding.actionNext.show()
-            binding.actionPrevious.show()
-        } else {
-            binding.actionNext.isVisible = PreferenceUtil.isExtraControls
-            binding.actionPrevious.isVisible = PreferenceUtil.isExtraControls
-        }
-        binding.actionNext.setOnClickListener(this)
-        binding.actionPrevious.setOnClickListener(this)
-    }
-
-    private fun setUpMiniPlayer() {
-        setUpPlayPauseButton()
-        binding.progressBar.accentColor()
-    }
-
-    private fun setUpPlayPauseButton() {
-        binding.miniPlayerPlayPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-    }
-
-    private fun updateSongTitle() {
-
-        val song = MusicPlayerRemote.currentSong
-
-        val builder = SpannableStringBuilder()
-
-        val title = song.title.toSpannable()
-        title.setSpan(ForegroundColorSpan(textColorPrimary()), 0, title.length, 0)
-
-        val text = song.artistName.toSpannable()
-        text.setSpan(ForegroundColorSpan(textColorSecondary()), 0, text.length, 0)
-
-        builder.append(title).append(" • ").append(text)
-
-        binding.miniPlayerTitle.isSelected = true
-        binding.miniPlayerTitle.text = builder
-
-//        binding.title.isSelected = true
-//        binding.title.text = song.title
-//        binding.text.isSelected = true
-//        binding.text.text = song.artistName
-    }
-
-    private fun updateSongCover() {
-        val song = MusicPlayerRemote.currentSong
-        Glide.with(requireContext())
-            .load(RetroGlideExtension.getSongModel(song))
-            .transition(RetroGlideExtension.getDefaultTransition())
-            .songCoverOptions(song)
-            .into(binding.image)
-    }
-
-    override fun onServiceConnected() {
-        updateSongTitle()
-        updateSongCover()
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onPlayingMetaChanged() {
-        updateSongTitle()
-        updateSongCover()
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.progressBar.max = total
-        binding.progressBar.progress = progress
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        progressViewUpdateHelper.stop()
-    }
-
-    protected fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_pause)
-        } else {
-            binding.miniPlayerPlayPauseButton.setImageResource(R.drawable.ic_play_arrow)
-        }
-    }
-
-    class FlingPlayBackController(context: Context) : View.OnTouchListener {
-
-        private var flingPlayBackController = GestureDetector(context,
-            object : GestureDetector.SimpleOnGestureListener() {
-                override fun onFling(
-                    e1: MotionEvent,
-                    e2: MotionEvent,
-                    velocityX: Float,
-                    velocityY: Float
-                ): Boolean {
-                    if (abs(velocityX) > abs(velocityY)) {
-                        if (velocityX < 0) {
-                            MusicPlayerRemote.playNextSong()
-                            return true
-                        } else if (velocityX > 0) {
-                            MusicPlayerRemote.playPreviousSong()
-                            return true
-                        }
-                    }
-                    return false
-                }
-            })
-
-        @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
-            return flingPlayBackController.onTouchEvent(event)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
deleted file mode 100644
index 16a013a0a..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/UserInfoFragment.kt
+++ /dev/null
@@ -1,303 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.other
-
-import android.app.Activity
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.net.Uri
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.activity.result.ActivityResult
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.updateLayoutParams
-import androidx.fragment.app.Fragment
-import androidx.lifecycle.lifecycleScope
-import androidx.navigation.fragment.findNavController
-import code.name.monkey.retromusic.Constants.USER_BANNER
-import code.name.monkey.retromusic.Constants.USER_PROFILE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentUserInfoBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.applyToolbar
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.profileBannerOptions
-import code.name.monkey.retromusic.glide.RetroGlideExtension.userProfileOptions
-import code.name.monkey.retromusic.util.ImageUtil
-import code.name.monkey.retromusic.util.PreferenceUtil.userName
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-import com.github.dhaval2404.imagepicker.ImagePicker
-import com.github.dhaval2404.imagepicker.constant.ImageProvider
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.transition.MaterialContainerTransform
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-import java.io.File
-
-class UserInfoFragment : Fragment() {
-
-    private var _binding: FragmentUserInfoBinding? = null
-    private val binding get() = _binding!!
-    private val libraryViewModel: LibraryViewModel by activityViewModel()
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        sharedElementEnterTransition = MaterialContainerTransform().apply {
-            drawingViewId = R.id.fragment_container
-            duration = 300L
-            scrimColor = Color.TRANSPARENT
-        }
-        _binding = FragmentUserInfoBinding.inflate(layoutInflater)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        applyToolbar(binding.toolbar)
-
-        binding.nameContainer.accentColor()
-        binding.next.accentColor()
-        binding.name.setText(userName)
-
-        binding.userImage.setOnClickListener {
-            showUserImageOptions()
-        }
-
-        binding.bannerImage.setOnClickListener {
-            showBannerImageOptions()
-        }
-
-        binding.next.setOnClickListener {
-            val nameString = binding.name.text.toString().trim { it <= ' ' }
-            if (nameString.isEmpty()) {
-                showToast(R.string.error_empty_name)
-                return@setOnClickListener
-            }
-            userName = nameString
-            findNavController().navigateUp()
-        }
-
-        loadProfile()
-        postponeEnterTransition()
-        view.doOnPreDraw {
-            startPostponedEnterTransition()
-        }
-        libraryViewModel.getFabMargin().observe(viewLifecycleOwner) {
-            binding.next.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = it
-            }
-        }
-    }
-
-    private fun showBannerImageOptions() {
-        val list = requireContext().resources.getStringArray(R.array.image_settings_options)
-        MaterialAlertDialogBuilder(requireContext()).setTitle("Banner Image")
-            .setItems(list) { _, which ->
-                when (which) {
-                    0 -> selectBannerImage()
-                    1 -> {
-                        val appDir = requireContext().filesDir
-                        val file = File(appDir, USER_BANNER)
-                        file.delete()
-                        loadProfile()
-                    }
-                }
-            }
-            .setNegativeButton(R.string.action_cancel, null)
-            .create()
-            .show()
-    }
-
-    private fun showUserImageOptions() {
-        val list = requireContext().resources.getStringArray(R.array.image_settings_options)
-        MaterialAlertDialogBuilder(requireContext()).setTitle("Profile Image")
-            .setItems(list) { _, which ->
-                when (which) {
-                    0 -> pickNewPhoto()
-                    1 -> {
-                        val appDir = requireContext().filesDir
-                        val file = File(appDir, USER_PROFILE)
-                        file.delete()
-                        loadProfile()
-                    }
-                }
-            }
-            .setNegativeButton(R.string.action_cancel, null)
-            .create()
-            .show()
-    }
-
-    private fun loadProfile() {
-        binding.bannerImage.let {
-            Glide.with(this)
-                .load(RetroGlideExtension.getBannerModel())
-                .profileBannerOptions(RetroGlideExtension.getBannerModel())
-                .into(it)
-        }
-        Glide.with(this)
-            .load(RetroGlideExtension.getUserModel())
-            .userProfileOptions(RetroGlideExtension.getUserModel(), requireContext())
-            .into(binding.userImage)
-    }
-
-    private fun selectBannerImage() {
-        ImagePicker.with(this)
-            .compress(1440)
-            .provider(ImageProvider.GALLERY)
-            .crop(16f, 9f)
-            .createIntent {
-                startForBannerImageResult.launch(it)
-            }
-    }
-
-    private fun pickNewPhoto() {
-        ImagePicker.with(this)
-            .provider(ImageProvider.GALLERY)
-            .cropSquare()
-            .compress(1440)
-            .createIntent {
-                startForProfileImageResult.launch(it)
-            }
-    }
-
-    private val startForProfileImageResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            saveImage(result) { fileUri ->
-                setAndSaveUserImage(fileUri)
-            }
-        }
-
-    private val startForBannerImageResult =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result: ActivityResult ->
-            saveImage(result) { fileUri ->
-                setAndSaveBannerImage(fileUri)
-            }
-        }
-
-    private fun saveImage(result: ActivityResult, doIfResultOk: (uri: Uri) -> Unit) {
-        val resultCode = result.resultCode
-        val data = result.data
-        when (resultCode) {
-            Activity.RESULT_OK -> {
-                data?.data?.let { uri ->
-                    doIfResultOk(uri)
-                }
-            }
-
-            ImagePicker.RESULT_ERROR -> {
-                showToast(ImagePicker.getError(data))
-            }
-
-            else -> {
-                showToast("Task Cancelled")
-            }
-        }
-    }
-
-    private fun setAndSaveBannerImage(fileUri: Uri) {
-        Glide.with(this)
-            .asBitmap()
-            .load(fileUri)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .listener(object : RequestListener<Bitmap> {
-                override fun onResourceReady(
-                    resource: Bitmap?,
-                    model: Any?,
-                    target: Target<Bitmap>?,
-                    dataSource: DataSource?,
-                    isFirstResource: Boolean,
-                ): Boolean {
-                    resource?.let { saveImage(it, USER_BANNER) }
-                    return false
-                }
-
-                override fun onLoadFailed(
-                    e: GlideException?,
-                    model: Any?,
-                    target: Target<Bitmap>?,
-                    isFirstResource: Boolean,
-                ): Boolean {
-                    return false
-                }
-            })
-            .into(binding.bannerImage)
-    }
-
-    private fun saveImage(bitmap: Bitmap, fileName: String) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val appDir = requireContext().filesDir
-            val file = File(appDir, fileName)
-            var successful: Boolean
-            file.outputStream().buffered().use {
-                successful = ImageUtil.resizeBitmap(bitmap, 2048)
-                    .compress(Bitmap.CompressFormat.WEBP, 100, it)
-            }
-            if (successful) {
-                withContext(Dispatchers.Main) {
-                    showToast(R.string.message_updated)
-                }
-            }
-        }
-    }
-
-    private fun setAndSaveUserImage(fileUri: Uri) {
-        Glide.with(this)
-            .asBitmap()
-            .load(fileUri)
-            .diskCacheStrategy(DiskCacheStrategy.NONE)
-            .listener(object : RequestListener<Bitmap> {
-                override fun onResourceReady(
-                    resource: Bitmap?,
-                    model: Any?,
-                    target: Target<Bitmap>?,
-                    dataSource: DataSource?,
-                    isFirstResource: Boolean,
-                ): Boolean {
-                    resource?.let { saveImage(it, USER_PROFILE) }
-                    return false
-                }
-
-                override fun onLoadFailed(
-                    e: GlideException?,
-                    model: Any?,
-                    target: Target<Bitmap>?,
-                    isFirstResource: Boolean,
-                ): Boolean {
-                    return false
-                }
-            })
-            .into(binding.userImage)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt
deleted file mode 100644
index a8b10d297..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/other/VolumeFragment.kt
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.other
-
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.media.AudioManager
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.core.content.getSystemService
-import androidx.fragment.app.Fragment
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentVolumeBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.google.android.material.slider.Slider
-
-class VolumeFragment : Fragment(), Slider.OnChangeListener, OnAudioVolumeChangedListener,
-    View.OnClickListener {
-
-    private var _binding: FragmentVolumeBinding? = null
-    private val binding get() = _binding!!
-
-    private var audioVolumeObserver: AudioVolumeObserver? = null
-
-    private val audioManager: AudioManager
-        get() = requireContext().getSystemService()!!
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?,
-    ): View {
-        _binding = FragmentVolumeBinding.inflate(inflater, container, false)
-        return binding.root
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        setTintable(ThemeStore.accentColor(requireContext()))
-        binding.volumeDown.setOnClickListener(this)
-        binding.volumeUp.setOnClickListener(this)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        if (audioVolumeObserver == null) {
-            audioVolumeObserver = AudioVolumeObserver(requireActivity())
-        }
-        audioVolumeObserver?.register(AudioManager.STREAM_MUSIC, this)
-
-        val audioManager = audioManager
-        binding.volumeSeekBar.valueTo =
-            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.value =
-            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.addOnChangeListener(this)
-    }
-
-    override fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int) {
-        if (_binding != null) {
-            binding.volumeSeekBar.valueTo = maxVolume.toFloat()
-            binding.volumeSeekBar.value = currentVolume.toFloat()
-            binding.volumeDown.setImageResource(if (currentVolume == 0) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        audioVolumeObserver?.unregister()
-        _binding = null
-    }
-
-    override fun onValueChange(slider: Slider, value: Float, fromUser: Boolean) {
-        val audioManager = audioManager
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, value.toInt(), 0)
-        setPauseWhenZeroVolume(value < 1f)
-        binding.volumeDown.setImageResource(if (value == 0f) R.drawable.ic_volume_off else R.drawable.ic_volume_down)
-    }
-
-    override fun onClick(view: View) {
-        val audioManager = audioManager
-        when (view.id) {
-            R.id.volumeDown -> audioManager.adjustStreamVolume(
-                AudioManager.STREAM_MUSIC, AudioManager.ADJUST_LOWER, 0
-            )
-            R.id.volumeUp -> audioManager.adjustStreamVolume(
-                AudioManager.STREAM_MUSIC, AudioManager.ADJUST_RAISE, 0
-            )
-        }
-    }
-
-    fun tintWhiteColor() {
-        val color = Color.WHITE
-        binding.volumeDown.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-        binding.volumeUp.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-        binding.volumeSeekBar.applyColor(color)
-    }
-
-    fun setTintable(color: Int) {
-        binding.volumeSeekBar.applyColor(color)
-    }
-
-    private fun setPauseWhenZeroVolume(pauseWhenZeroVolume: Boolean) {
-        if (PreferenceUtil.isPauseOnZeroVolume)
-            if (MusicPlayerRemote.isPlaying && pauseWhenZeroVolume)
-                MusicPlayerRemote.pauseSong()
-    }
-
-    fun setTintableColor(color: Int) {
-        binding.volumeDown.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-        binding.volumeUp.setColorFilter(color, PorterDuff.Mode.SRC_IN)
-        // TintHelper.setTint(volumeSeekBar, color, false)
-        binding.volumeSeekBar.applyColor(color)
-    }
-
-    companion object {
-        fun newInstance(): VolumeFragment {
-            return VolumeFragment()
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt
deleted file mode 100644
index ee32e72d3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/CoverLyricsFragment.kt
+++ /dev/null
@@ -1,192 +0,0 @@
-package code.name.monkey.retromusic.fragments.player
-
-import android.content.SharedPreferences
-import android.os.Bundle
-import android.view.View
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SHOW_LYRICS
-import code.name.monkey.retromusic.databinding.FragmentCoverLyricsBinding
-import code.name.monkey.retromusic.extensions.dipToPix
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToLyrics
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import code.name.monkey.retromusic.model.lyrics.Lyrics
-import code.name.monkey.retromusic.util.LyricUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import org.jaudiotagger.audio.exceptions.CannotReadException
-import java.io.File
-import java.io.FileNotFoundException
-
-class CoverLyricsFragment : AbsMusicServiceFragment(R.layout.fragment_cover_lyrics),
-    MusicProgressViewUpdateHelper.Callback, SharedPreferences.OnSharedPreferenceChangeListener {
-    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
-    private var _binding: FragmentCoverLyricsBinding? = null
-    private val binding get() = _binding!!
-
-    private val lyricsLayout: FrameLayout get() = binding.playerLyrics
-    private val lyricsLine1: TextView get() = binding.playerLyricsLine1
-    private val lyricsLine2: TextView get() = binding.playerLyricsLine2
-
-    private var lyrics: Lyrics? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCoverLyricsBinding.bind(view)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
-        if (PreferenceUtil.showLyrics) {
-            progressViewUpdateHelper?.start()
-        }
-        // Remove background on Fit theme
-        val nps = PreferenceUtil.nowPlayingScreen
-        if (nps == NowPlayingScreen.Fit || nps == NowPlayingScreen.Full) {
-            binding.root.background = null
-        }
-        binding.playerLyricsLine2.setOnClickListener {
-            goToLyrics(requireActivity())
-        }
-    }
-
-    fun setColors(color: MediaNotificationProcessor) {
-        binding.run {
-            playerLyrics.background = null
-            playerLyricsLine1.setTextColor(color.primaryTextColor)
-            playerLyricsLine1.setShadowLayer(dipToPix(10f), 0f, 0f, color.backgroundColor)
-            playerLyricsLine2.setTextColor(color.primaryTextColor)
-            playerLyricsLine2.setShadowLayer(dipToPix(10f), 0f, 0f, color.backgroundColor)
-        }
-
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == SHOW_LYRICS) {
-            if (sharedPreferences?.getBoolean(key, false) == true) {
-                progressViewUpdateHelper?.start()
-                binding.root.isVisible = true
-                updateLyrics()
-            } else {
-                progressViewUpdateHelper?.stop()
-                binding.root.isVisible = false
-            }
-        }
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        if (PreferenceUtil.showLyrics) {
-            updateLyrics()
-        }
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        if (PreferenceUtil.showLyrics) {
-            updateLyrics()
-        }
-    }
-
-    private fun updateLyrics() {
-        lyrics = null
-        lifecycleScope.launch(Dispatchers.IO) {
-            val song = MusicPlayerRemote.currentSong
-            lyrics = try {
-                val lrcFile: File? = LyricUtil.getSyncedLyricsFile(song)
-                val data: String = LyricUtil.getStringFromLrc(lrcFile)
-                Lyrics.parse(song,
-                    data.ifEmpty {
-                        // Get Embedded Lyrics
-                        LyricUtil.getEmbeddedSyncedLyrics(song.data)
-                    }
-                )
-            } catch (err: FileNotFoundException) {
-                null
-            } catch (e: CannotReadException) {
-                null
-            }
-        }
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        if (_binding == null) return
-
-        if (!isLyricsLayoutVisible()) {
-            hideLyricsLayout()
-            return
-        }
-
-        if (lyrics !is AbsSynchronizedLyrics) return
-        val synchronizedLyrics = lyrics as AbsSynchronizedLyrics
-
-        lyricsLayout.isVisible = true
-        lyricsLayout.alpha = 1f
-
-        val oldLine = lyricsLine2.text.toString()
-        val line = synchronizedLyrics.getLine(progress)
-
-        if (oldLine != line || oldLine.isEmpty()) {
-            lyricsLine1.text = oldLine
-            lyricsLine2.text = line
-
-            lyricsLine1.isVisible = true
-            lyricsLine2.isVisible = true
-
-            lyricsLine2.measure(
-                View.MeasureSpec.makeMeasureSpec(
-                    lyricsLine2.measuredWidth,
-                    View.MeasureSpec.EXACTLY
-                ),
-                View.MeasureSpec.UNSPECIFIED
-            )
-            val h: Float = lyricsLine2.measuredHeight.toFloat()
-
-            lyricsLine1.alpha = 1f
-            lyricsLine1.translationY = 0f
-            lyricsLine1.animate().alpha(0f).translationY(-h).duration =
-                AbsPlayerFragment.VISIBILITY_ANIM_DURATION
-
-            lyricsLine2.alpha = 0f
-            lyricsLine2.translationY = h
-            lyricsLine2.animate().alpha(1f).translationY(0f).duration =
-                AbsPlayerFragment.VISIBILITY_ANIM_DURATION
-        }
-    }
-
-    private fun isLyricsLayoutVisible(): Boolean {
-        return lyrics != null && lyrics!!.isSynchronized && lyrics!!.isValid
-    }
-
-    private fun hideLyricsLayout() {
-        lyricsLayout.animate().alpha(0f).setDuration(AbsPlayerFragment.VISIBILITY_ANIM_DURATION)
-            .withEndAction {
-                if (_binding == null) return@withEndAction
-                lyricsLayout.isVisible = false
-                lyricsLine1.text = null
-                lyricsLine2.text = null
-            }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .registerOnSharedPreferenceChangeListener(this)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .unregisterOnSharedPreferenceChangeListener(this)
-        progressViewUpdateHelper?.stop()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
index ca8bc97be..e1fada2e0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/PlayerAlbumCoverFragment.kt
@@ -1,269 +1,103 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player
 
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.content.SharedPreferences
-import android.graphics.Color
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import androidx.annotation.ColorInt
-import androidx.core.animation.doOnEnd
-import androidx.core.view.isVisible
-import androidx.lifecycle.lifecycleScope
-import androidx.preference.PreferenceManager
+import android.view.ViewGroup
 import androidx.viewpager.widget.ViewPager
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.retromusic.LYRICS_TYPE
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SHOW_LYRICS
-import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter
-import code.name.monkey.retromusic.adapter.album.AlbumCoverPagerAdapter.AlbumCoverFragment
-import code.name.monkey.retromusic.databinding.FragmentPlayerAlbumCoverBinding
-import code.name.monkey.retromusic.extensions.isColorLight
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
+import code.name.monkey.retromusic.album.album.AlbumCoverPagerAdapter
+import code.name.monkey.retromusic.album.album.AlbumCoverPagerAdapter.AlbumCoverFragment
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
 import code.name.monkey.retromusic.fragments.base.AbsMusicServiceFragment
-import code.name.monkey.retromusic.fragments.base.goToLyrics
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.lyrics.CoverLrcView
-import code.name.monkey.retromusic.model.lyrics.Lyrics
 import code.name.monkey.retromusic.transform.CarousalPagerTransformer
 import code.name.monkey.retromusic.transform.ParallaxPagerTransformer
-import code.name.monkey.retromusic.util.CoverLyricsType
-import code.name.monkey.retromusic.util.LyricUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
+import kotlinx.android.synthetic.main.fragment_player_album_cover.*
+
+
+class PlayerAlbumCoverFragment : AbsMusicServiceFragment(), ViewPager.OnPageChangeListener {
 
-class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_player_album_cover),
-    ViewPager.OnPageChangeListener, MusicProgressViewUpdateHelper.Callback,
-    SharedPreferences.OnSharedPreferenceChangeListener {
 
-    private var _binding: FragmentPlayerAlbumCoverBinding? = null
-    private val binding get() = _binding!!
     private var callbacks: Callbacks? = null
     private var currentPosition: Int = 0
-    val viewPager get() = binding.viewPager
-
     private val colorReceiver = object : AlbumCoverFragment.ColorReceiver {
-        override fun onColorReady(color: MediaNotificationProcessor, request: Int) {
+        override fun onColorReady(color: Int, request: Int) {
             if (currentPosition == request) {
                 notifyColorChange(color)
             }
         }
     }
-    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
-
-    private val lrcView: CoverLrcView get() = binding.lyricsView
-
-    var lyrics: Lyrics? = null
 
     fun removeSlideEffect() {
         val transformer = ParallaxPagerTransformer(R.id.player_image)
         transformer.setSpeed(0.3f)
-        lifecycleScope.launchWhenStarted {
-            viewPager.setPageTransformer(false, transformer)
-        }
-    }
-
-    private fun updateLyrics() {
-        val song = MusicPlayerRemote.currentSong
-        lifecycleScope.launch(Dispatchers.IO) {
-            val lrcFile = LyricUtil.getSyncedLyricsFile(song)
-            if (lrcFile != null) {
-                binding.lyricsView.loadLrc(lrcFile)
-            } else {
-                val embeddedLyrics = LyricUtil.getEmbeddedSyncedLyrics(song.data)
-                if (embeddedLyrics != null) {
-                    binding.lyricsView.loadLrc(embeddedLyrics)
-                } else {
-                    withContext(Dispatchers.Main) {
-                        binding.lyricsView.reset()
-                        binding.lyricsView.setLabel(context?.getString(R.string.no_lyrics_found))
-                    }
-                }
-            }
-        }
+        viewPager.setPageTransformer(true, transformer)
 
     }
 
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.lyricsView.updateTime(progress.toLong())
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_player_album_cover, container, false)
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlayerAlbumCoverBinding.bind(view)
-        setupViewPager()
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
-        maybeInitLyrics()
-        lrcView.apply {
-            setDraggable(true) { time ->
-                MusicPlayerRemote.seekTo(time.toInt())
-                MusicPlayerRemote.resumePlaying()
-                true
-            }
-            setOnClickListener {
-                goToLyrics(requireActivity())
-            }
-        }
-    }
 
-    private fun setupViewPager() {
-        binding.viewPager.addOnPageChangeListener(this)
-        val nps = PreferenceUtil.nowPlayingScreen
 
-        if (nps == Full || nps == Classic || nps == Fit || nps == Gradient) {
-            binding.viewPager.offscreenPageLimit = 2
-        } else if (PreferenceUtil.isCarouselEffect) {
-            val metrics = resources.displayMetrics
-            val ratio = metrics.heightPixels.toFloat() / metrics.widthPixels.toFloat()
-            binding.viewPager.clipToPadding = false
-            val padding =
-                if (ratio >= 1.777f) {
-                    40
-                } else {
-                    100
-                }
-            binding.viewPager.setPadding(padding, 0, padding, 0)
-            binding.viewPager.pageMargin = 0
-            binding.viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
+        viewPager.addOnPageChangeListener(this)
+        //noinspection ConstantConditions
+        if (PreferenceUtil.getInstance(requireContext()).carouselEffect() &&
+                !((PreferenceUtil.getInstance(requireContext()).nowPlayingScreen == NowPlayingScreen.FULL) ||
+                        (PreferenceUtil.getInstance(requireContext()).nowPlayingScreen == NowPlayingScreen.ADAPTIVE)
+                        || (PreferenceUtil.getInstance(requireContext()).nowPlayingScreen == NowPlayingScreen.FIT))) {
+            viewPager.clipToPadding = false
+            viewPager.setPadding(40, 40, 40, 0)
+            viewPager.pageMargin = 0
+            viewPager.setPageTransformer(false, CarousalPagerTransformer(requireContext()))
         } else {
-            binding.viewPager.offscreenPageLimit = 2
-            binding.viewPager.setPageTransformer(
-                true,
-                PreferenceUtil.albumCoverTransform
-            )
+            viewPager.offscreenPageLimit = 2
+            viewPager.setPageTransformer(true, PreferenceUtil.getInstance(requireContext()).albumCoverTransform)
         }
-    }
 
-    override fun onResume() {
-        super.onResume()
-        maybeInitLyrics()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .registerOnSharedPreferenceChangeListener(this)
+
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .unregisterOnSharedPreferenceChangeListener(this)
-        binding.viewPager.removeOnPageChangeListener(this)
-        progressViewUpdateHelper?.stop()
-        _binding = null
+        viewPager.removeOnPageChangeListener(this)
     }
 
     override fun onServiceConnected() {
         updatePlayingQueue()
-        updateLyrics()
     }
 
     override fun onPlayingMetaChanged() {
-        if (viewPager.currentItem != MusicPlayerRemote.position) {
-            viewPager.setCurrentItem(MusicPlayerRemote.position, true)
-        }
-        updateLyrics()
+        viewPager.currentItem = MusicPlayerRemote.position
     }
 
     override fun onQueueChanged() {
         updatePlayingQueue()
     }
 
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
-        when (key) {
-            SHOW_LYRICS -> {
-                if (PreferenceUtil.showLyrics) {
-                    maybeInitLyrics()
-                } else {
-                    showLyrics(false)
-                    progressViewUpdateHelper?.stop()
-                }
-            }
-            LYRICS_TYPE -> {
-                maybeInitLyrics()
-            }
-        }
-    }
-
-    private fun setLRCViewColors(@ColorInt primaryColor: Int, @ColorInt secondaryColor: Int) {
-        lrcView.apply {
-            setCurrentColor(primaryColor)
-            setTimeTextColor(primaryColor)
-            setTimelineColor(primaryColor)
-            setNormalColor(secondaryColor)
-            setTimelineTextColor(primaryColor)
-        }
-    }
-
-    private fun showLyrics(visible: Boolean) {
-        binding.coverLyrics.isVisible = false
-        binding.lyricsView.isVisible = false
-        binding.viewPager.isVisible = true
-        val lyrics: View = if (PreferenceUtil.lyricsType == CoverLyricsType.REPLACE_COVER) {
-            ObjectAnimator.ofFloat(viewPager, View.ALPHA, if (visible) 0F else 1F).start()
-            lrcView
-        } else {
-            ObjectAnimator.ofFloat(viewPager, View.ALPHA, 1F).start()
-            binding.coverLyrics
-        }
-        ObjectAnimator.ofFloat(lyrics, View.ALPHA, if (visible) 1F else 0F).apply {
-            doOnEnd {
-                lyrics.isVisible = visible
-            }
-            start()
-        }
-    }
-
-    private fun maybeInitLyrics() {
-        val nps = PreferenceUtil.nowPlayingScreen
-        // Don't show lyrics container for below conditions
-        if (lyricViewNpsList.contains(nps) && PreferenceUtil.showLyrics) {
-            showLyrics(true)
-            if (PreferenceUtil.lyricsType == CoverLyricsType.REPLACE_COVER) {
-                progressViewUpdateHelper?.start()
-            }
-        } else {
-            showLyrics(false)
-            progressViewUpdateHelper?.stop()
-        }
-    }
-
     private fun updatePlayingQueue() {
-        binding.viewPager.apply {
-            adapter = AlbumCoverPagerAdapter(parentFragmentManager, MusicPlayerRemote.playingQueue)
-            setCurrentItem(MusicPlayerRemote.position, true)
+        viewPager.apply {
+            adapter = AlbumCoverPagerAdapter(fragmentManager!!, MusicPlayerRemote.playingQueue)
+            viewPager.adapter!!.notifyDataSetChanged()
+            viewPager.currentItem = MusicPlayerRemote.position
             onPageSelected(MusicPlayerRemote.position)
         }
     }
 
-    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {}
+    override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+
+    }
 
     override fun onPageSelected(position: Int) {
         currentPosition = position
-        if (binding.viewPager.adapter != null) {
-            (binding.viewPager.adapter as AlbumCoverPagerAdapter).receiveColor(
-                colorReceiver,
-                position
-            )
+        if (viewPager.adapter != null) {
+            (viewPager.adapter as AlbumCoverPagerAdapter).receiveColor(colorReceiver, position)
         }
         if (position != MusicPlayerRemote.position) {
             MusicPlayerRemote.playSongAt(position)
@@ -271,29 +105,13 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
     }
 
     override fun onPageScrollStateChanged(state: Int) {
+
     }
 
 
-    private fun notifyColorChange(color: MediaNotificationProcessor) {
-        callbacks?.onColorChanged(color)
-        val primaryColor = MaterialValueHelper.getPrimaryTextColor(
-            requireContext(),
-            surfaceColor().isColorLight
-        )
-        val secondaryColor = MaterialValueHelper.getSecondaryDisabledTextColor(
-            requireContext(),
-            surfaceColor().isColorLight
-        )
-
-        when (PreferenceUtil.nowPlayingScreen) {
-            Flat, Normal, Material -> if (PreferenceUtil.isAdaptiveColor) {
-                setLRCViewColors(color.primaryTextColor, color.secondaryTextColor)
-            } else {
-                setLRCViewColors(primaryColor, secondaryColor)
-            }
-            Color, Classic -> setLRCViewColors(color.primaryTextColor, color.secondaryTextColor)
-            Blur -> setLRCViewColors(Color.WHITE, ColorUtil.withAlpha(Color.WHITE, 0.5f))
-            else -> setLRCViewColors(primaryColor, secondaryColor)
+    private fun notifyColorChange(color: Int) {
+        if (callbacks != null) {
+            callbacks!!.onColorChanged(color)
         }
     }
 
@@ -301,17 +119,21 @@ class PlayerAlbumCoverFragment : AbsMusicServiceFragment(R.layout.fragment_playe
         callbacks = listener
     }
 
+    fun removeEffect() {
+        viewPager.setPageTransformer(false, null)
+    }
+
+
     interface Callbacks {
 
-        fun onColorChanged(color: MediaNotificationProcessor)
+        fun onColorChanged(color: Int)
 
         fun onFavoriteToggled()
+
     }
 
+
     companion object {
         val TAG: String = PlayerAlbumCoverFragment::class.java.simpleName
     }
-
-    private val lyricViewNpsList =
-        listOf(Blur, Classic, Color, Flat, Material, MD3, Normal, Plain, Simple)
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
index e5e2159ac..e8268f234 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptiveFragment.kt
@@ -1,56 +1,137 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.adaptive
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerBinding
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
+import code.name.monkey.retromusic.model.lyrics.Lyrics
+import kotlinx.android.synthetic.main.fragment_adaptive_player.*
 
-class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
+class AdaptiveFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Callback {
+
+    private lateinit var lyricsLayout: FrameLayout
+    private lateinit var lyricsLine1: TextView
+    private lateinit var lyricsLine2: TextView
+
+    private var lyrics: Lyrics? = null
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        if (!isLyricsLayoutBound()) return
+
+        if (!isLyricsLayoutVisible()) {
+            hideLyricsLayout()
+            return
+        }
+
+        if (lyrics !is AbsSynchronizedLyrics) return
+        val synchronizedLyrics = lyrics as AbsSynchronizedLyrics
+
+        lyricsLayout.visibility = View.VISIBLE
+        lyricsLayout.alpha = 1f
+
+        val oldLine = lyricsLine2.text.toString()
+        val line = synchronizedLyrics.getLine(progress)
+
+        if (oldLine != line || oldLine.isEmpty()) {
+            lyricsLine1.text = oldLine
+            lyricsLine2.text = line
+
+            lyricsLine1.visibility = View.VISIBLE
+            lyricsLine2.visibility = View.VISIBLE
+
+            lyricsLine2.measure(View.MeasureSpec.makeMeasureSpec(lyricsLine2.measuredWidth, View.MeasureSpec.EXACTLY), View.MeasureSpec.UNSPECIFIED)
+            val h: Float = lyricsLine2.measuredHeight.toFloat()
+
+            lyricsLine1.alpha = 1f
+            lyricsLine1.translationY = 0f
+            lyricsLine1.animate().alpha(0f).translationY(-h).duration = VISIBILITY_ANIM_DURATION
+
+            lyricsLine2.alpha = 0f
+            lyricsLine2.translationY = h
+            lyricsLine2.animate().alpha(1f).translationY(0f).duration = VISIBILITY_ANIM_DURATION
+        }
+    }
+
+    private fun isLyricsLayoutVisible(): Boolean {
+        return lyrics != null && lyrics!!.isSynchronized && lyrics!!.isValid
+    }
+
+    private fun isLyricsLayoutBound(): Boolean {
+        return lyricsLayout != null && lyricsLine1 != null && lyricsLine2 != null
+    }
+
+    private fun hideLyricsLayout() {
+        lyricsLayout.animate().alpha(0f).setDuration(VISIBILITY_ANIM_DURATION).withEndAction(Runnable {
+            if (!isLyricsLayoutBound()) return@Runnable
+            lyricsLayout.visibility = View.GONE
+            lyricsLine1.text = null
+            lyricsLine2.text = null
+        })
+    }
+
+    override fun setLyrics(l: Lyrics?) {
+        lyrics = l
+
+        if (!isLyricsLayoutBound()) return
+
+        if (!isLyricsLayoutVisible()) {
+            hideLyricsLayout()
+            return
+        }
+
+        lyricsLine1.text = null
+        lyricsLine2.text = null
+
+        lyricsLayout.visibility = View.VISIBLE
+        lyricsLayout.animate().alpha(1f).duration = VISIBILITY_ANIM_DURATION
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        progressViewUpdateHelper.stop()
+    }
 
-    private var _binding: FragmentAdaptivePlayerBinding? = null
-    private val binding get() = _binding!!
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
     private lateinit var playbackControlsFragment: AdaptivePlaybackControlsFragment
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_adaptive_player, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentAdaptivePlayerBinding.bind(view)
+        lyricsLayout = view.findViewById(R.id.player_lyrics)
+        lyricsLine1 = view.findViewById(R.id.player_lyrics_line1)
+        lyricsLine2 = view.findViewById(R.id.player_lyrics_line2)
+
         setUpSubFragments()
         setUpPlayerToolbar()
-        binding.playbackControlsFragment.drawAboveSystemBars()
+
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
+        progressViewUpdateHelper.start()
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment =
-            whichFragment(R.id.playbackControlsFragment) as AdaptivePlaybackControlsFragment
-        val playerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as AdaptivePlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.apply {
             removeSlideEffect()
             setCallbacks(this@AdaptiveFragment)
@@ -58,12 +139,13 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        val primaryColor = ATHUtil.resolveColor(requireContext(), R.attr.colorPrimary)
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-            ToolbarContentTintHelper.colorizeToolbar(this, surfaceColor(), requireActivity())
-            setTitleTextColor(textColorPrimary())
-            setSubtitleTextColor(textColorSecondary())
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
+            ToolbarContentTintHelper.colorizeToolbar(this, primaryColor, requireActivity())
+            setTitleTextColor(primaryColor)
+            setSubtitleTextColor(ThemeStore.textColorSecondary(requireContext()))
             setOnMenuItemClickListener(this@AdaptiveFragment)
         }
     }
@@ -81,7 +163,7 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             title = song.title
             subtitle = song.artistName
         }
@@ -98,32 +180,31 @@ class AdaptiveFragment : AbsPlayerFragment(R.layout.fragment_adaptive_player) {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.primaryTextColor
-        libraryViewModel.updateColor(color.primaryTextColor)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
     }
 
     override fun onShow() {
+        playbackControlsFragment.show()
     }
 
     override fun onHide() {
+        playbackControlsFragment.hide()
+        onBackPressed()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
-        return colorControlNormal()
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
     }
 
     override val paletteColor: Int
         get() = lastColor
-}
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
index d954cfdb0..d68cb7e5f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/adaptive/AdaptivePlaybackControlsFragment.kt
@@ -1,89 +1,75 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.adaptive
 
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.ViewGroup
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.extensions.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentAdaptivePlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_adaptive_player_playback_controls.*
 
-class AdaptivePlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_adaptive_player_playback_controls) {
+class AdaptivePlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    private var _binding: FragmentAdaptivePlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_adaptive_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentAdaptivePlayerPlaybackControlsBinding.bind(view)
+        setUpMusicControllers()
 
-        setUpPlayPauseFab()
-    }
-
-    private fun updateSong() {
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation(playPauseButton)
         }
     }
 
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper!!.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper!!.stop()
     }
 
     override fun onServiceConnected() {
         updatePlayPauseDrawableState()
         updateRepeatState()
         updateShuffleState()
-        updateSong()
     }
 
     override fun onPlayStateChanged() {
@@ -98,21 +84,13 @@ class AdaptivePlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        if (ColorUtil.isColorLight(
-                ATHUtil.resolveColor(
-                    requireContext(),
-                    android.R.attr.windowBackground
-                )
-            )
-        ) {
+    override fun setDark(color: Int) {
+        if (ColorUtil.isColorLight(ATHUtil.resolveColor(context, android.R.attr.windowBackground))) {
             lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(activity, true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
         } else {
             lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(activity, false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
         }
 
         updateRepeatState()
@@ -120,51 +98,114 @@ class AdaptivePlaybackControlsFragment :
         updatePrevNextColor()
         updatePlayPauseColor()
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor()
+            ThemeStore.accentColor(context!!)
         }.ripAlpha()
 
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
-        binding.progressSlider.applyColor(colorFinal)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, true)
         volumeFragment?.setTintable(colorFinal)
     }
 
     private fun updatePlayPauseColor() {
-        // playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
+        //playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
-    override fun show() {}
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
 
-    override fun hide() {}
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
+    public override fun show() {
+        //Ignore
+    }
+
+    public override fun hide() {
+        //Ignore
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
index 4a92f1ca4..f4d00709f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlaybackControlsFragment.kt
@@ -1,94 +1,78 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.blur
 
+import android.animation.ObjectAnimator
 import android.graphics.Color
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 import androidx.core.content.ContextCompat
 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.databinding.FragmentBlurPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import kotlinx.android.synthetic.main.fragment_blur_player_playback_controls.*
 
-class BlurPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_blur_player_playback_controls) {
-    private var _binding: FragmentBlurPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+class BlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_blur_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentBlurPlayerPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+        setUpMusicControllers()
+
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation()
         }
+        title.isSelected = true
+        text.isSelected = true
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = String.format("%s • %s", song.artistName, song.albumName)
+        title.text = song.title
+        text.text = "${song.artistName} • ${song.albumName}"
+    }
 
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.show()
-            binding.songInfo.text = getSongInfo(song)
-        } else {
-            binding.songInfo.hide()
-        }
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper!!.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper!!.stop()
     }
 
     override fun onServiceConnected() {
@@ -115,75 +99,158 @@ class BlurPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
+    override fun setDark(color: Int) {
         lastPlaybackControlsColor = Color.WHITE
-        lastDisabledPlaybackControlsColor =
-            ContextCompat.getColor(requireContext(), code.name.monkey.appthemehelper.R.color.md_grey_500)
+        lastDisabledPlaybackControlsColor = ContextCompat.getColor(requireContext(), R.color.md_grey_500)
 
-        binding.title.setTextColor(lastPlaybackControlsColor)
+        title.setTextColor(lastPlaybackControlsColor)
 
-        binding.songCurrentProgress.setTextColor(lastPlaybackControlsColor)
-        binding.songTotalTime.setTextColor(lastPlaybackControlsColor)
+        songCurrentProgress.setTextColor(lastPlaybackControlsColor)
+        songTotalTime.setTextColor(lastPlaybackControlsColor)
 
         updateRepeatState()
         updateShuffleState()
         updatePrevNextColor()
 
-        binding.text.setTextColor(lastPlaybackControlsColor)
-        binding.songInfo.setTextColor(lastDisabledPlaybackControlsColor)
+        text.setTextColor(lastDisabledPlaybackControlsColor)
 
-        binding.progressSlider.applyColor(lastPlaybackControlsColor)
+        TintHelper.setTintAuto(progressSlider, lastPlaybackControlsColor, false)
         volumeFragment?.setTintableColor(lastPlaybackControlsColor)
         setFabColor(lastPlaybackControlsColor)
     }
 
     private fun setFabColor(i: Int) {
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(i)),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, i, true)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(i)), false)
+        TintHelper.setTintAuto(playPauseButton, i, true)
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+        }
+    }
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
         }
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+    private fun showBonceAnimation() {
+        playPauseButton.apply {
+            clearAnimation()
+            scaleX = 0.9f
+            scaleY = 0.9f
+            visibility = View.VISIBLE
+            pivotX = (width / 2).toFloat()
+            pivotY = (height / 2).toFloat()
+
+            animate().setDuration(200)
+                    .setInterpolator(DecelerateInterpolator())
+                    .scaleX(1.1f)
+                    .scaleY(1.1f)
+                    .withEndAction {
+                        animate().setDuration(200)
+                                .setInterpolator(AccelerateInterpolator())
+                                .scaleX(1f)
+                                .scaleY(1f)
+                                .alpha(1f).start()
+                    }.start()
+        }
+    }
+
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
index bd0f09c96..856ef431a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/blur/BlurPlayerFragment.kt
@@ -1,83 +1,58 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.blur
 
 import android.content.SharedPreferences
 import android.graphics.Color
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.NEW_BLUR_AMOUNT
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentBlurBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
+import kotlinx.android.synthetic.main.fragment_blur.*
 
-
-class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
-    SharedPreferences.OnSharedPreferenceChangeListener {
-
-    private var lastRequest: RequestBuilder<Drawable>? = null
+class BlurPlayerFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private lateinit var playbackControlsFragment: BlurPlaybackControlsFragment
 
     private var lastColor: Int = 0
 
-    private var _binding: FragmentBlurBinding? = null
-    private val binding get() = _binding!!
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_blur, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentBlurBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        binding.playerToolbar.drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as BlurPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar!!.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { activity!!.onBackPressed() }
             ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity)
         }.setOnMenuItemClickListener(this)
     }
@@ -86,11 +61,11 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks!!.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar!!, Color.WHITE, activity)
     }
 
     override fun toggleFavorite(song: Song) {
@@ -101,9 +76,15 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     }
 
     override fun onShow() {
+
     }
 
     override fun onHide() {
+
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -113,21 +94,24 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
     override val paletteColor: Int
         get() = lastColor
 
+
     private fun updateBlur() {
-        // https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-        Glide.with(this)
-            .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-            .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
-            .transform(
-                BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat())
-                    .build()
-            ).thumbnail(lastRequest)
-            .error(Glide.with(this).load(ColorDrawable(Color.DKGRAY)).fitCenter())
-            .also {
-                lastRequest = it.clone()
-                it.crossfadeListener()
-                    .into(binding.colorBackground)
-            }
+        val blurAmount = PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .getInt(PreferenceUtil.NEW_BLUR_AMOUNT, 25)
+        colorBackground!!.clearColorFilter()
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext()).build()
+                .transform(BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat()).build())
+                //.centerCrop()
+                //.override(320, 480)
+                .into(object : RetroMusicColoredTarget(colorBackground) {
+                    override fun onColorReady(color: Int) {
+                        if (color == defaultFooterColor) {
+                            colorBackground!!.setColorFilter(color)
+                        }
+                    }
+                })
     }
 
     override fun onServiceConnected() {
@@ -140,27 +124,21 @@ class BlurPlayerFragment : AbsPlayerFragment(R.layout.fragment_blur),
         updateBlur()
     }
 
-    override fun onPause() {
-        super.onPause()
-        lastRequest = null
-    }
-
     override fun onResume() {
         super.onResume()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .registerOnSharedPreferenceChangeListener(this)
+        PreferenceManager.getDefaultSharedPreferences(requireContext()).registerOnSharedPreferenceChangeListener(this)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .unregisterOnSharedPreferenceChangeListener(this)
-        _binding = null
+        PreferenceManager.getDefaultSharedPreferences(requireContext()).unregisterOnSharedPreferenceChangeListener(this)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == NEW_BLUR_AMOUNT) {
+        if (key == PreferenceUtil.NEW_BLUR_AMOUNT) {
             updateBlur()
         }
     }
+
 }
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
index 3553c35ab..e1767503b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardFragment.kt
@@ -1,37 +1,23 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.card
 
 import android.graphics.Color
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardPlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_card_player.*
 
-class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
+class CardFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
@@ -39,9 +25,6 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
         get() = lastColor
 
     private lateinit var playbackControlsFragment: CardPlaybackControlsFragment
-    private var _binding: FragmentCardPlayerBinding? = null
-    private val binding get() = _binding!!
-
 
     override fun onShow() {
         playbackControlsFragment.show()
@@ -49,17 +32,23 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.primaryTextColor
-        libraryViewModel.updateColor(color.primaryTextColor)
-        ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks!!.onPaletteColorChanged()
+
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
     }
 
     override fun toggleFavorite(song: Song) {
@@ -73,30 +62,32 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_card_player, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCardPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        (binding.playbackControlsFragment.parent as View).drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as CardPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
         playerAlbumCoverFragment.removeSlideEffect()
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
-            inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-            setOnMenuItemClickListener(this@CardFragment)
+        playerToolbar.inflateMenu(R.menu.menu_player)
+        playerToolbar.setNavigationOnClickListener { activity!!.onBackPressed() }
+        playerToolbar.setOnMenuItemClickListener(this)
+
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
 
-            ToolbarContentTintHelper.colorizeToolbar(this, Color.WHITE, activity)
-        }
     }
 
     override fun onServiceConnected() {
@@ -107,8 +98,15 @@ class CardFragment : AbsPlayerFragment(R.layout.fragment_card_player) {
         updateIsFavorite()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    companion object {
+
+        fun newInstance(): PlayerFragment {
+            val args = Bundle()
+            val fragment = PlayerFragment()
+            fragment.arguments = args
+            return fragment
+        }
     }
+
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
index 306412da4..5d0fa98ca 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/card/CardPlaybackControlsFragment.kt
@@ -1,92 +1,79 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.card
 
+import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageButton
+import android.view.ViewGroup
+import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
-import android.widget.TextView
+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.databinding.FragmentCardPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_card_player_playback_controls.*
+import kotlinx.android.synthetic.main.media_button.*
 
-class CardPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_card_player_playback_controls) {
+class CardPlaybackControlsFragment : AbsPlayerControlsFragment() {
+
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
 
 
-    private var _binding: FragmentCardPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val seekBar: SeekBar
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.mediaButton.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.mediaButton.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.mediaButton.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.mediaButton.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_card_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCardPlayerPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+        setUpMusicControllers()
+
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation(playPauseButton)
         }
+        title.isSelected = true
+        text.isSelected = true
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
+        title.text = song.title
+        text.text = song.artistName
 
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper!!.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper!!.stop()
     }
 
     override fun onServiceConnected() {
@@ -113,16 +100,14 @@ class CardPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        if (!ATHUtil.isWindowBackgroundDark(requireContext())
-        ) {
+    override fun setDark(color: Int) {
+
+        if (ColorUtil.isColorLight(ATHUtil.resolveColor(context, android.R.attr.windowBackground))) {
             lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(activity, true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
         } else {
             lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(activity, false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
         }
 
         updateRepeatState()
@@ -131,57 +116,121 @@ class CardPlaybackControlsFragment :
         updatePlayPauseColor()
         updateProgressTextColor()
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(context!!).ripAlpha()
         }
-        binding.image.setColorFilter(colorFinal, PorterDuff.Mode.SRC_IN)
-        TintHelper.setTintAuto(
-            binding.mediaButton.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)),
-            false
-        )
-        TintHelper.setTintAuto(binding.mediaButton.playPauseButton, colorFinal, true)
+        image.setColorFilter(colorFinal, PorterDuff.Mode.SRC_IN)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
 
         volumeFragment?.setTintable(colorFinal)
+
     }
 
     private fun updatePlayPauseColor() {
-        // playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
+        //playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN);
     }
 
     private fun setUpPlayPauseFab() {
-        binding.mediaButton.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.mediaButton.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.mediaButton.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
     private fun updateProgressTextColor() {
         val color = MaterialValueHelper.getPrimaryTextColor(context, false)
-        binding.songTotalTime.setTextColor(color)
-        binding.songCurrentProgress.setTextColor(color)
+        songTotalTime!!.setTextColor(color)
+        songCurrentProgress!!.setTextColor(color)
     }
 
-    public override fun show() {}
+    public override fun show() {
+        //Ignore
+    }
 
-    public override fun hide() {}
+    public override fun hide() {
+        //Ignore
+    }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis, MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
index a5ac12b2d..645306a8e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurFragment.kt
@@ -1,50 +1,30 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.cardblur
 
 import android.content.SharedPreferences
 import android.graphics.Color
-import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.NEW_BLUR_AMOUNT
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentCardBlurPlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil.blurAmount
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.util.PreferenceUtil
 import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
+import kotlinx.android.synthetic.main.fragment_card_blur_player.*
 
-class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+class CardBlurFragment : AbsPlayerFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
@@ -52,9 +32,6 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
         get() = lastColor
     private lateinit var playbackControlsFragment: CardBlurPlaybackControlsFragment
 
-    private var _binding: FragmentCardBlurPlayerBinding? = null
-    private val binding get() = _binding!!
-    private var lastRequest: RequestBuilder<Drawable>? = null
 
     override fun onShow() {
         playbackControlsFragment.show()
@@ -62,20 +39,25 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks!!.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
 
-        binding.title.setTextColor(Color.WHITE)
-        binding.text.setTextColor(Color.WHITE)
+        playerToolbar.setTitleTextColor(Color.WHITE)
+        playerToolbar.setSubtitleTextColor(Color.WHITE)
     }
 
     override fun toggleFavorite(song: Song) {
@@ -89,31 +71,37 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_card_blur_player, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCardBlurPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        binding.playerToolbar.drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment =
-            whichFragment(R.id.playbackControlsFragment) as CardBlurPlaybackControlsFragment
-        (whichFragment(R.id.playerAlbumCoverFragment) as? PlayerAlbumCoverFragment)?.setCallbacks(
-            this
-        )
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as CardBlurPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment?
+        if (playerAlbumCoverFragment != null) {
+            playerAlbumCoverFragment.setCallbacks(this)
+            playerAlbumCoverFragment.removeEffect()
+        }
+
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { activity!!.onBackPressed() }
             setTitleTextColor(Color.WHITE)
             setSubtitleTextColor(Color.WHITE)
-            ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
-            setOnMenuItemClickListener(this@CardBlurFragment)
-        }
+            ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
+        }.setOnMenuItemClickListener(this)
     }
 
     override fun onServiceConnected() {
@@ -130,49 +118,43 @@ class CardBlurFragment : AbsPlayerFragment(R.layout.fragment_card_blur_player),
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.run {
-            title.text = song.title
-            text.text = song.artistName
+        playerToolbar.apply {
+            title = song.title
+            subtitle = song.artistName
         }
     }
 
     private fun updateBlur() {
-        // https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-        Glide.with(this)
-            .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-            .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
-            .transform(
-                BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat())
-                    .build()
-            )
-            .thumbnail(lastRequest).also {
-                lastRequest = it.clone()
-                it.crossfadeListener()
-                    .into(binding.colorBackground)
-            }
-    }
-
-    override fun onPause() {
-        super.onPause()
-        lastRequest = null
+        val blurAmount = PreferenceManager.getDefaultSharedPreferences(requireContext())
+                .getInt(PreferenceUtil.NEW_BLUR_AMOUNT, 25)
+        colorBackground!!.clearColorFilter()
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext()).build()
+                .transform(BlurTransformation.Builder(requireContext()).blurRadius(blurAmount.toFloat()).build())
+                //.centerCrop()
+                //.override(320, 480)
+                .into(object : RetroMusicColoredTarget(colorBackground) {
+                    override fun onColorReady(color: Int) {
+                        if (color == defaultFooterColor) {
+                            colorBackground!!.setColorFilter(color)
+                        }
+                    }
+                })
     }
 
     override fun onResume() {
         super.onResume()
-        lastRequest = null
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .registerOnSharedPreferenceChangeListener(this)
+        PreferenceManager.getDefaultSharedPreferences(requireContext()).registerOnSharedPreferenceChangeListener(this)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .unregisterOnSharedPreferenceChangeListener(this)
-        _binding = null
+        PreferenceManager.getDefaultSharedPreferences(requireContext()).unregisterOnSharedPreferenceChangeListener(this)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == NEW_BLUR_AMOUNT) {
+        if (key == PreferenceUtil.NEW_BLUR_AMOUNT) {
             updateBlur()
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
index 8ada49c95..873eef27d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/cardblur/CardBlurPlaybackControlsFragment.kt
@@ -1,75 +1,55 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.cardblur
 
+import android.animation.ObjectAnimator
 import android.graphics.Color
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 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.databinding.FragmentCardBlurPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_card_blur_player_playback_controls.*
+import kotlinx.android.synthetic.main.media_button.*
 
-class CardBlurPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_card_blur_player_playback_controls) {
 
-    private var _binding: FragmentCardBlurPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+class CardBlurPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val shuffleButton: ImageButton
-        get() = binding.mediaButton.shuffleButton
 
-    override val repeatButton: ImageButton
-        get() = binding.mediaButton.repeatButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val nextButton: ImageButton
-        get() = binding.mediaButton.nextButton
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
 
-    override val previousButton: ImageButton
-        get() = binding.mediaButton.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+        return inflater.inflate(R.layout.fragment_card_blur_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCardBlurPlayerPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.progressSlider.applyColor(Color.WHITE)
+        setUpMusicControllers()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
+    override fun setDark(color: Int) {
         lastPlaybackControlsColor = Color.WHITE
         lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(Color.WHITE, 0.3f)
 
@@ -78,11 +58,13 @@ class CardBlurPlaybackControlsFragment :
         updatePrevNextColor()
         updateProgressTextColor()
 
+        ViewUtil.setProgressDrawable(progressSlider, Color.WHITE, true)
         volumeFragment?.tintWhiteColor()
     }
 
+
     private fun setUpPlayPauseFab() {
-        binding.mediaButton.playPauseButton.apply {
+        playPauseButton.apply {
             TintHelper.setTintAuto(this, Color.WHITE, true)
             TintHelper.setTintAuto(this, Color.BLACK, false)
             setOnClickListener(PlayPauseButtonOnClickHandler())
@@ -91,37 +73,33 @@ class CardBlurPlaybackControlsFragment :
 
     private fun updatePlayPauseDrawableState() {
         when {
-            MusicPlayerRemote.isPlaying -> binding.mediaButton.playPauseButton.setImageResource(R.drawable.ic_pause)
-            else -> binding.mediaButton.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
+
     private fun updateProgressTextColor() {
-        val color = Color.WHITE
-        binding.songTotalTime.setTextColor(color)
-        binding.songCurrentProgress.setTextColor(color)
-        binding.songInfo.setTextColor(color)
+        val color = MaterialValueHelper.getPrimaryTextColor(context, false)
+        songTotalTime.setTextColor(color)
+        songCurrentProgress.setTextColor(color)
+    }
+
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
     }
 
     override fun onServiceConnected() {
         updatePlayPauseDrawableState()
         updateRepeatState()
         updateShuffleState()
-        updateSong()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-    }
-
-    private fun updateSong() {
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
     }
 
     override fun onPlayStateChanged() {
@@ -136,25 +114,98 @@ class CardBlurPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    public override fun show() {
-        binding.mediaButton.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
     }
 
-    public override fun hide() {
-        binding.mediaButton.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    public override fun show() {
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+    }
+
+    public override fun hide() {
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
+        }
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
deleted file mode 100644
index fb1144e30..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/circle/CirclePlayerFragment.kt
+++ /dev/null
@@ -1,327 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.circle
-
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.drawable.ColorDrawable
-import android.graphics.drawable.Drawable
-import android.media.AudioManager
-import android.os.Bundle
-import android.view.View
-import android.view.animation.Animation
-import android.view.animation.LinearInterpolator
-import androidx.appcompat.widget.Toolbar
-import androidx.core.content.getSystemService
-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
-import code.name.monkey.retromusic.databinding.FragmentCirclePlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.simpleSongCoverOptions
-import code.name.monkey.retromusic.glide.crossfadeListener
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.bumptech.glide.Glide
-import com.bumptech.glide.RequestBuilder
-import com.google.android.material.slider.Slider
-import me.tankery.lib.circularseekbar.CircularSeekBar
-
-/**
- * Created by hemanths on 2020-01-06.
- */
-
-class CirclePlayerFragment : AbsPlayerFragment(R.layout.fragment_circle_player), Callback,
-    OnAudioVolumeChangedListener,
-    CircularSeekBar.OnCircularSeekBarChangeListener {
-
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-    private var audioVolumeObserver: AudioVolumeObserver? = null
-
-    private val audioManager: AudioManager
-        get() = requireContext().getSystemService()!!
-
-    private var _binding: FragmentCirclePlayerBinding? = null
-    private val binding get() = _binding!!
-
-    private var rotateAnimator: ObjectAnimator? = null
-    private var lastRequest: RequestBuilder<Drawable>? = null
-
-    var isSeeking = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentCirclePlayerBinding.bind(view)
-
-        setupViews()
-        binding.title.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        binding.songInfo.drawAboveSystemBars()
-    }
-
-    private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
-            inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-            setOnMenuItemClickListener(this@CirclePlayerFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
-        }
-    }
-
-    private fun setupViews() {
-        setUpProgressSlider()
-        binding.volumeSeekBar.circleProgressColor = accentColor()
-        binding.volumeSeekBar.circleColor = ColorUtil.withAlpha(accentColor(), 0.25f)
-        setUpPlayPauseFab()
-        setUpPrevNext()
-        setUpPlayerToolbar()
-        binding.albumCoverOverlay.background = ColorDrawable(
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                accentColor().isColorLight
-            )
-        )
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setUpPrevNext() {
-        updatePrevNextColor()
-        binding.nextButton.setOnTouchListener(MusicSeekSkipTouchListener(requireActivity(), true))
-        binding.previousButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                false
-            )
-        )
-    }
-
-    private fun updatePrevNextColor() {
-        val accentColor = accentColor()
-        binding.nextButton.setColorFilter(accentColor, PorterDuff.Mode.SRC_IN)
-        binding.previousButton.setColorFilter(accentColor, PorterDuff.Mode.SRC_IN)
-    }
-
-    private fun setUpPlayPauseFab() {
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            accentColor(),
-            false
-        )
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-    }
-
-    private fun setupRotateAnimation() {
-        rotateAnimator = ObjectAnimator.ofFloat(binding.albumCover, View.ROTATION, 360F).apply {
-            interpolator = LinearInterpolator()
-            repeatCount = Animation.INFINITE
-            duration = 10000
-            if (MusicPlayerRemote.isPlaying) {
-                start()
-            }
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-        if (audioVolumeObserver == null) {
-            audioVolumeObserver = AudioVolumeObserver(requireActivity())
-        }
-        audioVolumeObserver?.register(AudioManager.STREAM_MUSIC, this)
-
-        val audioManager = audioManager
-        binding.volumeSeekBar.max =
-            audioManager.getStreamMaxVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.progress =
-            audioManager.getStreamVolume(AudioManager.STREAM_MUSIC).toFloat()
-        binding.volumeSeekBar.setOnSeekBarChangeListener(this)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        lastRequest = null
-        progressViewUpdateHelper.stop()
-    }
-
-    override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
-    }
-
-    override fun onShow() {
-    }
-
-    override fun onHide() {
-    }
-
-    override fun toolbarIconColor(): Int =
-        colorControlNormal()
-
-    override val paletteColor: Int
-        get() = Color.BLACK
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-    }
-
-    override fun onFavoriteToggled() {
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-        if (MusicPlayerRemote.isPlaying) {
-            if (rotateAnimator?.isStarted == true) rotateAnimator?.resume() else rotateAnimator?.start()
-        } else {
-            rotateAnimator?.pause()
-        }
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSong()
-        updatePlayPauseDrawableState()
-        setupRotateAnimation()
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
-        Glide.with(this)
-            .load(RetroGlideExtension.getSongModel(MusicPlayerRemote.currentSong))
-            .simpleSongCoverOptions(MusicPlayerRemote.currentSong)
-            .thumbnail(lastRequest)
-            .error(Glide.with(this).load(R.drawable.default_audio_art).fitCenter())
-            .fitCenter().also {
-                lastRequest = it.clone()
-                it.crossfadeListener()
-                    .into(binding.albumCover)
-            }
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        when {
-            MusicPlayerRemote.isPlaying -> binding.playPauseButton.setImageResource(R.drawable.ic_pause)
-            else -> binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow)
-        }
-    }
-
-    override fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int) {
-        _binding?.volumeSeekBar?.max = maxVolume.toFloat()
-        _binding?.volumeSeekBar?.progress = currentVolume.toFloat()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        if (audioVolumeObserver != null) {
-            audioVolumeObserver!!.unregister()
-        }
-        _binding = null
-    }
-
-
-    override fun onProgressChanged(
-        circularSeekBar: CircularSeekBar?,
-        progress: Float,
-        fromUser: Boolean,
-    ) {
-        val audioManager = audioManager
-        audioManager.setStreamVolume(AudioManager.STREAM_MUSIC, progress.toInt(), 0)
-    }
-
-    override fun onStartTrackingTouch(seekBar: CircularSeekBar?) {
-    }
-
-    override fun onStopTrackingTouch(seekBar: CircularSeekBar?) {
-    }
-
-    private fun setUpProgressSlider() {
-        binding.progressSlider.applyColor(accentColor())
-        val progressSlider = binding.progressSlider
-        progressSlider.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            if (fromUser) {
-                onUpdateProgressViews(
-                    value.toInt(),
-                    MusicPlayerRemote.songDurationMillis
-                )
-            }
-        })
-        progressSlider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                isSeeking = true
-                progressViewUpdateHelper.stop()
-            }
-
-            override fun onStopTrackingTouch(slider: Slider) {
-                isSeeking = false
-                MusicPlayerRemote.seekTo(slider.value.toInt())
-                progressViewUpdateHelper.start()
-            }
-        })
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        val progressSlider = binding.progressSlider
-        progressSlider.valueTo = total.toFloat()
-
-        progressSlider.valueTo = total.toFloat()
-
-        progressSlider.value =
-            progress.toFloat().coerceIn(progressSlider.valueFrom, progressSlider.valueTo)
-
-        binding.songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
-        binding.songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
deleted file mode 100644
index ed51772bd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/classic/ClassicPlayerFragment.kt
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.classic
-
-import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.os.Bundle
-import android.view.View
-import android.view.animation.LinearInterpolator
-import android.widget.SeekBar
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.Toolbar
-import androidx.fragment.app.commit
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentClassicPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.from
-import com.google.android.material.card.MaterialCardView
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.shape.ShapeAppearanceModel
-import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
-import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
-import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
-import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
-import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
-
-class ClassicPlayerFragment : AbsPlayerFragment(R.layout.fragment_classic_player),
-    View.OnLayoutChangeListener,
-    MusicProgressViewUpdateHelper.Callback {
-
-    private var _binding: FragmentClassicPlayerBinding? = null
-    private val binding get() = _binding!!
-
-    private var lastColor: Int = 0
-    private var lastPlaybackControlsColor: Int = 0
-    private var lastDisabledPlaybackControlsColor: Int = 0
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-    private var volumeFragment: VolumeFragment? = null
-    private lateinit var shapeDrawable: MaterialShapeDrawable
-    private lateinit var wrappedAdapter: RecyclerView.Adapter<*>
-    private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null
-    private var recyclerViewSwipeManager: RecyclerViewSwipeManager? = null
-    private var recyclerViewTouchActionGuardManager: RecyclerViewTouchActionGuardManager? = null
-    private var playingQueueAdapter: PlayingQueueAdapter? = null
-    private lateinit var linearLayoutManager: LinearLayoutManager
-
-    private val bottomSheetCallbackList = object : BottomSheetBehavior.BottomSheetCallback() {
-        override fun onSlide(bottomSheet: View, slideOffset: Float) {
-            mainActivity.getBottomSheetBehavior().isDraggable = false
-            binding.playerQueueSheet.setContentPadding(
-                binding.playerQueueSheet.contentPaddingLeft,
-                (slideOffset * binding.statusBar.height).toInt(),
-                binding.playerQueueSheet.contentPaddingRight,
-                binding.playerQueueSheet.contentPaddingBottom
-            )
-
-            shapeDrawable.interpolation = 1 - slideOffset
-        }
-
-        override fun onStateChanged(bottomSheet: View, newState: Int) {
-            when (newState) {
-                BottomSheetBehavior.STATE_EXPANDED,
-                BottomSheetBehavior.STATE_DRAGGING -> {
-                    mainActivity.getBottomSheetBehavior().isDraggable = false
-                }
-
-                BottomSheetBehavior.STATE_COLLAPSED -> {
-                    resetToCurrentPosition()
-                    mainActivity.getBottomSheetBehavior().isDraggable = true
-                }
-
-                else -> {
-                    mainActivity.getBottomSheetBehavior().isDraggable = true
-                }
-            }
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentClassicPlayerBinding.bind(view)
-        setupPanel()
-        setUpMusicControllers()
-        setUpPlayerToolbar()
-        hideVolumeIfAvailable()
-        setupRecyclerView()
-
-        val coverFragment: PlayerAlbumCoverFragment = whichFragment(R.id.playerAlbumCoverFragment)
-        coverFragment.setCallbacks(this)
-
-        getQueuePanel().addBottomSheetCallback(bottomSheetCallbackList)
-
-        shapeDrawable = MaterialShapeDrawable(
-            ShapeAppearanceModel.builder(
-                requireContext(),
-                R.style.ClassicThemeOverLay,
-                0
-            ).build()
-        )
-        shapeDrawable.fillColor =
-            ColorStateList.valueOf(surfaceColor())
-        binding.playerQueueSheet.background = shapeDrawable
-
-        binding.playerQueueSheet.setOnTouchListener { _, _ ->
-            mainActivity.getBottomSheetBehavior().isDraggable = false
-            getQueuePanel().isDraggable = true
-            return@setOnTouchListener false
-        }
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            Color.WHITE,
-            requireActivity()
-        )
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        requireActivity().onBackPressedDispatcher.addCallback(object: OnBackPressedCallback(true) {
-            override fun handleOnBackPressed() {
-                if (getQueuePanel().state == BottomSheetBehavior.STATE_EXPANDED) {
-                    getQueuePanel().state = BottomSheetBehavior.STATE_COLLAPSED
-                }
-            }
-        })
-    }
-
-    private fun hideVolumeIfAvailable() {
-        if (PreferenceUtil.isVolumeVisibilityMode) {
-            childFragmentManager.commit {
-                replace(R.id.volumeFragmentContainer, VolumeFragment.newInstance())
-            }
-            childFragmentManager.executePendingTransactions()
-            volumeFragment =
-                whichFragment(R.id.volumeFragmentContainer) as VolumeFragment?
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        getQueuePanel().removeBottomSheetCallback(bottomSheetCallbackList)
-        if (recyclerViewDragDropManager != null) {
-            recyclerViewDragDropManager?.release()
-            recyclerViewDragDropManager = null
-        }
-
-        if (recyclerViewSwipeManager != null) {
-            recyclerViewSwipeManager?.release()
-            recyclerViewSwipeManager = null
-        }
-
-        WrapperAdapterUtils.releaseAll(wrappedAdapter)
-        _binding = null
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.playerControlsContainer.songInfo.text = getSongInfo(song)
-            binding.playerControlsContainer.songInfo.show()
-        } else {
-            binding.playerControlsContainer.songInfo.hide()
-        }
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    override fun onPause() {
-        recyclerViewDragDropManager?.cancelDrag()
-        super.onPause()
-        progressViewUpdateHelper.stop()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSong()
-        updatePlayPauseDrawableState()
-        updateQueue()
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onRepeatModeChanged() {
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        updateShuffleState()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-        updateQueuePosition()
-    }
-
-    override fun onQueueChanged() {
-        super.onQueueChanged()
-        updateQueue()
-    }
-
-    override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
-    }
-
-    override fun onShow() {
-    }
-
-    override fun onHide() {
-    }
-
-    override fun toolbarIconColor(): Int {
-        return Color.WHITE
-    }
-
-    override val paletteColor: Int
-        get() = lastColor
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-
-        lastPlaybackControlsColor = color.primaryTextColor
-        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color.primaryTextColor, 0.3f)
-
-        binding.playerContainer.setBackgroundColor(color.backgroundColor)
-        binding.playerControlsContainer.songInfo.setTextColor(color.primaryTextColor)
-        binding.playerQueueSubHeader.setTextColor(color.primaryTextColor)
-
-        binding.playerControlsContainer.songCurrentProgress.setTextColor(lastPlaybackControlsColor)
-        binding.playerControlsContainer.songTotalTime.setTextColor(lastPlaybackControlsColor)
-
-        ViewUtil.setProgressDrawable(
-            binding.playerControlsContainer.progressSlider,
-            color.primaryTextColor,
-            true
-        )
-        volumeFragment?.setTintableColor(color.primaryTextColor)
-
-        TintHelper.setTintAuto(
-            binding.playerControlsContainer.playPauseButton,
-            color.primaryTextColor,
-            true
-        )
-        TintHelper.setTintAuto(
-            binding.playerControlsContainer.playPauseButton,
-            color.backgroundColor,
-            false
-        )
-
-        updateRepeatState()
-        updateShuffleState()
-        updatePrevNextColor()
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            Color.WHITE,
-            requireActivity()
-        )
-    }
-
-    override fun toggleFavorite(song: Song) {
-        super.toggleFavorite(song)
-        if (song.id == MusicPlayerRemote.currentSong.id) {
-            updateIsFavorite()
-        }
-    }
-
-    override fun onFavoriteToggled() {
-        toggleFavorite(MusicPlayerRemote.currentSong)
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.playerControlsContainer.progressSlider.max = total
-
-        val animator = ObjectAnimator.ofInt(
-            binding.playerControlsContainer.progressSlider,
-            "progress",
-            progress
-        )
-        animator.duration = AbsPlayerControlsFragment.SLIDER_ANIMATION_TIME
-        animator.interpolator = LinearInterpolator()
-        animator.start()
-
-        binding.playerControlsContainer.songTotalTime.text =
-            MusicUtil.getReadableDurationString(total.toLong())
-        binding.playerControlsContainer.songCurrentProgress.text =
-            MusicUtil.getReadableDurationString(progress.toLong())
-    }
-
-    private fun updateQueuePosition() {
-        playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
-        resetToCurrentPosition()
-    }
-
-    private fun updateQueue() {
-        playingQueueAdapter?.swapDataSet(MusicPlayerRemote.playingQueue, MusicPlayerRemote.position)
-        resetToCurrentPosition()
-    }
-
-    private fun resetToCurrentPosition() {
-        binding.recyclerView.stopScroll()
-        linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
-    }
-
-    private fun getQueuePanel(): BottomSheetBehavior<MaterialCardView> {
-        return from(binding.playerQueueSheet)
-    }
-
-    private fun setupPanel() {
-        if (!binding.playerContainer.isLaidOut || binding.playerContainer.isLayoutRequested) {
-            binding.playerContainer.addOnLayoutChangeListener(this)
-            return
-        }
-        val height = binding.playerContainer.height
-        val width = binding.playerContainer.width
-        val finalHeight = height - width
-        val panel = getQueuePanel()
-        panel.peekHeight = finalHeight
-    }
-
-    private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            Color.WHITE,
-            requireActivity()
-        )
-    }
-
-    private fun setupRecyclerView() {
-        playingQueueAdapter = PlayingQueueAdapter(
-            requireActivity() as AppCompatActivity,
-            MusicPlayerRemote.playingQueue.toMutableList(),
-            MusicPlayerRemote.position,
-            R.layout.item_queue
-        )
-        linearLayoutManager = LinearLayoutManager(requireContext())
-        recyclerViewTouchActionGuardManager = RecyclerViewTouchActionGuardManager()
-        recyclerViewDragDropManager = RecyclerViewDragDropManager()
-        recyclerViewSwipeManager = RecyclerViewSwipeManager()
-
-        val animator = DraggableItemAnimator()
-        animator.supportsChangeAnimations = false
-        wrappedAdapter =
-            recyclerViewDragDropManager?.createWrappedAdapter(playingQueueAdapter!!) as RecyclerView.Adapter<*>
-        wrappedAdapter =
-            recyclerViewSwipeManager?.createWrappedAdapter(wrappedAdapter) as RecyclerView.Adapter<*>
-        binding.recyclerView.layoutManager = linearLayoutManager
-        binding.recyclerView.adapter = wrappedAdapter
-        binding.recyclerView.itemAnimator = animator
-        recyclerViewTouchActionGuardManager?.attachRecyclerView(binding.recyclerView)
-        recyclerViewDragDropManager?.attachRecyclerView(binding.recyclerView)
-        recyclerViewSwipeManager?.attachRecyclerView(binding.recyclerView)
-
-        linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
-    }
-
-    private fun setUpProgressSlider() {
-        binding.playerControlsContainer.progressSlider.setOnSeekBarChangeListener(object :
-            SimpleOnSeekbarChangeListener() {
-            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
-                if (fromUser) {
-                    MusicPlayerRemote.seekTo(progress)
-                    onUpdateProgressViews(
-                        MusicPlayerRemote.songProgressMillis,
-                        MusicPlayerRemote.songDurationMillis
-                    )
-                }
-            }
-        })
-    }
-
-    private fun setUpPlayPauseFab() {
-        binding.playerControlsContainer.playPauseButton.setOnClickListener(
-            PlayPauseButtonOnClickHandler()
-        )
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playerControlsContainer.playPauseButton.setImageResource(R.drawable.ic_pause)
-        } else {
-            binding.playerControlsContainer.playPauseButton.setImageResource(R.drawable.ic_play_arrow)
-        }
-    }
-
-    private fun setUpMusicControllers() {
-        setUpPlayPauseFab()
-        setUpPrevNext()
-        setUpRepeatButton()
-        setUpShuffleButton()
-        setUpProgressSlider()
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setUpPrevNext() {
-        updatePrevNextColor()
-        binding.playerControlsContainer.nextButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                true
-            )
-        )
-        binding.playerControlsContainer.previousButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                false
-            )
-        )
-    }
-
-    private fun updatePrevNextColor() {
-        binding.playerControlsContainer.nextButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playerControlsContainer.previousButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-    }
-
-    private fun setUpShuffleButton() {
-        binding.playerControlsContainer.shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
-    }
-
-    fun updateShuffleState() {
-        when (MusicPlayerRemote.shuffleMode) {
-            MusicService.SHUFFLE_MODE_SHUFFLE ->
-                binding.playerControlsContainer.shuffleButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-
-            else -> binding.playerControlsContainer.shuffleButton.setColorFilter(
-                lastDisabledPlaybackControlsColor,
-                PorterDuff.Mode.SRC_IN
-            )
-        }
-    }
-
-    private fun setUpRepeatButton() {
-        binding.playerControlsContainer.repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
-    }
-
-    fun updateRepeatState() {
-        when (MusicPlayerRemote.repeatMode) {
-            MusicService.REPEAT_MODE_NONE -> {
-                binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.playerControlsContainer.repeatButton.setColorFilter(
-                    lastDisabledPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_ALL -> {
-                binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.playerControlsContainer.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_THIS -> {
-                binding.playerControlsContainer.repeatButton.setImageResource(R.drawable.ic_repeat_one)
-                binding.playerControlsContainer.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-        }
-    }
-
-    override fun onLayoutChange(
-        v: View?,
-        left: Int,
-        top: Int,
-        right: Int,
-        bottom: Int,
-        oldLeft: Int,
-        oldTop: Int,
-        oldRight: Int,
-        oldBottom: Int
-    ) {
-        val height = binding.playerContainer.height
-        val width = binding.playerContainer.width
-        val finalHeight = height - (binding.playerControlsContainer.root.height + width)
-        val panel = getQueuePanel()
-        panel.peekHeight = finalHeight
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
index 12221274d..106e56a63 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorFragment.kt
@@ -1,76 +1,49 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.color
 
 import android.animation.ValueAnimator
+import android.graphics.drawable.Drawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
-import androidx.core.animation.doOnEnd
+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.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentColorPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest.Builder
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.animation.GlideAnimation
+import kotlinx.android.synthetic.main.fragment_color_player.*
 
-class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
+class ColorFragment : AbsPlayerFragment() {
 
     private var lastColor: Int = 0
-    private var navigationColor: Int = 0
+    private var backgroundColor: Int = 0
     private lateinit var playbackControlsFragment: ColorPlaybackControlsFragment
     private var valueAnimator: ValueAnimator? = null
-    private var _binding: FragmentColorPlayerBinding? = null
-    private val binding get() = _binding!!
 
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     override val paletteColor: Int
-        get() = navigationColor
+        get() = backgroundColor
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        libraryViewModel.updateColor(color.backgroundColor)
-        lastColor = color.secondaryTextColor
-        playbackControlsFragment.setColor(color)
-        navigationColor = color.backgroundColor
+    override fun onColorChanged(color: Int) {
 
-        binding.colorGradientBackground.setBackgroundColor(color.backgroundColor)
-        val animator =
-            playbackControlsFragment.createRevealAnimator(binding.colorGradientBackground)
-        animator.doOnEnd {
-            _binding?.root?.setBackgroundColor(color.backgroundColor)
-        }
-        animator.start()
-        binding.playerToolbar.post {
-            ToolbarContentTintHelper.colorizeToolbar(
-                binding.playerToolbar,
-                color.secondaryTextColor,
-                requireActivity()
-            )
-        }
     }
 
     override fun onFavoriteToggled() {
-        toggleFavorite(MusicPlayerRemote.currentSong)
+
     }
 
     override fun onShow() {
@@ -79,6 +52,11 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
@@ -98,40 +76,97 @@ class ColorFragment : AbsPlayerFragment(R.layout.fragment_color_player) {
             valueAnimator!!.cancel()
             valueAnimator = null
         }
-        _binding = null
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_color_player, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentColorPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
-        playerAlbumCoverFragment.setCallbacks(this)
-        playerToolbar().drawAboveSystemBars()
+        playerImage.setOnClickListener {
+            NavigationUtil.goToLyrics(requireActivity())
+        }
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment = whichFragment(R.id.playbackControlsFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as ColorPlaybackControlsFragment
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@ColorFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
         }
     }
 
+    override fun onPlayingMetaChanged() {
+        super.onPlayingMetaChanged()
+        updateSong()
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        updateSong()
+    }
+
+    private fun updateSong() {
+        Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext())
+                .build()
+                .into(object : RetroMusicColoredTarget(playerImage) {
+                    override fun onColorReady(color: Int) {
+
+                    }
+
+                    override fun onResourceReady(
+                            resource: BitmapPaletteWrapper?,
+                            glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?
+                    ) {
+                        super.onResourceReady(resource, glideAnimation)
+                        resource?.let {
+                            val palette = resource.palette
+                            val swatch = RetroColorUtil.getSwatch(palette)
+
+                            val textColor = RetroColorUtil.getTextColor(palette)
+                            val backgroundColor = swatch.rgb
+
+                            setColors(backgroundColor, textColor)
+                        }
+
+                    }
+
+                    override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+                        super.onLoadFailed(e, errorDrawable)
+                        val backgroundColor = defaultFooterColor
+                        val textColor = if (ColorUtil.isColorLight(defaultFooterColor)) MaterialValueHelper.getPrimaryTextColor(requireContext(), true)
+                        else MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+                        setColors(backgroundColor, textColor)
+                    }
+                })
+    }
+
+    private fun setColors(backgroundColor: Int, componentsColor: Int) {
+        this.lastColor = componentsColor
+        this.backgroundColor = backgroundColor
+        playbackControlsFragment.setDark(componentsColor, backgroundColor)
+        colorGradientBackground?.setBackgroundColor(backgroundColor)
+        playerActivity?.setLightNavigationBar(ColorUtil.isColorLight(backgroundColor))
+        callbacks?.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, componentsColor, requireActivity())
+    }
+
     companion object {
         fun newInstance(): ColorFragment {
-            return ColorFragment()
+            val args = Bundle()
+            val fragment = ColorFragment()
+            fragment.arguments = args
+            return fragment
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
index 084d2aaf3..edc020230 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/color/ColorPlaybackControlsFragment.kt
@@ -1,98 +1,70 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.color
 
-import android.animation.Animator
+import android.animation.ObjectAnimator
 import android.graphics.Color
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.view.ViewAnimationUtils
-import android.view.animation.AccelerateInterpolator
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
 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.databinding.FragmentColorPlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
-import kotlin.math.sqrt
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.progressSlider
+import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songCurrentProgress
+import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.songTotalTime
+import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.text
+import kotlinx.android.synthetic.main.fragment_color_player_playback_controls.title
+import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
 
-class ColorPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_color_player_playback_controls) {
 
-    private var _binding: FragmentColorPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+class ColorPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_color_player_playback_controls, container, false)
+    }
 
-    override val nextButton: ImageButton
-        get() = binding.nextButton
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
 
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentColorPlayerPlaybackControlsBinding.bind(view)
-
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
+        setUpMusicControllers()
+        title.isSelected = true
+        text.isSelected = true
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = song.artistName
     }
 
     override fun onServiceConnected() {
@@ -119,20 +91,26 @@ class ColorPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        TintHelper.setTintAuto(binding.playPauseButton, color.primaryTextColor, true)
-        TintHelper.setTintAuto(binding.playPauseButton, color.backgroundColor, false)
-        binding.progressSlider.applyColor(color.primaryTextColor)
 
-        binding.title.setTextColor(color.primaryTextColor)
-        binding.text.setTextColor(color.secondaryTextColor)
-        binding.songInfo.setTextColor(color.secondaryTextColor)
-        binding.songCurrentProgress.setTextColor(color.secondaryTextColor)
-        binding.songTotalTime.setTextColor(color.secondaryTextColor)
-        volumeFragment?.setTintableColor(color.primaryTextColor)
+    fun setDark(textColor: Int, background: Int) {
+        setDark(textColor)
+        TintHelper.setTintAuto(playPauseButton, background, false)
+        TintHelper.setTintAuto(playPauseButton, textColor, true)
+    }
 
-        lastPlaybackControlsColor = color.secondaryTextColor
-        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color.secondaryTextColor, 0.25f)
+    override fun setDark(color: Int) {
+        lastPlaybackControlsColor = color
+        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color, 0.5f)
+
+        title!!.setTextColor(lastPlaybackControlsColor)
+        text!!.setTextColor(lastDisabledPlaybackControlsColor)
+
+        ViewUtil.setProgressDrawable(progressSlider, lastPlaybackControlsColor, true)
+
+        volumeFragment?.setTintableColor(color)
+
+        songCurrentProgress.setTextColor(lastDisabledPlaybackControlsColor)
+        songTotalTime.setTextColor(lastDisabledPlaybackControlsColor)
 
         updateRepeatState()
         updateShuffleState()
@@ -140,64 +118,109 @@ class ColorPlaybackControlsFragment :
     }
 
     private fun setUpPlayPauseFab() {
-        TintHelper.setTintAuto(binding.playPauseButton, Color.WHITE, true)
-        TintHelper.setTintAuto(binding.playPauseButton, Color.BLACK, false)
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
+        TintHelper.setTintAuto(playPauseButton, Color.WHITE, true)
+        TintHelper.setTintAuto(playPauseButton, Color.BLACK, false)
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
+
+    private fun updatePlayPauseDrawableState() {
+        when {
+            MusicPlayerRemote.isPlaying -> playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+            else -> playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
-    private fun updatePlayPauseDrawableState() {
-        binding.playPauseButton.setImageResource(
-            when {
-                MusicPlayerRemote.isPlaying -> R.drawable.ic_pause
-                else -> R.drawable.ic_play_arrow
-            }
-        )
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
     }
 
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
+        playPauseButton.apply {
             scaleX = 0f
             scaleY = 0f
             rotation = 0f
         }
     }
 
-    fun createRevealAnimator(view: View): Animator {
-        val location = IntArray(2)
-        binding.playPauseButton.getLocationOnScreen(location)
-        val x = (location[0] + binding.playPauseButton.measuredWidth / 2)
-        val y = (location[1] + binding.playPauseButton.measuredHeight / 2)
-        val endRadius = sqrt((x * x + y * y).toFloat())
-        val startRadius =
-            binding.playPauseButton.measuredWidth.coerceAtMost(binding.playPauseButton.measuredHeight)
-        return ViewAnimationUtils.createCircularReveal(
-            view, x, y, startRadius.toFloat(),
-            endRadius
-        ).apply {
-            duration = 300
-            interpolator = AccelerateInterpolator()
-        }
-
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis, MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider!!.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
index 54a9c9f22..f8f543c0b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitFragment.kt
@@ -1,40 +1,23 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.fit
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFitBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_fit.*
 
-class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
-    private var _binding: FragmentFitBinding? = null
-    private val binding get() = _binding!!
 
+class FitFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
@@ -49,21 +32,24 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
-        return colorControlNormal()
+        return ATHUtil.resolveColor(context, R.attr.colorControlNormal)
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.primaryTextColor
-        libraryViewModel.updateColor(color.primaryTextColor)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
+
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
+
     }
 
     override fun toggleFavorite(song: Song) {
@@ -77,48 +63,46 @@ class FitFragment : AbsPlayerFragment(R.layout.fragment_fit) {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_fit, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFitBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        playerToolbar().drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as FitPlaybackControlsFragment
+
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
+        playerAlbumCoverFragment.removeEffect()
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@FitFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
         }
     }
 
     override fun onServiceConnected() {
         updateIsFavorite()
+
     }
 
     override fun onPlayingMetaChanged() {
         updateIsFavorite()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
     companion object {
+
         fun newInstance(): FitFragment {
             return FitFragment()
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
index 8cf981725..3a968c2da 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/fit/FitPlaybackControlsFragment.kt
@@ -1,91 +1,72 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.fit
 
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
 import android.os.Bundle
-import android.view.View
-import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
+import android.view.*
+import android.view.animation.*
 import android.widget.SeekBar
-import android.widget.TextView
-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.extensions.*
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFitPlaybackControlsBinding
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.helper.*
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.*
+import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
 
-class FitPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_fit_playback_controls) {
+class FitPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    private var _binding: FragmentFitPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
 
-    override val seekBar: SeekBar
-        get() = binding.progressSlider
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val nextButton: ImageButton
-        get() = binding.nextButton
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
 
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+        return inflater.inflate(R.layout.fragment_fit_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFitPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
+        setUpMusicControllers()
 
-        binding.title.isSelected = true
-        binding.text.isSelected = true
+        title.isSelected = true
+        text.isSelected = true
 
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation()
         }
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = song.artistName
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
     }
 
     override fun onServiceConnected() {
@@ -112,22 +93,20 @@ class FitPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        if (ColorUtil.isColorLight(colorBackground())) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(activity, android.R.attr.colorBackground)
+        if (ColorUtil.isColorLight(colorBg)) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(activity, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
         } else {
             lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(activity, false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
         }
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(requireContext()).ripAlpha()
         }
 
         volumeFragment?.setTintable(colorFinal)
@@ -139,52 +118,137 @@ class FitPlaybackControlsFragment :
     }
 
     private fun setFabColor(i: Int) {
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(i)),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, i, true)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(i)), false)
+        TintHelper.setTintAuto(playPauseButton, i, true)
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+        }
+    }
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton!!.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton!!.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
         }
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
+
+    private fun showBonceAnimation() {
+        playPauseButton.apply {
+            clearAnimation()
+            scaleX = 0.9f
+            scaleY = 0.9f
+            visibility = View.VISIBLE
+            pivotX = (width / 2).toFloat()
+            pivotY = (height / 2).toFloat()
+
+            animate().setDuration(200)
+                    .setInterpolator(DecelerateInterpolator())
+                    .scaleX(1.1f)
+                    .scaleY(1.1f)
+                    .withEndAction {
+                        animate().setDuration(200)
+                                .setInterpolator(AccelerateInterpolator())
+                                .scaleX(1f)
+                                .scaleY(1f)
+                                .alpha(1f).start()
+                    }.start()
+        }
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
index 02bdcb7aa..9acafa18f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlaybackControlsFragment.kt
@@ -1,120 +1,118 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.flat
 
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
+import android.view.animation.LinearInterpolator
 import android.widget.SeekBar
-import android.widget.TextView
+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.extensions.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFlatPlayerPlaybackControlsBinding
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper.Callback
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_flat_player_playback_controls.*
 
-class FlatPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_flat_player_playback_controls), Callback {
+class FlatPlaybackControlsFragment : AbsPlayerControlsFragment(), Callback {
 
-    private var _binding: FragmentFlatPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val seekBar: SeekBar
-        get() = binding.progressSlider
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton?
-        get() = null
-
-    override val previousButton: ImageButton?
-        get() = null
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_flat_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFlatPlayerPlaybackControlsBinding.bind(view)
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
+        setUpMusicControllers()
+        title.isSelected = true
+        text.isSelected = true
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
+
     public override fun hide() {
-        binding.playPauseButton.apply {
+        playPauseButton!!.apply {
             scaleX = 0f
             scaleY = 0f
             rotation = 0f
         }
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        if (ATHUtil.isWindowBackgroundDark(requireContext())) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), false)
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(activity, android.R.attr.colorBackground)
+        val isDark = ColorUtil.isColorLight(colorBg)
+        if (isDark) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(activity, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(activity, true)
         } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), true)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(activity, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(activity, false)
         }
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor().ripAlpha()
+            ThemeStore.accentColor(context!!).ripAlpha()
         }
 
         updateTextColors(colorFinal)
         volumeFragment?.setTintable(colorFinal)
-        binding.progressSlider.applyColor(colorFinal)
+
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, true)
+
         updateRepeatState()
         updateShuffleState()
     }
@@ -123,18 +121,15 @@ class FlatPlaybackControlsFragment :
         val isDark = ColorUtil.isColorLight(color)
         val darkColor = ColorUtil.darkenColor(color)
         val colorPrimary = MaterialValueHelper.getPrimaryTextColor(context, isDark)
-        val colorSecondary =
-            MaterialValueHelper.getSecondaryTextColor(context, ColorUtil.isColorLight(darkColor))
+        val colorSecondary = MaterialValueHelper.getSecondaryTextColor(context, ColorUtil.isColorLight(darkColor))
 
-        TintHelper.setTintAuto(binding.playPauseButton, colorPrimary, false)
-        TintHelper.setTintAuto(binding.playPauseButton, color, true)
+        TintHelper.setTintAuto(playPauseButton!!, colorPrimary, false)
+        TintHelper.setTintAuto(playPauseButton!!, color, true)
 
-        binding.title.setBackgroundColor(color)
-        binding.title.setTextColor(colorPrimary)
-        binding.text.setBackgroundColor(darkColor)
-        binding.text.setTextColor(colorSecondary)
-        binding.songInfo.setBackgroundColor(darkColor)
-        binding.songInfo.setTextColor(colorSecondary)
+        title.setBackgroundColor(color)
+        title.setTextColor(colorPrimary)
+        text.setBackgroundColor(darkColor)
+        text.setTextColor(colorSecondary)
     }
 
     override fun onServiceConnected() {
@@ -153,24 +148,43 @@ class FlatPlaybackControlsFragment :
         updatePlayPauseDrawableState()
     }
 
+    private fun setUpPlayPauseFab() {
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
     private fun updateSong() {
+        //TransitionManager.beginDelayedTransition(viewGroup, new ChangeText().setChangeBehavior(ChangeText.CHANGE_BEHAVIOR_OUT_IN));
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = song.artistName
+
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider!!.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
 
     override fun onRepeatModeChanged() {
@@ -181,8 +195,36 @@ class FlatPlaybackControlsFragment :
         updateShuffleState()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
     }
-}
\ No newline at end of file
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
index 23cd4f63f..a9422bb4a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/flat/FlatPlayerFragment.kt
@@ -1,142 +1,124 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.flat
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+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.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFlatPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import code.name.monkey.retromusic.views.DrawableGradient
+import kotlinx.android.synthetic.main.fragment_flat_player.*
 
-class FlatPlayerFragment : AbsPlayerFragment(R.layout.fragment_flat_player) {
+class FlatPlayerFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var valueAnimator: ValueAnimator? = null
-    private lateinit var controlsFragment: FlatPlaybackControlsFragment
+    private lateinit var flatPlaybackControlsFragment: FlatPlaybackControlsFragment
     private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
 
-    private var _binding: FragmentFlatPlayerBinding? = null
-    private val binding get() = _binding!!
-
-
     private fun setUpSubFragments() {
-        controlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        flatPlaybackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as FlatPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+        playerToolbar.inflateMenu(R.menu.menu_player)
+        playerToolbar.setNavigationOnClickListener { _ -> requireActivity().onBackPressed() }
+        playerToolbar.setOnMenuItemClickListener(this)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), requireActivity())
     }
 
     private fun colorize(i: Int) {
         if (valueAnimator != null) {
-            valueAnimator?.cancel()
+            valueAnimator!!.cancel()
         }
 
         valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), android.R.color.transparent, i)
-        valueAnimator?.addUpdateListener { animation ->
-            val drawable = DrawableGradient(
-                GradientDrawable.Orientation.TOP_BOTTOM,
-                intArrayOf(animation.animatedValue as Int, android.R.color.transparent), 0
-            )
-            _binding?.colorGradientBackground?.background = drawable
+        valueAnimator!!.addUpdateListener { animation ->
+            val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM,
+                    intArrayOf(animation.animatedValue as Int, android.R.color.transparent), 0)
+            colorGradientBackground?.background = drawable
+
         }
-        valueAnimator?.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong())?.start()
+        valueAnimator!!.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong()).start()
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_flat_player, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFlatPlayerBinding.bind(view)
         setUpPlayerToolbar()
         setUpSubFragments()
-        binding.playerToolbar.drawAboveSystemBars()
+
     }
 
     override fun onShow() {
-        controlsFragment.show()
+        flatPlaybackControlsFragment.show()
     }
 
     override fun onHide() {
-        controlsFragment.hide()
+        flatPlaybackControlsFragment.hide()
+        onBackPressed()
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
         val isLight = ColorUtil.isColorLight(paletteColor)
-        return if (PreferenceUtil.isAdaptiveColor)
+        return if (PreferenceUtil.getInstance(requireContext()).adaptiveColor)
             MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight)
         else
-            colorControlNormal()
+            ATHUtil.resolveColor(context, R.attr.colorControlNormal)
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        controlsFragment.setColor(color)
-        libraryViewModel.updateColor(color.backgroundColor)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
-        if (PreferenceUtil.isAdaptiveColor) {
-            colorize(color.backgroundColor)
+    override fun onColorChanged(color: Int) {
+        lastColor = color
+        flatPlaybackControlsFragment.setDark(color)
+        callbacks?.onPaletteColorChanged()
+        val isLight = ColorUtil.isColorLight(color)
+        val iconColor = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor)
+            MaterialValueHelper.getPrimaryTextColor(requireContext(), isLight)
+        else
+            ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, iconColor, requireActivity())
+        if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            colorize(color)
         }
     }
 
+
     override fun onFavoriteToggled() {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+
     override fun toggleFavorite(song: Song) {
         super.toggleFavorite(song)
         if (song.id == MusicPlayerRemote.currentSong.id) {
             updateIsFavorite()
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
index f7e34433c..0aae7ae74 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlaybackControlsFragment.kt
@@ -1,141 +1,131 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.full
 
-import android.content.Intent
+import android.animation.ObjectAnimator
+import android.annotation.SuppressLint
 import android.content.res.ColorStateList
 import android.graphics.Color
-import android.graphics.drawable.AnimatedVectorDrawable
+import android.graphics.PorterDuff
+import android.os.AsyncTask
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.MenuItem
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
-import androidx.appcompat.widget.PopupMenu
-import androidx.lifecycle.lifecycleScope
+import android.view.animation.LinearInterpolator
+import android.widget.PopupMenu
+import android.widget.SeekBar
+import androidx.core.content.ContextCompat
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.VersionUtils
+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.databinding.FragmentFullPlayerControlsBinding
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_full_player_controls.*
 
 /**
  * Created by hemanths on 20/09/17.
  */
 
-class FullPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_full_player_controls),
-    PopupMenu.OnMenuItemClickListener {
+class FullPlaybackControlsFragment : AbsPlayerControlsFragment(), PopupMenu.OnMenuItemClickListener {
 
-    private val libraryViewModel: LibraryViewModel by activityViewModel()
-    private var _binding: FragmentFullPlayerControlsBinding? = null
-    private val binding get() = _binding!!
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun onCreateView(inflater: LayoutInflater,
+                              container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_full_player_controls, container, false)
+    }
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFullPlayerControlsBinding.bind(view)
-
         setUpMusicControllers()
-        binding.songTotalTime.setTextColor(Color.WHITE)
-        binding.songCurrentProgress.setTextColor(Color.WHITE)
-        binding.title.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
+
+        songTotalTime.setTextColor(Color.WHITE)
+        songCurrentProgress.setTextColor(Color.WHITE)
+
+        title.isSelected = true
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper!!.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper!!.stop()
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
+
     public override fun hide() {
-        binding.playPauseButton.apply {
+        playPauseButton.apply {
             scaleX = 0f
             scaleY = 0f
             rotation = 0f
         }
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        lastPlaybackControlsColor = color.primaryTextColor
-        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color.primaryTextColor, 0.3f)
+    override fun setDark(color: Int) {
+        lastPlaybackControlsColor = Color.WHITE
+        lastDisabledPlaybackControlsColor = ContextCompat.getColor(context!!, R.color.md_grey_500)
 
-        val tintList = ColorStateList.valueOf(color.primaryTextColor)
-        binding.playerMenu.imageTintList = tintList
-        binding.songFavourite.imageTintList = tintList
-        volumeFragment?.setTintableColor(color.primaryTextColor)
-        binding.progressSlider.applyColor(color.primaryTextColor)
-        binding.title.setTextColor(color.primaryTextColor)
-        binding.text.setTextColor(color.secondaryTextColor)
-        binding.songInfo.setTextColor(color.secondaryTextColor)
-        binding.songCurrentProgress.setTextColor(color.secondaryTextColor)
-        binding.songTotalTime.setTextColor(color.secondaryTextColor)
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
+        } else {
+            ThemeStore.accentColor(context!!).ripAlpha()
+        }
+        volumeFragment?.setTintableColor(colorFinal)
+        text.setTextColor(colorFinal)
 
-        binding.playPauseButton.backgroundTintList = tintList
-        binding.playPauseButton.imageTintList = ColorStateList.valueOf(color.backgroundColor)
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, true)
+
+        playPauseButton.backgroundTintList = ColorStateList.valueOf(colorFinal)
+        playPauseButton.imageTintList = ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(colorFinal)))
 
         updateRepeatState()
         updateShuffleState()
         updatePrevNextColor()
+
     }
 
     override fun onServiceConnected() {
@@ -147,15 +137,9 @@ class FullPlaybackControlsFragment :
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
+        title.text = song.title
+        text.text = song.artistName
         updateIsFavorite()
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
     }
 
     override fun onPlayingMetaChanged() {
@@ -169,32 +153,38 @@ class FullPlaybackControlsFragment :
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
 
-        binding.playPauseButton.pivotX = (binding.playPauseButton.width / 2).toFloat()
-        binding.playPauseButton.pivotY = (binding.playPauseButton.height / 2).toFloat()
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+        playPauseButton.post {
+            if (playPauseButton != null) {
+                playPauseButton.pivotX = (playPauseButton.width / 2).toFloat()
+                playPauseButton.pivotY = (playPauseButton.height / 2).toFloat()
+            }
+        }
     }
 
     private fun setUpMusicControllers() {
         setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
         setupFavourite()
         setupMenu()
     }
 
     private fun setupMenu() {
-        binding.playerMenu.setOnClickListener {
-            val popupMenu = PopupMenu(requireContext(), it)
+        playerMenu.setOnClickListener {
+            val popupMenu = PopupMenu(context!!, it)
             popupMenu.setOnMenuItemClickListener(this)
             popupMenu.inflate(R.menu.menu_player)
-            popupMenu.menu.findItem(R.id.action_toggle_favorite).isVisible = false
-            popupMenu.menu.findItem(R.id.action_toggle_lyrics).isChecked = PreferenceUtil.showLyrics
             popupMenu.show()
         }
     }
@@ -203,6 +193,30 @@ class FullPlaybackControlsFragment :
         return (parentFragment as FullPlayerFragment).onMenuItemClick(item!!)
     }
 
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider!!.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis, MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+
     override fun onRepeatModeChanged() {
         updateRepeatState()
     }
@@ -211,61 +225,86 @@ class FullPlaybackControlsFragment :
         updateShuffleState()
     }
 
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
     private fun setupFavourite() {
-        binding.songFavourite.setOnClickListener {
+        songFavourite?.setOnClickListener {
             toggleFavorite(MusicPlayerRemote.currentSong)
         }
     }
 
-    override fun onFavoriteStateChanged() {
-        updateIsFavorite(animate = true)
-    }
-
-    fun updateIsFavorite(animate: Boolean = false) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val isFavorite: Boolean =
-                libraryViewModel.isSongFavorite(MusicPlayerRemote.currentSong.id)
-            withContext(Dispatchers.Main) {
-                val icon = if (animate && VersionUtils.hasMarshmallow()) {
-                    if (isFavorite) R.drawable.avd_favorite else R.drawable.avd_unfavorite
-                } else {
-                    if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-                }
-                val drawable = requireContext().getTintedDrawable(
-                    icon,
-                    Color.WHITE
-                )
-                binding.songFavourite.apply {
-                    setImageDrawable(drawable)
-                    if (drawable is AnimatedVectorDrawable) {
-                        drawable.start()
-                    }
-                }
-            }
-        }
-    }
-
     private fun toggleFavorite(song: Song) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val playlist: PlaylistEntity = libraryViewModel.favoritePlaylist()
-            val songEntity = song.toSongEntity(playlist.playListId)
-            val isFavorite = libraryViewModel.isFavoriteSong(songEntity).isNotEmpty()
-            if (isFavorite) {
-                libraryViewModel.removeSongFromPlaylist(songEntity)
-            } else {
-                libraryViewModel.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
-            }
-            libraryViewModel.forceReload(ReloadType.Playlists)
-            requireContext().sendBroadcast(Intent(MusicService.FAVORITE_STATE_CHANGED))
+        MusicUtil.toggleFavorite(activity!!, song)
+        if (song.id == MusicPlayerRemote.currentSong.id) {
+            updateIsFavorite()
         }
     }
 
+    private var updateIsFavoriteTask: AsyncTask<*, *, *>? = null
+
+    @SuppressLint("StaticFieldLeak")
+    fun updateIsFavorite() {
+        if (updateIsFavoriteTask != null) {
+            updateIsFavoriteTask!!.cancel(false)
+        }
+        updateIsFavoriteTask = object : AsyncTask<Song, Void, Boolean>() {
+            override fun doInBackground(vararg params: Song): Boolean? {
+                val activity = activity
+                return if (activity != null) {
+                    MusicUtil.isFavorite(requireActivity(), params[0])
+                } else {
+                    cancel(false)
+                    null
+                }
+            }
+
+            override fun onPostExecute(isFavorite: Boolean?) {
+                val activity = activity
+                if (activity != null) {
+                    val res = if (isFavorite!!)
+                        R.drawable.ic_favorite_white_24dp
+                    else
+                        R.drawable.ic_favorite_border_white_24dp
+
+                    val drawable = TintHelper.createTintedDrawable(activity, res, Color.WHITE)
+                    songFavourite?.setImageDrawable(drawable)
+                }
+            }
+        }.execute(MusicPlayerRemote.currentSong)
+    }
+
     fun onFavoriteToggled() {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
index 9d418e21d..b09d7140d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/full/FullPlayerFragment.kt
@@ -1,107 +1,188 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.full
 
-import android.content.res.ColorStateList
 import android.graphics.Color
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.widget.FrameLayout
+import android.widget.TextView
 import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentFullBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.CoverLyricsFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.artistImageOptions
+import code.name.monkey.retromusic.glide.ArtistGlideRequest
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.loaders.ArtistLoader
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
+import code.name.monkey.retromusic.model.lyrics.Lyrics
+import code.name.monkey.retromusic.util.NavigationUtil
 import com.bumptech.glide.Glide
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import kotlinx.android.synthetic.main.fragment_full.*
 
-class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
-    private var _binding: FragmentFullBinding? = null
-    private val binding get() = _binding!!
+class FullPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Callback {
+    private lateinit var lyricsLayout: FrameLayout
+    private lateinit var lyricsLine1: TextView
+    private lateinit var lyricsLine2: TextView
+
+    private var lyrics: Lyrics? = null
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        if (!isLyricsLayoutBound()) return
+
+        if (!isLyricsLayoutVisible()) {
+            hideLyricsLayout()
+            return
+        }
+
+        if (lyrics !is AbsSynchronizedLyrics) return
+        val synchronizedLyrics = lyrics as AbsSynchronizedLyrics
+
+        lyricsLayout.visibility = View.VISIBLE
+        lyricsLayout.alpha = 1f
+
+        val oldLine = lyricsLine2.text.toString()
+        val line = synchronizedLyrics.getLine(progress)
+
+        if (oldLine != line || oldLine.isEmpty()) {
+            lyricsLine1.text = oldLine
+            lyricsLine2.text = line
+
+            lyricsLine1.visibility = View.VISIBLE
+            lyricsLine2.visibility = View.VISIBLE
+
+            lyricsLine2.measure(View.MeasureSpec.makeMeasureSpec(lyricsLine2.measuredWidth, View.MeasureSpec.EXACTLY), View.MeasureSpec.UNSPECIFIED)
+            val h: Float = lyricsLine2.measuredHeight.toFloat()
+
+            lyricsLine1.alpha = 1f
+            lyricsLine1.translationY = 0f
+            lyricsLine1.animate().alpha(0f).translationY(-h).duration = VISIBILITY_ANIM_DURATION
+
+            lyricsLine2.alpha = 0f
+            lyricsLine2.translationY = h
+            lyricsLine2.animate().alpha(1f).translationY(0f).duration = VISIBILITY_ANIM_DURATION
+        }
+    }
+
+    private fun isLyricsLayoutVisible(): Boolean {
+        return lyrics != null && lyrics!!.isSynchronized && lyrics!!.isValid
+    }
+
+    private fun isLyricsLayoutBound(): Boolean {
+        return lyricsLayout != null && lyricsLine1 != null && lyricsLine2 != null
+    }
+
+    private fun hideLyricsLayout() {
+        lyricsLayout.animate().alpha(0f).setDuration(VISIBILITY_ANIM_DURATION).withEndAction(Runnable {
+            if (!isLyricsLayoutBound()) return@Runnable
+            lyricsLayout.visibility = View.GONE
+            lyricsLine1.text = null
+            lyricsLine2.text = null
+        })
+    }
+
+    override fun setLyrics(l: Lyrics?) {
+        lyrics = l
+
+        if (!isLyricsLayoutBound()) return
+
+        if (!isLyricsLayoutVisible()) {
+            hideLyricsLayout()
+            return
+        }
+
+        lyricsLine1.text = null
+        lyricsLine2.text = null
+
+        lyricsLayout.visibility = View.VISIBLE
+        lyricsLayout.animate().alpha(1f).duration = VISIBILITY_ANIM_DURATION
+    }
 
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
-    private lateinit var controlsFragment: FullPlaybackControlsFragment
+    private lateinit var fullPlaybackControlsFragment: FullPlaybackControlsFragment
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+        playerToolbar.apply {
+            setNavigationOnClickListener { activity!!.onBackPressed() }
         }
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_full, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentFullBinding.bind(view)
+        lyricsLayout = view.findViewById(R.id.player_lyrics)
+        lyricsLine1 = view.findViewById(R.id.player_lyrics_line1)
+        lyricsLine2 = view.findViewById(R.id.player_lyrics_line2)
 
         setUpSubFragments()
         setUpPlayerToolbar()
         setupArtist()
-        binding.nextSong.isSelected = true
-        binding.playbackControlsFragment.drawAboveSystemBars()
+        nextSong.isSelected = true
+
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this, 500, 1000)
+        progressViewUpdateHelper.start()
     }
 
     private fun setupArtist() {
-        binding.artistImage.setOnClickListener {
-            goToArtist(mainActivity)
+        artistImage.setOnClickListener {
+            NavigationUtil.goToArtist(requireActivity(), MusicPlayerRemote.currentSong.artistId)
         }
     }
 
     private fun setUpSubFragments() {
-        controlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val coverFragment: PlayerAlbumCoverFragment = whichFragment(R.id.playerAlbumCoverFragment)
-        coverFragment.setCallbacks(this)
-        coverFragment.removeSlideEffect()
+        fullPlaybackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as FullPlaybackControlsFragment
+
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
+        playerAlbumCoverFragment.setCallbacks(this)
+        playerAlbumCoverFragment.removeSlideEffect()
     }
 
     override fun onShow() {
+
     }
 
     override fun onHide() {
+
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
     }
 
     override fun toolbarIconColor(): Int {
         return Color.WHITE
     }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        binding.mask.backgroundTintList = ColorStateList.valueOf(color.backgroundColor)
-        controlsFragment.setColor(color)
-        libraryViewModel.updateColor(color.backgroundColor)
-        ToolbarContentTintHelper.colorizeToolbar(binding.playerToolbar, Color.WHITE, activity)
-        binding.coverLyrics.getFragment<CoverLyricsFragment>().setColors(color)
+    override fun onColorChanged(color: Int) {
+        lastColor = color
+        fullPlaybackControlsFragment.setDark(color)
+        callbacks!!.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, Color.WHITE, activity)
     }
 
     override fun onFavoriteToggled() {
         toggleFavorite(MusicPlayerRemote.currentSong)
-        controlsFragment.onFavoriteToggled()
+        fullPlaybackControlsFragment.onFavoriteToggled()
     }
 
     override fun toggleFavorite(song: Song) {
@@ -125,20 +206,25 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
 
     override fun onDestroyView() {
         super.onDestroyView()
-        _binding = null
+        progressViewUpdateHelper.stop()
+        compositeDisposable.dispose()
     }
 
-    private fun updateArtistImage() {
-        libraryViewModel.artist(MusicPlayerRemote.currentSong.artistId)
-            .observe(viewLifecycleOwner) { artist ->
-                if (artist.id != -1L) {
-                    Glide.with(requireActivity())
-                        .load(RetroGlideExtension.getArtistModel(artist))
-                        .artistImageOptions(artist)
-                        .into(binding.artistImage)
-                }
+    private val compositeDisposable = CompositeDisposable()
 
-            }
+    private fun updateArtistImage() {
+        compositeDisposable.addAll(ArtistLoader.getArtistFlowable(context!!, MusicPlayerRemote.currentSong.artistId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+                .subscribe {
+                    ArtistGlideRequest.Builder.from(Glide.with(requireContext()), it)
+                            .generatePalette(requireContext())
+                            .build().into(object : RetroMusicColoredTarget(artistImage) {
+                                override fun onColorReady(color: Int) {
+
+                                }
+                            })
+                })
     }
 
     override fun onQueueChanged() {
@@ -147,15 +233,17 @@ class FullPlayerFragment : AbsPlayerFragment(R.layout.fragment_full) {
     }
 
     private fun updateLabel() {
-        if ((MusicPlayerRemote.playingQueue.size - 1) == (MusicPlayerRemote.position)) {
-            binding.nextSongLabel.setText(R.string.last_song)
-            binding.nextSong.hide()
-        } else {
-            val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title
-            binding.nextSongLabel.setText(R.string.next_song)
-            binding.nextSong.apply {
-                text = title
-                show()
+        (MusicPlayerRemote.playingQueue.size - 1).apply {
+            if (this == (MusicPlayerRemote.position)) {
+                nextSongLabel.setText(R.string.last_song)
+                nextSong.hide()
+            } else {
+                val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title
+                nextSongLabel.setText(R.string.next_song)
+                nextSong.apply {
+                    text = title
+                    show()
+                }
             }
         }
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
deleted file mode 100644
index ca4cebac7..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/gradient/GradientPlayerFragment.kt
+++ /dev/null
@@ -1,596 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.gradient
-
-import android.annotation.SuppressLint
-import android.content.res.ColorStateList
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.graphics.drawable.AnimatedVectorDrawable
-import android.os.Bundle
-import android.view.View
-import androidx.activity.OnBackPressedCallback
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.widget.PopupMenu
-import androidx.appcompat.widget.Toolbar
-import androidx.constraintlayout.widget.ConstraintLayout
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.view.updatePadding
-import androidx.fragment.app.commit
-import androidx.lifecycle.lifecycleScope
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.PlayingQueueAdapter
-import code.name.monkey.retromusic.databinding.FragmentGradientPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.MusicSeekSkipTouchListener
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.other.VolumeFragment
-import code.name.monkey.retromusic.fragments.player.CoverLyricsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.*
-import com.google.android.material.slider.Slider
-import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
-import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
-import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager
-import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager
-import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-
-class GradientPlayerFragment : AbsPlayerFragment(R.layout.fragment_gradient_player),
-    MusicProgressViewUpdateHelper.Callback,
-    View.OnLayoutChangeListener, PopupMenu.OnMenuItemClickListener {
-    private var lastColor: Int = 0
-    private var lastPlaybackControlsColor: Int = 0
-    private var lastDisabledPlaybackControlsColor: Int = 0
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-    private var volumeFragment: VolumeFragment? = null
-    private lateinit var wrappedAdapter: RecyclerView.Adapter<*>
-    private var recyclerViewDragDropManager: RecyclerViewDragDropManager? = null
-    private var recyclerViewSwipeManager: RecyclerViewSwipeManager? = null
-    private var recyclerViewTouchActionGuardManager: RecyclerViewTouchActionGuardManager? = null
-    private var playingQueueAdapter: PlayingQueueAdapter? = null
-    private lateinit var linearLayoutManager: LinearLayoutManager
-    private var navBarHeight = 0
-
-    private var _binding: FragmentGradientPlayerBinding? = null
-    private val binding get() = _binding!!
-
-    private val bottomSheetCallbackList = object : BottomSheetCallback() {
-        override fun onSlide(bottomSheet: View, slideOffset: Float) {
-            mainActivity.getBottomSheetBehavior().isDraggable = false
-            binding.playerQueueSheet.updatePadding(
-                top = (slideOffset * binding.statusBarLayout.statusBar.height).toInt()
-            )
-            binding.container.updatePadding(
-                bottom = ((1 - slideOffset) * navBarHeight).toInt()
-            )
-        }
-
-        override fun onStateChanged(bottomSheet: View, newState: Int) {
-            onBackPressedCallback.isEnabled = newState == STATE_EXPANDED
-            when (newState) {
-                STATE_EXPANDED,
-                STATE_DRAGGING,
-                -> {
-                    mainActivity.getBottomSheetBehavior().isDraggable = false
-                }
-
-                STATE_COLLAPSED -> {
-                    resetToCurrentPosition()
-                    mainActivity.getBottomSheetBehavior().isDraggable = true
-                }
-
-                else -> {
-                    mainActivity.getBottomSheetBehavior().isDraggable = true
-                }
-            }
-        }
-    }
-
-    private val onBackPressedCallback = object : OnBackPressedCallback(true) {
-        override fun handleOnBackPressed() {
-            if (getQueuePanel().state == STATE_EXPANDED) {
-                getQueuePanel().state = STATE_COLLAPSED
-            } else {
-                isEnabled = false
-                requireActivity().onBackPressedDispatcher.onBackPressed()
-            }
-        }
-    }
-
-    private fun setupFavourite() {
-        binding.playbackControlsFragment.songFavourite.setOnClickListener {
-            toggleFavorite(MusicPlayerRemote.currentSong)
-        }
-    }
-
-    private fun setupMenu() {
-        binding.playbackControlsFragment.playerMenu.setOnClickListener {
-            val popupMenu = PopupMenu(requireContext(), it)
-            popupMenu.setOnMenuItemClickListener(this)
-            popupMenu.inflate(R.menu.menu_player)
-            popupMenu.menu.findItem(R.id.action_toggle_favorite).isVisible = false
-            popupMenu.menu.findItem(R.id.action_toggle_lyrics).isChecked = PreferenceUtil.showLyrics
-            popupMenu.show()
-        }
-    }
-
-    private fun setupPanel() {
-        if (!binding.colorBackground.isLaidOut || binding.colorBackground.isLayoutRequested) {
-            binding.colorBackground.addOnLayoutChangeListener(this)
-            return
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentGradientPlayerBinding.bind(view)
-        hideVolumeIfAvailable()
-        setUpMusicControllers()
-        setupPanel()
-        setupRecyclerView()
-        setupSheet()
-        setupMenu()
-        setupFavourite()
-        binding.playbackControlsFragment.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.playbackControlsFragment.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        ViewCompat.setOnApplyWindowInsetsListener(
-            (binding.container)
-        ) { v: View, insets: WindowInsetsCompat ->
-            navBarHeight = insets.getBottomInsets()
-            v.updatePadding(bottom = navBarHeight)
-            insets
-        }
-        binding.playbackControlsFragment.root.drawAboveSystemBars()
-        requireActivity().onBackPressedDispatcher.addCallback(
-            viewLifecycleOwner,
-            onBackPressedCallback
-        )
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setupSheet() {
-        getQueuePanel().addBottomSheetCallback(bottomSheetCallbackList)
-        binding.playerQueueSheet.setOnTouchListener { _, _ ->
-            mainActivity.getBottomSheetBehavior().isDraggable = false
-            getQueuePanel().isDraggable = true
-            return@setOnTouchListener false
-        }
-    }
-
-    private fun getQueuePanel(): BottomSheetBehavior<ConstraintLayout> {
-        return from(binding.playerQueueSheet)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        recyclerViewDragDropManager?.cancelDrag()
-        progressViewUpdateHelper.stop()
-    }
-
-    override fun playerToolbar(): Toolbar? {
-        return null
-    }
-
-    override fun onShow() {
-    }
-
-    override fun onHide() {
-    }
-
-    override fun toolbarIconColor(): Int {
-        return Color.WHITE
-    }
-
-    override val paletteColor: Int
-        get() = lastColor
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        binding.mask.backgroundTintList = ColorStateList.valueOf(color.backgroundColor)
-        binding.colorBackground.setBackgroundColor(color.backgroundColor)
-        binding.playerQueueSheet.setBackgroundColor(ColorUtil.darkenColor(color.backgroundColor))
-
-        lastPlaybackControlsColor = color.primaryTextColor
-        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color.primaryTextColor, 0.3f)
-
-        binding.playbackControlsFragment.title.setTextColor(lastPlaybackControlsColor)
-        binding.playbackControlsFragment.text.setTextColor(lastDisabledPlaybackControlsColor)
-        binding.playbackControlsFragment.playPauseButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playbackControlsFragment.nextButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playbackControlsFragment.previousButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playbackControlsFragment.songFavourite.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.queueIcon.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
-        binding.playbackControlsFragment.playerMenu.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playbackControlsFragment.songCurrentProgress.setTextColor(
-            lastDisabledPlaybackControlsColor
-        )
-        binding.playbackControlsFragment.songTotalTime.setTextColor(
-            lastDisabledPlaybackControlsColor
-        )
-        binding.nextSong.setTextColor(lastPlaybackControlsColor)
-        binding.playbackControlsFragment.songInfo.setTextColor(lastDisabledPlaybackControlsColor)
-
-        volumeFragment?.setTintableColor(lastPlaybackControlsColor.ripAlpha())
-
-        binding.playbackControlsFragment.progressSlider.applyColor(lastPlaybackControlsColor.ripAlpha())
-
-        updateRepeatState()
-        updateShuffleState()
-        updatePrevNextColor()
-        binding.coverLyrics.getFragment<CoverLyricsFragment>().setColors(color)
-    }
-
-    override fun onFavoriteToggled() {
-        toggleFavorite(MusicPlayerRemote.currentSong)
-    }
-
-    private fun updateIsFavoriteIcon(animate: Boolean = false) {
-        lifecycleScope.launch(Dispatchers.IO) {
-            val isFavorite: Boolean =
-                libraryViewModel.isSongFavorite(MusicPlayerRemote.currentSong.id)
-            withContext(Dispatchers.Main) {
-                val icon = if (animate && VersionUtils.hasMarshmallow()) {
-                    if (isFavorite) R.drawable.avd_favorite else R.drawable.avd_unfavorite
-                } else {
-                    if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-                }
-                binding.playbackControlsFragment.songFavourite.apply {
-                    setImageResource(icon)
-                    drawable.also {
-                        if (it is AnimatedVectorDrawable) {
-                            it.start()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun hideVolumeIfAvailable() {
-        if (PreferenceUtil.isVolumeVisibilityMode) {
-            childFragmentManager.commit {
-                replace(R.id.volumeFragmentContainer, VolumeFragment.newInstance())
-            }
-            childFragmentManager.executePendingTransactions()
-            volumeFragment =
-                whichFragment(R.id.volumeFragmentContainer) as VolumeFragment?
-        }
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSong()
-        updatePlayPauseDrawableState()
-        updateQueue()
-        updateIsFavoriteIcon()
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onRepeatModeChanged() {
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        updateShuffleState()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-        updateQueuePosition()
-        updateIsFavoriteIcon()
-    }
-
-    override fun onFavoriteStateChanged() {
-        updateIsFavoriteIcon(animate = true)
-    }
-
-    override fun onQueueChanged() {
-        super.onQueueChanged()
-        updateLabel()
-        playingQueueAdapter?.swapDataSet(MusicPlayerRemote.playingQueue)
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.playbackControlsFragment.title.text = song.title
-        binding.playbackControlsFragment.text.text = song.artistName
-        updateLabel()
-        if (PreferenceUtil.isSongInfo) {
-            binding.playbackControlsFragment.songInfo.text = getSongInfo(song)
-            binding.playbackControlsFragment.songInfo.show()
-        } else {
-            binding.playbackControlsFragment.songInfo.hide()
-        }
-    }
-
-    private fun setUpMusicControllers() {
-        setUpPlayPauseFab()
-        setUpPrevNext()
-        setUpRepeatButton()
-        setUpShuffleButton()
-        setUpProgressSlider()
-        binding.playbackControlsFragment.title.isSelected = true
-        binding.playbackControlsFragment.text.isSelected = true
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playbackControlsFragment.playPauseButton.setImageResource(R.drawable.ic_pause_white_64dp)
-        } else {
-            binding.playbackControlsFragment.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_64dp)
-        }
-    }
-
-    private fun setUpPlayPauseFab() {
-        binding.playbackControlsFragment.playPauseButton.setOnClickListener(
-            PlayPauseButtonOnClickHandler()
-        )
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    private fun setUpPrevNext() {
-        updatePrevNextColor()
-        binding.playbackControlsFragment.nextButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(
-                requireActivity(),
-                true
-            )
-        )
-        binding.playbackControlsFragment.previousButton.setOnTouchListener(
-            MusicSeekSkipTouchListener(requireActivity(), false)
-        )
-    }
-
-    private fun updatePrevNextColor() {
-        binding.playbackControlsFragment.nextButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-        binding.playbackControlsFragment.previousButton.setColorFilter(
-            lastPlaybackControlsColor,
-            PorterDuff.Mode.SRC_IN
-        )
-    }
-
-    private fun setUpShuffleButton() {
-        binding.shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
-    }
-
-    fun updateShuffleState() {
-        when (MusicPlayerRemote.shuffleMode) {
-            MusicService.SHUFFLE_MODE_SHUFFLE ->
-                binding.shuffleButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-
-            else -> binding.shuffleButton.setColorFilter(
-                lastDisabledPlaybackControlsColor,
-                PorterDuff.Mode.SRC_IN
-            )
-        }
-    }
-
-    private fun setUpRepeatButton() {
-        binding.repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
-    }
-
-    fun updateRepeatState() {
-        when (MusicPlayerRemote.repeatMode) {
-            MusicService.REPEAT_MODE_NONE -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.repeatButton.setColorFilter(
-                    lastDisabledPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_ALL -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat)
-                binding.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-
-            MusicService.REPEAT_MODE_THIS -> {
-                binding.repeatButton.setImageResource(R.drawable.ic_repeat_one)
-                binding.repeatButton.setColorFilter(
-                    lastPlaybackControlsColor,
-                    PorterDuff.Mode.SRC_IN
-                )
-            }
-        }
-    }
-
-    private fun updateLabel() {
-        (MusicPlayerRemote.playingQueue.size - 1).apply {
-            if (this == (MusicPlayerRemote.position)) {
-                binding.nextSong.text = context?.resources?.getString(R.string.last_song)
-            } else {
-                val title = MusicPlayerRemote.playingQueue[MusicPlayerRemote.position + 1].title
-                binding.nextSong.text = title
-            }
-        }
-    }
-
-    override fun onLayoutChange(
-        v: View?,
-        left: Int,
-        top: Int,
-        right: Int,
-        bottom: Int,
-        oldLeft: Int,
-        oldTop: Int,
-        oldRight: Int,
-        oldBottom: Int,
-    ) {
-        val panel = getQueuePanel()
-        if (panel.state == STATE_COLLAPSED) {
-            panel.peekHeight = binding.container.height
-        } else if (panel.state == STATE_EXPANDED) {
-            panel.peekHeight = binding.container.height + navBarHeight
-        }
-    }
-
-    private fun setupRecyclerView() {
-        playingQueueAdapter = PlayingQueueAdapter(
-            requireActivity() as AppCompatActivity,
-            MusicPlayerRemote.playingQueue.toMutableList(),
-            MusicPlayerRemote.position,
-            R.layout.item_queue
-        )
-        linearLayoutManager = LinearLayoutManager(requireContext())
-        recyclerViewTouchActionGuardManager = RecyclerViewTouchActionGuardManager()
-        recyclerViewDragDropManager = RecyclerViewDragDropManager()
-        recyclerViewSwipeManager = RecyclerViewSwipeManager()
-
-        val animator = DraggableItemAnimator()
-        animator.supportsChangeAnimations = false
-        wrappedAdapter =
-            recyclerViewDragDropManager?.createWrappedAdapter(playingQueueAdapter!!) as RecyclerView.Adapter<*>
-        wrappedAdapter =
-            recyclerViewSwipeManager?.createWrappedAdapter(wrappedAdapter) as RecyclerView.Adapter<*>
-        binding.recyclerView.apply {
-            layoutManager = linearLayoutManager
-            adapter = wrappedAdapter
-            itemAnimator = animator
-            recyclerViewTouchActionGuardManager?.attachRecyclerView(this)
-            recyclerViewDragDropManager?.attachRecyclerView(this)
-            recyclerViewSwipeManager?.attachRecyclerView(this)
-        }
-
-        linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        getQueuePanel().removeBottomSheetCallback(bottomSheetCallbackList)
-        if (recyclerViewDragDropManager != null) {
-            recyclerViewDragDropManager?.release()
-            recyclerViewDragDropManager = null
-        }
-
-        if (recyclerViewSwipeManager != null) {
-            recyclerViewSwipeManager?.release()
-            recyclerViewSwipeManager = null
-        }
-
-        WrapperAdapterUtils.releaseAll(wrappedAdapter)
-        _binding = null
-    }
-
-    private fun updateQueuePosition() {
-        playingQueueAdapter?.setCurrent(MusicPlayerRemote.position)
-        resetToCurrentPosition()
-    }
-
-    private fun updateQueue() {
-        playingQueueAdapter?.swapDataSet(MusicPlayerRemote.playingQueue, MusicPlayerRemote.position)
-        resetToCurrentPosition()
-    }
-
-    private fun resetToCurrentPosition() {
-        binding.recyclerView.stopScroll()
-        linearLayoutManager.scrollToPositionWithOffset(MusicPlayerRemote.position + 1, 0)
-    }
-
-    private fun setUpProgressSlider() {
-        val progressSlider = binding.playbackControlsFragment.progressSlider
-        progressSlider.addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-            if (fromUser) {
-                onUpdateProgressViews(
-                    value.toInt(),
-                    MusicPlayerRemote.songDurationMillis
-                )
-            }
-        })
-        progressSlider.addOnSliderTouchListener(object : Slider.OnSliderTouchListener {
-            override fun onStartTrackingTouch(slider: Slider) {
-                progressViewUpdateHelper.stop()
-            }
-
-            override fun onStopTrackingTouch(slider: Slider) {
-                MusicPlayerRemote.seekTo(slider.value.toInt())
-                progressViewUpdateHelper.start()
-            }
-        })
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        val progressSlider = binding.playbackControlsFragment.progressSlider
-        progressSlider.valueTo = total.toFloat()
-
-        progressSlider.value =
-            progress.toFloat().coerceIn(progressSlider.valueFrom, progressSlider.valueTo)
-
-        binding.playbackControlsFragment.songTotalTime.text =
-            MusicUtil.getReadableDurationString(total.toLong())
-        binding.playbackControlsFragment.songCurrentProgress.text =
-            MusicUtil.getReadableDurationString(progress.toLong())
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
deleted file mode 100644
index c374010dc..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/home/HomePlayerFragment.kt
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.home
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.Toolbar
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentHomePlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-
-class HomePlayerFragment : AbsPlayerFragment(R.layout.fragment_home_player),
-    MusicProgressViewUpdateHelper.Callback {
-    private var lastColor: Int = 0
-    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
-
-    private var _binding: FragmentHomePlayerBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentHomePlayerBinding.bind(view)
-        setUpPlayerToolbar()
-    }
-
-    override fun onResume() {
-        super.onResume()
-        progressViewUpdateHelper.start()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        progressViewUpdateHelper.stop()
-    }
-
-    override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
-    }
-
-    override fun onShow() {
-    }
-
-    override fun onHide() {
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSong()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-    }
-
-    override fun toolbarIconColor(): Int {
-        return Color.WHITE
-    }
-
-    override val paletteColor: Int
-        get() = lastColor
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            Color.WHITE,
-            requireActivity()
-        )
-    }
-
-    override fun toggleFavorite(song: Song) {
-        super.toggleFavorite(song)
-        if (song.id == MusicPlayerRemote.currentSong.id) {
-            updateIsFavorite()
-        }
-    }
-
-    override fun onFavoriteToggled() {
-        toggleFavorite(MusicPlayerRemote.currentSong)
-    }
-
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.songTotalTime.text = MusicUtil.getReadableDurationString(progress.toLong())
-    }
-
-    private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt
deleted file mode 100644
index 564cdfdc0..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenControlsFragment.kt
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.lockscreen
-
-import android.os.Bundle
-import android.view.View
-import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
-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.databinding.FragmentLockScreenPlaybackControlsBinding
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.extensions.ripAlpha
-import code.name.monkey.retromusic.extensions.textColorSecondary
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
-
-/**
- * @author Hemanth S (h4h13).
- */
-class LockScreenControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_lock_screen_playback_controls) {
-
-    private var _binding: FragmentLockScreenPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
-
-    override val progressSlider: Slider
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentLockScreenPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = String.format("%s - %s", song.artistName, song.albumName)
-    }
-
-    override fun onServiceConnected() {
-        updatePlayPauseDrawableState()
-        updateRepeatState()
-        updateShuffleState()
-        updateSong()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onRepeatModeChanged() {
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        updateShuffleState()
-    }
-
-    override fun setColor(color: MediaNotificationProcessor) {
-        val context = context ?: return
-
-        val colorBg = ATHUtil.resolveColor(context, android.R.attr.colorBackground)
-        if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(context, true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(context, true)
-        } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(context, false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(context, false)
-        }
-
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
-        } else {
-            textColorSecondary()
-        }.ripAlpha()
-
-        volumeFragment?.setTintable(colorFinal)
-        binding.progressSlider.applyColor(colorFinal)
-
-        updateRepeatState()
-        updateShuffleState()
-        updatePrevNextColor()
-
-        val isDark = ColorUtil.isColorLight(colorFinal)
-        binding.text.setTextColor(colorFinal)
-
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(context, isDark),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
-    }
-
-    private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
-        } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
-        }
-    }
-
-    public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
-    }
-
-    public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
new file mode 100644
index 000000000..a34e1614b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/lockscreen/LockScreenPlayerControlsFragment.kt
@@ -0,0 +1,247 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.fragments.player.lockscreen
+
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.DecelerateInterpolator
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.extensions.ripAlpha
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_lock_screen_playback_controls.*
+
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+class LockScreenPlayerControlsFragment : AbsPlayerControlsFragment() {
+
+    private var progressViewUpdateHelper: MusicProgressViewUpdateHelper? = null
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_lock_screen_playback_controls, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpMusicControllers()
+        title.isSelected = true
+    }
+
+    private fun updateSong() {
+        val song = MusicPlayerRemote.currentSong
+        title.text = song.title
+        text.text = String.format("%s - %s", song.artistName, song.albumName)
+
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper!!.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper!!.stop()
+    }
+
+    override fun onServiceConnected() {
+        updatePlayPauseDrawableState()
+        updateRepeatState()
+        updateShuffleState()
+        updateSong()
+    }
+
+    override fun onPlayingMetaChanged() {
+        super.onPlayingMetaChanged()
+        updateSong()
+    }
+
+    override fun onPlayStateChanged() {
+        updatePlayPauseDrawableState()
+    }
+
+    override fun onRepeatModeChanged() {
+        updateRepeatState()
+    }
+
+    override fun onShuffleModeChanged() {
+        updateShuffleState()
+    }
+
+    override fun setDark(color: Int) {
+
+        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
+        if (ColorUtil.isColorLight(colorBg)) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+        } else {
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+        }
+
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
+        } else {
+            ThemeStore.textColorSecondary(requireContext())
+        }.ripAlpha()
+
+        volumeFragment?.setTintable(colorFinal)
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, true)
+
+        updatePrevNextColor()
+
+        val isDark = ColorUtil.isColorLight(colorFinal)
+        text.setTextColor(colorFinal)
+
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(requireContext(), isDark), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
+    }
+
+    private fun setUpPlayPauseFab() {
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
+    private fun updatePlayPauseDrawableState() {
+        if (MusicPlayerRemote.isPlaying) {
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+        } else {
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+        }
+    }
+
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpProgressSlider()
+        setUpShuffleButton()
+        setUpRepeatButton()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    public override fun show() {
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
+    }
+
+    public override fun hide() {
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
+        }
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
index e5984476a..247ae1ce8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialControlsFragment.kt
@@ -1,95 +1,71 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.material
 
+import android.animation.ObjectAnimator
 import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageButton
-import android.widget.TextView
-import androidx.core.content.ContextCompat
+import android.view.ViewGroup
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.retromusic.extensions.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMaterialPlaybackControlsBinding
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
 import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_material_playback_controls.*
 
 /**
  * @author Hemanth S (h4h13).
  */
-class MaterialControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_material_playback_controls) {
+class MaterialControlsFragment : AbsPlayerControlsFragment() {
+
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
 
-    private var _binding: FragmentMaterialPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_material_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMaterialPlaybackControlsBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
+        setUpMusicControllers()
+        title.isSelected = true
+        text.isSelected = true
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
+        title.text = song.title
+        text.text = song.artistName
+    }
 
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
     }
 
     override fun onServiceConnected() {
@@ -116,70 +92,131 @@ class MaterialControlsFragment :
         updateShuffleState()
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        if (ATHUtil.isWindowBackgroundDark(requireContext())) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
+        if (ColorUtil.isColorLight(colorBg)) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
         } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
         }
+
         updateRepeatState()
         updateShuffleState()
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            lastPlaybackControlsColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            lastPlaybackControlsColor = color
+            color
         } else {
-            textColorSecondary()
-        }.ripAlpha()
+            ThemeStore.textColorSecondary(requireContext())
+        }
 
-        binding.text.setTextColor(colorFinal)
-        binding.progressSlider.applyColor(colorFinal)
+        text.setTextColor(colorFinal)
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal.ripAlpha(), true)
 
-        volumeFragment?.setTintable(colorFinal)
+        volumeFragment?.setTintable(colorFinal.ripAlpha())
 
-        updateRepeatState()
-        updateShuffleState()
         updatePlayPauseColor()
         updatePrevNextColor()
     }
 
     private fun updatePlayPauseColor() {
-        binding.playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageDrawable(
-                ContextCompat.getDrawable(
-                    requireContext(),
-                    R.drawable.ic_pause_outline
-                )
-            )
-        } else if (!MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageDrawable(
-                ContextCompat.getDrawable(
-                    requireContext(),
-                    R.drawable.ic_play_arrow_outline
-                )
-            )
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_64dp)
+        } else {
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_64dp);
         }
     }
 
-    public override fun show() {}
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
 
-    public override fun hide() {}
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    public override fun show() {
+
+    }
+
+    public override fun hide() {
+
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider!!.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
index ee88983c7..9a548fd6d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/material/MaterialFragment.kt
@@ -1,49 +1,26 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.material
 
-import android.animation.ArgbEvaluator
-import android.animation.ValueAnimator
-import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMaterialBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.fragments.player.normal.PlayerFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import code.name.monkey.retromusic.views.DrawableGradient
+import kotlinx.android.synthetic.main.fragment_material.*
 
 /**
  * @author Hemanth S (h4h13).
  */
-class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
-
+class MaterialFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
@@ -53,61 +30,29 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
 
     private lateinit var playbackControlsFragment: MaterialControlsFragment
 
-    private var _binding: FragmentMaterialBinding? = null
-    private val binding get() = _binding!!
-
-    private var valueAnimator: ValueAnimator? = null
-
-    private fun colorize(i: Int) {
-        if (valueAnimator != null) {
-            valueAnimator?.cancel()
-        }
-
-        valueAnimator = ValueAnimator.ofObject(
-            ArgbEvaluator(),
-            surfaceColor(),
-            i
-        )
-        valueAnimator?.addUpdateListener { animation ->
-            if (isAdded) {
-                val drawable = DrawableGradient(
-                    GradientDrawable.Orientation.TOP_BOTTOM,
-                    intArrayOf(
-                        animation.animatedValue as Int,
-                        surfaceColor()
-                    ), 0
-                )
-                binding.colorGradientBackground.background = drawable
-            }
-        }
-        valueAnimator?.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong())?.start()
-    }
-
-
     override fun onShow() {
         playbackControlsFragment.show()
     }
 
     override fun onHide() {
         playbackControlsFragment.hide()
+        onBackPressed()
     }
 
-    override fun toolbarIconColor() = colorControlNormal()
+    override fun onBackPressed(): Boolean {
+        return false
+    }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        playbackControlsFragment.setColor(color)
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
+    override fun toolbarIconColor(): Int {
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
+    }
 
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
 
-        if (PreferenceUtil.isAdaptiveColor) {
-            colorize(color.backgroundColor)
-        }
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
     }
 
     override fun toggleFavorite(song: Song) {
@@ -121,31 +66,30 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_material, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMaterialBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        playerToolbar().drawAboveSystemBars()
+
     }
 
     private fun setUpSubFragments() {
-        playbackControlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as MaterialControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@MaterialFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
         }
     }
 
@@ -163,9 +107,4 @@ class MaterialFragment : AbsPlayerFragment(R.layout.fragment_material) {
             return PlayerFragment()
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt
deleted file mode 100644
index 796bce973..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlaybackControlsFragment.kt
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.md3
-
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageButton
-import android.widget.TextView
-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.extensions.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMd3PlayerPlaybackControlsBinding
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
-
-class MD3PlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_md3_player_playback_controls) {
-
-    private var _binding: FragmentMd3PlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
-
-    override val progressSlider: Slider
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMd3PlayerPlaybackControlsBinding.bind(view)
-        setUpMusicControllers()
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-        }
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-    }
-
-    override fun setColor(color: MediaNotificationProcessor) {
-        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
-        if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
-        } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
-        }
-
-        val colorFinal = accentColor().ripAlpha()
-
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                ColorUtil.isColorLight(colorFinal)
-            ),
-            false
-        )
-        binding.playPauseCard.setCardBackgroundColor(colorFinal)
-
-        binding.progressSlider.applyColor(colorFinal)
-        volumeFragment?.setTintable(colorFinal)
-        updateRepeatState()
-        updateShuffleState()
-        updatePrevNextColor()
-        updatePlayPauseDrawableState()
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
-    }
-
-    override fun onServiceConnected() {
-        updatePlayPauseDrawableState()
-        updateRepeatState()
-        updateShuffleState()
-        updateSong()
-    }
-
-    override fun onPlayingMetaChanged() {
-        updateSong()
-    }
-
-    override fun onPlayStateChanged() {
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onRepeatModeChanged() {
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        updateShuffleState()
-    }
-
-    private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-        updatePlayPauseDrawableState()
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause_outline_small)
-            binding.playPauseCard.animateRadius(40F)
-        } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_outline_small)
-            binding.playPauseCard.animateToCircle()
-        }
-    }
-
-    private fun setUpMusicControllers() {
-        setUpPlayPauseFab()
-    }
-
-    public override fun show() {}
-
-    public override fun hide() {}
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
deleted file mode 100644
index f90aadb81..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/md3/MD3PlayerFragment.kt
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.md3
-
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.Toolbar
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMd3PlayerBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-
-class MD3PlayerFragment : AbsPlayerFragment(R.layout.fragment_md3_player) {
-
-    private var lastColor: Int = 0
-    override val paletteColor: Int
-        get() = lastColor
-
-    private lateinit var controlsFragment: MD3PlaybackControlsFragment
-
-    private var _binding: FragmentMd3PlayerBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onShow() {
-        controlsFragment.show()
-    }
-
-    override fun onHide() {
-        controlsFragment.hide()
-    }
-
-    override fun toolbarIconColor(): Int {
-        return ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal)
-    }
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        controlsFragment.setColor(color)
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal),
-            requireActivity()
-        )
-    }
-
-    override fun toggleFavorite(song: Song) {
-        super.toggleFavorite(song)
-        if (song.id == MusicPlayerRemote.currentSong.id) {
-            updateIsFavorite()
-        }
-    }
-
-    override fun onFavoriteToggled() {
-        toggleFavorite(MusicPlayerRemote.currentSong)
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentMd3PlayerBinding.bind(view)
-        setUpSubFragments()
-        setUpPlayerToolbar()
-        playerToolbar().drawAboveSystemBars()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    private fun setUpSubFragments() {
-        controlsFragment =
-            childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as MD3PlaybackControlsFragment
-        val playerAlbumCoverFragment =
-            childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
-        playerAlbumCoverFragment.setCallbacks(this)
-    }
-
-    private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        //binding.playerToolbar.menu.setUpWithIcons()
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
-
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            ATHUtil.resolveColor(requireContext(), androidx.appcompat.R.attr.colorControlNormal),
-            requireActivity()
-        )
-    }
-
-    override fun onServiceConnected() {
-        updateIsFavorite()
-    }
-
-    override fun onPlayingMetaChanged() {
-        updateIsFavorite()
-    }
-
-    override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
-    }
-
-    companion object {
-
-        fun newInstance(): MD3PlayerFragment {
-            return MD3PlayerFragment()
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
index 45bbac39d..b70b94acf 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerFragment.kt
@@ -1,104 +1,79 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.normal
 
 import android.animation.ArgbEvaluator
 import android.animation.ValueAnimator
-import android.content.SharedPreferences
 import android.graphics.drawable.GradientDrawable
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
-import androidx.core.view.isVisible
-import androidx.preference.PreferenceManager
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.SNOWFALL
-import code.name.monkey.retromusic.databinding.FragmentPlayerBinding
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
 import code.name.monkey.retromusic.views.DrawableGradient
+import kotlinx.android.synthetic.main.fragment_player.*
 
-class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+
+class PlayerFragment : AbsPlayerFragment() {
 
     private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
 
-    private lateinit var controlsFragment: PlayerPlaybackControlsFragment
+    private lateinit var playbackControlsFragment: PlayerPlaybackControlsFragment
     private var valueAnimator: ValueAnimator? = null
 
-    private var _binding: FragmentPlayerBinding? = null
-    private val binding get() = _binding!!
-
 
     private fun colorize(i: Int) {
         if (valueAnimator != null) {
             valueAnimator?.cancel()
         }
 
-        valueAnimator = ValueAnimator.ofObject(
-            ArgbEvaluator(),
-            surfaceColor(),
-            i
-        )
+        valueAnimator = ValueAnimator.ofObject(ArgbEvaluator(), ATHUtil.resolveColor(requireContext(), R.attr.colorSurface), i)
         valueAnimator?.addUpdateListener { animation ->
             if (isAdded) {
-                val drawable = DrawableGradient(
-                    GradientDrawable.Orientation.TOP_BOTTOM,
-                    intArrayOf(
-                        animation.animatedValue as Int,
-                        surfaceColor()
-                    ), 0
-                )
-                binding.colorGradientBackground.background = drawable
+                val drawable = DrawableGradient(GradientDrawable.Orientation.TOP_BOTTOM,
+                        intArrayOf(animation.animatedValue as Int,
+                                ATHUtil.resolveColor(requireContext(), R.attr.colorSurface)), 0)
+                colorGradientBackground?.background = drawable
             }
         }
         valueAnimator?.setDuration(ViewUtil.RETRO_MUSIC_ANIM_TIME.toLong())?.start()
     }
 
     override fun onShow() {
-        controlsFragment.show()
+        playbackControlsFragment.show()
     }
 
     override fun onHide() {
-        controlsFragment.hide()
+        playbackControlsFragment.hide()
+        onBackPressed()
     }
 
-    override fun toolbarIconColor() = colorControlNormal()
+    override fun onBackPressed(): Boolean {
+        return false
+    }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        controlsFragment.setColor(color)
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
+    override fun toolbarIconColor(): Int {
+        return ATHUtil.resolveColor(context, R.attr.colorControlNormal)
+    }
 
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
 
-        if (PreferenceUtil.isAdaptiveColor) {
-            colorize(color.backgroundColor)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.colorControlNormal), activity)
+
+        if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            colorize(color)
         }
     }
 
@@ -113,60 +88,32 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_player, container, false)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        startOrStopSnow(PreferenceUtil.isSnowFalling)
-
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .registerOnSharedPreferenceChangeListener(this)
-        playerToolbar().drawAboveSystemBars()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        PreferenceManager.getDefaultSharedPreferences(requireContext())
-            .unregisterOnSharedPreferenceChangeListener(this)
-        _binding = null
-    }
 
     private fun setUpSubFragments() {
-        controlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as PlayerPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        //binding.playerToolbar.menu.setUpWithIcons()
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
+        playerToolbar.inflateMenu(R.menu.menu_player)
+        playerToolbar.setNavigationOnClickListener { activity!!.onBackPressed() }
+        playerToolbar.setOnMenuItemClickListener(this)
 
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
-    }
-
-    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == SNOWFALL) {
-            startOrStopSnow(PreferenceUtil.isSnowFalling)
-        }
-    }
-
-    private fun startOrStopSnow(isSnowFalling: Boolean) {
-        if (_binding == null) return
-        if (isSnowFalling && !surfaceColor().isColorLight) {
-            binding.snowfallView.isVisible = true
-            binding.snowfallView.restartFalling()
-        } else {
-            binding.snowfallView.isVisible = false
-            binding.snowfallView.stopFalling()
-        }
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
     }
 
     override fun onServiceConnected() {
@@ -178,7 +125,7 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
     }
 
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     companion object {
@@ -188,3 +135,4 @@ class PlayerFragment : AbsPlayerFragment(R.layout.fragment_player),
         }
     }
 }
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
index cf644dedf..ba458c90b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt
@@ -1,112 +1,87 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.normal
 
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.extensions.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPlayerPlaybackControlsBinding
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_player_playback_controls.*
 
-class PlayerPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_player_playback_controls) {
 
-    private var _binding: FragmentPlayerPlaybackControlsBinding? = null
-    private val binding get() = _binding!!
+class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
 
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
+        return inflater.inflate(R.layout.fragment_player_playback_controls, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlayerPlaybackControlsBinding.bind(view)
-
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+        setUpMusicControllers()
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation(playPauseButton)
         }
+        title.isSelected = true
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
+    override fun setDark(color: Int) {
         val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
         if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
         } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
         }
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor()
+            ThemeStore.accentColor(requireContext())
         }.ripAlpha()
 
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                ColorUtil.isColorLight(colorFinal)
-            ),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
-        binding.progressSlider.applyColor(colorFinal)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(requireContext(), ColorUtil.isColorLight(colorFinal)), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
+
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, false)
+
         volumeFragment?.setTintable(colorFinal)
+
         updateRepeatState()
         updateShuffleState()
         updatePrevNextColor()
@@ -114,17 +89,19 @@ class PlayerPlaybackControlsFragment :
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = song.artistName
     }
 
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
 
     override fun onServiceConnected() {
         updatePlayPauseDrawableState()
@@ -151,43 +128,109 @@ class PlayerPlaybackControlsFragment :
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+        }
+    }
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
         }
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
     }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt
new file mode 100644
index 000000000..16d9f4ed9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerControlFragment.kt
@@ -0,0 +1,231 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.fragments.player.peak
+
+import android.animation.ObjectAnimator
+import android.graphics.Color
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.extensions.ripAlpha
+import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_peak_control_player.*
+
+/**
+ * Created by hemanths on 2019-10-04.
+ */
+
+class PeakPlayerControlFragment : AbsPlayerControlsFragment() {
+
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
+
+    override fun onCreateView(
+            inflater: LayoutInflater,
+            container: ViewGroup?,
+            savedInstanceState: Bundle?
+    ): View? {
+        return inflater.inflate(R.layout.fragment_peak_control_player, container, false)
+    }
+
+    override fun onViewCreated(
+            view: View,
+            savedInstanceState: Bundle?
+    ) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpMusicControllers()
+    }
+
+    override fun show() {
+
+    }
+
+    override fun hide() {
+
+    }
+
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
+        if (ColorUtil.isColorLight(colorBg)) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+        } else {
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+        }
+
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            lastPlaybackControlsColor = color
+            color
+        } else {
+            ThemeStore.textColorSecondary(requireContext())
+        }.ripAlpha()
+
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal, true)
+        volumeFragment?.setTintableColor(colorFinal)
+        playPauseButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        updateRepeatState()
+        updateShuffleState()
+        updatePrevNextColor()
+    }
+
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
+    }
+
+    private fun updatePlayPauseDrawableState() {
+        if (MusicPlayerRemote.isPlaying) {
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
+        } else {
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+        }
+    }
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener {
+            println("shuffleButton Click")
+            MusicPlayerRemote.toggleShuffleMode()
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener {
+            println("repeatButton Click")
+            MusicPlayerRemote.cycleRepeatMode()
+        }
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis, MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+    private fun setUpPlayPauseFab() {
+        TintHelper.setTintAuto(playPauseButton, Color.WHITE, true)
+        TintHelper.setTintAuto(playPauseButton, Color.BLACK, false)
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
+    override fun onPlayStateChanged() {
+        super.onPlayStateChanged()
+        updatePlayPauseDrawableState()
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        updatePlayPauseDrawableState()
+    }
+
+    override fun onRepeatModeChanged() {
+        updateRepeatState()
+    }
+
+    override fun onShuffleModeChanged() {
+        updateShuffleState()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt
new file mode 100644
index 000000000..09f6fa996
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peak/PeakPlayerFragment.kt
@@ -0,0 +1,128 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.fragments.player.peak
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
+import code.name.monkey.retromusic.glide.RetroMusicColoredTarget
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.util.NavigationUtil
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.fragment_peak_player.*
+
+/**
+ * Created by hemanths on 2019-10-03.
+ */
+
+class PeakPlayerFragment : AbsPlayerFragment() {
+
+    private lateinit var playbackControlsFragment: PeakPlayerControlFragment
+    private var lastColor: Int = 0
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_peak_player, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setUpPlayerToolbar()
+        setUpSubFragments()
+        title.isSelected = true
+        playerImage.setOnClickListener {
+            NavigationUtil.goToLyrics(requireActivity())
+        }
+    }
+
+    private fun setUpSubFragments() {
+        playbackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as PeakPlayerControlFragment
+    }
+
+    private fun setUpPlayerToolbar() {
+        playerToolbar.apply {
+            inflateMenu(R.menu.menu_player)
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
+            setOnMenuItemClickListener(this@PeakPlayerFragment)
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
+        }
+    }
+
+    override fun playerToolbar(): Toolbar {
+        return playerToolbar
+    }
+
+    override fun onShow() {
+
+    }
+
+    override fun onHide() {
+
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
+    override fun toolbarIconColor(): Int {
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
+    }
+
+    override val paletteColor: Int
+        get() = lastColor
+
+    override fun onColorChanged(color: Int) {
+        playbackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
+    }
+
+    override fun onFavoriteToggled() {
+
+    }
+
+    private fun updateSong() {
+        val song = MusicPlayerRemote.currentSong
+        title.text = song.title
+        text.text = song.artistName
+
+        SongGlideRequest.Builder.from(Glide.with(requireActivity()), MusicPlayerRemote.currentSong)
+                .checkIgnoreMediaStore(requireContext())
+                .generatePalette(requireContext())
+                .build()
+                .into(object : RetroMusicColoredTarget(playerImage) {
+                    override fun onColorReady(color: Int) {
+                        playbackControlsFragment.setDark(color)
+                    }
+                })
+
+    }
+
+    override fun onServiceConnected() {
+        super.onServiceConnected()
+        updateSong()
+    }
+
+    override fun onPlayingMetaChanged() {
+        super.onPlayingMetaChanged()
+        updateSong()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt
deleted file mode 100644
index 36150ad80..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerControlFragment.kt
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.peek
-
-import android.graphics.Color
-import android.graphics.PorterDuff
-import android.os.Bundle
-import android.view.View
-import android.widget.ImageButton
-import android.widget.TextView
-import code.name.monkey.appthemehelper.util.ATHUtil
-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.databinding.FragmentPeekControlPlayerBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.applyColor
-import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
-
-/**
- * Created by hemanths on 2019-10-04.
- */
-
-class PeekPlayerControlFragment : AbsPlayerControlsFragment(R.layout.fragment_peek_control_player) {
-
-    private var _binding: FragmentPeekControlPlayerBinding? = null
-    private val binding get() = _binding!!
-
-    override val progressSlider: Slider
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
-
-    override fun onViewCreated(
-        view: View,
-        savedInstanceState: Bundle?
-    ) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPeekControlPlayerBinding.bind(view)
-        setUpPlayPauseFab()
-    }
-
-    override fun show() {}
-
-    override fun hide() {}
-
-    override fun setColor(color: MediaNotificationProcessor) {
-        val controlsColor =
-            if (PreferenceUtil.isAdaptiveColor) {
-                color.primaryTextColor
-            } else {
-                accentColor()
-            }
-        binding.progressSlider.applyColor(controlsColor)
-        volumeFragment?.setTintableColor(controlsColor)
-        binding.playPauseButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN)
-        binding.nextButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN)
-        binding.previousButton.setColorFilter(controlsColor, PorterDuff.Mode.SRC_IN)
-
-        if (!ATHUtil.isWindowBackgroundDark(requireContext())) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
-        } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
-        }
-        updateRepeatState()
-        updateShuffleState()
-    }
-
-    private fun updatePlayPauseDrawableState() {
-        if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
-        } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
-        }
-    }
-
-    private fun setUpPlayPauseFab() {
-        TintHelper.setTintAuto(binding.playPauseButton, Color.WHITE, true)
-        TintHelper.setTintAuto(binding.playPauseButton, Color.BLACK, false)
-        binding.playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
-    }
-
-    override fun onPlayStateChanged() {
-        super.onPlayStateChanged()
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updatePlayPauseDrawableState()
-    }
-
-    override fun onRepeatModeChanged() {
-        updateRepeatState()
-    }
-
-    override fun onShuffleModeChanged() {
-        updateShuffleState()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
deleted file mode 100644
index 3fe563dc8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/peek/PeekPlayerFragment.kt
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.player.peek
-
-import android.os.Bundle
-import android.view.View
-import androidx.appcompat.widget.Toolbar
-import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPeekPlayerBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
-import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-
-/**
- * Created by hemanths on 2019-10-03.
- */
-
-class PeekPlayerFragment : AbsPlayerFragment(R.layout.fragment_peek_player) {
-
-    private lateinit var controlsFragment: PeekPlayerControlFragment
-    private var lastColor: Int = 0
-    private var _binding: FragmentPeekPlayerBinding? = null
-    private val binding get() = _binding!!
-
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPeekPlayerBinding.bind(view)
-        setUpPlayerToolbar()
-        setUpSubFragments()
-        binding.title.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        binding.root.drawAboveSystemBarsWithPadding()
-    }
-
-    private fun setUpSubFragments() {
-        controlsFragment =
-            whichFragment(R.id.playbackControlsFragment) as PeekPlayerControlFragment
-
-        val coverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
-        coverFragment.setCallbacks(this)
-    }
-
-    private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
-            inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-            setOnMenuItemClickListener(this@PeekPlayerFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
-        }
-    }
-
-    override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
-    }
-
-    override fun onShow() {
-    }
-
-    override fun onHide() {
-    }
-
-    override fun toolbarIconColor() = colorControlNormal()
-
-    override val paletteColor: Int
-        get() = lastColor
-
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.primaryTextColor
-        libraryViewModel.updateColor(color.primaryTextColor)
-        controlsFragment.setColor(color)
-    }
-
-    override fun onFavoriteToggled() {
-    }
-
-    private fun updateSong() {
-        val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
-    }
-
-    override fun onServiceConnected() {
-        super.onServiceConnected()
-        updateSong()
-    }
-
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
index c5c7869ed..a083153b1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlaybackControlsFragment.kt
@@ -1,67 +1,46 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.plain
 
+import android.animation.ObjectAnimator
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
+import android.view.animation.AccelerateInterpolator
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
-import android.widget.TextView
+import android.view.animation.LinearInterpolator
+import android.widget.SeekBar
+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.databinding.FragmentPlainControlsFragmentBinding
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.extensions.ripAlpha
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.misc.SimpleOnSeekbarChangeListener
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.google.android.material.slider.Slider
+import code.name.monkey.retromusic.util.ViewUtil
+import kotlinx.android.synthetic.main.fragment_plain_controls_fragment.*
+import kotlinx.android.synthetic.main.media_button.playPauseButton
+import kotlinx.android.synthetic.main.media_button.repeatButton
+import kotlinx.android.synthetic.main.media_button.shuffleButton
 
 /**
  * @author Hemanth S (h4h13).
  */
 
-class PlainPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_plain_controls_fragment) {
+class PlainPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    private var _binding: FragmentPlainControlsFragmentBinding? = null
-    private val binding get() = _binding!!
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val progressSlider: Slider
-        get() = binding.progressSlider
-
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
-
-    override val songTotalTime: TextView
-        get() = binding.songTotalTime
-
-    override val songCurrentProgress: TextView
-        get() = binding.songCurrentProgress
 
     override fun onPlayStateChanged() {
         updatePlayPauseDrawableState()
@@ -79,104 +58,198 @@ class PlainPlaybackControlsFragment :
         updatePlayPauseDrawableState()
         updateRepeatState()
         updateShuffleState()
-        updateSong()
     }
 
-    override fun onPlayingMetaChanged() {
-        super.onPlayingMetaChanged()
-        updateSong()
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
     }
 
-    private fun updateSong() {
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(MusicPlayerRemote.currentSong)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_plain_controls_fragment, container, false)
+    }
+
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlainControlsFragmentBinding.bind(view)
-        setUpPlayPauseFab()
-    }
+        setUpMusicControllers()
 
-    private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
+        playPauseButton.setOnClickListener {
             if (MusicPlayerRemote.isPlaying) {
                 MusicPlayerRemote.pauseSong()
             } else {
                 MusicPlayerRemote.resumePlaying()
             }
-            it.showBounceAnimation()
+            showBonceAnimation()
         }
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
+    private fun setUpPlayPauseFab() {
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
+    }
+
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(context!!, android.R.attr.colorBackground)
         if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(context!!, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(context!!, true)
         } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(context!!, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(context!!, false)
         }
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor()
+            ThemeStore.accentColor(context!!)
         }
         volumeFragment?.setTintable(colorFinal)
-        binding.progressSlider.applyColor(colorFinal)
 
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                ColorUtil.isColorLight(colorFinal)
-            ),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context!!, ColorUtil.isColorLight(colorFinal)), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
+
+        ViewUtil.setProgressDrawable(progressSlider, colorFinal.ripAlpha(), true)
 
         updateRepeatState()
         updateShuffleState()
         updatePrevNextColor()
     }
 
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
+    }
+
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
+        }
+    }
+
+    override fun setUpProgressSlider() {
+        progressSlider.setOnSeekBarChangeListener(object : SimpleOnSeekbarChangeListener() {
+            override fun onProgressChanged(seekBar: SeekBar, progress: Int, fromUser: Boolean) {
+                if (fromUser) {
+                    MusicPlayerRemote.seekTo(progress)
+                    onUpdateProgressViews(MusicPlayerRemote.songProgressMillis,
+                            MusicPlayerRemote.songDurationMillis)
+                }
+            }
+        })
+    }
+
+    private fun showBonceAnimation() {
+        playPauseButton.apply {
+            clearAnimation()
+            scaleX = 0.9f
+            scaleY = 0.9f
+            visibility = View.VISIBLE
+            pivotX = (width / 2).toFloat()
+            pivotY = (height / 2).toFloat()
+
+            animate().setDuration(200)
+                    .setInterpolator(DecelerateInterpolator())
+                    .scaleX(1.1f)
+                    .scaleY(1.1f)
+                    .withEndAction {
+                        animate().setDuration(200)
+                                .setInterpolator(AccelerateInterpolator())
+                                .scaleX(1f)
+                                .scaleY(1f)
+                                .alpha(1f).start()
+                    }.start()
         }
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressSlider.max = total
+
+        val animator = ObjectAnimator.ofInt(progressSlider, "progress", progress)
+        animator.duration = SLIDER_ANIMATION_TIME
+        animator.interpolator = LinearInterpolator()
+        animator.start()
+
+        songTotalTime.text = MusicUtil.getReadableDurationString(total.toLong())
+        songCurrentProgress.text = MusicUtil.getReadableDurationString(progress.toLong())
     }
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
index a2cc47387..f580a2361 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/plain/PlainPlayerFragment.kt
@@ -1,47 +1,28 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.plain
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentPlainPlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_plain_player.*
 
-class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
+class PlainPlayerFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private lateinit var plainPlaybackControlsFragment: PlainPlaybackControlsFragment
     private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
-    private var _binding: FragmentPlainPlayerBinding? = null
-    private val binding get() = _binding!!
 
 
     override fun onPlayingMetaChanged() {
@@ -51,8 +32,8 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
+        title.text = song.title
+        text.text = song.artistName
     }
 
     override fun onServiceConnected() {
@@ -60,39 +41,31 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
         updateSong()
     }
 
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_plain_player, container, false)
+    }
+
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
             setOnMenuItemClickListener(this@PlainPlayerFragment)
-            ToolbarContentTintHelper.colorizeToolbar(
-                this,
-                colorControlNormal(),
-                requireActivity()
-            )
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.iconColor), activity)
         }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlainPlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        binding.title.isSelected = true
-        binding.text.isSelected = true
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        playerToolbar().drawAboveSystemBars()
+        title.isSelected = true
+        text.isSelected = true
     }
 
     private fun setUpSubFragments() {
-        plainPlaybackControlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        plainPlaybackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as PlainPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
     }
 
@@ -102,19 +75,22 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
 
     override fun onHide() {
         plainPlaybackControlsFragment.hide()
+        onBackPressed()
     }
 
-    override fun toolbarIconColor() = colorControlNormal()
+    override fun onBackPressed(): Boolean {
+        return false
+    }
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        plainPlaybackControlsFragment.setColor(color)
-        lastColor = color.primaryTextColor
-        libraryViewModel.updateColor(color.primaryTextColor)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
+    override fun toolbarIconColor(): Int {
+        return ATHUtil.resolveColor(requireContext(), R.attr.iconColor)
+    }
+
+    override fun onColorChanged(color: Int) {
+        plainPlaybackControlsFragment.setDark(color)
+        lastColor = color
+        callbacks!!.onPaletteColorChanged()
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.iconColor), activity)
     }
 
     override fun onFavoriteToggled() {
@@ -127,9 +103,4 @@ class PlainPlayerFragment : AbsPlayerFragment(R.layout.fragment_plain_player) {
             updateIsFavorite()
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
index 1d487ddb8..7e087c9e7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlaybackControlsFragment.kt
@@ -1,62 +1,36 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.simple
 
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.DecelerateInterpolator
-import android.widget.ImageButton
+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.databinding.FragmentSimpleControlsFragmentBinding
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.getSongInfo
-import code.name.monkey.retromusic.extensions.hide
-import code.name.monkey.retromusic.extensions.show
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
+import code.name.monkey.retromusic.helper.PlayPauseButtonOnClickHandler
+import code.name.monkey.retromusic.service.MusicService
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_simple_controls_fragment.*
 
 /**
  * @author Hemanth S (h4h13).
  */
 
-class SimplePlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_simple_controls_fragment) {
+class SimplePlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    private var _binding: FragmentSimpleControlsFragmentBinding? = null
-    private val binding get() = _binding!!
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+    private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
-
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
-
-    override val nextButton: ImageButton
-        get() = binding.nextButton
-
-    override val previousButton: ImageButton
-        get() = binding.previousButton
 
     override fun onPlayStateChanged() {
         updatePlayPauseDrawableState()
@@ -77,98 +51,153 @@ class SimplePlaybackControlsFragment :
         updateSong()
     }
 
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        progressViewUpdateHelper = MusicProgressViewUpdateHelper(this)
+    }
+
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_simple_controls_fragment, container, false)
+    }
+
+    override fun onResume() {
+        super.onResume()
+        progressViewUpdateHelper.start()
+    }
+
+    override fun onPause() {
+        super.onPause()
+        progressViewUpdateHelper.stop()
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentSimpleControlsFragmentBinding.bind(view)
-        setUpPlayPauseFab()
-        binding.title.isSelected = true
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+        setUpMusicControllers()
+        title.isSelected = true
+        playPauseButton.setOnClickListener {
+            if (MusicPlayerRemote.isPlaying) {
+                MusicPlayerRemote.pauseSong()
+            } else {
+                MusicPlayerRemote.resumePlaying()
+            }
+            showBonceAnimation(playPauseButton)
         }
+    }
 
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
+    private fun setUpMusicControllers() {
+        setUpPlayPauseFab()
+        setUpPrevNext()
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpPrevNext() {
+        updatePrevNextColor()
+        nextButton.setOnClickListener { MusicPlayerRemote.playNextSong() }
+        previousButton.setOnClickListener { MusicPlayerRemote.back() }
+    }
+
+    private fun updatePrevNextColor() {
+        nextButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        previousButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+    }
+
+    private fun setUpShuffleButton() {
+        shuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> shuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> shuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
         }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
+    }
+
+    private fun setUpRepeatButton() {
+        repeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                repeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                repeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
         }
     }
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = song.artistName
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = song.artistName
     }
 
     override fun onPlayingMetaChanged() {
         super.onPlayingMetaChanged()
         updateSong()
+
     }
 
     public override fun show() {
-        binding.playPauseButton.animate()
-            .scaleX(1f)
-            .scaleY(1f)
-            .rotation(360f)
-            .setInterpolator(DecelerateInterpolator())
-            .start()
+        playPauseButton!!.animate()
+                .scaleX(1f)
+                .scaleY(1f)
+                .rotation(360f)
+                .setInterpolator(DecelerateInterpolator())
+                .start()
     }
 
     public override fun hide() {
-        binding.playPauseButton.apply {
-            scaleX = 0f
-            scaleY = 0f
-            rotation = 0f
+        if (playPauseButton != null) {
+            playPauseButton!!.apply {
+                scaleX = 0f
+                scaleY = 0f
+                rotation = 0f
+            }
         }
     }
 
+    override fun setUpProgressSlider() {
+
+    }
+
+
     override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.songCurrentProgress.text = String.format(
-            "%s / %s",
-            MusicUtil.getReadableDurationString(progress.toLong()),
-            MusicUtil.getReadableDurationString(total.toLong())
-        )
+        songCurrentProgress!!.text = String.format("%s / %s", MusicUtil.getReadableDurationString(progress.toLong()),
+                MusicUtil.getReadableDurationString(total.toLong()))
     }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        val colorBg = ATHUtil.resolveColor(requireContext(), android.R.attr.colorBackground)
+    override fun setDark(color: Int) {
+        val colorBg = ATHUtil.resolveColor(context!!, android.R.attr.colorBackground)
         if (ColorUtil.isColorLight(colorBg)) {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(context!!, true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(context!!, true)
         } else {
-            lastPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
-            lastDisabledPlaybackControlsColor =
-                MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(context!!, false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(context!!, false)
         }
 
-        val colorFinal = if (PreferenceUtil.isAdaptiveColor) {
-            color.primaryTextColor
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
         } else {
-            accentColor()
+            ThemeStore.accentColor(context!!)
         }
 
         volumeFragment?.setTintable(colorFinal)
 
-        TintHelper.setTintAuto(
-            binding.playPauseButton,
-            MaterialValueHelper.getPrimaryTextColor(
-                requireContext(),
-                ColorUtil.isColorLight(colorFinal)
-            ),
-            false
-        )
-        TintHelper.setTintAuto(binding.playPauseButton, colorFinal, true)
-        binding.text.setTextColor(colorFinal)
+        TintHelper.setTintAuto(playPauseButton, MaterialValueHelper.getPrimaryTextColor(context!!, ColorUtil.isColorLight(colorFinal)), false)
+        TintHelper.setTintAuto(playPauseButton, colorFinal, true)
+        text.setTextColor(colorFinal)
 
         updateRepeatState()
         updateShuffleState()
@@ -176,26 +205,14 @@ class SimplePlaybackControlsFragment :
     }
 
     private fun setUpPlayPauseFab() {
-        binding.playPauseButton.setOnClickListener {
-            if (MusicPlayerRemote.isPlaying) {
-                MusicPlayerRemote.pauseSong()
-            } else {
-                MusicPlayerRemote.resumePlaying()
-            }
-            it.showBounceAnimation()
-        }
+        playPauseButton.setOnClickListener(PlayPauseButtonOnClickHandler())
     }
 
     private fun updatePlayPauseDrawableState() {
         if (MusicPlayerRemote.isPlaying) {
-            binding.playPauseButton.setImageResource(R.drawable.ic_pause)
+            playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp)
         } else {
-            binding.playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
+            playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp)
         }
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
index fd7f41e1b..267f1df71 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/simple/SimplePlayerFragment.kt
@@ -1,87 +1,74 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.simple
 
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import androidx.appcompat.widget.Toolbar
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentSimplePlayerBinding
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.drawAboveSystemBars
-import code.name.monkey.retromusic.extensions.whichFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import kotlinx.android.synthetic.main.fragment_simple_player.*
 
 /**
  * @author Hemanth S (h4h13).
  */
 
-class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player) {
-
-    private var _binding: FragmentSimplePlayerBinding? = null
-    private val binding get() = _binding!!
-
+class SimplePlayerFragment : AbsPlayerFragment() {
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
     private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
 
-    private lateinit var controlsFragment: SimplePlaybackControlsFragment
+    private lateinit var simplePlaybackControlsFragment: SimplePlaybackControlsFragment
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+
+        return inflater.inflate(R.layout.fragment_simple_player, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentSimplePlayerBinding.bind(view)
         setUpSubFragments()
         setUpPlayerToolbar()
-        playerToolbar().drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
-        controlsFragment = whichFragment(R.id.playbackControlsFragment)
+        simplePlaybackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as SimplePlaybackControlsFragment
     }
 
     override fun onShow() {
-        controlsFragment.show()
+        simplePlaybackControlsFragment.show()
     }
 
     override fun onHide() {
-        controlsFragment.hide()
+        simplePlaybackControlsFragment.hide()
     }
 
-    override fun toolbarIconColor() = colorControlNormal()
+    override fun onBackPressed(): Boolean {
+        return false
+    }
+
+    override fun toolbarIconColor(): Int {
+        return ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal)
+    }
+
+    override fun onColorChanged(color: Int) {
+        lastColor = color
+        callbacks?.onPaletteColorChanged()
+        simplePlaybackControlsFragment.setDark(color)
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, ATHUtil.resolveColor(requireContext(), R.attr.colorControlNormal), requireActivity())
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        controlsFragment.setColor(color)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
     }
 
     override fun onFavoriteToggled() {
@@ -96,18 +83,11 @@ class SimplePlayerFragment : AbsPlayerFragment(R.layout.fragment_simple_player)
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.inflateMenu(R.menu.menu_player)
-        binding.playerToolbar.setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
-        binding.playerToolbar.setOnMenuItemClickListener(this)
-        ToolbarContentTintHelper.colorizeToolbar(
-            binding.playerToolbar,
-            colorControlNormal(),
-            requireActivity()
-        )
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+        playerToolbar.apply {
+            inflateMenu(R.menu.menu_player)
+            setNavigationOnClickListener { requireActivity().onBackPressed() }
+            setOnMenuItemClickListener(this@SimplePlayerFragment)
+            ToolbarContentTintHelper.colorizeToolbar(this, ATHUtil.resolveColor(context, R.attr.colorControlNormal), requireActivity())
+        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
index 2104ddf50..147faf4ab 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlaybackControlsFragment.kt
@@ -1,57 +1,98 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.tiny
 
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
-import android.widget.ImageButton
+import android.view.ViewGroup
 import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentTinyControlsFragmentBinding
 import code.name.monkey.retromusic.fragments.base.AbsPlayerControlsFragment
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.service.MusicService
+import kotlinx.android.synthetic.main.fragment_tiny_controls_fragment.*
 
-class TinyPlaybackControlsFragment :
-    AbsPlayerControlsFragment(R.layout.fragment_tiny_controls_fragment) {
-    private var _binding: FragmentTinyControlsFragmentBinding? = null
-    private val binding get() = _binding!!
+class TinyPlaybackControlsFragment : AbsPlayerControlsFragment() {
 
-    override val shuffleButton: ImageButton
-        get() = binding.shuffleButton
+    override fun show() {
 
-    override val repeatButton: ImageButton
-        get() = binding.repeatButton
+    }
 
-    override fun show() {}
+    override fun hide() {
 
-    override fun hide() {}
+    }
 
-    override fun setColor(color: MediaNotificationProcessor) {
-        lastPlaybackControlsColor = color.secondaryTextColor
-        lastDisabledPlaybackControlsColor = ColorUtil.withAlpha(color.secondaryTextColor, 0.25f)
+    override fun setUpProgressSlider() {
 
-        updateRepeatState()
-        updateShuffleState()
+    }
+
+    override fun setDark(color: Int) {
+
+        if (ColorUtil.isColorLight(color)) {
+            lastPlaybackControlsColor = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getSecondaryDisabledTextColor(requireContext(), true)
+        } else {
+            lastPlaybackControlsColor = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            lastDisabledPlaybackControlsColor = MaterialValueHelper.getPrimaryDisabledTextColor(requireContext(), false)
+        }
+
+        updateRepeatState();
+        updateShuffleState();
     }
 
     override fun onUpdateProgressViews(progress: Int, total: Int) {
+
+    }
+
+    private var lastPlaybackControlsColor: Int = 0
+    private var lastDisabledPlaybackControlsColor: Int = 0
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_tiny_controls_fragment, container, false);
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentTinyControlsFragmentBinding.bind(view)
+        setUpMusicControllers()
+    }
+
+    private fun setUpMusicControllers() {
+        setUpRepeatButton()
+        setUpShuffleButton()
+        setUpProgressSlider()
+    }
+
+    private fun setUpShuffleButton() {
+        playerShuffleButton.setOnClickListener { MusicPlayerRemote.toggleShuffleMode() }
+    }
+
+    private fun setUpRepeatButton() {
+        playerRepeatButton.setOnClickListener { MusicPlayerRemote.cycleRepeatMode() }
+    }
+
+    override fun updateShuffleState() {
+        when (MusicPlayerRemote.shuffleMode) {
+            MusicService.SHUFFLE_MODE_SHUFFLE -> playerShuffleButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            else -> playerShuffleButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+        }
+    }
+
+    override fun updateRepeatState() {
+        when (MusicPlayerRemote.repeatMode) {
+            MusicService.REPEAT_MODE_NONE -> {
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                playerRepeatButton.setColorFilter(lastDisabledPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_ALL -> {
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat_white_24dp)
+                playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+            MusicService.REPEAT_MODE_THIS -> {
+                playerRepeatButton.setImageResource(R.drawable.ic_repeat_one_white_24dp)
+                playerRepeatButton.setColorFilter(lastPlaybackControlsColor, PorterDuff.Mode.SRC_IN)
+            }
+        }
     }
 
     override fun onServiceConnected() {
@@ -66,9 +107,4 @@ class TinyPlaybackControlsFragment :
     override fun onShuffleModeChanged() {
         updateShuffleState()
     }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
index 72489846e..105531fe1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/tiny/TinyPlayerFragment.kt
@@ -1,39 +1,20 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
 package code.name.monkey.retromusic.fragments.player.tiny
 
 import android.animation.AnimatorSet
 import android.animation.ObjectAnimator
-import android.annotation.SuppressLint
-import android.content.Context
-import android.os.*
-import android.view.GestureDetector
-import android.view.MotionEvent
+import android.os.Bundle
+import android.view.LayoutInflater
 import android.view.View
+import android.view.ViewGroup
 import android.view.animation.LinearInterpolator
 import androidx.appcompat.widget.Toolbar
-import androidx.core.content.getSystemService
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.appthemehelper.util.ColorUtil
+import code.name.monkey.appthemehelper.util.MaterialValueHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.extensions.*
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentTinyPlayerBinding
-import code.name.monkey.retromusic.extensions.*
+import code.name.monkey.retromusic.fragments.MiniPlayerFragment
 import code.name.monkey.retromusic.fragments.base.AbsPlayerFragment
-import code.name.monkey.retromusic.fragments.base.goToAlbum
-import code.name.monkey.retromusic.fragments.base.goToArtist
 import code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicProgressViewUpdateHelper
@@ -42,61 +23,89 @@ import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import kotlin.math.abs
+import kotlinx.android.synthetic.main.fragment_tiny_player.*
 
-class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
-    MusicProgressViewUpdateHelper.Callback {
-    private var _binding: FragmentTinyPlayerBinding? = null
-    private val binding get() = _binding!!
+class TinyPlayerFragment : AbsPlayerFragment(), MusicProgressViewUpdateHelper.Callback {
+    override fun onUpdateProgressViews(progress: Int, total: Int) {
+        progressBar.max = total
+
+        val animator = ObjectAnimator.ofInt(progressBar, "progress", progress)
+
+        val animatorSet = AnimatorSet()
+        animatorSet.playSequentially(animator)
+
+        animatorSet.duration = 1500
+        animatorSet.interpolator = LinearInterpolator()
+        animatorSet.start()
+
+        playerSongTotalTime.text = String.format("%s/%s", MusicUtil.getReadableDurationString(total.toLong()),
+                MusicUtil.getReadableDurationString(progress.toLong()))
+    }
 
-    private var lastColor: Int = 0
-    private var toolbarColor: Int = 0
-    private var isDragEnabled = false
-    lateinit var animator: ObjectAnimator
 
     override fun playerToolbar(): Toolbar {
-        return binding.playerToolbar
+        return playerToolbar
     }
 
-    override fun onShow() {}
+    override fun onShow() {
 
-    override fun onHide() {}
+    }
+
+    override fun onHide() {
+    }
+
+    override fun onBackPressed(): Boolean {
+        return false
+    }
 
     override fun toolbarIconColor(): Int {
-        return toolbarColor
+        return textColorPrimary
     }
 
+    private var lastColor: Int = 0
     override val paletteColor: Int
         get() = lastColor
 
-    override fun onColorChanged(color: MediaNotificationProcessor) {
-        lastColor = color.backgroundColor
-        libraryViewModel.updateColor(color.backgroundColor)
-        toolbarColor = color.secondaryTextColor
-        controlsFragment.setColor(color)
+    private var textColorPrimary = 0
+    private var textColorPrimaryDisabled = 0
 
-        binding.title.setTextColor(color.primaryTextColor)
-        binding.playerSongTotalTime.setTextColor(color.primaryTextColor)
-        binding.text.setTextColor(color.secondaryTextColor)
-        binding.songInfo.setTextColor(color.secondaryTextColor)
-        ViewUtil.setProgressDrawable(binding.progressBar, color.backgroundColor)
+    override fun onColorChanged(color: Int) {
 
-        Handler(Looper.myLooper()!!).post {
-            ToolbarContentTintHelper.colorizeToolbar(
-                binding.playerToolbar,
-                color.secondaryTextColor,
-                requireActivity()
-            )
+        val colorFinal = if (PreferenceUtil.getInstance(requireContext()).adaptiveColor) {
+            color
+        } else {
+            ThemeStore.accentColor(requireContext())
         }
-    }
 
+        if (ColorUtil.isColorLight(colorFinal)) {
+            textColorPrimary = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+            textColorPrimaryDisabled = MaterialValueHelper.getSecondaryTextColor(requireContext(), true)
+        } else {
+            textColorPrimary = MaterialValueHelper.getPrimaryTextColor(requireContext(), false)
+            textColorPrimaryDisabled = MaterialValueHelper.getSecondaryTextColor(requireContext(), false)
+        }
+
+        this.lastColor = colorFinal
+
+        callbacks?.onPaletteColorChanged()
+
+        tinyPlaybackControlsFragment.setDark(colorFinal)
+
+        ViewUtil.setProgressDrawable(progressBar, colorFinal)
+
+        title.setTextColor(textColorPrimary)
+        text.setTextColor(textColorPrimaryDisabled)
+
+        playerSongTotalTime.setTextColor(textColorPrimary)
+
+        ToolbarContentTintHelper.colorizeToolbar(playerToolbar, textColorPrimary, requireActivity())
+    }
 
     override fun onFavoriteToggled() {
         toggleFavorite(MusicPlayerRemote.currentSong)
     }
 
-    private lateinit var controlsFragment: TinyPlaybackControlsFragment
+    private lateinit var tinyPlaybackControlsFragment: TinyPlaybackControlsFragment
     private lateinit var progressViewUpdateHelper: MusicProgressViewUpdateHelper
 
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -116,47 +125,35 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
 
     private fun updateSong() {
         val song = MusicPlayerRemote.currentSong
-        binding.title.text = song.title
-        binding.text.text = String.format("%s \nby - %s", song.albumName, song.artistName)
-
-        if (PreferenceUtil.isSongInfo) {
-            binding.songInfo.text = getSongInfo(song)
-            binding.songInfo.show()
-        } else {
-            binding.songInfo.hide()
-        }
+        title.text = song.title
+        text.text = String.format("%s \nby - %s", song.albumName, song.artistName)
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_tiny_player, container, false)
     }
 
-    @SuppressLint("ClickableViewAccessibility")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentTinyPlayerBinding.bind(view)
-        binding.title.isSelected = true
-        binding.progressBar.setOnClickListener(PlayPauseButtonOnClickHandler())
-        binding.progressBar.setOnTouchListener(ProgressHelper(requireContext()))
+        title.isSelected = true
+        progressBar.setOnClickListener(PlayPauseButtonOnClickHandler())
+        progressBar.setOnTouchListener(MiniPlayerFragment.FlingPlayBackController(activity!!))
 
         setUpPlayerToolbar()
         setUpSubFragments()
-        binding.title.setOnClickListener {
-            goToAlbum(requireActivity())
-        }
-        binding.text.setOnClickListener {
-            goToArtist(requireActivity())
-        }
-        playerToolbar().drawAboveSystemBars()
     }
 
     private fun setUpSubFragments() {
-        controlsFragment = whichFragment(R.id.playbackControlsFragment)
-        val playerAlbumCoverFragment: PlayerAlbumCoverFragment =
-            whichFragment(R.id.playerAlbumCoverFragment)
+        tinyPlaybackControlsFragment = childFragmentManager.findFragmentById(R.id.playbackControlsFragment) as TinyPlaybackControlsFragment
+        val playerAlbumCoverFragment = childFragmentManager.findFragmentById(R.id.playerAlbumCoverFragment) as PlayerAlbumCoverFragment
         playerAlbumCoverFragment.setCallbacks(this)
+
     }
 
     private fun setUpPlayerToolbar() {
-        binding.playerToolbar.apply {
+        playerToolbar.apply {
             inflateMenu(R.menu.menu_player)
-            setNavigationOnClickListener { requireActivity().onBackPressedDispatcher.onBackPressed() }
+            setNavigationOnClickListener { activity!!.onBackPressed() }
             setOnMenuItemClickListener(this@TinyPlayerFragment)
         }
     }
@@ -178,117 +175,4 @@ class TinyPlayerFragment : AbsPlayerFragment(R.layout.fragment_tiny_player),
         updateSong()
     }
 
-    override fun onUpdateProgressViews(progress: Int, total: Int) {
-        binding.progressBar.max = total
-
-        if (isDragEnabled) {
-            binding.progressBar.progress = progress
-        } else {
-            animator = ObjectAnimator.ofInt(binding.progressBar, "progress", progress)
-
-            val animatorSet = AnimatorSet()
-            animatorSet.playSequentially(animator)
-
-            animatorSet.duration = 1500
-            animatorSet.interpolator = LinearInterpolator()
-            animatorSet.start()
-        }
-        binding.playerSongTotalTime.text = String.format(
-            "%s/%s", MusicUtil.getReadableDurationString(total.toLong()),
-            MusicUtil.getReadableDurationString(progress.toLong())
-        )
-    }
-
-    inner class ProgressHelper(context: Context) : View.OnTouchListener {
-        private var initialY: Int = 0
-        private var initialProgress = 0
-        private var progress: Int = 0
-        private val displayHeight = resources.displayMetrics.heightPixels
-        private var gestureDetector: GestureDetector
-
-        init {
-            gestureDetector = GestureDetector(context, object :
-                GestureDetector.SimpleOnGestureListener() {
-
-                override fun onLongPress(e: MotionEvent) {
-                    if (abs(e.y - initialY) <= 2) {
-                        vibrate()
-                        isDragEnabled = true
-                        binding.progressBar.parent.requestDisallowInterceptTouchEvent(true)
-                        animator.pause()
-                    }
-                    super.onLongPress(e)
-                }
-
-                override fun onFling(
-                    e1: MotionEvent,
-                    e2: MotionEvent,
-                    velocityX: Float,
-                    velocityY: Float
-                ): Boolean {
-                    if (abs(velocityX) > abs(velocityY)) {
-                        if (velocityX < 0) {
-                            MusicPlayerRemote.playNextSong()
-                            return true
-                        } else if (velocityX > 0) {
-                            MusicPlayerRemote.playPreviousSong()
-                            return true
-                        }
-                    }
-                    return false
-                }
-            })
-        }
-
-        @SuppressLint("ClickableViewAccessibility")
-        override fun onTouch(v: View, event: MotionEvent): Boolean {
-            when (event.actionMasked) {
-                MotionEvent.ACTION_DOWN -> {
-                    initialProgress = MusicPlayerRemote.songProgressMillis
-                    initialY = event.y.toInt()
-                    progressViewUpdateHelper.stop()
-                }
-
-                MotionEvent.ACTION_UP,
-                MotionEvent.ACTION_CANCEL -> {
-                    progressViewUpdateHelper.start()
-                    if (isDragEnabled) {
-                        MusicPlayerRemote.seekTo(progress)
-                        isDragEnabled = false
-                        return true
-                    }
-                }
-
-                MotionEvent.ACTION_MOVE -> {
-                    if (isDragEnabled) {
-                        val diffY = (initialY - event.y).toInt()
-                        progress =
-                            initialProgress + diffY * (binding.progressBar.max / displayHeight) // Multiplier
-                        if (progress > 0 && progress < binding.progressBar.max) {
-                            onUpdateProgressViews(
-                                progress,
-                                MusicPlayerRemote.songDurationMillis
-                            )
-                        }
-                    }
-                }
-            }
-            return gestureDetector.onTouchEvent(event)
-        }
-
-        @Suppress("Deprecation")
-        private fun vibrate() {
-            val v = requireContext().getSystemService<Vibrator>()
-            if (VersionUtils.hasOreo()) {
-                v?.vibrate(VibrationEffect.createOneShot(10, VibrationEffect.DEFAULT_AMPLITUDE))
-            } else {
-                v?.vibrate(10)
-            }
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
deleted file mode 100644
index 352bf453b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsFragment.kt
+++ /dev/null
@@ -1,185 +0,0 @@
-package code.name.monkey.retromusic.fragments.playlists
-
-import android.graphics.Color
-import android.os.Bundle
-import android.view.Menu
-import android.view.MenuInflater
-import android.view.MenuItem
-import android.view.View
-import androidx.core.view.doOnPreDraw
-import androidx.core.view.isVisible
-import androidx.navigation.fragment.findNavController
-import androidx.navigation.fragment.navArgs
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.OrderablePlaylistSongAdapter
-import code.name.monkey.retromusic.databinding.FragmentPlaylistDetailNewBinding
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.elevatedAccentColor
-import code.name.monkey.retromusic.extensions.surfaceColor
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.glide.RetroGlideExtension.playlistOptions
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.helper.menu.PlaylistMenuHelper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.ThemedFastScroller
-import com.bumptech.glide.Glide
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.transition.MaterialArcMotion
-import com.google.android.material.transition.MaterialContainerTransform
-import com.google.android.material.transition.MaterialSharedAxis
-import com.h6ah4i.android.widget.advrecyclerview.animator.DraggableItemAnimator
-import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager
-import org.koin.androidx.viewmodel.ext.android.viewModel
-import org.koin.core.parameter.parametersOf
-
-
-class PlaylistDetailsFragment : AbsMainActivityFragment(R.layout.fragment_playlist_detail_new) {
-    private val arguments by navArgs<PlaylistDetailsFragmentArgs>()
-    private val viewModel by viewModel<PlaylistDetailsViewModel> {
-        parametersOf(arguments.extraPlaylistId)
-    }
-
-    private var _binding: FragmentPlaylistDetailNewBinding? = null
-    private val binding get() = _binding!!
-
-    private lateinit var playlist: PlaylistWithSongs
-    private lateinit var playlistSongAdapter: OrderablePlaylistSongAdapter
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        sharedElementEnterTransition = MaterialContainerTransform(requireContext(), true).apply {
-            drawingViewId = R.id.fragment_container
-            scrimColor = Color.TRANSPARENT
-            setAllContainerColors(surfaceColor())
-            setPathMotion(MaterialArcMotion())
-        }
-    }
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        _binding = FragmentPlaylistDetailNewBinding.bind(view)
-        enterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(view)
-        returnTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        binding.toolbar.title = null
-//        binding.container.transitionName = playlist.playlistEntity.playlistName
-
-        setUpRecyclerView()
-        setupButtons()
-        viewModel.getPlaylist().observe(viewLifecycleOwner) { playlistWithSongs ->
-            playlist = playlistWithSongs
-            Glide.with(this)
-                .load(PlaylistPreview(playlistWithSongs))
-                .playlistOptions()
-                .into(binding.image)
-            binding.title.text = playlist.playlistEntity.playlistName
-            binding.subtitle.text =
-                MusicUtil.getPlaylistInfoString(requireContext(), playlist.songs.toSongs())
-            binding.collapsingAppBarLayout.title = playlist.playlistEntity.playlistName
-        }
-        viewModel.getSongs().observe(viewLifecycleOwner) {
-            songs(it.toSongs())
-        }
-        viewModel.playlistExists().observe(viewLifecycleOwner) {
-            if (!it) {
-                findNavController().navigateUp()
-            }
-        }
-        postponeEnterTransition()
-        view.doOnPreDraw { startPostponedEnterTransition() }
-        binding.appBarLayout.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun setupButtons() {
-        binding.playButton.apply {
-            setOnClickListener {
-                MusicPlayerRemote.openQueue(playlistSongAdapter.dataSet, 0, true)
-            }
-            accentColor()
-        }
-        binding.shuffleButton.apply {
-            setOnClickListener {
-                MusicPlayerRemote.openAndShuffleQueue(playlistSongAdapter.dataSet, true)
-            }
-            elevatedAccentColor()
-        }
-    }
-
-    private fun setUpRecyclerView() {
-        playlistSongAdapter = OrderablePlaylistSongAdapter(
-            arguments.extraPlaylistId,
-            requireActivity(),
-            ArrayList(),
-            R.layout.item_queue
-        )
-
-        val dragDropManager = RecyclerViewDragDropManager()
-
-        val wrappedAdapter: RecyclerView.Adapter<*> =
-            dragDropManager.createWrappedAdapter(playlistSongAdapter)
-
-        binding.recyclerView.apply {
-            adapter = wrappedAdapter
-            layoutManager = LinearLayoutManager(requireContext())
-            itemAnimator = DraggableItemAnimator()
-            dragDropManager.attachRecyclerView(this)
-            ThemedFastScroller.create(this)
-        }
-        playlistSongAdapter.registerAdapterDataObserver(object :
-            RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                super.onChanged()
-                checkIsEmpty()
-            }
-        })
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        inflater.inflate(R.menu.menu_playlist_detail, menu)
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        return PlaylistMenuHelper.handleMenuClick(requireActivity(), playlist, item)
-    }
-
-    private fun checkIsEmpty() {
-        binding.empty.isVisible = playlistSongAdapter.itemCount == 0
-        binding.emptyText.isVisible = playlistSongAdapter.itemCount == 0
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        _binding = null
-    }
-
-    override fun onPause() {
-        playlistSongAdapter.saveSongs(playlist.playlistEntity)
-        super.onPause()
-    }
-
-    private fun showEmptyView() {
-        binding.empty.isVisible = true
-        binding.emptyText.isVisible = true
-    }
-
-    fun songs(songs: List<Song>) {
-        binding.progressIndicator.hide()
-        if (songs.isNotEmpty()) {
-            playlistSongAdapter.swapDataSet(songs)
-        } else {
-            showEmptyView()
-        }
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
deleted file mode 100644
index ce2f452f5..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistDetailsViewModel.kt
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.playlists
-
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.ViewModel
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.repository.RealRepository
-
-class PlaylistDetailsViewModel(
-    private val realRepository: RealRepository,
-    private var playlistId: Long
-) : ViewModel() {
-    fun getSongs(): LiveData<List<SongEntity>> =
-        realRepository.playlistSongs(playlistId)
-
-    fun playlistExists(): LiveData<Boolean> =
-        realRepository.checkPlaylistExists(playlistId)
-
-    fun getPlaylist(): LiveData<PlaylistWithSongs> = realRepository.getPlaylist(playlistId)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt
deleted file mode 100644
index 258fb0ed2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistsFragment.kt
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.playlists
-
-import android.os.Bundle
-import android.view.*
-import androidx.core.os.bundleOf
-import androidx.core.view.MenuCompat
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.EXTRA_PLAYLIST_ID
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.playlist.PlaylistAdapter
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder
-import code.name.monkey.retromusic.interfaces.IPlaylistClickListener
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-import com.google.android.material.transition.MaterialSharedAxis
-
-class PlaylistsFragment :
-    AbsRecyclerViewCustomGridSizeFragment<PlaylistAdapter, GridLayoutManager>(),
-    IPlaylistClickListener {
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getPlaylists().observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                adapter?.swapDataSet(it)
-            else
-                adapter?.swapDataSet(listOf())
-        }
-    }
-
-    override val titleRes: Int
-        get() = R.string.playlists
-
-    override val emptyMessage: Int
-        get() = R.string.no_playlists
-
-    override val isShuffleVisible: Boolean
-        get() = false
-
-    override fun createLayoutManager(): GridLayoutManager {
-        return GridLayoutManager(requireContext(), getGridSize())
-    }
-
-    override fun createAdapter(): PlaylistAdapter {
-        val dataSet = if (adapter == null) mutableListOf() else adapter!!.dataSet
-        return PlaylistAdapter(
-            requireActivity(),
-            dataSet,
-            itemLayoutRes(),
-            this
-        )
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateMenu(menu, inflater)
-        val gridSizeItem: MenuItem = menu.findItem(R.id.action_grid_size)
-        if (RetroUtil.isLandscape) {
-            gridSizeItem.setTitle(R.string.action_grid_size_land)
-        }
-        setupGridSizeMenu(gridSizeItem.subMenu!!)
-        menu.removeItem(R.id.action_layout_type)
-        menu.add(0, R.id.action_add_to_playlist, 0, R.string.new_playlist_title)
-        menu.add(0, R.id.action_import_playlist, 0, R.string.import_playlist)
-        menu.findItem(R.id.action_settings).setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
-        MenuCompat.setGroupDividerEnabled(menu, true)
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        if (handleGridSizeMenuItem(item)) {
-            return true
-        }
-        if (handleSortOrderMenuItem(item)) {
-            return true
-        }
-        return super.onMenuItemSelected(item)
-    }
-
-    private fun setupGridSizeMenu(gridSizeMenu: SubMenu) {
-        when (getGridSize()) {
-            1 -> gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked = true
-            2 -> gridSizeMenu.findItem(R.id.action_grid_size_2).isChecked = true
-            3 -> gridSizeMenu.findItem(R.id.action_grid_size_3).isChecked = true
-            4 -> gridSizeMenu.findItem(R.id.action_grid_size_4).isChecked = true
-            5 -> gridSizeMenu.findItem(R.id.action_grid_size_5).isChecked = true
-            6 -> gridSizeMenu.findItem(R.id.action_grid_size_6).isChecked = true
-            7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true
-            8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true
-        }
-        val gridSize = if (RetroUtil.isLandscape) 4 else 3
-        if (gridSize < 8) {
-            gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false
-        }
-        if (gridSize < 7) {
-            gridSizeMenu.findItem(R.id.action_grid_size_7).isVisible = false
-        }
-        if (gridSize < 6) {
-            gridSizeMenu.findItem(R.id.action_grid_size_6).isVisible = false
-        }
-        if (gridSize < 5) {
-            gridSizeMenu.findItem(R.id.action_grid_size_5).isVisible = false
-        }
-        if (gridSize < 4) {
-            gridSizeMenu.findItem(R.id.action_grid_size_4).isVisible = false
-        }
-        if (gridSize < 3) {
-            gridSizeMenu.findItem(R.id.action_grid_size_3).isVisible = false
-        }
-    }
-
-    private fun setUpSortOrderMenu(subMenu: SubMenu) {
-        val order: String? = getSortOrder()
-        subMenu.clear()
-        createId(
-            subMenu,
-            R.id.action_song_sort_order_asc,
-            R.string.sort_order_a_z,
-            order == PlaylistSortOrder.PLAYLIST_A_Z
-        )
-        createId(
-            subMenu,
-            R.id.action_song_sort_order_desc,
-            R.string.sort_order_z_a,
-            order == PlaylistSortOrder.PLAYLIST_Z_A
-        )
-        createId(
-            subMenu,
-            R.id.action_playlist_sort_order,
-            R.string.sort_order_num_songs,
-            order == PlaylistSortOrder.PLAYLIST_SONG_COUNT
-        )
-        createId(
-            subMenu,
-            R.id.action_playlist_sort_order_desc,
-            R.string.sort_order_num_songs_desc,
-            order == PlaylistSortOrder.PLAYLIST_SONG_COUNT_DESC
-        )
-        subMenu.setGroupCheckable(0, true, true)
-    }
-
-    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
-        val sortOrder: String = when (item.itemId) {
-            R.id.action_song_sort_order_asc -> PlaylistSortOrder.PLAYLIST_A_Z
-            R.id.action_song_sort_order_desc -> PlaylistSortOrder.PLAYLIST_Z_A
-            R.id.action_playlist_sort_order -> PlaylistSortOrder.PLAYLIST_SONG_COUNT
-            R.id.action_playlist_sort_order_desc -> PlaylistSortOrder.PLAYLIST_SONG_COUNT_DESC
-            else -> PreferenceUtil.playlistSortOrder
-        }
-        if (sortOrder != PreferenceUtil.playlistSortOrder) {
-            item.isChecked = true
-            setAndSaveSortOrder(sortOrder)
-            return true
-        }
-        return false
-    }
-
-    private fun handleGridSizeMenuItem(item: MenuItem): Boolean {
-        val gridSize = when (item.itemId) {
-            R.id.action_grid_size_1 -> 1
-            R.id.action_grid_size_2 -> 2
-            R.id.action_grid_size_3 -> 3
-            R.id.action_grid_size_4 -> 4
-            R.id.action_grid_size_5 -> 5
-            R.id.action_grid_size_6 -> 6
-            R.id.action_grid_size_7 -> 7
-            R.id.action_grid_size_8 -> 8
-            else -> 0
-        }
-        if (gridSize > 0) {
-            item.isChecked = true
-            setAndSaveGridSize(gridSize)
-            return true
-        }
-        return false
-    }
-
-    private fun createId(menu: SubMenu, id: Int, title: Int, checked: Boolean) {
-        menu.add(0, id, 0, title).isChecked = checked
-    }
-
-    override fun setGridSize(gridSize: Int) {
-        adapter?.notifyDataSetChanged()
-    }
-
-    override fun setSortOrder(sortOrder: String) {
-        libraryViewModel.forceReload(ReloadType.Playlists)
-    }
-
-    override fun loadSortOrder(): String {
-        return PreferenceUtil.playlistSortOrder
-    }
-
-    override fun saveSortOrder(sortOrder: String) {
-        PreferenceUtil.playlistSortOrder = sortOrder
-    }
-
-    override fun loadGridSize(): Int {
-        return PreferenceUtil.playlistGridSize
-    }
-
-    override fun saveGridSize(gridColumns: Int) {
-        PreferenceUtil.playlistGridSize = gridColumns
-    }
-
-    override fun loadGridSizeLand(): Int {
-        return PreferenceUtil.playlistGridSizeLand
-    }
-
-    override fun saveGridSizeLand(gridColumns: Int) {
-        PreferenceUtil.playlistGridSizeLand = gridColumns
-    }
-
-    override fun loadLayoutRes(): Int {
-        return R.layout.item_grid
-    }
-
-    override fun saveLayoutRes(layoutRes: Int) {
-        //Save layout
-    }
-
-    override fun onPlaylistClick(playlistWithSongs: PlaylistWithSongs, view: View) {
-        exitTransition = MaterialSharedAxis(MaterialSharedAxis.Z, true).addTarget(requireView())
-        reenterTransition = MaterialSharedAxis(MaterialSharedAxis.Z, false)
-        findNavController().navigate(
-            R.id.playlistDetailsFragment,
-            bundleOf(EXTRA_PLAYLIST_ID to playlistWithSongs.playlistEntity.playListId)
-        )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
deleted file mode 100644
index 808aa6732..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/search/SearchFragment.kt
+++ /dev/null
@@ -1,273 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.search
-
-import android.app.Activity.RESULT_OK
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.content.res.ColorStateList
-import android.os.Bundle
-import android.speech.RecognizerIntent
-import android.view.*
-import android.view.inputmethod.InputMethodManager
-import androidx.activity.result.contract.ActivityResultContracts
-import androidx.core.content.getSystemService
-import androidx.core.view.*
-import androidx.core.widget.doAfterTextChanged
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import androidx.transition.TransitionManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.SearchAdapter
-import code.name.monkey.retromusic.databinding.FragmentSearchBinding
-import code.name.monkey.retromusic.extensions.*
-import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.chip.Chip
-import com.google.android.material.chip.ChipGroup
-import com.google.android.material.shape.MaterialShapeDrawable
-import com.google.android.material.textfield.TextInputEditText
-import com.google.android.material.transition.MaterialFadeThrough
-import kotlinx.coroutines.Job
-import net.yslibrary.android.keyboardvisibilityevent.KeyboardVisibilityEvent
-import java.util.*
-
-
-class SearchFragment : AbsMainActivityFragment(R.layout.fragment_search),
-    ChipGroup.OnCheckedStateChangeListener {
-    companion object {
-        const val QUERY = "query"
-    }
-
-    private var _binding: FragmentSearchBinding? = null
-    private val binding get() = _binding!!
-
-    private lateinit var searchAdapter: SearchAdapter
-    private var query: String? = null
-
-    private var job: Job? = null
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        enterTransition = MaterialFadeThrough().addTarget(view)
-        reenterTransition = MaterialFadeThrough().addTarget(view)
-        _binding = FragmentSearchBinding.bind(view)
-        mainActivity.setSupportActionBar(binding.toolbar)
-        libraryViewModel.clearSearchResult()
-        setupRecyclerView()
-
-        binding.voiceSearch.setOnClickListener { startMicSearch() }
-        binding.clearText.setOnClickListener {
-            binding.searchView.clearText()
-            searchAdapter.swapDataSet(listOf())
-        }
-        binding.searchView.apply {
-            doAfterTextChanged {
-                if (!it.isNullOrEmpty())
-                    search(it.toString())
-                else {
-                    TransitionManager.beginDelayedTransition(binding.appBarLayout)
-                    binding.voiceSearch.isVisible = true
-                    binding.clearText.isGone = true
-                }
-            }
-            focusAndShowKeyboard()
-        }
-        binding.keyboardPopup.apply {
-            accentColor()
-            setOnClickListener {
-                binding.searchView.focusAndShowKeyboard()
-            }
-        }
-        if (savedInstanceState != null) {
-            query = savedInstanceState.getString(QUERY)
-        }
-        libraryViewModel.getSearchResult().observe(viewLifecycleOwner) {
-            showData(it)
-        }
-        setupChips()
-        postponeEnterTransition()
-        view.doOnPreDraw {
-            startPostponedEnterTransition()
-        }
-        libraryViewModel.getFabMargin().observe(viewLifecycleOwner) {
-            binding.keyboardPopup.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = it
-            }
-        }
-        KeyboardVisibilityEvent.setEventListener(requireActivity(), viewLifecycleOwner) {
-            if (it) {
-                binding.keyboardPopup.isGone = true
-            } else {
-                binding.keyboardPopup.show()
-            }
-        }
-        binding.appBarLayout.statusBarForeground =
-            MaterialShapeDrawable.createWithElevationOverlay(requireContext())
-    }
-
-    private fun setupChips() {
-        val chips = binding.searchFilterGroup.children.map { it as Chip }
-        if (!PreferenceUtil.materialYou) {
-            val states = arrayOf(
-                intArrayOf(-android.R.attr.state_checked),
-                intArrayOf(android.R.attr.state_checked)
-            )
-
-            val colors = intArrayOf(
-                android.R.color.transparent,
-                accentColor().addAlpha(0.5F)
-            )
-
-            chips.forEach {
-                it.chipBackgroundColor = ColorStateList(states, colors)
-            }
-        }
-        binding.searchFilterGroup.setOnCheckedStateChangeListener(this)
-    }
-
-    private fun showData(data: List<Any>) {
-        if (data.isNotEmpty()) {
-            searchAdapter.swapDataSet(data)
-        } else {
-            searchAdapter.swapDataSet(ArrayList())
-        }
-    }
-
-    private fun checkForMargins() {
-        if (mainActivity.isBottomNavVisible) {
-            binding.recyclerView.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                bottomMargin = dip(R.dimen.bottom_nav_height)
-            }
-        }
-    }
-
-    private fun setupRecyclerView() {
-        searchAdapter = SearchAdapter(requireActivity(), emptyList())
-        searchAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
-            override fun onChanged() {
-                super.onChanged()
-                binding.empty.isVisible = searchAdapter.itemCount < 1
-            }
-        })
-        binding.recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = searchAdapter
-            addOnScrollListener(object : RecyclerView.OnScrollListener() {
-                override fun onScrolled(recyclerView: RecyclerView, dx: Int, dy: Int) {
-                    super.onScrolled(recyclerView, dx, dy)
-                    if (dy > 0) {
-                        binding.keyboardPopup.shrink()
-                    } else if (dy < 0) {
-                        binding.keyboardPopup.extend()
-                    }
-                }
-            })
-        }
-    }
-
-    private fun search(query: String) {
-        this.query = query
-        TransitionManager.beginDelayedTransition(binding.appBarLayout)
-        binding.voiceSearch.isGone = query.isNotEmpty()
-        binding.clearText.isVisible = query.isNotEmpty()
-        val filter = getFilter()
-        job?.cancel()
-        job = libraryViewModel.search(query, filter)
-    }
-
-    private fun getFilter(): Filter {
-        return when (binding.searchFilterGroup.checkedChipId) {
-            R.id.chip_audio -> Filter.SONGS
-            R.id.chip_artists -> Filter.ARTISTS
-            R.id.chip_albums -> Filter.ALBUMS
-            R.id.chip_album_artists -> Filter.ALBUM_ARTISTS
-            R.id.chip_genres -> Filter.GENRES
-            R.id.chip_playlists -> Filter.PLAYLISTS
-            else -> Filter.NO_FILTER
-        }
-    }
-
-    private fun startMicSearch() {
-        val intent = Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH)
-        intent.putExtra(
-            RecognizerIntent.EXTRA_LANGUAGE_MODEL,
-            RecognizerIntent.LANGUAGE_MODEL_FREE_FORM
-        )
-        intent.putExtra(RecognizerIntent.EXTRA_LANGUAGE, Locale.getDefault())
-        intent.putExtra(RecognizerIntent.EXTRA_PROMPT, getString(R.string.speech_prompt))
-        try {
-            speechInputLauncher.launch(intent)
-        } catch (e: ActivityNotFoundException) {
-            e.printStackTrace()
-            showToast(getString(R.string.speech_not_supported))
-        }
-    }
-
-    private val speechInputLauncher =
-        registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result ->
-            if (result.resultCode == RESULT_OK) {
-                val spokenText: String? =
-                    result?.data?.getStringArrayListExtra(RecognizerIntent.EXTRA_RESULTS)?.get(0)
-                binding.searchView.setText(spokenText)
-            }
-        }
-
-    override fun onResume() {
-        super.onResume()
-        checkForMargins()
-    }
-
-    override fun onDestroyView() {
-        hideKeyboard(view)
-        super.onDestroyView()
-        _binding = null
-    }
-
-    override fun onPause() {
-        super.onPause()
-        hideKeyboard(view)
-    }
-
-    private fun hideKeyboard(view: View?) {
-        if (view != null) {
-            val imm =
-                requireContext().getSystemService<InputMethodManager>()
-            imm?.hideSoftInputFromWindow(view.windowToken, 0)
-        }
-    }
-
-    override fun onCheckedChanged(group: ChipGroup, checkedIds: MutableList<Int>) {
-        search(binding.searchView.text.toString())
-    }
-
-    override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {}
-
-    override fun onMenuItemSelected(menuItem: MenuItem) = false
-}
-
-enum class Filter {
-    SONGS,
-    ARTISTS,
-    ALBUMS,
-    ALBUM_ARTISTS,
-    GENRES,
-    PLAYLISTS,
-    NO_FILTER
-}
-
-fun TextInputEditText.clearText() {
-    text = null
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
index 3991dc229..f56142f9d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AbsSettingsFragment.kt
@@ -1,33 +1,33 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
-import android.os.Build
 import android.os.Bundle
 import android.view.View
-import androidx.core.view.updatePadding
+import android.widget.Toast
+import androidx.fragment.app.DialogFragment
 import androidx.preference.ListPreference
 import androidx.preference.Preference
 import androidx.preference.PreferenceManager
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceFragmentCompat
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.dip
 import code.name.monkey.retromusic.preferences.*
-import dev.chrisbanes.insetter.applyInsetter
+import code.name.monkey.retromusic.util.NavigationUtil
 
 /**
  * @author Hemanth S (h4h13).
@@ -35,6 +35,11 @@ import dev.chrisbanes.insetter.applyInsetter
 
 abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
 
+    internal fun showProToastAndNavigate(message: String) {
+        Toast.makeText(requireContext(), "$message is Pro version feature.", Toast.LENGTH_SHORT).show()
+        NavigationUtil.goToProVersion(requireActivity())
+    }
+
     internal fun setSummary(preference: Preference, value: Any?) {
         val stringValue = value.toString()
         if (preference is ListPreference) {
@@ -49,57 +54,32 @@ abstract class AbsSettingsFragment : ATEPreferenceFragmentCompat() {
 
     protected fun setSummary(preference: Preference?) {
         preference?.let {
-            setSummary(
-                it, PreferenceManager
+            setSummary(it, PreferenceManager
                     .getDefaultSharedPreferences(it.context)
-                    .getString(it.key, "")
-            )
+                    .getString(it.key, ""))
         }
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setDivider(ColorDrawable(Color.TRANSPARENT))
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.S) {
-            listView.overScrollMode = View.OVER_SCROLL_NEVER
-        }
-
-        listView.updatePadding(bottom = dip(R.dimen.mini_player_height))
-        listView.applyInsetter {
-            type(navigationBars = true) {
-                padding(vertical = true)
-            }
-        }
+        listView.setBackgroundColor(ATHUtil.resolveColor(requireContext(), R.attr.colorSurface))
+        listView.overScrollMode = View.OVER_SCROLL_NEVER
+        listView.setPadding(0, 0, 0, 0)
+        listView.setPaddingRelative(0, 0, 0, 0)
         invalidateSettings()
     }
 
-    override fun onDisplayPreferenceDialog(preference: Preference) {
-        when (preference) {
-            is LibraryPreference -> {
-                val fragment = LibraryPreferenceDialog.newInstance()
-                fragment.show(childFragmentManager, preference.key)
+    override fun onCreatePreferenceDialog(preference: Preference): DialogFragment? {
+        return when (preference) {
+            is LibraryPreference -> LibraryPreferenceDialog.newInstance(preference.key)
+            is NowPlayingScreenPreference -> NowPlayingScreenPreferenceDialog.newInstance(preference.key)
+            is AlbumCoverStylePreference -> AlbumCoverStylePreferenceDialog.newInstance(preference.key)
+            is MaterialListPreference -> {
+                MaterialListPreferenceDialog.newInstance(preference)
             }
-            is NowPlayingScreenPreference -> {
-                val fragment = NowPlayingScreenPreferenceDialog.newInstance()
-                fragment.show(childFragmentManager, preference.key)
-            }
-            is AlbumCoverStylePreference -> {
-                val fragment = AlbumCoverStylePreferenceDialog.newInstance()
-                fragment.show(childFragmentManager, preference.key)
-            }
-            is BlacklistPreference -> {
-                val fragment = BlacklistPreferenceDialog.newInstance()
-                fragment.show(childFragmentManager, preference.key)
-            }
-            is DurationPreference -> {
-                val fragment = DurationPreferenceDialog.newInstance()
-                fragment.show(childFragmentManager, preference.key)
-            }
-            else -> super.onDisplayPreferenceDialog(preference)
+            is BlacklistPreference -> BlacklistPreferenceDialog.newInstance()
+            else -> super.onCreatePreferenceDialog(preference)
         }
     }
-
-    fun restartActivity() {
-        activity?.recreate()
-    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
index d493085c0..43a4245de 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/AudioSettings.kt
@@ -1,32 +1,26 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
-import android.Manifest.permission.BLUETOOTH_CONNECT
 import android.content.Intent
-import android.content.pm.PackageManager.PERMISSION_GRANTED
 import android.media.audiofx.AudioEffect
 import android.os.Bundle
-import androidx.core.app.ActivityCompat
 import androidx.preference.Preference
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.BLUETOOTH_PLAYBACK
-import code.name.monkey.retromusic.EQUALIZER
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.base.AbsBaseActivity.Companion.BLUETOOTH_PERMISSION_REQUEST
 import code.name.monkey.retromusic.util.NavigationUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
 
 /**
  * @author Hemanth S (h4h13).
@@ -34,36 +28,17 @@ import code.name.monkey.retromusic.util.NavigationUtil
 
 class AudioSettings : AbsSettingsFragment() {
     override fun invalidateSettings() {
-        val eqPreference: Preference? = findPreference(EQUALIZER)
-        if (!hasEqualizer()) {
-            eqPreference?.isEnabled = false
-            eqPreference?.summary = resources.getString(R.string.no_equalizer)
+        val findPreference: Preference = findPreference("equalizer")!!
+        if (!hasEqualizer() && PreferenceUtil.getInstance(requireContext()).selectedEqualizer != "retro") {
+            findPreference.isEnabled = false
+            findPreference.summary = resources.getString(R.string.no_equalizer)
         } else {
-            eqPreference?.isEnabled = true
+            findPreference.isEnabled = true
         }
-        eqPreference?.setOnPreferenceClickListener {
+        findPreference.setOnPreferenceClickListener {
             NavigationUtil.openEqualizer(requireActivity())
             true
         }
-        val bluetoothPreference: Preference? = findPreference(BLUETOOTH_PLAYBACK)
-        if (VersionUtils.hasS()) {
-            bluetoothPreference?.setOnPreferenceChangeListener { _, newValue ->
-                if (newValue as Boolean) {
-                    if (ActivityCompat.checkSelfPermission(
-                            requireContext(),
-                            BLUETOOTH_CONNECT
-                        ) != PERMISSION_GRANTED
-                    ) {
-                        ActivityCompat.requestPermissions(
-                            requireActivity(), arrayOf(
-                                BLUETOOTH_CONNECT
-                            ), BLUETOOTH_PERMISSION_REQUEST
-                        )
-                    }
-                }
-                return@setOnPreferenceChangeListener true
-            }
-        }
     }
 
     private fun hasEqualizer(): Boolean {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
index 50f984a49..2f60f1ba1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ImageSettingFragment.kt
@@ -1,20 +1,22 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
 import android.os.Bundle
+import android.view.View
+import androidx.preference.Preference
 import code.name.monkey.retromusic.R
 
 /**
@@ -22,9 +24,23 @@ import code.name.monkey.retromusic.R
  */
 
 class ImageSettingFragment : AbsSettingsFragment() {
-    override fun invalidateSettings() {}
+    override fun invalidateSettings() {
+        val autoDownloadImagesPolicy: Preference = findPreference("auto_download_images_policy")!!
+        setSummary(autoDownloadImagesPolicy)
+        autoDownloadImagesPolicy.setOnPreferenceChangeListener { _, o ->
+            setSummary(autoDownloadImagesPolicy, o)
+            true
+        }
+
+    }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_images)
     }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        val preference: Preference? = findPreference("auto_download_images_policy")
+        preference?.let { setSummary(it) }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
index 263f60945..82d8e84f5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/MainSettingsFragment.kt
@@ -1,79 +1,84 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
+import android.content.res.ColorStateList
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.annotation.StringRes
 import androidx.fragment.app.Fragment
-import androidx.navigation.fragment.findNavController
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.FragmentMainSettingsBinding
-import code.name.monkey.retromusic.extensions.drawAboveSystemBarsWithPadding
+import code.name.monkey.retromusic.activities.SettingsActivity
+import code.name.monkey.retromusic.extensions.hide
+import code.name.monkey.retromusic.extensions.show
+import code.name.monkey.retromusic.util.NavigationUtil
+import kotlinx.android.synthetic.main.fragment_main_settings.*
+
 
 class MainSettingsFragment : Fragment(), View.OnClickListener {
-
-    private var _binding: FragmentMainSettingsBinding? = null
-    private val binding get() = _binding!!
-
-
-    override fun onClick(view: View) {
-        findNavController().navigate(
-            when (view.id) {
-                R.id.generalSettings -> R.id.action_mainSettingsFragment_to_themeSettingsFragment
-                R.id.audioSettings -> R.id.action_mainSettingsFragment_to_audioSettings
-                R.id.personalizeSettings -> R.id.action_mainSettingsFragment_to_personalizeSettingsFragment
-                R.id.imageSettings -> R.id.action_mainSettingsFragment_to_imageSettingFragment
-                R.id.notificationSettings -> R.id.action_mainSettingsFragment_to_notificationSettingsFragment
-                R.id.otherSettings -> R.id.action_mainSettingsFragment_to_otherSettingsFragment
-                R.id.aboutSettings -> R.id.action_mainSettingsFragment_to_aboutActivity
-                R.id.nowPlayingSettings -> R.id.action_mainSettingsFragment_to_nowPlayingSettingsFragment
-                R.id.backup_restore_settings -> R.id.action_mainSettingsFragment_to_backupFragment
-                else -> R.id.action_mainSettingsFragment_to_themeSettingsFragment
-            }
-        )
+    override fun onClick(v: View) {
+        when (v.id) {
+            R.id.generalSettings -> inflateFragment(ThemeSettingsFragment(), R.string.general_settings_title)
+            R.id.audioSettings -> inflateFragment(AudioSettings(), R.string.pref_header_audio)
+            R.id.nowPlayingSettings -> inflateFragment(NowPlayingSettingsFragment(), R.string.now_playing)
+            R.id.personalizeSettings -> inflateFragment(PersonalizeSettingsFragment(), R.string.personalize)
+            R.id.imageSettings -> inflateFragment(ImageSettingFragment(), R.string.pref_header_images)
+            R.id.notificationSettings -> inflateFragment(NotificationSettingsFragment(), R.string.notification)
+            R.id.otherSettings -> inflateFragment(OtherSettingsFragment(), R.string.others)
+            R.id.aboutSettings -> NavigationUtil.goToAbout(requireActivity())
+        }
     }
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = FragmentMainSettingsBinding.inflate(inflater, container, false)
-        return binding.root
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_main_settings, container, false)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        binding.generalSettings.setOnClickListener(this)
-        binding.audioSettings.setOnClickListener(this)
-        binding.nowPlayingSettings.setOnClickListener(this)
-        binding.personalizeSettings.setOnClickListener(this)
-        binding.imageSettings.setOnClickListener(this)
-        binding.notificationSettings.setOnClickListener(this)
-        binding.otherSettings.setOnClickListener(this)
-        binding.aboutSettings.setOnClickListener(this)
-        binding.backupRestoreSettings.setOnClickListener(this)
+        generalSettings.setOnClickListener(this)
+        audioSettings.setOnClickListener(this)
+        nowPlayingSettings.setOnClickListener(this)
+        personalizeSettings.setOnClickListener(this)
+        imageSettings.setOnClickListener(this)
+        notificationSettings.setOnClickListener(this)
+        otherSettings.setOnClickListener(this)
+        aboutSettings.setOnClickListener(this)
+
+        buyProContainer.apply {
+            if (!App.isProVersion()) show() else hide()
+            setOnClickListener {
+                NavigationUtil.goToProVersion(requireContext())
+            }
+        }
+        buyPremium.setOnClickListener {
+            NavigationUtil.goToProVersion(requireContext())
+        }
+        ThemeStore.accentColor(requireContext()).let {
+            buyPremium.setTextColor(it)
+            diamondIcon.imageTintList = ColorStateList.valueOf(it)
+        }
 
-        binding.container.drawAboveSystemBarsWithPadding()
     }
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
+    private fun inflateFragment(fragment: Fragment, @StringRes title: Int) {
+        (requireActivity() as SettingsActivity).setupFragment(fragment, title)
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
index 2abffa6b0..dfd74f157 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NotificationSettingsFragment.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
 import android.content.SharedPreferences
@@ -20,51 +20,48 @@ import android.os.Build.VERSION_CODES
 import android.os.Bundle
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.CLASSIC_NOTIFICATION
-import code.name.monkey.retromusic.COLORED_NOTIFICATION
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 
+
 /**
  * @author Hemanth S (h4h13).
  */
 
-class NotificationSettingsFragment : AbsSettingsFragment(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+class NotificationSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
-        if (key == CLASSIC_NOTIFICATION) {
+        if (key == PreferenceUtil.CLASSIC_NOTIFICATION) {
             if (VERSION.SDK_INT >= VERSION_CODES.O) {
-                findPreference<Preference>(COLORED_NOTIFICATION)?.isEnabled =
-                    sharedPreferences?.getBoolean(key, false)!!
+                findPreference<Preference>("colored_notification")?.isEnabled = sharedPreferences?.getBoolean(key, false)!!
             }
         }
     }
 
     override fun invalidateSettings() {
 
-        val classicNotification: TwoStatePreference? = findPreference(CLASSIC_NOTIFICATION)
+        val classicNotification: TwoStatePreference? = findPreference("classic_notification")
         if (VERSION.SDK_INT < VERSION_CODES.N) {
             classicNotification?.isVisible = false
         } else {
             classicNotification?.apply {
-                isChecked = PreferenceUtil.isClassicNotification
+                isChecked = PreferenceUtil.getInstance(requireContext()).classicNotification()
                 setOnPreferenceChangeListener { _, newValue ->
                     // Save preference
-                    PreferenceUtil.isClassicNotification = newValue as Boolean
+                    PreferenceUtil.getInstance(requireContext()).setClassicNotification(newValue as Boolean)
                     invalidateSettings()
                     true
                 }
             }
         }
 
-        val coloredNotification: TwoStatePreference? = findPreference(COLORED_NOTIFICATION)
+        val coloredNotification: TwoStatePreference? = findPreference("colored_notification")
         if (VERSION.SDK_INT >= VERSION_CODES.O) {
-            coloredNotification?.isEnabled = PreferenceUtil.isClassicNotification
+            coloredNotification?.isEnabled = PreferenceUtil.getInstance(requireContext()).classicNotification()
         } else {
             coloredNotification?.apply {
-                isChecked = PreferenceUtil.isColoredNotification
+                isChecked = PreferenceUtil.getInstance(requireContext()).coloredNotification()
                 setOnPreferenceChangeListener { _, newValue ->
-                    PreferenceUtil.isColoredNotification = newValue as Boolean
+                    PreferenceUtil.getInstance(requireContext()).setColoredNotification(newValue as Boolean)
                     true
                 }
             }
@@ -73,12 +70,12 @@ class NotificationSettingsFragment : AbsSettingsFragment(),
 
     override fun onResume() {
         super.onResume()
-        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
+        PreferenceUtil.getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
+        PreferenceUtil.getInstance(requireContext()).unregisterOnSharedPreferenceChangedListener(this)
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
index 955cf9af0..b596729be 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/NowPlayingSettingsFragment.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
 import android.content.SharedPreferences
@@ -19,22 +19,26 @@ import android.os.Bundle
 import android.view.View
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.App
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.util.PreferenceUtil.*
 
 /**
  * @author Hemanth S (h4h13).
  */
 
-class NowPlayingSettingsFragment : AbsSettingsFragment(),
-    SharedPreferences.OnSharedPreferenceChangeListener {
+class NowPlayingSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
 
     override fun invalidateSettings() {
         updateNowPlayingScreenSummary()
         updateAlbumCoverStyleSummary()
 
-        val carouselEffect: TwoStatePreference? = findPreference(CAROUSEL_EFFECT)
-        carouselEffect?.setOnPreferenceChangeListener { _, _ ->
+        val carouselEffect: TwoStatePreference = findPreference("carousel_effect")!!
+        carouselEffect.setOnPreferenceChangeListener { _, newValue ->
+            if (newValue as Boolean && !App.isProVersion()) {
+                showProToastAndNavigate(activity!!.getString(R.string.pref_title_toggle_carousel_effect))
+                return@setOnPreferenceChangeListener false
+            }
             return@setOnPreferenceChangeListener true
         }
     }
@@ -44,28 +48,25 @@ class NowPlayingSettingsFragment : AbsSettingsFragment(),
     }
 
     private fun updateAlbumCoverStyleSummary() {
-        val preference: Preference? = findPreference(ALBUM_COVER_STYLE)
-        preference?.setSummary(PreferenceUtil.albumCoverStyle.titleRes)
+        val preference: Preference = findPreference(ALBUM_COVER_STYLE)!!
+        preference.setSummary(getInstance(requireContext()).albumCoverStyle.titleRes)
     }
 
     private fun updateNowPlayingScreenSummary() {
-        val preference: Preference? = findPreference(NOW_PLAYING_SCREEN_ID)
-        preference?.setSummary(PreferenceUtil.nowPlayingScreen.titleRes)
+        val preference: Preference = findPreference(NOW_PLAYING_SCREEN_ID)!!
+        preference.setSummary(getInstance(requireContext()).nowPlayingScreen.titleRes)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        PreferenceUtil.registerOnSharedPreferenceChangedListener(this)
-        val preference: Preference? = findPreference(ALBUM_COVER_TRANSFORM)
-        preference?.setOnPreferenceChangeListener { albumPrefs, newValue ->
-            setSummary(albumPrefs, newValue)
-            true
-        }
+        getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this)
+        val preference: Preference = findPreference("album_cover_transform")!!
+        setSummary(preference)
     }
 
     override fun onDestroyView() {
         super.onDestroyView()
-        PreferenceUtil.unregisterOnSharedPreferenceChangedListener(this)
+        getInstance(requireContext()).unregisterOnSharedPreferenceChangedListener(this)
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
index fcc625105..ade77cff1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/OtherSettingsFragment.kt
@@ -1,76 +1,41 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.app.AppCompatDelegate
-import androidx.core.os.LocaleListCompat
 import androidx.preference.Preference
-import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-import code.name.monkey.retromusic.LANGUAGE_NAME
-import code.name.monkey.retromusic.LAST_ADDED_CUTOFF
+
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType.HomeSections
-import code.name.monkey.retromusic.util.PreferenceUtil
-import org.koin.androidx.viewmodel.ext.android.activityViewModel
-import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
 /**
  * @author Hemanth S (h4h13).
  */
 
 class OtherSettingsFragment : AbsSettingsFragment() {
-    private val libraryViewModel by activityViewModel<LibraryViewModel>()
-
     override fun invalidateSettings() {
-        val languagePreference: ATEListPreference? = findPreference(LANGUAGE_NAME)
-        languagePreference?.setOnPreferenceChangeListener { _, _ ->
-            restartActivity()
-            return@setOnPreferenceChangeListener true
-        }
+
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-        PreferenceUtil.languageCode =
-            AppCompatDelegate.getApplicationLocales().toLanguageTags().ifEmpty { "auto" }
         addPreferencesFromResource(R.xml.pref_advanced)
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val preference: Preference? = findPreference(LAST_ADDED_CUTOFF)
-        preference?.setOnPreferenceChangeListener { lastAdded, newValue ->
-            setSummary(lastAdded, newValue)
-            libraryViewModel.forceReload(HomeSections)
-            true
-        }
-        val languagePreference: Preference? = findPreference(LANGUAGE_NAME)
-        languagePreference?.setOnPreferenceChangeListener { prefs, newValue ->
-            setSummary(prefs, newValue)
-            if (newValue as? String == "auto") {
-                AppCompatDelegate.setApplicationLocales(LocaleListCompat.getEmptyLocaleList())
-            } else {
-                AppCompatDelegate.setApplicationLocales(
-                    LocaleListCompat.forLanguageTags(
-                        newValue as? String
-                    )
-                )
-            }
-            true
-        }
+        val preference: Preference = findPreference("last_added_interval")!!
+        setSummary(preference)
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
index 42dee53b9..7b1f01c49 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/PersonalizeSettingsFragment.kt
@@ -1,62 +1,65 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
+import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
-import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
+import androidx.preference.Preference
+import androidx.preference.TwoStatePreference
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.util.PreferenceUtil
 
-class PersonalizeSettingsFragment : AbsSettingsFragment() {
+
+class PersonalizeSettingsFragment : AbsSettingsFragment(), SharedPreferences.OnSharedPreferenceChangeListener {
+
+    override fun invalidateSettings() {
+
+        val toggleFullScreen: TwoStatePreference = findPreference("toggle_full_screen")!!
+        toggleFullScreen.setOnPreferenceChangeListener { _, _ ->
+            requireActivity().recreate()
+            true
+        }
+    }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_ui)
-        // Hide Blur album art preference on Android 11+ devices as the lockscreen album art feature was removed by Google
-        // And if the feature is present in some Custom ROM's there is also an option to set blur so this preference is unnecessary on Android 11 and above
-        val blurredAlbumArt: ATESwitchPreference? = findPreference(BLURRED_ALBUM_ART)
-        blurredAlbumArt?.isVisible = !VersionUtils.hasR()
     }
 
-    override fun invalidateSettings() {}
-
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        val albumArtOnLockscreen: ATESwitchPreference? = findPreference(ALBUM_ART_ON_LOCK_SCREEN)
-        albumArtOnLockscreen?.isVisible = !VersionUtils.hasT()
+        PreferenceUtil.getInstance(requireContext()).registerOnSharedPreferenceChangedListener(this)
 
-        val homeArtistStyle: ATEListPreference? = findPreference(HOME_ARTIST_GRID_STYLE)
-        homeArtistStyle?.setOnPreferenceChangeListener { preference, newValue ->
-            setSummary(preference, newValue)
-            true
-        }
-        val homeAlbumStyle: ATEListPreference? = findPreference(HOME_ALBUM_GRID_STYLE)
-        homeAlbumStyle?.setOnPreferenceChangeListener { preference, newValue ->
-            setSummary(preference, newValue)
-            true
-        }
-        val tabTextMode: ATEListPreference? = findPreference(TAB_TEXT_MODE)
-        tabTextMode?.setOnPreferenceChangeListener { prefs, newValue ->
-            setSummary(prefs, newValue)
-            true
-        }
-        val appBarMode: ATEListPreference? = findPreference(APPBAR_MODE)
-        appBarMode?.setOnPreferenceChangeListener { _, _ ->
-            restartActivity()
-            true
+        var preference: Preference? = findPreference("album_grid_style")
+        setSummary(preference!!)
+        preference = findPreference("artist_grid_style")
+        setSummary(preference!!)
+        preference = findPreference("home_artist_grid_style")
+        setSummary(preference!!)
+        preference = findPreference("tab_text_mode")
+        setSummary(preference!!)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        PreferenceUtil.getInstance(requireContext()).unregisterOnSharedPreferenceChangedListener(this)
+    }
+
+    override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
+        when (key) {
+            PreferenceUtil.CAROUSEL_EFFECT -> invalidateSettings()
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt
deleted file mode 100644
index cfc758307..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/SettingsFragment.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.settings
-
-import android.os.Bundle
-import android.view.View
-import androidx.fragment.app.Fragment
-import androidx.navigation.NavController
-import androidx.navigation.NavDestination
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.databinding.FragmentSettingsBinding
-import code.name.monkey.retromusic.extensions.findNavController
-import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.color.ColorCallback
-
-class SettingsFragment : Fragment(R.layout.fragment_settings), ColorCallback {
-    private var _binding: FragmentSettingsBinding? = null
-    private val binding get() = _binding!!
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        _binding = FragmentSettingsBinding.bind(view)
-        setupToolbar()
-    }
-
-    private fun setupToolbar() {
-        val navController: NavController = findNavController(R.id.contentFrame)
-        with (binding.appBarLayout.toolbar) {
-            setNavigationIcon(R.drawable.ic_arrow_back)
-            isTitleCentered = false
-            setNavigationOnClickListener {
-                requireActivity().onBackPressedDispatcher.onBackPressed()
-            }
-        }
-
-        navController.addOnDestinationChangedListener { _, _, _ ->
-            binding.appBarLayout.title =
-                navController.currentDestination?.let { getStringFromDestination(it) }.toString()
-        }
-    }
-
-    private fun getStringFromDestination(currentDestination: NavDestination): String {
-        val idRes = when (currentDestination.id) {
-            R.id.mainSettingsFragment -> R.string.action_settings
-            R.id.audioSettings -> R.string.pref_header_audio
-            R.id.imageSettingFragment -> R.string.pref_header_images
-            R.id.notificationSettingsFragment -> R.string.notification
-            R.id.nowPlayingSettingsFragment -> R.string.now_playing
-            R.id.otherSettingsFragment -> R.string.others
-            R.id.personalizeSettingsFragment -> R.string.personalize
-            R.id.themeSettingsFragment -> R.string.general_settings_title
-            R.id.aboutActivity -> R.string.action_about
-            R.id.backup_fragment -> R.string.backup_restore_title
-            else -> R.id.action_settings
-        }
-        return getString(idRes)
-    }
-
-    override fun invoke(dialog: MaterialDialog, color: Int) {
-        ThemeStore.editTheme(requireContext()).accentColor(color).commit()
-        if (VersionUtils.hasNougatMR())
-            DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
-        activity?.recreate()
-    }
-
-    override fun onDestroyView() {
-        super.onDestroyView()
-        _binding = null
-    }
-
-    companion object {
-        val TAG: String = SettingsFragment::class.java.simpleName
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
index 87ac19699..b299db4f2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/settings/ThemeSettingsFragment.kt
@@ -1,21 +1,21 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
+
 package code.name.monkey.retromusic.fragments.settings
 
-import android.annotation.SuppressLint
+import android.os.Build
 import android.os.Bundle
-import androidx.core.content.edit
 import androidx.preference.Preference
 import androidx.preference.TwoStatePreference
 import code.name.monkey.appthemehelper.ACCENT_COLORS
@@ -25,116 +25,92 @@ import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.appshortcuts.DynamicShortcutManager
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
 import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.color.colorChooser
-import com.google.android.material.color.DynamicColors
+
 
 /**
  * @author Hemanth S (h4h13).
  */
 
 class ThemeSettingsFragment : AbsSettingsFragment() {
-    @SuppressLint("CheckResult")
     override fun invalidateSettings() {
-        val generalTheme: Preference? = findPreference(GENERAL_THEME)
+        val generalTheme: Preference? = findPreference("general_theme")
         generalTheme?.let {
             setSummary(it)
             it.setOnPreferenceChangeListener { _, newValue ->
+                val theme = newValue as String
                 setSummary(it, newValue)
                 ThemeStore.markChanged(requireContext())
 
-                if (VersionUtils.hasNougatMR()) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                    requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue(theme))
                     DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
                 }
-                restartActivity()
+                requireActivity().recreate()
                 true
             }
         }
 
-        val accentColorPref: ATEColorPreference? = findPreference(ACCENT_COLOR)
+        val accentColorPref: ATEColorPreference = findPreference("accent_color")!!
         val accentColor = ThemeStore.accentColor(requireContext())
-        accentColorPref?.setColor(accentColor, ColorUtil.darkenColor(accentColor))
-        accentColorPref?.setOnPreferenceClickListener {
-            materialDialog().show {
-                colorChooser(
-                    initialSelection = accentColor,
-                    showAlphaSelector = false,
-                    colors = ACCENT_COLORS,
-                    subColors = ACCENT_COLORS_SUB, allowCustomArgb = true
-                ) { _, color ->
+        accentColorPref.setColor(accentColor, ColorUtil.darkenColor(accentColor))
+
+        accentColorPref.setOnPreferenceClickListener {
+            MaterialDialog(requireActivity(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                title(R.string.accent_color)
+                positiveButton(R.string.set)
+                colorChooser(colors = ACCENT_COLORS, allowCustomArgb = true, subColors = ACCENT_COLORS_SUB) { _, color ->
                     ThemeStore.editTheme(requireContext()).accentColor(color).commit()
                     if (VersionUtils.hasNougatMR())
                         DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
-                    restartActivity()
+                    requireActivity().recreate()
                 }
             }
             return@setOnPreferenceClickListener true
         }
-        val blackTheme: ATESwitchPreference? = findPreference(BLACK_THEME)
+        val blackTheme: ATESwitchPreference? = findPreference("black_theme")
         blackTheme?.setOnPreferenceChangeListener { _, _ ->
             ThemeStore.markChanged(requireContext())
-            if (VersionUtils.hasNougatMR()) {
-                requireActivity().setTheme(PreferenceUtil.themeResFromPrefValue("black"))
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                requireActivity().setTheme(PreferenceUtil.getThemeResFromPrefValue("black"))
                 DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
             }
-            restartActivity()
+            requireActivity().recreate()
             true
         }
 
-        val desaturatedColor: ATESwitchPreference? = findPreference(DESATURATED_COLOR)
+        val desaturatedColor: ATESwitchPreference? = findPreference(PreferenceUtil.DESATURATED_COLOR)
         desaturatedColor?.setOnPreferenceChangeListener { _, value ->
             val desaturated = value as Boolean
-            ThemeStore.prefs(requireContext()).edit {
-                putBoolean("desaturated_color", desaturated)
-            }
-            PreferenceUtil.isDesaturatedColor = desaturated
-            restartActivity()
+            ThemeStore.prefs(requireContext()).edit().putBoolean("desaturated_color", desaturated).apply()
+            PreferenceUtil.getInstance(requireContext()).setDesaturatedColor(desaturated)
+            requireActivity().recreate()
             true
         }
 
-        val colorAppShortcuts: TwoStatePreference? = findPreference(SHOULD_COLOR_APP_SHORTCUTS)
+
+        val colorAppShortcuts: TwoStatePreference = findPreference("should_color_app_shortcuts")!!
         if (!VersionUtils.hasNougatMR()) {
-            colorAppShortcuts?.isVisible = false
+            colorAppShortcuts.isVisible = false
         } else {
-            colorAppShortcuts?.isChecked = PreferenceUtil.isColoredAppShortcuts
-            colorAppShortcuts?.setOnPreferenceChangeListener { _, newValue ->
-                PreferenceUtil.isColoredAppShortcuts = newValue as Boolean
+            colorAppShortcuts.isChecked = PreferenceUtil.getInstance(requireContext()).coloredAppShortcuts()
+            colorAppShortcuts.setOnPreferenceChangeListener { _, newValue ->
+                // Save preference
+                PreferenceUtil.getInstance(requireContext()).setColoredAppShortcuts(newValue as Boolean)
                 DynamicShortcutManager(requireContext()).updateDynamicShortcuts()
                 true
             }
         }
-
-        val materialYou: ATESwitchPreference? = findPreference(MATERIAL_YOU)
-        materialYou?.setOnPreferenceChangeListener { _, newValue ->
-            if (newValue as Boolean) {
-                DynamicColors.applyToActivitiesIfAvailable(App.getContext())
-            }
-            restartActivity()
-            true
-        }
-        val wallpaperAccent: ATESwitchPreference? = findPreference(WALLPAPER_ACCENT)
-        wallpaperAccent?.setOnPreferenceChangeListener { _, _ ->
-            restartActivity()
-            true
-        }
-        val customFont: ATESwitchPreference? = findPreference(CUSTOM_FONT)
-        customFont?.setOnPreferenceChangeListener { _, _ ->
-            restartActivity()
-            true
-        }
-
-        val adaptiveColor: ATESwitchPreference? = findPreference(ADAPTIVE_COLOR_APP)
-        adaptiveColor?.isEnabled =
-            PreferenceUtil.nowPlayingScreen in listOf(Normal, Material, Flat)
     }
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         addPreferencesFromResource(R.xml.pref_general)
-        val wallpaperAccent: ATESwitchPreference? = findPreference(WALLPAPER_ACCENT)
-        wallpaperAccent?.isVisible = VersionUtils.hasOreoMR1() && !VersionUtils.hasS()
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
deleted file mode 100644
index 997fc327c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsFragment.kt
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Cop()yright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.fragments.songs
-
-import android.os.Bundle
-import android.view.*
-import androidx.annotation.LayoutRes
-import androidx.recyclerview.widget.GridLayoutManager
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.adapter.song.SongAdapter
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.ReloadType
-import code.name.monkey.retromusic.fragments.base.AbsRecyclerViewCustomGridSizeFragment
-import code.name.monkey.retromusic.helper.SortOrder.SongSortOrder
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.RetroUtil
-
-class SongsFragment : AbsRecyclerViewCustomGridSizeFragment<SongAdapter, GridLayoutManager>() {
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        libraryViewModel.getSongs().observe(viewLifecycleOwner) {
-            if (it.isNotEmpty())
-                adapter?.swapDataSet(it)
-            else
-                adapter?.swapDataSet(listOf())
-        }
-    }
-
-    override val titleRes: Int
-        get() = R.string.songs
-
-    override val emptyMessage: Int
-        get() = R.string.no_songs
-
-    override val isShuffleVisible: Boolean
-        get() = true
-
-    override fun onShuffleClicked() {
-        libraryViewModel.shuffleSongs()
-    }
-
-    override fun createLayoutManager(): GridLayoutManager {
-        return GridLayoutManager(requireActivity(), getGridSize())
-    }
-
-    override fun createAdapter(): SongAdapter {
-        val dataSet = if (adapter == null) mutableListOf() else adapter!!.dataSet
-        return SongAdapter(
-            requireActivity(),
-            dataSet,
-            itemLayoutRes()
-        )
-    }
-
-    override fun loadGridSize(): Int {
-        return PreferenceUtil.songGridSize
-    }
-
-    override fun saveGridSize(gridColumns: Int) {
-        PreferenceUtil.songGridSize = gridColumns
-    }
-
-    override fun loadGridSizeLand(): Int {
-        return PreferenceUtil.songGridSizeLand
-    }
-
-    override fun saveGridSizeLand(gridColumns: Int) {
-        PreferenceUtil.songGridSizeLand = gridColumns
-    }
-
-    override fun setGridSize(gridSize: Int) {
-        adapter?.notifyDataSetChanged()
-    }
-
-    override fun loadSortOrder(): String {
-        return PreferenceUtil.songSortOrder
-    }
-
-    override fun saveSortOrder(sortOrder: String) {
-        PreferenceUtil.songSortOrder = sortOrder
-    }
-
-    @LayoutRes
-    override fun loadLayoutRes(): Int {
-        return PreferenceUtil.songGridStyle.layoutResId
-    }
-
-    override fun saveLayoutRes(@LayoutRes layoutRes: Int) {
-        PreferenceUtil.songGridStyle = GridStyle.values().first { gridStyle ->
-            gridStyle.layoutResId == layoutRes
-        }
-    }
-
-    override fun setSortOrder(sortOrder: String) {
-        libraryViewModel.forceReload(ReloadType.Songs)
-    }
-
-    override fun onCreateMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateMenu(menu, inflater)
-        val gridSizeItem: MenuItem = menu.findItem(R.id.action_grid_size)
-        if (RetroUtil.isLandscape) {
-            gridSizeItem.setTitle(R.string.action_grid_size_land)
-        }
-        setUpGridSizeMenu(gridSizeItem.subMenu!!)
-        val layoutItem = menu.findItem(R.id.action_layout_type)
-        setupLayoutMenu(layoutItem.subMenu!!)
-        setUpSortOrderMenu(menu.findItem(R.id.action_sort_order).subMenu!!)
-    }
-
-    private fun setUpSortOrderMenu(sortOrderMenu: SubMenu) {
-        val currentSortOrder: String? = getSortOrder()
-        sortOrderMenu.clear()
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_default_sort_order,
-            0,
-            R.string.sort_order_default
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_DEFAULT
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_asc,
-            0,
-            R.string.sort_order_a_z
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_A_Z
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_desc,
-            1,
-            R.string.sort_order_z_a
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_Z_A
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_artist,
-            2,
-            R.string.sort_order_artist
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_ARTIST
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_album,
-            3,
-            R.string.sort_order_album
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_ALBUM
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_year,
-            4,
-            R.string.sort_order_year
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_YEAR
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_date,
-            5,
-            R.string.sort_order_date
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_DATE
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_date_modified,
-            6,
-            R.string.sort_order_date_modified
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_DATE_MODIFIED
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_composer,
-            7,
-            R.string.sort_order_composer
-        ).isChecked =
-            currentSortOrder == SongSortOrder.COMPOSER
-        sortOrderMenu.add(
-            0,
-            R.id.action_song_sort_order_album_artist,
-            8,
-            R.string.album_artist
-        ).isChecked =
-            currentSortOrder == SongSortOrder.SONG_ALBUM_ARTIST
-
-        sortOrderMenu.setGroupCheckable(0, true, true)
-    }
-
-    private fun setupLayoutMenu(subMenu: SubMenu) {
-        when (itemLayoutRes()) {
-            R.layout.item_card -> subMenu.findItem(R.id.action_layout_card).isChecked = true
-            R.layout.item_grid -> subMenu.findItem(R.id.action_layout_normal).isChecked = true
-            R.layout.item_card_color ->
-                subMenu.findItem(R.id.action_layout_colored_card).isChecked = true
-            R.layout.item_grid_circle ->
-                subMenu.findItem(R.id.action_layout_circular).isChecked = true
-            R.layout.image -> subMenu.findItem(R.id.action_layout_image).isChecked = true
-            R.layout.item_image_gradient ->
-                subMenu.findItem(R.id.action_layout_gradient_image).isChecked = true
-        }
-    }
-
-    private fun setUpGridSizeMenu(gridSizeMenu: SubMenu) {
-        when (getGridSize()) {
-            1 -> gridSizeMenu.findItem(R.id.action_grid_size_1).isChecked = true
-            2 -> gridSizeMenu.findItem(R.id.action_grid_size_2).isChecked = true
-            3 -> gridSizeMenu.findItem(R.id.action_grid_size_3).isChecked = true
-            4 -> gridSizeMenu.findItem(R.id.action_grid_size_4).isChecked = true
-            5 -> gridSizeMenu.findItem(R.id.action_grid_size_5).isChecked = true
-            6 -> gridSizeMenu.findItem(R.id.action_grid_size_6).isChecked = true
-            7 -> gridSizeMenu.findItem(R.id.action_grid_size_7).isChecked = true
-            8 -> gridSizeMenu.findItem(R.id.action_grid_size_8).isChecked = true
-        }
-        val gridSize: Int = maxGridSize
-        if (gridSize < 8) {
-            gridSizeMenu.findItem(R.id.action_grid_size_8).isVisible = false
-        }
-        if (gridSize < 7) {
-            gridSizeMenu.findItem(R.id.action_grid_size_7).isVisible = false
-        }
-        if (gridSize < 6) {
-            gridSizeMenu.findItem(R.id.action_grid_size_6).isVisible = false
-        }
-        if (gridSize < 5) {
-            gridSizeMenu.findItem(R.id.action_grid_size_5).isVisible = false
-        }
-        if (gridSize < 4) {
-            gridSizeMenu.findItem(R.id.action_grid_size_4).isVisible = false
-        }
-        if (gridSize < 3) {
-            gridSizeMenu.findItem(R.id.action_grid_size_3).isVisible = false
-        }
-    }
-
-    override fun onMenuItemSelected(item: MenuItem): Boolean {
-        if (handleGridSizeMenuItem(item)) {
-            return true
-        }
-        if (handleLayoutResType(item)) {
-            return true
-        }
-        if (handleSortOrderMenuItem(item)) {
-            return true
-        }
-        return super.onMenuItemSelected(item)
-    }
-
-    private fun handleSortOrderMenuItem(item: MenuItem): Boolean {
-        val sortOrder: String = when (item.itemId) {
-            R.id.action_song_default_sort_order -> SongSortOrder.SONG_DEFAULT
-            R.id.action_song_sort_order_asc -> SongSortOrder.SONG_A_Z
-            R.id.action_song_sort_order_desc -> SongSortOrder.SONG_Z_A
-            R.id.action_song_sort_order_artist -> SongSortOrder.SONG_ARTIST
-            R.id.action_song_sort_order_album_artist -> SongSortOrder.SONG_ALBUM_ARTIST
-            R.id.action_song_sort_order_album -> SongSortOrder.SONG_ALBUM
-            R.id.action_song_sort_order_year -> SongSortOrder.SONG_YEAR
-            R.id.action_song_sort_order_date -> SongSortOrder.SONG_DATE
-            R.id.action_song_sort_order_composer -> SongSortOrder.COMPOSER
-            R.id.action_song_sort_order_date_modified -> SongSortOrder.SONG_DATE_MODIFIED
-            else -> PreferenceUtil.songSortOrder
-        }
-        if (sortOrder != PreferenceUtil.songSortOrder) {
-            item.isChecked = true
-            setAndSaveSortOrder(sortOrder)
-            return true
-        }
-        return false
-    }
-
-    private fun handleLayoutResType(item: MenuItem): Boolean {
-        val layoutRes = when (item.itemId) {
-            R.id.action_layout_normal -> R.layout.item_grid
-            R.id.action_layout_card -> R.layout.item_card
-            R.id.action_layout_colored_card -> R.layout.item_card_color
-            R.id.action_layout_circular -> R.layout.item_grid_circle
-            R.id.action_layout_image -> R.layout.image
-            R.id.action_layout_gradient_image -> R.layout.item_image_gradient
-            else -> PreferenceUtil.songGridStyle.layoutResId
-        }
-        if (layoutRes != PreferenceUtil.songGridStyle.layoutResId) {
-            item.isChecked = true
-            setAndSaveLayoutRes(layoutRes)
-            return true
-        }
-        return false
-    }
-
-    private fun handleGridSizeMenuItem(item: MenuItem): Boolean {
-        val gridSize = when (item.itemId) {
-            R.id.action_grid_size_1 -> 1
-            R.id.action_grid_size_2 -> 2
-            R.id.action_grid_size_3 -> 3
-            R.id.action_grid_size_4 -> 4
-            R.id.action_grid_size_5 -> 5
-            R.id.action_grid_size_6 -> 6
-            R.id.action_grid_size_7 -> 7
-            R.id.action_grid_size_8 -> 8
-            else -> 0
-        }
-        if (gridSize > 0) {
-            item.isChecked = true
-            setAndSaveGridSize(gridSize)
-            return true
-        }
-        return false
-    }
-
-    override fun onResume() {
-        super.onResume()
-        libraryViewModel.forceReload(ReloadType.Songs)
-    }
-
-    override fun onPause() {
-        super.onPause()
-        adapter?.actionMode?.finish()
-    }
-
-    companion object {
-        @JvmField
-        var TAG: String = SongsFragment::class.java.simpleName
-
-        @JvmStatic
-        fun newInstance(): SongsFragment {
-            return SongsFragment()
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
new file mode 100644
index 000000000..e339cf1d6
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/ArtistGlideRequest.java
@@ -0,0 +1,258 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.BitmapRequestBuilder;
+import com.bumptech.glide.DrawableRequestBuilder;
+import com.bumptech.glide.DrawableTypeRequest;
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.load.Key;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.request.target.Target;
+
+import code.name.monkey.retromusic.App;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.glide.artistimage.ArtistImage;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper;
+import code.name.monkey.retromusic.model.Artist;
+import code.name.monkey.retromusic.util.ArtistSignatureUtil;
+import code.name.monkey.retromusic.util.CustomArtistImageUtil;
+
+
+public class ArtistGlideRequest {
+
+    public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
+    private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.SOURCE;
+    private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_art;
+
+    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist, boolean noCustomImage, boolean forceDownload) {
+        boolean hasCustomImage = CustomArtistImageUtil.Companion.getInstance(App.Companion.getContext()).hasCustomArtistImage(artist);
+        if (noCustomImage || !hasCustomImage) {
+            return requestManager.load(new ArtistImage(artist.getName(), forceDownload));
+        } else {
+            return requestManager.load(CustomArtistImageUtil.getFile(artist));
+        }
+    }
+
+    public static Key createSignature(Artist artist) {
+        return ArtistSignatureUtil.getInstance(App.Companion.getContext()).getArtistSignature(artist.getName());
+    }
+
+    public static class Builder {
+        final RequestManager requestManager;
+        final Artist artist;
+        boolean noCustomImage;
+        boolean forceDownload;
+
+        private Builder(@NonNull RequestManager requestManager, Artist artist) {
+            this.requestManager = requestManager;
+            this.artist = artist;
+        }
+
+        public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
+            return new Builder(requestManager, artist);
+        }
+
+        public PaletteBuilder generatePalette(Context context) {
+            return new PaletteBuilder(this, context);
+        }
+
+        public BitmapBuilder asBitmap() {
+            return new BitmapBuilder(this);
+        }
+
+        public Builder noCustomImage(boolean noCustomImage) {
+            this.noCustomImage = noCustomImage;
+            return this;
+        }
+
+        public Builder forceDownload(boolean forceDownload) {
+            this.forceDownload = forceDownload;
+            return this;
+        }
+
+        public DrawableRequestBuilder<GlideDrawable> build() {
+            //noinspection unchecked
+            return createBaseRequest(requestManager, artist, noCustomImage, forceDownload)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(artist));
+        }
+    }
+
+    public static class BitmapBuilder {
+        private final Builder builder;
+
+        public BitmapBuilder(Builder builder) {
+            this.builder = builder;
+        }
+
+        public BitmapRequestBuilder<?, Bitmap> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage, builder.forceDownload)
+                    .asBitmap()
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(builder.artist));
+        }
+    }
+
+    public static class PaletteBuilder {
+        final Context context;
+        private final Builder builder;
+
+        public PaletteBuilder(Builder builder, Context context) {
+            this.builder = builder;
+            this.context = context;
+        }
+
+        public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage, builder.forceDownload)
+                    .asBitmap()
+                    .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(builder.artist));
+        }
+    }
+}
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ *//*
+public class ArtistGlideRequest {
+
+    public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
+    private static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.ALL;
+    private static final int DEFAULT_ERROR_IMAGE = R.drawable.default_artist_art;
+
+    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Artist artist, boolean noCustomImage) {
+        boolean hasCustomImage = CustomArtistImageUtil.Companion.getInstance(App.Companion.getContext()).hasCustomArtistImage(artist);
+        if (noCustomImage || !hasCustomImage) {
+            final List<AlbumCover> songs = new ArrayList<>();
+            for (final Album album : artist.getAlbums()) {
+                final Song song = album.safeGetFirstSong();
+                songs.add(new AlbumCover(album.getYear(), song.getData()));
+            }
+            return requestManager.load(new ArtistImage(artist.getName(), songs));
+        } else {
+            return requestManager.load(CustomArtistImageUtil.getFile(artist));
+        }
+    }
+
+    private static Key createSignature(Artist artist) {
+        return ArtistSignatureUtil.getInstance(App.Companion.getContext()).getArtistSignature(artist.getName());
+    }
+
+    public static class Builder {
+        final RequestManager requestManager;
+        final Artist artist;
+        boolean noCustomImage;
+
+        private Builder(@NonNull RequestManager requestManager, Artist artist) {
+            this.requestManager = requestManager;
+            this.artist = artist;
+        }
+
+        public static Builder from(@NonNull RequestManager requestManager, Artist artist) {
+            return new Builder(requestManager, artist);
+        }
+
+        public PaletteBuilder generatePalette(Context context) {
+            return new PaletteBuilder(this, context);
+        }
+
+        public BitmapBuilder asBitmap() {
+            return new BitmapBuilder(this);
+        }
+
+        public Builder noCustomImage(boolean noCustomImage) {
+            this.noCustomImage = noCustomImage;
+            return this;
+        }
+
+        public DrawableRequestBuilder<GlideDrawable> build() {
+            //noinspection unchecked
+            return createBaseRequest(requestManager, artist, noCustomImage)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(artist));
+        }
+    }
+
+    public static class BitmapBuilder {
+        private final Builder builder;
+
+        public BitmapBuilder(Builder builder) {
+            this.builder = builder;
+        }
+
+        public BitmapRequestBuilder<?, Bitmap> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
+                    .asBitmap()
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(builder.artist));
+        }
+    }
+
+    public static class PaletteBuilder {
+        final Context context;
+        private final Builder builder;
+
+        public PaletteBuilder(Builder builder, Context context) {
+            this.builder = builder;
+            this.context = context;
+        }
+
+        public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.artist, builder.noCustomImage)
+                    .asBitmap()
+                    .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .priority(Priority.LOW)
+                    .override(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL)
+                    .signature(createSignature(builder.artist));
+        }
+    }
+}*/
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt b/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt
index a2bb033f8..969fc7437 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/BlurTransformation.kt
@@ -1,9 +1,24 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
 package code.name.monkey.retromusic.glide
 
 import android.content.Context
 import android.graphics.Bitmap
 import android.graphics.Canvas
 import android.graphics.Paint
+import android.os.Build
 import android.renderscript.*
 import androidx.annotation.FloatRange
 import code.name.monkey.retromusic.BuildConfig
@@ -11,26 +26,32 @@ import code.name.monkey.retromusic.helper.StackBlur
 import code.name.monkey.retromusic.util.ImageUtil
 import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool
 import com.bumptech.glide.load.resource.bitmap.BitmapTransformation
-import java.security.MessageDigest
 
 
-@Suppress("Deprecation")
-class BlurTransformation private constructor(builder: Builder) : BitmapTransformation() {
+class BlurTransformation : BitmapTransformation {
 
     private var context: Context? = null
-    private var blurRadius = 0f
-    private var sampling = 0
+    private var blurRadius: Float = 0.toFloat()
+    private var sampling: Int = 0
 
-    init {
+    private fun init(builder: Builder) {
         this.context = builder.context
         this.blurRadius = builder.blurRadius
         this.sampling = builder.sampling
     }
 
+    private constructor(builder: Builder) : super(builder.context) {
+        init(builder)
+    }
+
+    private constructor(builder: Builder, bitmapPool: BitmapPool) : super(bitmapPool) {
+        init(builder)
+    }
+
     class Builder(val context: Context) {
         private var bitmapPool: BitmapPool? = null
         var blurRadius = DEFAULT_BLUR_RADIUS
-        var sampling = 0
+        var sampling: Int = 0
 
         /**
          * @param blurRadius The radius to use. Must be between 0 and 25. Default is 5.
@@ -54,79 +75,74 @@ class BlurTransformation private constructor(builder: Builder) : BitmapTransform
          * @param bitmapPool The BitmapPool to use.
          * @return the same Builder
          */
-        fun bitmapPool(bitmapPool: BitmapPool?): Builder {
+        fun bitmapPool(bitmapPool: BitmapPool): Builder {
             this.bitmapPool = bitmapPool
             return this
         }
 
         fun build(): BlurTransformation {
             return if (bitmapPool != null) {
-                BlurTransformation(this)
+                BlurTransformation(this, bitmapPool!!)
             } else BlurTransformation(this)
         }
     }
 
-    override fun transform(
-        pool: BitmapPool,
-        toTransform: Bitmap,
-        outWidth: Int,
-        outHeight: Int,
-    ): Bitmap {
-        val sampling = if (this.sampling == 0) {
-            ImageUtil.calculateInSampleSize(toTransform.width, toTransform.height, 100)
+    override fun transform(pool: BitmapPool, toTransform: Bitmap, outWidth: Int, outHeight: Int): Bitmap? {
+        val sampling: Int
+        if (this.sampling == 0) {
+            sampling = ImageUtil.calculateInSampleSize(toTransform.width, toTransform.height, 100)
         } else {
-            this.sampling
+            sampling = this.sampling
         }
+
         val width = toTransform.width
         val height = toTransform.height
         val scaledWidth = width / sampling
         val scaledHeight = height / sampling
-        val out = pool[scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888]
-        val canvas = Canvas(out)
+
+        var out: Bitmap? = pool.get(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888)
+        if (out == null) {
+            out = Bitmap.createBitmap(scaledWidth, scaledHeight, Bitmap.Config.ARGB_8888)
+        }
+
+        val canvas = Canvas(out!!)
         canvas.scale(1 / sampling.toFloat(), 1 / sampling.toFloat())
         val paint = Paint()
         paint.flags = Paint.FILTER_BITMAP_FLAG
         canvas.drawBitmap(toTransform, 0f, 0f, paint)
 
-        try {
-            val rs = RenderScript.create(context!!.applicationContext)
-            val input = Allocation.createFromBitmap(
-                rs,
-                out,
-                Allocation.MipmapControl.MIPMAP_NONE,
-                Allocation.USAGE_SCRIPT
-            )
-            val output = Allocation.createTyped(rs, input.type)
-            val script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs))
+        if (Build.VERSION.SDK_INT >= 17) {
+            try {
+                val rs = RenderScript.create(context!!.applicationContext)
+                val input = Allocation.createFromBitmap(rs, out, Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT)
+                val output = Allocation.createTyped(rs, input.type)
+                val script = ScriptIntrinsicBlur.create(rs, Element.U8_4(rs))
 
-            script.setRadius(blurRadius)
-            script.setInput(input)
-            script.forEach(output)
+                script.setRadius(blurRadius)
+                script.setInput(input)
+                script.forEach(output)
 
-            output.copyTo(out)
-            output.destroy()
-            script.destroy()
-            input.destroy()
-            rs.destroy()
+                output.copyTo(out)
+
+                rs.destroy()
+
+                return out
+
+            } catch (e: RSRuntimeException) {
+                // on some devices RenderScript.create() throws: android.support.v8.renderscript.RSRuntimeException: Error loading libRSSupport library
+                if (BuildConfig.DEBUG) e.printStackTrace()
+            }
 
-            return out
-        } catch (e: RSRuntimeException) {
-            // on some devices RenderScript.create() throws: android.support.v8.renderscript.RSRuntimeException: Error loading libRSSupport library
-            if (BuildConfig.DEBUG) e.printStackTrace()
         }
 
         return StackBlur.blur(out, blurRadius)
     }
 
-    override fun updateDiskCacheKey(messageDigest: MessageDigest) {
-        messageDigest.update(
-            "BlurTransformation(radius=$blurRadius, sampling=$sampling)".toByteArray(
-                CHARSET
-            )
-        )
+    override fun getId(): String {
+        return "BlurTransformation(radius=$blurRadius, sampling=$sampling)"
     }
 
     companion object {
-        const val DEFAULT_BLUR_RADIUS = 5f
+        val DEFAULT_BLUR_RADIUS = 5f
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt
deleted file mode 100644
index 11439ace9..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroGlideExtension.kt
+++ /dev/null
@@ -1,224 +0,0 @@
-package code.name.monkey.retromusic.glide
-
-import android.content.Context
-import android.graphics.drawable.Drawable
-import androidx.annotation.DrawableRes
-import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.App.Companion.getContext
-import code.name.monkey.retromusic.Constants.USER_BANNER
-import code.name.monkey.retromusic.Constants.USER_PROFILE
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.glide.artistimage.ArtistImage
-import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.ArtistSignatureUtil
-import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getFile
-import code.name.monkey.retromusic.util.CustomArtistImageUtil.Companion.getInstance
-import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.GenericTransitionOptions
-import com.bumptech.glide.Priority
-import com.bumptech.glide.RequestBuilder
-import com.bumptech.glide.RequestManager
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.Key
-import com.bumptech.glide.load.engine.DiskCacheStrategy
-import com.bumptech.glide.load.engine.GlideException
-import com.bumptech.glide.request.RequestListener
-import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.target.Target.SIZE_ORIGINAL
-import com.bumptech.glide.request.transition.DrawableCrossFadeFactory
-import com.bumptech.glide.request.transition.Transition
-import com.bumptech.glide.signature.MediaStoreSignature
-import java.io.File
-
-
-object RetroGlideExtension {
-
-    private const val DEFAULT_ARTIST_IMAGE =
-        R.drawable.default_artist_art
-    private const val DEFAULT_SONG_IMAGE: Int = R.drawable.default_audio_art
-    private const val DEFAULT_ALBUM_IMAGE = R.drawable.default_album_art
-    private const val DEFAULT_ERROR_IMAGE_BANNER = R.drawable.material_design_default
-
-    private val DEFAULT_DISK_CACHE_STRATEGY_ARTIST = DiskCacheStrategy.RESOURCE
-    private val DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.NONE
-
-    private const val DEFAULT_ANIMATION = android.R.anim.fade_in
-
-    fun RequestManager.asBitmapPalette(): RequestBuilder<BitmapPaletteWrapper> {
-        return this.`as`(BitmapPaletteWrapper::class.java)
-    }
-
-    private fun getSongModel(song: Song, ignoreMediaStore: Boolean): Any {
-        return if (ignoreMediaStore) {
-            AudioFileCover(song.data)
-        } else {
-            getMediaStoreAlbumCoverUri(song.albumId)
-        }
-    }
-
-    fun getSongModel(song: Song): Any {
-        return getSongModel(song, PreferenceUtil.isIgnoreMediaStoreArtwork)
-    }
-
-    fun getArtistModel(artist: Artist): Any {
-        return getArtistModel(
-            artist,
-            getInstance(getContext()).hasCustomArtistImage(artist),
-            false
-        )
-    }
-
-    fun getArtistModel(artist: Artist, forceDownload: Boolean): Any {
-        return getArtistModel(
-            artist,
-            getInstance(getContext()).hasCustomArtistImage(artist),
-            forceDownload
-        )
-    }
-
-    private fun getArtistModel(
-        artist: Artist,
-        hasCustomImage: Boolean,
-        forceDownload: Boolean
-    ): Any {
-        return if (!hasCustomImage) {
-            ArtistImage(artist)
-        } else {
-            getFile(artist)
-        }
-    }
-
-    fun <T> RequestBuilder<T>.artistImageOptions(
-        artist: Artist
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY_ARTIST)
-            .priority(Priority.LOW)
-            .error(getDrawable(DEFAULT_ARTIST_IMAGE))
-            .placeholder(getDrawable(DEFAULT_ARTIST_IMAGE))
-            .override(SIZE_ORIGINAL, SIZE_ORIGINAL)
-            .signature(createSignature(artist))
-    }
-
-    fun <T> RequestBuilder<T>.songCoverOptions(
-        song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-            .error(getDrawable(DEFAULT_SONG_IMAGE))
-            .placeholder(getDrawable(DEFAULT_SONG_IMAGE))
-            .signature(createSignature(song))
-    }
-
-    fun <T> RequestBuilder<T>.simpleSongCoverOptions(
-        song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-            .signature(createSignature(song))
-    }
-
-    fun <T> RequestBuilder<T>.albumCoverOptions(
-        song: Song
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-            .error(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE))
-            .placeholder(ContextCompat.getDrawable(getContext(), DEFAULT_ALBUM_IMAGE))
-            .signature(createSignature(song))
-    }
-
-    fun <T> RequestBuilder<T>.userProfileOptions(
-        file: File,
-        context: Context
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-            .error(getErrorUserProfile(context))
-            .signature(createSignature(file))
-    }
-
-    fun <T> RequestBuilder<T>.profileBannerOptions(
-        file: File
-    ): RequestBuilder<T> {
-        return diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
-            .placeholder(DEFAULT_ERROR_IMAGE_BANNER)
-            .error(DEFAULT_ERROR_IMAGE_BANNER)
-            .signature(createSignature(file))
-    }
-
-    fun <T> RequestBuilder<T>.playlistOptions(): RequestBuilder<T> {
-        return diskCacheStrategy(DiskCacheStrategy.AUTOMATIC)
-            .placeholder(getDrawable(DEFAULT_ALBUM_IMAGE))
-            .error(getDrawable(DEFAULT_ALBUM_IMAGE))
-    }
-
-    private fun createSignature(song: Song): Key {
-        return MediaStoreSignature("", song.dateModified, 0)
-    }
-
-    private fun createSignature(file: File): Key {
-        return MediaStoreSignature("", file.lastModified(), 0)
-    }
-
-    private fun createSignature(artist: Artist): Key {
-        return ArtistSignatureUtil.getInstance(getContext())
-            .getArtistSignature(artist.name)
-    }
-
-    fun getUserModel(): File {
-        val dir = getContext().filesDir
-        return File(dir, USER_PROFILE)
-    }
-
-    fun getBannerModel(): File {
-        val dir = getContext().filesDir
-        return File(dir, USER_BANNER)
-    }
-
-    private fun getErrorUserProfile(context: Context): Drawable {
-        return TintHelper.createTintedDrawable(
-            context,
-            R.drawable.ic_account,
-            context.accentColor()
-        )
-    }
-
-    fun <TranscodeType> getDefaultTransition(): GenericTransitionOptions<TranscodeType> {
-        return GenericTransitionOptions<TranscodeType>().transition(DEFAULT_ANIMATION)
-    }
-
-    fun getDrawable(@DrawableRes id: Int): Drawable? {
-        return ContextCompat.getDrawable(getContext(), id)
-    }
-}
-
-// https://github.com/bumptech/glide/issues/527#issuecomment-148840717
-fun RequestBuilder<Drawable>.crossfadeListener(): RequestBuilder<Drawable> {
-    return listener(object : RequestListener<Drawable> {
-        override fun onLoadFailed(
-            e: GlideException?,
-            model: Any?,
-            target: Target<Drawable>?,
-            isFirstResource: Boolean
-        ): Boolean {
-            return false
-        }
-
-        override fun onResourceReady(
-            resource: Drawable?,
-            model: Any?,
-            target: Target<Drawable>?,
-            dataSource: DataSource?,
-            isFirstResource: Boolean
-        ): Boolean {
-            return if (isFirstResource) {
-                false // thumbnail was not shown, do as usual
-            } else DrawableCrossFadeFactory.Builder()
-                .setCrossFadeEnabled(true).build()
-                .build(dataSource, isFirstResource)
-                .transition(resource, target as Transition.ViewAdapter)
-        }
-    })
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt
index 19a1a1712..6da19079c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicColoredTarget.kt
@@ -1,47 +1,54 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.glide
 
 import android.graphics.drawable.Drawable
 import android.widget.ImageView
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.extensions.colorControlNormal
+import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
 import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.request.transition.Transition
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.bumptech.glide.request.animation.GlideAnimation
+
 
 abstract class RetroMusicColoredTarget(view: ImageView) : BitmapPaletteTarget(view) {
 
     protected val defaultFooterColor: Int
-        get() = getView().context.colorControlNormal()
+        get() = ATHUtil.resolveColor(getView().context, R.attr.colorSurface)
 
-    abstract fun onColorReady(colors: MediaNotificationProcessor)
+    protected val albumArtistFooterColor: Int
+        get() = ATHUtil.resolveColor(getView().context, R.attr.colorSurface)
 
-    override fun onLoadFailed(errorDrawable: Drawable?) {
-        super.onLoadFailed(errorDrawable)
-        onColorReady(MediaNotificationProcessor.errorColor(App.getContext()))
+    abstract fun onColorReady(color: Int)
+
+    override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+        super.onLoadFailed(e, errorDrawable)
+        onColorReady(defaultFooterColor)
     }
 
-    override fun onResourceReady(
-        resource: BitmapPaletteWrapper,
-        transition: Transition<in BitmapPaletteWrapper>?
-    ) {
-        super.onResourceReady(resource, transition)
-        MediaNotificationProcessor(App.getContext()).getPaletteAsync({
-            onColorReady(it)
-        }, resource.bitmap)
+    override fun onResourceReady(resource: BitmapPaletteWrapper?, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>?) {
+        super.onResourceReady(resource, glideAnimation)
+        val defaultColor = defaultFooterColor
+
+        resource?.let {
+            onColorReady(if (PreferenceUtil.getInstance(getView().context).isDominantColor)
+                RetroColorUtil.getDominantColor(it.bitmap, defaultColor)
+            else
+                RetroColorUtil.getColor(it.palette, defaultColor))
+        }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
index be5e36056..816a324fd 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/RetroMusicGlideModule.kt
@@ -1,56 +1,36 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.glide
 
 import android.content.Context
-import android.graphics.Bitmap
 import code.name.monkey.retromusic.glide.artistimage.ArtistImage
+import code.name.monkey.retromusic.glide.artistimage.ArtistImageLoader
 import code.name.monkey.retromusic.glide.artistimage.Factory
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCover
 import code.name.monkey.retromusic.glide.audiocover.AudioFileCoverLoader
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreview
-import code.name.monkey.retromusic.glide.playlistPreview.PlaylistPreviewLoader
 import com.bumptech.glide.Glide
-import com.bumptech.glide.Registry
-import com.bumptech.glide.annotation.GlideModule
-import com.bumptech.glide.module.AppGlideModule
+import com.bumptech.glide.GlideBuilder
+import com.bumptech.glide.module.GlideModule
 import java.io.InputStream
 
-@GlideModule
-class RetroMusicGlideModule : AppGlideModule() {
-    override fun registerComponents(context: Context, glide: Glide, registry: Registry) {
-        registry.prepend(
-            PlaylistPreview::class.java,
-            Bitmap::class.java,
-            PlaylistPreviewLoader.Factory(context)
-        )
-        registry.prepend(
-            AudioFileCover::class.java,
-            InputStream::class.java,
-            AudioFileCoverLoader.Factory()
-        )
-        registry.prepend(ArtistImage::class.java, InputStream::class.java, Factory(context))
-        registry.register(
-            Bitmap::class.java,
-            BitmapPaletteWrapper::class.java, BitmapPaletteTranscoder()
-        )
+class RetroMusicGlideModule : GlideModule {
+    override fun applyOptions(context: Context, builder: GlideBuilder) {
     }
 
-    override fun isManifestParsingEnabled(): Boolean {
-        return false
+    override fun registerComponents(context: Context, glide: Glide) {
+        glide.register(AudioFileCover::class.java, InputStream::class.java, AudioFileCoverLoader.Factory())
+        glide.register(ArtistImage::class.java, InputStream::class.java, Factory(context))
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt b/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
deleted file mode 100644
index 6323411f8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/SingleColorTarget.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.glide
-
-import android.graphics.drawable.Drawable
-import android.widget.ImageView
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteTarget
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.util.ColorUtil
-import com.bumptech.glide.request.transition.Transition
-
-abstract class SingleColorTarget(view: ImageView) : BitmapPaletteTarget(view) {
-
-    private val defaultFooterColor: Int
-        get() = ATHUtil.resolveColor(view.context, androidx.appcompat.R.attr.colorControlNormal)
-
-    abstract fun onColorReady(color: Int)
-
-    override fun onLoadFailed(errorDrawable: Drawable?) {
-        super.onLoadFailed(errorDrawable)
-        onColorReady(defaultFooterColor)
-    }
-
-    override fun onResourceReady(
-        resource: BitmapPaletteWrapper,
-        transition: Transition<in BitmapPaletteWrapper>?
-    ) {
-        super.onResourceReady(resource, transition)
-        onColorReady(
-            ColorUtil.getColor(
-                resource.palette,
-                ATHUtil.resolveColor(view.context, androidx.appcompat.R.attr.colorPrimary)
-            )
-        )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java
new file mode 100644
index 000000000..1696865cc
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/SongGlideRequest.java
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.glide;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.BitmapRequestBuilder;
+import com.bumptech.glide.DrawableRequestBuilder;
+import com.bumptech.glide.DrawableTypeRequest;
+import com.bumptech.glide.RequestManager;
+import com.bumptech.glide.load.Key;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.load.resource.drawable.GlideDrawable;
+import com.bumptech.glide.signature.MediaStoreSignature;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.glide.audiocover.AudioFileCover;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteTranscoder;
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.util.MusicUtil;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+/**
+ * Created by hemanths on 2019-09-15.
+ */
+public class SongGlideRequest {
+
+    public static final DiskCacheStrategy DEFAULT_DISK_CACHE_STRATEGY = DiskCacheStrategy.NONE;
+    public static final int DEFAULT_ERROR_IMAGE = R.drawable.default_album_art;
+    public static final int DEFAULT_ANIMATION = android.R.anim.fade_in;
+
+    public static class Builder {
+        final RequestManager requestManager;
+        final Song song;
+        boolean ignoreMediaStore;
+
+        public static Builder from(@NonNull RequestManager requestManager, Song song) {
+            return new Builder(requestManager, song);
+        }
+
+        private Builder(@NonNull RequestManager requestManager, Song song) {
+            this.requestManager = requestManager;
+            this.song = song;
+        }
+
+        public PaletteBuilder generatePalette(Context context) {
+            return new PaletteBuilder(this, context);
+        }
+
+        public BitmapBuilder asBitmap() {
+            return new BitmapBuilder(this);
+        }
+
+        public Builder checkIgnoreMediaStore(Context context) {
+            return ignoreMediaStore(PreferenceUtil.getInstance(context).ignoreMediaStoreArtwork());
+        }
+
+        public Builder ignoreMediaStore(boolean ignoreMediaStore) {
+            this.ignoreMediaStore = ignoreMediaStore;
+            return this;
+        }
+
+        public DrawableRequestBuilder<GlideDrawable> build() {
+            //noinspection unchecked
+            return createBaseRequest(requestManager, song, ignoreMediaStore)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .signature(createSignature(song));
+        }
+    }
+
+    public static class BitmapBuilder {
+        private final Builder builder;
+
+        public BitmapBuilder(Builder builder) {
+            this.builder = builder;
+        }
+
+        public BitmapRequestBuilder<?, Bitmap> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore)
+                    .asBitmap()
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .signature(createSignature(builder.song));
+        }
+    }
+
+    public static class PaletteBuilder {
+        final Context context;
+        private final Builder builder;
+
+        public PaletteBuilder(Builder builder, Context context) {
+            this.builder = builder;
+            this.context = context;
+        }
+
+        public BitmapRequestBuilder<?, BitmapPaletteWrapper> build() {
+            //noinspection unchecked
+            return createBaseRequest(builder.requestManager, builder.song, builder.ignoreMediaStore)
+                    .asBitmap()
+                    .transcode(new BitmapPaletteTranscoder(context), BitmapPaletteWrapper.class)
+                    .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY)
+                    .error(DEFAULT_ERROR_IMAGE)
+                    .animate(DEFAULT_ANIMATION)
+                    .signature(createSignature(builder.song));
+        }
+    }
+
+    public static DrawableTypeRequest createBaseRequest(RequestManager requestManager, Song song, boolean ignoreMediaStore) {
+        if (ignoreMediaStore) {
+            return requestManager.load(new AudioFileCover(song.getData()));
+        } else {
+            return requestManager.loadFromMediaStore(MusicUtil.getMediaStoreAlbumCoverUri(song.getAlbumId()));
+        }
+    }
+
+    public static Key createSignature(Song song) {
+        return new MediaStoreSignature("", song.getDateModified(), 0);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt
deleted file mode 100644
index da9de7d42..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImage.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.glide.artistimage
-
-import code.name.monkey.retromusic.model.Artist
-
-class ArtistImage(val artist: Artist){
-    override fun equals(other: Any?): Boolean {
-        if (other is ArtistImage){
-            return other.artist == artist
-        }
-        return false
-    }
-
-    override fun hashCode(): Int {
-        return artist.hashCode()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt
deleted file mode 100644
index 65dfef68a..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageFetcher.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package code.name.monkey.retromusic.glide.artistimage
-
-import android.content.Context
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.data.DataFetcher
-import code.name.monkey.retromusic.util.MusicUtil
-import java.io.FileNotFoundException
-import java.io.InputStream
-
-
-class ArtistImageFetcher(
-    private val context: Context,
-    val model: ArtistImage,
-) : DataFetcher<InputStream> {
-
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
-
-    override fun getDataSource(): DataSource {
-        return DataSource.REMOTE
-    }
-
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        if (!MusicUtil.isArtistNameUnknown(model.artist.name)) {
-            callback.onDataReady(getFallbackAlbumImage())
-        }
-    }
-
-    private fun getFallbackAlbumImage(): InputStream? {
-        model.artist.safeGetFirstAlbum().id.let { id->
-            return if (id != -1L) {
-                val imageUri = MusicUtil.getMediaStoreAlbumCoverUri(model.artist.safeGetFirstAlbum().id)
-                try {
-                    context.contentResolver.openInputStream(imageUri)
-                } catch (e: FileNotFoundException){
-                    null
-                } catch (e: UnsupportedOperationException) {
-                    null
-                }
-            } else {
-                null
-            }
-        }
-    }
-
-    override fun cleanup() {
-    }
-
-    override fun cancel() {
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
index 7a85edf95..af811112a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/artistimage/ArtistImageLoader.kt
@@ -1,56 +1,141 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.glide.artistimage
 
 import android.content.Context
-import com.bumptech.glide.load.Options
+import code.name.monkey.retromusic.deezer.Data
+import code.name.monkey.retromusic.deezer.DeezerApiService
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.bumptech.glide.Priority
+import com.bumptech.glide.integration.okhttp3.OkHttpUrlLoader
+import com.bumptech.glide.load.data.DataFetcher
+import com.bumptech.glide.load.model.GenericLoaderFactory
+import com.bumptech.glide.load.model.GlideUrl
 import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoader.LoadData
 import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import com.bumptech.glide.signature.ObjectKey
+import com.bumptech.glide.load.model.stream.StreamModelLoader
+import okhttp3.OkHttpClient
+import java.io.IOException
 import java.io.InputStream
+import java.util.concurrent.TimeUnit
 
-class ArtistImageLoader(
-    val context: Context,
-) : ModelLoader<ArtistImage, InputStream> {
 
-    override fun buildLoadData(
-        model: ArtistImage,
-        width: Int,
-        height: Int,
-        options: Options
-    ): LoadData<InputStream> {
-        return LoadData(
-            ObjectKey(model.artist.name),
-            ArtistImageFetcher(context, model)
-        )
+class ArtistImage(val artistName: String, val skipOkHttpCache: Boolean)
+
+class ArtistImageFetcher(
+        private val context: Context,
+        private val deezerApiService: DeezerApiService,
+        val model: ArtistImage,
+        val urlLoader: ModelLoader<GlideUrl, InputStream>,
+        val width: Int,
+        val height: Int
+) : DataFetcher<InputStream> {
+
+    private var urlFetcher: DataFetcher<InputStream>? = null
+    private var isCancelled: Boolean = false
+
+    override fun cleanup() {
+        urlFetcher?.cleanup()
     }
 
-    override fun handles(model: ArtistImage): Boolean {
-        return true
+    override fun getId(): String {
+        return model.artistName
+    }
+
+    override fun cancel() {
+        isCancelled = true
+        urlFetcher?.cancel()
+    }
+
+    override fun loadData(priority: Priority?): InputStream? {
+        if (!MusicUtil.isArtistNameUnknown(model.artistName) && PreferenceUtil.isAllowedToDownloadMetadata(context)) {
+            val artists = model.artistName.split(",")
+            val response = deezerApiService.getArtistImage(artists[0]).execute()
+
+            if (!response.isSuccessful) {
+                throw   IOException("Request failed with code: " + response.code());
+            }
+
+            if (isCancelled) return null
+
+            return try {
+                val deezerResponse = response.body();
+                val imageUrl = deezerResponse?.data?.get(0)?.let { getHighestQuality(it) }
+                val glideUrl = GlideUrl(imageUrl)
+                urlFetcher = urlLoader.getResourceFetcher(glideUrl, width, height)
+                urlFetcher?.loadData(priority)
+            } catch (e: Exception) {
+                null
+            }
+        } else return null
+    }
+
+    private fun getHighestQuality(imageUrl: Data): String {
+        return when {
+            imageUrl.pictureXl.isNotEmpty() -> imageUrl.pictureXl
+            imageUrl.pictureBig.isNotEmpty() -> imageUrl.pictureBig
+            imageUrl.pictureMedium.isNotEmpty() -> imageUrl.pictureMedium
+            imageUrl.pictureSmall.isNotEmpty() -> imageUrl.pictureSmall
+            imageUrl.picture.isNotEmpty() -> imageUrl.picture
+            else -> ""
+        }
+    }
+}
+
+class ArtistImageLoader(
+        val context: Context,
+        private val deezerApiService: DeezerApiService,
+        private val urlLoader: ModelLoader<GlideUrl, InputStream>
+) : StreamModelLoader<ArtistImage> {
+
+    override fun getResourceFetcher(model: ArtistImage, width: Int, height: Int): DataFetcher<InputStream> {
+        return ArtistImageFetcher(context, deezerApiService, model, urlLoader, width, height)
     }
 }
 
 class Factory(
-    val context: Context
+        val context: Context
 ) : ModelLoaderFactory<ArtistImage, InputStream> {
+    private var deezerApiService: DeezerApiService
+    private var okHttpFactory: OkHttpUrlLoader.Factory
 
-    override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<ArtistImage, InputStream> {
-        return ArtistImageLoader(context)
+    init {
+        okHttpFactory = OkHttpUrlLoader.Factory(OkHttpClient.Builder()
+                .connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .readTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .build())
+        deezerApiService = DeezerApiService.invoke(DeezerApiService.createDefaultOkHttpClient(context)
+                .connectTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .readTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .writeTimeout(TIMEOUT, TimeUnit.MILLISECONDS)
+                .build())
+    }
+
+    override fun build(context: Context?, factories: GenericLoaderFactory?): ModelLoader<ArtistImage, InputStream> {
+        return ArtistImageLoader(context!!, deezerApiService, okHttpFactory.build(context, factories))
+    }
+
+    override fun teardown() {
+        okHttpFactory.teardown()
+    }
+
+    companion object {
+        // we need these very low values to make sure our artist image loading calls doesn't block the image loading queue
+        private const val TIMEOUT: Long = 700
     }
 
-    override fun teardown() {}
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.java b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.java
new file mode 100644
index 000000000..cf3a82c5b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.java
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.glide.audiocover;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class AudioFileCover {
+    public final String filePath;
+
+    public AudioFileCover(String filePath) {
+        this.filePath = filePath;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.java b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.java
new file mode 100644
index 000000000..4ce9df5ca
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.glide.audiocover;
+
+import android.media.MediaMetadataRetriever;
+
+import com.bumptech.glide.Priority;
+import com.bumptech.glide.load.data.DataFetcher;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+
+public class AudioFileCoverFetcher implements DataFetcher<InputStream> {
+    private final AudioFileCover model;
+
+    private InputStream stream;
+
+    public AudioFileCoverFetcher(AudioFileCover model) {
+
+        this.model = model;
+    }
+
+    @Override
+    public String getId() {
+        // makes sure we never ever return null here
+        return String.valueOf(model.filePath);
+    }
+
+    @Override
+    public InputStream loadData(final Priority priority) throws Exception {
+
+        final MediaMetadataRetriever retriever = new MediaMetadataRetriever();
+        try {
+            retriever.setDataSource(model.filePath);
+            byte[] picture = retriever.getEmbeddedPicture();
+            if (picture != null) {
+                stream = new ByteArrayInputStream(picture);
+            } else {
+                stream = AudioFileCoverUtils.fallback(model.filePath);
+            }
+        } finally {
+            retriever.release();
+        }
+
+        return stream;
+    }
+
+    @Override
+    public void cleanup() {
+        // already cleaned up in loadData and ByteArrayInputStream will be GC'd
+        if (stream != null) {
+            try {
+                stream.close();
+            } catch (IOException ignore) {
+                // can't do much about it
+            }
+        }
+    }
+
+    @Override
+    public void cancel() {
+        // cannot cancel
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt
deleted file mode 100644
index 897d46730..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverFetcher.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.glide.audiocover
-
-import android.media.MediaMetadataRetriever
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.data.DataFetcher
-import java.io.ByteArrayInputStream
-import java.io.FileNotFoundException
-import java.io.IOException
-import java.io.InputStream
-
-class AudioFileCoverFetcher(private val model: AudioFileCover) : DataFetcher<InputStream> {
-    private var stream: InputStream? = null
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in InputStream>) {
-        val retriever = MediaMetadataRetriever()
-        try {
-            retriever.setDataSource(model.filePath)
-            val picture = retriever.embeddedPicture
-            stream = if (picture != null) {
-                ByteArrayInputStream(picture)
-            } else {
-                AudioFileCoverUtils.fallback(model.filePath)
-            }
-            callback.onDataReady(stream)
-        } catch (e: FileNotFoundException) {
-            callback.onLoadFailed(e)
-        } finally {
-            retriever.release()
-        }
-    }
-
-    override fun cleanup() {
-        // already cleaned up in loadData and ByteArrayInputStream will be GC'd
-        if (stream != null) {
-            try {
-                stream?.close()
-            } catch (ignore: IOException) {
-                // can't do much about it
-            }
-        }
-    }
-
-    override fun cancel() {
-        // cannot cancel
-    }
-
-    override fun getDataClass(): Class<InputStream> {
-        return InputStream::class.java
-    }
-
-    override fun getDataSource(): DataSource {
-        return DataSource.LOCAL
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.java b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.java
new file mode 100644
index 000000000..591d5a350
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.glide.audiocover;
+
+import android.content.Context;
+
+import com.bumptech.glide.load.data.DataFetcher;
+import com.bumptech.glide.load.model.GenericLoaderFactory;
+import com.bumptech.glide.load.model.ModelLoader;
+import com.bumptech.glide.load.model.ModelLoaderFactory;
+import com.bumptech.glide.load.model.stream.StreamModelLoader;
+
+import java.io.InputStream;
+
+
+
+public class AudioFileCoverLoader implements StreamModelLoader<AudioFileCover> {
+
+    @Override
+    public DataFetcher<InputStream> getResourceFetcher(AudioFileCover model, int width, int height) {
+        return new AudioFileCoverFetcher(model);
+    }
+
+    public static class Factory implements ModelLoaderFactory<AudioFileCover, InputStream> {
+        @Override
+        public ModelLoader<AudioFileCover, InputStream> build(Context context, GenericLoaderFactory factories) {
+            return new AudioFileCoverLoader();
+        }
+
+        @Override
+        public void teardown() {
+        }
+    }
+}
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt
deleted file mode 100644
index 0008f09c1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverLoader.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.glide.audiocover
-
-import com.bumptech.glide.load.Options
-import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoader.LoadData
-import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import com.bumptech.glide.signature.ObjectKey
-import java.io.InputStream
-
-class AudioFileCoverLoader : ModelLoader<AudioFileCover, InputStream> {
-    override fun buildLoadData(
-        audioFileCover: AudioFileCover,
-        width: Int,
-        height: Int,
-        options: Options
-    ): LoadData<InputStream> {
-        return LoadData(ObjectKey(audioFileCover.filePath), AudioFileCoverFetcher(audioFileCover))
-    }
-
-    override fun handles(audioFileCover: AudioFileCover): Boolean {
-        return true
-    }
-
-    class Factory : ModelLoaderFactory<AudioFileCover, InputStream> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<AudioFileCover, InputStream> {
-            return AudioFileCoverLoader()
-        }
-
-        override fun teardown() {}
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java
index 5c7fa7aad..7fc6bbdd8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCoverUtils.java
@@ -14,7 +14,6 @@
 
 package code.name.monkey.retromusic.glide.audiocover;
 
-import org.jaudiotagger.audio.exceptions.CannotReadException;
 import org.jaudiotagger.audio.exceptions.InvalidAudioFrameException;
 import org.jaudiotagger.audio.exceptions.ReadOnlyFileException;
 import org.jaudiotagger.audio.mp3.MP3File;
@@ -30,33 +29,35 @@ import java.io.InputStream;
 
 public class AudioFileCoverUtils {
 
-  public static final String[] FALLBACKS = {
-    "cover.jpg", "album.jpg", "folder.jpg", "cover.png", "album.png", "folder.png"
-  };
+    public static final String[] FALLBACKS = {"cover.jpg", "album.jpg", "folder.jpg", "cover.png", "album.png", "folder.png"};
 
-  public static InputStream fallback(String path) throws FileNotFoundException {
-    // Method 1: use embedded high resolution album art if there is any
-    try {
-      MP3File mp3File = new MP3File(path);
-      if (mp3File.hasID3v2Tag()) {
-        Artwork art = mp3File.getTag().getFirstArtwork();
-        if (art != null) {
-          byte[] imageData = art.getBinaryData();
-          return new ByteArrayInputStream(imageData);
+
+    public static InputStream fallback(String path) throws FileNotFoundException {
+        // Method 1: use embedded high resolution album art if there is any
+        try {
+            MP3File mp3File = new MP3File(path);
+            if (mp3File.hasID3v2Tag()) {
+                Artwork art = mp3File.getTag().getFirstArtwork();
+                if (art != null) {
+                    byte[] imageData = art.getBinaryData();
+                    return new ByteArrayInputStream(imageData);
+                }
+            }
+            // If there are any exceptions, we ignore them and continue to the other fallback method
+        } catch (ReadOnlyFileException ignored) {
+        } catch (InvalidAudioFrameException ignored) {
+        } catch (TagException ignored) {
+        } catch (IOException ignored) {
         }
-      }
-      // If there are any exceptions, we ignore them and continue to the other fallback method
-    } catch (ReadOnlyFileException | InvalidAudioFrameException | TagException | IOException | CannotReadException ignored) {
-    }
 
-    // Method 2: look for album art in external files
-    final File parent = new File(path).getParentFile();
-    for (String fallback : FALLBACKS) {
-      File cover = new File(parent, fallback);
-      if (cover.exists()) {
-        return new FileInputStream(cover);
-      }
+        // Method 2: look for album art in external files
+        final File parent = new File(path).getParentFile();
+        for (String fallback : FALLBACKS) {
+            File cover = new File(parent, fallback);
+            if (cover.exists()) {
+                return new FileInputStream(cover);
+            }
+        }
+        return null;
     }
-    return null;
-  }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java
index da3c4bb6c..dc954db20 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteResource.java
@@ -14,38 +14,34 @@
 
 package code.name.monkey.retromusic.glide.palette;
 
-import androidx.annotation.NonNull;
-
 import com.bumptech.glide.load.engine.Resource;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.util.Util;
 
 public class BitmapPaletteResource implements Resource<BitmapPaletteWrapper> {
 
-  private final BitmapPaletteWrapper bitmapPaletteWrapper;
+    private final BitmapPaletteWrapper bitmapPaletteWrapper;
+    private final BitmapPool bitmapPool;
 
-  public BitmapPaletteResource(BitmapPaletteWrapper bitmapPaletteWrapper) {
-    this.bitmapPaletteWrapper = bitmapPaletteWrapper;
-  }
+    public BitmapPaletteResource(BitmapPaletteWrapper bitmapPaletteWrapper, BitmapPool bitmapPool) {
+        this.bitmapPaletteWrapper = bitmapPaletteWrapper;
+        this.bitmapPool = bitmapPool;
+    }
 
-  @NonNull
-  @Override
-  public BitmapPaletteWrapper get() {
-    return bitmapPaletteWrapper;
-  }
+    @Override
+    public BitmapPaletteWrapper get() {
+        return bitmapPaletteWrapper;
+    }
 
-  @NonNull
-  @Override
-  public Class<BitmapPaletteWrapper> getResourceClass() {
-    return BitmapPaletteWrapper.class;
-  }
+    @Override
+    public int getSize() {
+        return Util.getBitmapByteSize(bitmapPaletteWrapper.getBitmap());
+    }
 
-  @Override
-  public int getSize() {
-    return Util.getBitmapByteSize(bitmapPaletteWrapper.getBitmap());
-  }
-
-  @Override
-  public void recycle() {
-    bitmapPaletteWrapper.getBitmap().recycle();
-  }
+    @Override
+    public void recycle() {
+        if (!bitmapPool.put(bitmapPaletteWrapper.getBitmap())) {
+            bitmapPaletteWrapper.getBitmap().recycle();
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java
index 4fb766049..5d478e67f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTarget.java
@@ -19,14 +19,12 @@ import android.widget.ImageView;
 import com.bumptech.glide.request.target.ImageViewTarget;
 
 public class BitmapPaletteTarget extends ImageViewTarget<BitmapPaletteWrapper> {
-  public BitmapPaletteTarget(ImageView view) {
-    super(view);
-  }
-
-  @Override
-  protected void setResource(BitmapPaletteWrapper bitmapPaletteWrapper) {
-    if (bitmapPaletteWrapper != null) {
-      view.setImageBitmap(bitmapPaletteWrapper.getBitmap());
+    public BitmapPaletteTarget(ImageView view) {
+        super(view);
+    }
+
+    @Override
+    protected void setResource(BitmapPaletteWrapper bitmapPaletteWrapper) {
+        view.setImageBitmap(bitmapPaletteWrapper.getBitmap());
     }
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java
index 0e96b8090..796bfa748 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteTranscoder.java
@@ -14,23 +14,36 @@
 
 package code.name.monkey.retromusic.glide.palette;
 
+import android.content.Context;
 import android.graphics.Bitmap;
 
-import androidx.annotation.NonNull;
-
-import com.bumptech.glide.load.Options;
+import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.Resource;
+import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool;
 import com.bumptech.glide.load.resource.transcode.ResourceTranscoder;
 
 import code.name.monkey.retromusic.util.RetroColorUtil;
 
-public class BitmapPaletteTranscoder implements ResourceTranscoder<Bitmap,  BitmapPaletteWrapper> {
+public class BitmapPaletteTranscoder implements ResourceTranscoder<Bitmap, BitmapPaletteWrapper> {
+    private final BitmapPool bitmapPool;
+
+    public BitmapPaletteTranscoder(Context context) {
+        this(Glide.get(context).getBitmapPool());
+    }
+
+    public BitmapPaletteTranscoder(BitmapPool bitmapPool) {
+        this.bitmapPool = bitmapPool;
+    }
 
     @Override
-  public Resource<BitmapPaletteWrapper> transcode(@NonNull Resource<Bitmap> toTranscode, @NonNull Options options) {
-    Bitmap bitmap = toTranscode.get();
-    BitmapPaletteWrapper bitmapPaletteWrapper =
-            new BitmapPaletteWrapper(bitmap, RetroColorUtil.generatePalette(bitmap));
-    return new BitmapPaletteResource(bitmapPaletteWrapper);
-  }
-}
+    public Resource<BitmapPaletteWrapper> transcode(Resource<Bitmap> bitmapResource) {
+        Bitmap bitmap = bitmapResource.get();
+        BitmapPaletteWrapper bitmapPaletteWrapper = new BitmapPaletteWrapper(bitmap, RetroColorUtil.generatePalette(bitmap));
+        return new BitmapPaletteResource(bitmapPaletteWrapper, bitmapPool);
+    }
+
+    @Override
+    public String getId() {
+        return "BitmapPaletteTranscoder.com.kabouzeid.gramophone.glide.palette";
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
index db647f6ef..4aa89e086 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/glide/palette/BitmapPaletteWrapper.java
@@ -15,23 +15,22 @@
 package code.name.monkey.retromusic.glide.palette;
 
 import android.graphics.Bitmap;
-
 import androidx.palette.graphics.Palette;
 
 public class BitmapPaletteWrapper {
-  private final Bitmap mBitmap;
-  private final Palette mPalette;
+    private final Bitmap mBitmap;
+    private final Palette mPalette;
 
-  public BitmapPaletteWrapper(Bitmap bitmap, Palette palette) {
-    mBitmap = bitmap;
-    mPalette = palette;
-  }
+    public BitmapPaletteWrapper(Bitmap bitmap, Palette palette) {
+        mBitmap = bitmap;
+        mPalette = palette;
+    }
 
-  public Bitmap getBitmap() {
-    return mBitmap;
-  }
+    public Bitmap getBitmap() {
+        return mBitmap;
+    }
 
-  public Palette getPalette() {
-    return mPalette;
-  }
+    public Palette getPalette() {
+        return mPalette;
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt
deleted file mode 100644
index 7af7e0dae..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreview.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package code.name.monkey.retromusic.glide.playlistPreview
-
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.model.Song
-
-class PlaylistPreview(val playlistWithSongs: PlaylistWithSongs) {
-
-    val playlistEntity: PlaylistEntity get() = playlistWithSongs.playlistEntity
-    val songs: List<Song> get() = playlistWithSongs.songs.toSongs()
-
-    override fun equals(other: Any?): Boolean {
-        println("Glide equals $this $other")
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as PlaylistPreview
-        if (other.playlistEntity.playListId != playlistEntity.playListId) return false
-        if (other.songs.size != songs.size) return false
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = playlistEntity.playListId.hashCode()
-        result = 31 * result + playlistWithSongs.songs.size
-        println("Glide $result")
-        return result
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt
deleted file mode 100644
index 5443b5825..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewFetcher.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package code.name.monkey.retromusic.glide.playlistPreview
-
-import android.content.Context
-import android.graphics.Bitmap
-import code.name.monkey.retromusic.util.AutoGeneratedPlaylistBitmap
-import com.bumptech.glide.Priority
-import com.bumptech.glide.load.DataSource
-import com.bumptech.glide.load.data.DataFetcher
-import kotlinx.coroutines.*
-import java.util.concurrent.Executors
-
-class PlaylistPreviewFetcher(val context: Context, private val playlistPreview: PlaylistPreview) :
-    DataFetcher<Bitmap>, CoroutineScope by GlideScope() {
-    override fun loadData(priority: Priority, callback: DataFetcher.DataCallback<in Bitmap>) {
-        launch {
-            try {
-                val bitmap =
-                    AutoGeneratedPlaylistBitmap.getBitmap(
-                        context,
-                        playlistPreview.songs
-                    )
-                callback.onDataReady(bitmap)
-            } catch (e: Exception) {
-                callback.onLoadFailed(e)
-            }
-        }
-    }
-
-    override fun cleanup() {}
-
-    override fun cancel() {
-        cancel(null)
-    }
-
-    override fun getDataClass(): Class<Bitmap> {
-        return Bitmap::class.java
-    }
-
-    override fun getDataSource(): DataSource {
-        return DataSource.LOCAL
-    }
-}
-
-private val glideDispatcher: CoroutineDispatcher by lazy {
-    Executors.newFixedThreadPool(4).asCoroutineDispatcher()
-}
-
-@Suppress("FunctionName")
-internal fun GlideScope(): CoroutineScope = CoroutineScope(SupervisorJob() + glideDispatcher)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt b/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt
deleted file mode 100644
index 6dae74c9a..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/glide/playlistPreview/PlaylistPreviewLoader.kt
+++ /dev/null
@@ -1,36 +0,0 @@
-package code.name.monkey.retromusic.glide.playlistPreview
-
-import android.content.Context
-import android.graphics.Bitmap
-import com.bumptech.glide.load.Options
-import com.bumptech.glide.load.model.ModelLoader
-import com.bumptech.glide.load.model.ModelLoader.LoadData
-import com.bumptech.glide.load.model.ModelLoaderFactory
-import com.bumptech.glide.load.model.MultiModelLoaderFactory
-import com.bumptech.glide.signature.ObjectKey
-
-class PlaylistPreviewLoader(val context: Context) : ModelLoader<PlaylistPreview, Bitmap> {
-    override fun buildLoadData(
-        model: PlaylistPreview,
-        width: Int,
-        height: Int,
-        options: Options
-    ): LoadData<Bitmap> {
-        return LoadData(
-            ObjectKey(model),
-            PlaylistPreviewFetcher(context, model)
-        )
-    }
-
-    override fun handles(model: PlaylistPreview): Boolean {
-        return true
-    }
-
-    class Factory(val context: Context) : ModelLoaderFactory<PlaylistPreview, Bitmap> {
-        override fun build(multiFactory: MultiModelLoaderFactory): ModelLoader<PlaylistPreview, Bitmap> {
-            return PlaylistPreviewLoader(context)
-        }
-
-        override fun teardown() {}
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
deleted file mode 100644
index 50869e936..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/helper/BackupHelper.kt
+++ /dev/null
@@ -1,324 +0,0 @@
-package code.name.monkey.retromusic.helper
-
-import android.content.Context
-import android.os.Environment
-import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.zipOutputStream
-import code.name.monkey.retromusic.helper.BackupContent.*
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-import java.io.File
-import java.io.InputStream
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.zip.ZipEntry
-import java.util.zip.ZipInputStream
-
-object BackupHelper : KoinComponent {
-    private val repository by inject<Repository>()
-    private val songRepository by inject<SongRepository>()
-
-    suspend fun createBackup(context: Context, name: String) {
-        val backupFile =
-            File(getBackupRoot(), name + APPEND_EXTENSION)
-        if (backupFile.parentFile?.exists() != true) {
-            backupFile.parentFile?.mkdirs()
-        }
-        val zipItems = mutableListOf<ZipItem>()
-        zipItems.addAll(getPlaylistZipItems(context))
-        zipItems.addAll(getSettingsZipItems(context))
-        getUserImageZipItems(context)?.let { zipItems.addAll(it) }
-        zipItems.addAll(getCustomArtistZipItems(context))
-        zipAll(context, zipItems, backupFile)
-        // Clean Cache Playlist Directory
-        File(context.filesDir, PLAYLISTS_PATH).deleteRecursively()
-    }
-
-    private suspend fun zipAll(context: Context, zipItems: List<ZipItem>, backupFile: File) =
-        withContext(Dispatchers.IO) {
-            runCatching {
-                backupFile.outputStream().buffered().zipOutputStream().use { out ->
-                    for (zipItem in zipItems) {
-                        File(zipItem.filePath).inputStream().buffered().use { origin ->
-                            val entry = ZipEntry(zipItem.zipPath)
-                            out.putNextEntry(entry)
-                            origin.copyTo(out)
-                        }
-                    }
-                }
-            }.onFailure {
-                withContext(Dispatchers.Main) {
-                    context.showToast(R.string.error_create_backup)
-                }
-            }.onSuccess {
-                withContext(Dispatchers.Main) {
-                    context.showToast(R.string.message_backup_create_success)
-                }
-            }
-        }
-
-    private suspend fun getPlaylistZipItems(context: Context): List<ZipItem> {
-        val playlistZipItems = mutableListOf<ZipItem>()
-        // Cache Playlist files in App storage
-        val playlistFolder = File(context.filesDir, PLAYLISTS_PATH)
-        if (!playlistFolder.exists()) {
-            playlistFolder.mkdirs()
-        }
-        for (playlist in repository.fetchPlaylistWithSongs()) {
-            runCatching {
-                M3UWriter.writeIO(playlistFolder, playlist)
-            }.onSuccess { playlistFile ->
-                if (playlistFile.exists()) {
-                    playlistZipItems.add(
-                        ZipItem(
-                            playlistFile.absolutePath,
-                            PLAYLISTS_PATH.child(playlistFile.name)
-                        )
-                    )
-                }
-            }
-        }
-        return playlistZipItems
-    }
-
-    private fun getSettingsZipItems(context: Context): List<ZipItem> {
-        val sharedPrefPath = File(context.filesDir.parentFile, "shared_prefs")
-        return listOf(
-            "${BuildConfig.APPLICATION_ID}_preferences.xml", // App settings pref path
-            "$THEME_PREFS_KEY_DEFAULT.xml"  // appthemehelper pref path
-        ).map {
-            ZipItem(File(sharedPrefPath, it).absolutePath, SETTINGS_PATH.child(it))
-        }
-    }
-
-    private fun getUserImageZipItems(context: Context): List<ZipItem>? {
-        return context.filesDir.listFiles { _, name ->
-            name.endsWith(".jpg")
-        }?.map {
-            ZipItem(it.absolutePath, IMAGES_PATH.child(it.name))
-        }
-    }
-
-    private fun getCustomArtistZipItems(context: Context): List<ZipItem> {
-        val zipItemList = mutableListOf<ZipItem>()
-        val sharedPrefPath = File(context.filesDir.parentFile, "shared_prefs")
-
-        zipItemList.addAll(
-            File(context.filesDir, "custom_artist_images")
-                .listFiles()?.map {
-                    ZipItem(
-                        it.absolutePath,
-                        CUSTOM_ARTISTS_PATH.child("custom_artist_images").child(it.name)
-                    )
-                }?.toList() ?: listOf()
-        )
-        File(sharedPrefPath, "custom_artist_image.xml").let {
-            if (it.exists()) {
-                zipItemList.add(
-                    ZipItem(
-                        it.absolutePath,
-                        CUSTOM_ARTISTS_PATH.child("prefs").child("custom_artist_image.xml")
-                    )
-                )
-            }
-        }
-        return zipItemList
-    }
-
-    suspend fun restoreBackup(
-        context: Context,
-        inputStream: InputStream?,
-        contents: List<BackupContent>
-    ) {
-        withContext(Dispatchers.IO) {
-            ZipInputStream(inputStream).use {
-                var entry = it.nextEntry
-                while (entry != null) {
-                    if (entry.isPlaylistEntry() && contents.contains(PLAYLISTS)) {
-                        restorePlaylists(it, entry)
-                    } else if (entry.isPreferenceEntry() && contents.contains(SETTINGS)) {
-                        restorePreferences(context, it, entry)
-                    } else if (entry.isImageEntry() && contents.contains(USER_IMAGES)) {
-                        restoreImages(context, it, entry)
-                    } else if (entry.isCustomArtistEntry() && contents.contains(CUSTOM_ARTIST_IMAGES)) {
-                        if (entry.isCustomArtistPrefEntry()) {
-                            restoreCustomArtistPrefs(context, it, entry)
-                        } else if (entry.isCustomArtistImageEntry()) {
-                            restoreCustomArtistImages(context, it, entry)
-                        }
-                    }
-                    entry = it.nextEntry
-                }
-            }
-            withContext(Dispatchers.Main) {
-                context.showToast(R.string.message_restore_success)
-            }
-        }
-    }
-
-    private fun restoreImages(context: Context, zipIn: ZipInputStream, zipEntry: ZipEntry) {
-        val file = File(
-            context.filesDir.path, zipEntry.getFileName()
-        )
-        file.outputStream().buffered().use { bos ->
-            zipIn.copyTo(bos)
-        }
-    }
-
-    private fun restorePreferences(context: Context, zipIn: ZipInputStream, zipEntry: ZipEntry) {
-        val file = File(
-            context.filesDir.parent!! + File.separator + "shared_prefs" + File.separator + zipEntry.getFileName()
-        )
-        if (file.exists()) {
-            file.delete()
-        }
-        file.outputStream().buffered().use { bos ->
-            zipIn.copyTo(bos)
-        }
-    }
-
-    private suspend fun restorePlaylists(
-        zipIn: ZipInputStream,
-        zipEntry: ZipEntry
-    ) {
-        val playlistName = zipEntry.getFileName().substringBeforeLast(".")
-        val songs = mutableListOf<Song>()
-
-        // Get songs from m3u playlist files
-        zipIn.bufferedReader().lineSequence().forEach { line ->
-            if (line.startsWith(File.separator)) {
-                if (File(line).exists()) {
-                    songs.addAll(songRepository.songsByFilePath(line))
-                }
-            }
-        }
-        val playlistEntity = repository.checkPlaylistExists(playlistName).firstOrNull()
-        if (playlistEntity != null) {
-            val songEntities = songs.map {
-                it.toSongEntity(playlistEntity.playListId)
-            }
-            repository.insertSongs(songEntities)
-        } else {
-            val playListId = repository.createPlaylist(PlaylistEntity(playlistName = playlistName))
-            val songEntities = songs.map {
-                it.toSongEntity(playListId)
-            }
-            repository.insertSongs(songEntities)
-        }
-    }
-
-    private fun restoreCustomArtistImages(
-        context: Context,
-        zipIn: ZipInputStream,
-        zipEntry: ZipEntry
-    ) {
-        val parentFolder = File(context.filesDir, "custom_artist_images")
-
-        if (!parentFolder.exists()) {
-            parentFolder.mkdirs()
-        }
-        val file = File(
-            parentFolder,
-            zipEntry.getFileName()
-        )
-        file.outputStream().buffered()
-            .use { bos ->
-                zipIn.copyTo(bos)
-            }
-    }
-
-    private fun restoreCustomArtistPrefs(
-        context: Context,
-        zipIn: ZipInputStream,
-        zipEntry: ZipEntry
-    ) {
-        val file =
-            File(context.filesDir.parentFile, "shared_prefs".child(zipEntry.getFileName()))
-        file.outputStream().buffered().use { bos ->
-            zipIn.copyTo(bos)
-        }
-    }
-
-    fun getBackupRoot(): File {
-        return File(
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_DOCUMENTS),
-            "RetroMusic/Backups"
-        )
-    }
-
-    const val BACKUP_EXTENSION = "rmbak"
-    const val APPEND_EXTENSION = ".$BACKUP_EXTENSION"
-    private const val PLAYLISTS_PATH = "Playlists"
-    private const val SETTINGS_PATH = "prefs"
-    private const val IMAGES_PATH = "userImages"
-    private const val CUSTOM_ARTISTS_PATH = "artistImages"
-    private const val THEME_PREFS_KEY_DEFAULT = "[[kabouzeid_app-theme-helper]]"
-
-    private fun ZipEntry.isPlaylistEntry(): Boolean {
-        return name.startsWith(PLAYLISTS_PATH)
-    }
-
-    private fun ZipEntry.isPreferenceEntry(): Boolean {
-        return name.startsWith(SETTINGS_PATH)
-    }
-
-    private fun ZipEntry.isImageEntry(): Boolean {
-        return name.startsWith(IMAGES_PATH)
-    }
-
-    private fun ZipEntry.isCustomArtistEntry(): Boolean {
-        return name.startsWith(CUSTOM_ARTISTS_PATH)
-    }
-
-    private fun ZipEntry.isCustomArtistImageEntry(): Boolean {
-        return name.startsWith(CUSTOM_ARTISTS_PATH) && name.contains("custom_artist_images")
-    }
-
-    private fun ZipEntry.isCustomArtistPrefEntry(): Boolean {
-        return name.startsWith(CUSTOM_ARTISTS_PATH) && name.contains("prefs")
-    }
-
-    private fun ZipEntry.getFileName(): String {
-        return name.substring(name.lastIndexOf(File.separator) + 1)
-    }
-
-    fun getTimeStamp(): String {
-        return SimpleDateFormat("dd-MMM yyyy HHmmss", Locale.getDefault()).format(Date())
-    }
-}
-
-data class ZipItem(val filePath: String, val zipPath: String)
-
-fun CharSequence.sanitize(): String {
-    return toString().replace("/", "_")
-        .replace(":", "_")
-        .replace("*", "_")
-        .replace("?", "_")
-        .replace("\"", "_")
-        .replace("<", "_")
-        .replace(">", "_")
-        .replace("|", "_")
-        .replace("\\", "_")
-        .replace("&", "_")
-}
-
-fun String.child(child: String): String {
-    return this + File.separator + child
-}
-
-enum class BackupContent {
-    SETTINGS,
-    USER_IMAGES,
-    CUSTOM_ARTIST_IMAGES,
-    PLAYLISTS
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/EqualizerHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/EqualizerHelper.kt
new file mode 100644
index 000000000..02ed03c46
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/EqualizerHelper.kt
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.helper
+
+import android.media.audiofx.BassBoost
+import android.media.audiofx.Equalizer
+import android.media.audiofx.Virtualizer
+import android.util.Log
+
+import code.name.monkey.retromusic.interfaces.EqualizerInterface
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+
+class EqualizerHelper private constructor() : EqualizerInterface {
+    override val equalizer: Equalizer
+    override val bassBoost: BassBoost
+    override val virtualizer: Virtualizer
+
+    override val bandLevelHigh: Int
+    override val bandLevelLow: Int
+    override var isRunning = false
+
+    override val numberOfBands: Int
+        get() = equalizer.numberOfBands.toInt()
+
+    override var isBassBoostEnabled: Boolean
+        get() = bassBoost.enabled
+        set(isEnabled) {
+            bassBoost.enabled = isEnabled
+        }
+
+    override var bassBoostStrength: Int
+        get() = bassBoost.roundedStrength.toInt()
+        set(strength) = bassBoost.setStrength(strength.toShort())
+
+    override var isVirtualizerEnabled: Boolean
+        get() = virtualizer.enabled
+        set(isEnabled) {
+            virtualizer.enabled = isEnabled
+        }
+
+    override var virtualizerStrength: Int
+        get() = virtualizer.roundedStrength.toInt()
+        set(strength) = virtualizer.setStrength(strength.toShort())
+
+    init {
+
+        //Prevent form the reflection api.
+        if (ourInstance != null) {
+            throw RuntimeException("Use getInstance() method to get the single instance of this class.")
+        }
+
+        val i = MusicPlayerRemote.audioSessionId
+
+        equalizer = Equalizer(100, i)
+
+        equalizer.enabled = true
+        bassBoost = BassBoost(100, i)
+        virtualizer = Virtualizer(100, i)
+
+        bandLevelHigh = equalizer.bandLevelRange[1].toInt()
+        bandLevelLow = equalizer.bandLevelRange[0].toInt()
+
+        Log.i(TAG, "onCreate: $bandLevelHigh $bandLevelLow")
+        isRunning = true
+    }
+
+    //Make singleton from serialize and deserialize operation.
+    protected fun readResolve(): EqualizerHelper? {
+        return instance
+    }
+
+    override fun getCenterFreq(band: Int): Int {
+        return equalizer.getCenterFreq(band.toShort())
+    }
+
+
+    override fun getBandLevel(band: Int): Int {
+        return equalizer.getBandLevel(band.toShort()).toInt()
+    }
+
+    override fun setBandLevel(band: Int, level: Int) {
+        equalizer.setBandLevel(band.toShort(), level.toShort())
+    }
+
+    companion object {
+        private val TAG = "EqualizerHelper"
+        @Volatile
+        private var ourInstance: EqualizerHelper? = null
+
+        //Double check locking pattern
+        //Check for the first time
+        //Check for the second time.
+        //if there is no instance available... create new one
+        val instance: EqualizerHelper?
+            get() {
+                if (ourInstance == null) {
+
+                    synchronized(EqualizerHelper::class.java) {
+                        if (ourInstance == null) {
+                            ourInstance = EqualizerHelper()
+                        }
+                    }
+                }
+                return ourInstance
+            }
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt
index f98508bf8..0980a9ac9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/HorizontalAdapterHelper.kt
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 import android.content.Context
 import android.view.ViewGroup
 import code.name.monkey.retromusic.R
 
+
 object HorizontalAdapterHelper {
 
     const val LAYOUT_RES = R.layout.item_image
@@ -26,13 +27,10 @@ object HorizontalAdapterHelper {
     private const val TYPE_MIDDLE = 2
     private const val TYPE_LAST = 3
 
-    fun applyMarginToLayoutParams(
-        context: Context,
-        layoutParams: ViewGroup.MarginLayoutParams,
-        viewType: Int
-    ) {
+    fun applyMarginToLayoutParams(context: Context,
+                                  layoutParams: ViewGroup.MarginLayoutParams, viewType: Int) {
         val listMargin = context.resources
-            .getDimensionPixelSize(R.dimen.now_playing_top_margin)
+                .getDimensionPixelSize(R.dimen.now_playing_top_margin)
         if (viewType == TYPE_FIRST) {
             layoutParams.leftMargin = listMargin
         } else if (viewType == TYPE_LAST) {
@@ -40,7 +38,7 @@ object HorizontalAdapterHelper {
         }
     }
 
-    fun getItemViewType(position: Int, itemCount: Int): Int {
+    fun getItemViewtype(position: Int, itemCount: Int): Int {
         return when (position) {
             0 -> TYPE_FIRST
             itemCount - 1 -> TYPE_LAST
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java b/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java
index f2956897b..9865cad24 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/M3UConstants.java
@@ -15,8 +15,8 @@
 package code.name.monkey.retromusic.helper;
 
 public interface M3UConstants {
-  String EXTENSION = "m3u";
-  String HEADER = "#EXTM3U";
-  String ENTRY = "#EXTINF:";
-  String DURATION_SEPARATOR = ",";
-}
+    String EXTENSION = "m3u";
+    String HEADER = "#EXTM3U";
+    String ENTRY = "#EXTINF:";
+    String DURATION_SEPARATOR = ",";
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java
new file mode 100644
index 000000000..cdf121039
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.helper;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.BufferedWriter;
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.model.Playlist;
+import code.name.monkey.retromusic.model.Song;
+
+public class M3UWriter implements M3UConstants {
+
+    @Nullable
+    public static File write(@NonNull Context context,
+                             @NonNull File dir,
+                             @NonNull Playlist playlist) throws IOException {
+        if (!dir.exists()) //noinspection ResultOfMethodCallIgnored
+            dir.mkdirs();
+        File file = new File(dir, playlist.name.concat("." + EXTENSION));
+
+        ArrayList<Song> songs = playlist.getSongs(context);
+
+        if (songs.size() > 0) {
+            BufferedWriter bw = new BufferedWriter(new FileWriter(file));
+
+            bw.write(HEADER);
+            for (Song song : songs) {
+                bw.newLine();
+                bw.write(ENTRY + song.getDuration() + DURATION_SEPARATOR + song.getArtistName() + " - " + song.getTitle());
+                bw.newLine();
+                bw.write(song.getData());
+            }
+
+            bw.close();
+        }
+        return file;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt b/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt
deleted file mode 100644
index fb895743e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/helper/M3UWriter.kt
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.helper
-
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.Song
-import java.io.*
-
-object M3UWriter : M3UConstants {
-    @JvmStatic
-    @Throws(IOException::class)
-    fun write(
-        dir: File,
-        playlist: Playlist
-    ): File {
-        if (!dir.exists()) dir.mkdirs()
-        val file = File(dir, playlist.name + "." + M3UConstants.EXTENSION)
-        val songs = playlist.getSongs()
-        if (songs.isNotEmpty()) {
-            BufferedWriter(FileWriter(file)).use { bw ->
-                bw.write(M3UConstants.HEADER)
-                for (song in songs) {
-                    bw.newLine()
-                    bw.write(M3UConstants.ENTRY + song.duration + M3UConstants.DURATION_SEPARATOR + song.artistName + " - " + song.title)
-                    bw.newLine()
-                    bw.write(song.data)
-                }
-            }
-        }
-        return file
-    }
-
-    @JvmStatic
-    @Throws(IOException::class)
-    fun writeIO(dir: File, playlistWithSongs: PlaylistWithSongs): File {
-        if (!dir.exists()) dir.mkdirs()
-        val fileName = "${playlistWithSongs.playlistEntity.playlistName}.${M3UConstants.EXTENSION}"
-        val file = File(dir, fileName)
-        val songs: List<Song> = playlistWithSongs.songs.sortedBy {
-            it.songPrimaryKey
-        }.toSongs()
-        if (songs.isNotEmpty()) {
-            BufferedWriter(FileWriter(file)).use { bw->
-                bw.write(M3UConstants.HEADER)
-                songs.forEach {
-                    bw.newLine()
-                    bw.write(M3UConstants.ENTRY + it.duration + M3UConstants.DURATION_SEPARATOR + it.artistName + " - " + it.title)
-                    bw.newLine()
-                    bw.write(it.data)
-                }
-            }
-        }
-        return file
-    }
-
-    fun writeIO(outputStream: OutputStream, playlistWithSongs: PlaylistWithSongs) {
-        val songs: List<Song> = playlistWithSongs.songs.sortedBy {
-            it.songPrimaryKey
-        }.toSongs()
-        if (songs.isNotEmpty()) {
-            outputStream.use { os ->
-                os.bufferedWriter().use { bw->
-                    bw.write(M3UConstants.HEADER)
-                    songs.forEach {
-                        bw.newLine()
-                        bw.write(M3UConstants.ENTRY + it.duration + M3UConstants.DURATION_SEPARATOR + it.artistName + " - " + it.title)
-                        bw.newLine()
-                        bw.write(it.data)
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
index 3c20e2aca..2e23081de 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicPlayerRemote.kt
@@ -1,50 +1,45 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
-import android.annotation.SuppressLint
+import android.annotation.TargetApi
 import android.app.Activity
 import android.content.*
 import android.database.Cursor
 import android.net.Uri
+import android.os.Build
+import android.os.Environment
 import android.os.IBinder
 import android.provider.DocumentsContract
+import android.provider.MediaStore
+import android.util.Log
 import android.widget.Toast
 import androidx.core.content.ContextCompat
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.loaders.SongLoader
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.SongRepository
 import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.util.getExternalStorageDirectory
-import code.name.monkey.retromusic.util.logE
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
+import code.name.monkey.retromusic.util.PreferenceUtil
 import java.io.File
 import java.util.*
-import kotlin.collections.set
 
 
-object MusicPlayerRemote : KoinComponent {
+object MusicPlayerRemote {
     val TAG: String = MusicPlayerRemote::class.java.simpleName
     private val mConnectionMap = WeakHashMap<Context, ServiceBinder>()
     var musicService: MusicService? = null
 
-    private val songRepository by inject<SongRepository>()
-
-    @JvmStatic
     val isPlaying: Boolean
         get() = musicService != null && musicService!!.isPlaying
 
@@ -59,11 +54,9 @@ object MusicPlayerRemote : KoinComponent {
             musicService!!.currentSong
         } else Song.emptySong
 
-    val nextSong: Song?
-        get() = if (musicService != null) {
-            musicService?.nextSong
-        } else Song.emptySong
-
+    /**
+     * Async
+     */
     var position: Int
         get() = if (musicService != null) {
             musicService!!.position
@@ -74,11 +67,10 @@ object MusicPlayerRemote : KoinComponent {
             }
         }
 
-    @JvmStatic
-    val playingQueue: List<Song>
+    val playingQueue: ArrayList<Song>
         get() = if (musicService != null) {
-            musicService?.playingQueue as List<Song>
-        } else listOf()
+            musicService!!.playingQueue
+        } else ArrayList()
 
     val songProgressMillis: Int
         get() = if (musicService != null) {
@@ -95,7 +87,6 @@ object MusicPlayerRemote : KoinComponent {
             musicService!!.repeatMode
         } else MusicService.REPEAT_MODE_NONE
 
-    @JvmStatic
     val shuffleMode: Int
         get() = if (musicService != null) {
             musicService!!.shuffleMode
@@ -111,26 +102,21 @@ object MusicPlayerRemote : KoinComponent {
 
     fun bindToService(context: Context, callback: ServiceConnection): ServiceToken? {
 
-        val realActivity = (context as Activity).parent ?: context
-        val contextWrapper = ContextWrapper(realActivity)
-        val intent = Intent(contextWrapper, MusicService::class.java)
-
-        // https://issuetracker.google.com/issues/76112072#comment184
-        // Workaround for ForegroundServiceDidNotStartInTimeException
-        try {
-            context.startService(intent)
-        } catch (e: Exception) {
-            ContextCompat.startForegroundService(context, intent)
+        var realActivity: Activity? = (context as Activity).parent
+        if (realActivity == null) {
+            realActivity = context
         }
 
+        val contextWrapper = ContextWrapper(realActivity)
+        val intent = Intent(contextWrapper, MusicService::class.java)
+        try {
+            contextWrapper.startService(intent)
+        } catch (ignored: IllegalStateException) {
+            ContextCompat.startForegroundService(context, intent)
+        }
         val binder = ServiceBinder(callback)
 
-        if (contextWrapper.bindService(
-                Intent().setClass(contextWrapper, MusicService::class.java),
-                binder,
-                Context.BIND_AUTO_CREATE
-            )
-        ) {
+        if (contextWrapper.bindService(Intent().setClass(contextWrapper, MusicService::class.java), binder, Context.BIND_AUTO_CREATE)) {
             mConnectionMap[contextWrapper] = binder
             return ServiceToken(contextWrapper)
         }
@@ -161,88 +147,92 @@ object MusicPlayerRemote : KoinComponent {
                 return cursor.getString(columnIndex)
             }
         } catch (e: Exception) {
-            e.printStackTrace()
+            Log.e(TAG, e.message)
         } finally {
             cursor?.close()
         }
         return null
     }
-
     fun getQueueDurationSongs(): Int {
-        return musicService?.playingQueue?.size ?: -1
+        return if (musicService != null) {
+            musicService!!.playingQueue.size
+        } else -1
     }
-
+    /**
+     * Async
+     */
     fun playSongAt(position: Int) {
-        musicService?.playSongAt(position)
+        if (musicService != null) {
+            musicService!!.playSongAt(position)
+        }
     }
 
     fun pauseSong() {
-        musicService?.pause()
+        if (musicService != null) {
+            musicService!!.pause()
+        }
     }
 
     /**
      * Async
      */
     fun playNextSong() {
-        musicService?.playNextSong(true)
+        if (musicService != null) {
+            musicService!!.playNextSong(true)
+        }
     }
 
     /**
      * Async
      */
     fun playPreviousSong() {
-        musicService?.playPreviousSong(true)
+        if (musicService != null) {
+            musicService!!.playPreviousSong(true)
+        }
     }
 
     /**
      * Async
      */
     fun back() {
-        musicService?.back(true)
+        if (musicService != null) {
+            musicService!!.back(true)
+        }
     }
 
     fun resumePlaying() {
-        musicService?.play()
+        if (musicService != null) {
+            musicService!!.play()
+        }
     }
 
     /**
      * Async
      */
-    @JvmStatic
-    fun openQueue(queue: List<Song>, startPosition: Int, startPlaying: Boolean) {
-        if (!tryToHandleOpenPlayingQueue(
-                queue,
-                startPosition,
-                startPlaying
-            ) && musicService != null
-        ) {
-            musicService?.openQueue(queue, startPosition, startPlaying)
+    fun openQueue(queue: ArrayList<Song>, startPosition: Int, startPlaying: Boolean) {
+        if (!tryToHandleOpenPlayingQueue(queue, startPosition, startPlaying) && musicService != null) {
+            musicService!!.openQueue(queue, startPosition, startPlaying)
+            if (PreferenceUtil.getInstance(musicService).isShuffleModeOn)
+                setShuffleMode(MusicService.SHUFFLE_MODE_NONE)
         }
     }
 
-    @JvmStatic
-    fun openAndShuffleQueue(queue: List<Song>, startPlaying: Boolean) {
+    /**
+     * Async
+     */
+    fun openAndShuffleQueue(queue: ArrayList<Song>, startPlaying: Boolean) {
         var startPosition = 0
         if (queue.isNotEmpty()) {
             startPosition = Random().nextInt(queue.size)
         }
 
-        if (!tryToHandleOpenPlayingQueue(
-                queue,
-                startPosition,
-                startPlaying
-            ) && musicService != null
-        ) {
+        if (!tryToHandleOpenPlayingQueue(queue, startPosition, startPlaying) && musicService != null) {
             openQueue(queue, startPosition, startPlaying)
             setShuffleMode(MusicService.SHUFFLE_MODE_SHUFFLE)
         }
     }
 
-    private fun tryToHandleOpenPlayingQueue(
-        queue: List<Song>,
-        startPosition: Int,
-        startPlaying: Boolean,
-    ): Boolean {
+    private fun tryToHandleOpenPlayingQueue(queue: ArrayList<Song>, startPosition: Int, startPlaying: Boolean): Boolean {
         if (playingQueue === queue) {
             if (startPlaying) {
                 playSongAt(startPosition)
@@ -268,7 +258,7 @@ object MusicPlayerRemote : KoinComponent {
 
     fun cycleRepeatMode(): Boolean {
         if (musicService != null) {
-            musicService?.cycleRepeatMode()
+            musicService!!.cycleRepeatMode()
             return true
         }
         return false
@@ -276,7 +266,7 @@ object MusicPlayerRemote : KoinComponent {
 
     fun toggleShuffleMode(): Boolean {
         if (musicService != null) {
-            musicService?.toggleShuffle()
+            musicService!!.toggleShuffle()
             return true
         }
         return false
@@ -284,7 +274,7 @@ object MusicPlayerRemote : KoinComponent {
 
     fun setShuffleMode(shuffleMode: Int): Boolean {
         if (musicService != null) {
-            musicService!!.setShuffleMode(shuffleMode)
+            musicService!!.shuffleMode = shuffleMode
             return true
         }
         return false
@@ -292,33 +282,28 @@ object MusicPlayerRemote : KoinComponent {
 
     fun playNext(song: Song): Boolean {
         if (musicService != null) {
-            if (playingQueue.isNotEmpty()) {
-                musicService?.addSong(position + 1, song)
+            if (playingQueue.size > 0) {
+                musicService!!.addSong(position + 1, song)
             } else {
                 val queue = ArrayList<Song>()
                 queue.add(song)
                 openQueue(queue, 0, false)
             }
-            musicService?.showToast(R.string.added_title_to_playing_queue)
+            Toast.makeText(musicService, musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue), Toast.LENGTH_SHORT).show()
             return true
         }
         return false
     }
 
-    @SuppressLint("StringFormatInvalid")
-    fun playNext(songs: List<Song>): Boolean {
+    fun playNext(songs: ArrayList<Song>): Boolean {
         if (musicService != null) {
-            if (playingQueue.isNotEmpty()) {
-                musicService?.addSongs(position + 1, songs)
+            if (playingQueue.size > 0) {
+                musicService!!.addSongs(position + 1, songs)
             } else {
                 openQueue(songs, 0, false)
             }
-            val toast =
-                if (songs.size == 1) musicService!!.resources.getString(R.string.added_title_to_playing_queue) else musicService!!.resources.getString(
-                    R.string.added_x_titles_to_playing_queue,
-                    songs.size
-                )
-            musicService?.showToast(toast, Toast.LENGTH_SHORT)
+            val toast = if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue, songs.size)
+            Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
             return true
         }
         return false
@@ -326,38 +311,33 @@ object MusicPlayerRemote : KoinComponent {
 
     fun enqueue(song: Song): Boolean {
         if (musicService != null) {
-            if (playingQueue.isNotEmpty()) {
-                musicService?.addSong(song)
+            if (playingQueue.size > 0) {
+                musicService!!.addSong(song)
             } else {
                 val queue = ArrayList<Song>()
                 queue.add(song)
                 openQueue(queue, 0, false)
             }
-            musicService?.showToast(R.string.added_title_to_playing_queue)
+            Toast.makeText(musicService, musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue), Toast.LENGTH_SHORT).show()
             return true
         }
         return false
     }
 
-    fun enqueue(songs: List<Song>): Boolean {
+    fun enqueue(songs: ArrayList<Song>): Boolean {
         if (musicService != null) {
-            if (playingQueue.isNotEmpty()) {
-                musicService?.addSongs(songs)
+            if (playingQueue.size > 0) {
+                musicService!!.addSongs(songs)
             } else {
                 openQueue(songs, 0, false)
             }
-            val toast =
-                if (songs.size == 1) musicService!!.resources.getString(R.string.added_title_to_playing_queue) else musicService!!.resources.getString(
-                    R.string.added_x_titles_to_playing_queue,
-                    songs.size
-                )
-            musicService?.showToast(toast)
+            val toast = if (songs.size == 1) musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_title_to_playing_queue) else musicService!!.resources.getString(code.name.monkey.retromusic.R.string.added_x_titles_to_playing_queue, songs.size)
+            Toast.makeText(musicService, toast, Toast.LENGTH_SHORT).show()
             return true
         }
         return false
     }
 
-    @JvmStatic
     fun removeFromQueue(song: Song): Boolean {
         if (musicService != null) {
             musicService!!.removeSong(song)
@@ -366,15 +346,6 @@ object MusicPlayerRemote : KoinComponent {
         return false
     }
 
-    @JvmStatic
-    fun removeFromQueue(songs: List<Song>): Boolean {
-        if (musicService != null) {
-            musicService!!.removeSongs(songs)
-            return true
-        }
-        return false
-    }
-
     fun removeFromQueue(position: Int): Boolean {
         if (musicService != null && position >= 0 && position < playingQueue.size) {
             musicService!!.removeSong(position)
@@ -399,11 +370,10 @@ object MusicPlayerRemote : KoinComponent {
         return false
     }
 
-    @JvmStatic
-    fun playFromUri(context: Context, uri: Uri) {
+    fun playFromUri(uri: Uri) {
         if (musicService != null) {
 
-            var songs: List<Song>? = null
+            var songs: ArrayList<Song>? = null
             if (uri.scheme != null && uri.authority != null) {
                 if (uri.scheme == ContentResolver.SCHEME_CONTENT) {
                     var songId: String? = null
@@ -413,49 +383,49 @@ object MusicPlayerRemote : KoinComponent {
                         songId = uri.lastPathSegment
                     }
                     if (songId != null) {
-                        songs = songRepository.songs(songId)
+                        songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                                musicService!!,
+                                MediaStore.Audio.AudioColumns._ID + "=?",
+                                arrayOf(songId)
+                        ))
                     }
                 }
             }
-            if (songs.isNullOrEmpty()) {
+            if (songs == null) {
                 var songFile: File? = null
                 if (uri.authority != null && uri.authority == "com.android.externalstorage.documents") {
-                    val path = uri.path?.split(":".toRegex(), 2)?.get(1)
-                    if (path != null) {
-                        songFile = File(getExternalStorageDirectory(), path)
-                    }
+                    songFile = File(Environment.getExternalStorageDirectory(), uri.path?.split(":".toRegex(), 2)?.get(1))
                 }
                 if (songFile == null) {
-                    val path = getFilePathFromUri(context, uri)
+                    val path = getFilePathFromUri(musicService!!, uri)
                     if (path != null)
                         songFile = File(path)
                 }
                 if (songFile == null && uri.path != null) {
-                    songFile = File(uri.path!!)
+                    songFile = File(uri.path)
                 }
                 if (songFile != null) {
-                    songs = songRepository.songsByFilePath(songFile.absolutePath, true)
+                    songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                            musicService!!,
+                            MediaStore.Audio.AudioColumns.DATA + "=?",
+                            arrayOf(songFile.absolutePath)
+                    ))
                 }
             }
-            if (!songs.isNullOrEmpty()) {
+            if (songs != null && songs.isNotEmpty()) {
                 openQueue(songs, 0, true)
             } else {
-                try {
-                    context.showToast(R.string.unplayable_file)
-                } catch (e: Exception) {
-                    logE("The file is not listed in the media store")
-                }
+                //TODO the file is not listed in the media store
             }
         }
     }
 
+    @TargetApi(Build.VERSION_CODES.KITKAT)
     private fun getSongIdFromMediaProvider(uri: Uri): String {
-        return DocumentsContract.getDocumentId(uri).split(":".toRegex())
-            .dropLastWhile { it.isEmpty() }.toTypedArray()[1]
+        return DocumentsContract.getDocumentId(uri).split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray()[1]
     }
 
-    class ServiceBinder internal constructor(private val mCallback: ServiceConnection?) :
-        ServiceConnection {
+    class ServiceBinder internal constructor(private val mCallback: ServiceConnection?) : ServiceConnection {
 
         override fun onServiceConnected(className: ComponentName, service: IBinder) {
             val binder = service as MusicService.MusicBinder
@@ -470,4 +440,5 @@ object MusicPlayerRemote : KoinComponent {
     }
 
     class ServiceToken internal constructor(internal var mWrappedContext: ContextWrapper)
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt
index 37deb038e..5561555b2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/MusicProgressViewUpdateHelper.kt
@@ -1,50 +1,44 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 import android.os.Handler
-import android.os.Looper
 import android.os.Message
-import kotlin.math.max
+
 
 class MusicProgressViewUpdateHelper : Handler {
 
     private var callback: Callback? = null
     private var intervalPlaying: Int = 0
     private var intervalPaused: Int = 0
-    private var firstUpdate = true
 
     fun start() {
-        queueNextRefresh(refreshProgressViews().toLong())
+        queueNextRefresh(1)
     }
 
     fun stop() {
         removeMessages(CMD_REFRESH_PROGRESS_VIEWS)
     }
 
-    constructor(callback: Callback) : super(Looper.getMainLooper()) {
+    constructor(callback: Callback) {
         this.callback = callback
         this.intervalPlaying = UPDATE_INTERVAL_PLAYING
         this.intervalPaused = UPDATE_INTERVAL_PAUSED
     }
 
-    constructor(
-        callback: Callback,
-        intervalPlaying: Int,
-        intervalPaused: Int,
-    ) : super(Looper.getMainLooper()) {
+    constructor(callback: Callback, intervalPlaying: Int, intervalPaused: Int) {
         this.callback = callback
         this.intervalPlaying = intervalPlaying
         this.intervalPaused = intervalPaused
@@ -60,17 +54,16 @@ class MusicProgressViewUpdateHelper : Handler {
     private fun refreshProgressViews(): Int {
         val progressMillis = MusicPlayerRemote.songProgressMillis
         val totalMillis = MusicPlayerRemote.songDurationMillis
-        if (totalMillis > 0) {
-            firstUpdate = false
-            callback?.onUpdateProgressViews(progressMillis, totalMillis)
-        }
-        if (!MusicPlayerRemote.isPlaying && !firstUpdate) {
+
+        callback!!.onUpdateProgressViews(progressMillis, totalMillis)
+
+        if (!MusicPlayerRemote.isPlaying) {
             return intervalPaused
         }
 
         val remainingMillis = intervalPlaying - progressMillis % intervalPlaying
 
-        return max(MIN_INTERVAL, remainingMillis)
+        return Math.max(MIN_INTERVAL, remainingMillis)
     }
 
     private fun queueNextRefresh(delay: Long) {
@@ -84,9 +77,10 @@ class MusicProgressViewUpdateHelper : Handler {
     }
 
     companion object {
-        private const val CMD_REFRESH_PROGRESS_VIEWS = 1
-        private const val MIN_INTERVAL = 20
-        private const val UPDATE_INTERVAL_PLAYING = 500
-        private const val UPDATE_INTERVAL_PAUSED = 500
+        private val CMD_REFRESH_PROGRESS_VIEWS = 1
+
+        private val MIN_INTERVAL = 20
+        private val UPDATE_INTERVAL_PLAYING = 1000
+        private val UPDATE_INTERVAL_PAUSED = 500
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt b/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt
index 50be97474..24c1d351a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/PlayPauseButtonOnClickHandler.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 import android.view.View
 
+
 class PlayPauseButtonOnClickHandler : View.OnClickListener {
     override fun onClick(v: View) {
         if (MusicPlayerRemote.isPlaying) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt
index 06c76294d..88ae6f23a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/SearchQueryHelper.kt
@@ -1,144 +1,92 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 import android.app.SearchManager
+import android.content.Context
 import android.os.Bundle
 import android.provider.MediaStore
+import code.name.monkey.retromusic.loaders.SongLoader
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealSongRepository
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
+import java.util.*
 
-object SearchQueryHelper : KoinComponent {
+
+object SearchQueryHelper {
     private const val TITLE_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.TITLE + ") = ?"
     private const val ALBUM_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ALBUM + ") = ?"
     private const val ARTIST_SELECTION = "lower(" + MediaStore.Audio.AudioColumns.ARTIST + ") = ?"
     private const val AND = " AND "
-    private val songRepository by inject<RealSongRepository>()
     var songs = ArrayList<Song>()
 
-    @JvmStatic
-    fun getSongs(extras: Bundle): List<Song> {
+    fun getSongs(context: Context, extras: Bundle): ArrayList<Song> {
         val query = extras.getString(SearchManager.QUERY, null)
         val artistName = extras.getString(MediaStore.EXTRA_MEDIA_ARTIST, null)
         val albumName = extras.getString(MediaStore.EXTRA_MEDIA_ALBUM, null)
         val titleName = extras.getString(MediaStore.EXTRA_MEDIA_TITLE, null)
 
-        var songs = listOf<Song>()
+        var songs = ArrayList<Song>()
         if (artistName != null && albumName != null && titleName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    ARTIST_SELECTION + AND + ALBUM_SELECTION + AND + TITLE_SELECTION,
-                    arrayOf(
-                        artistName.lowercase(),
-                        albumName.lowercase(),
-                        titleName.lowercase()
-                    )
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION + AND + ALBUM_SELECTION + AND + TITLE_SELECTION, arrayOf(artistName.toLowerCase(), albumName.toLowerCase(), titleName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
         if (artistName != null && titleName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    ARTIST_SELECTION + AND + TITLE_SELECTION,
-                    arrayOf(
-                        artistName.lowercase(),
-                        titleName.lowercase()
-                    )
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION + AND + TITLE_SELECTION, arrayOf(artistName.toLowerCase(), titleName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
         if (albumName != null && titleName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    ALBUM_SELECTION + AND + TITLE_SELECTION,
-                    arrayOf(
-                        albumName.lowercase(),
-                        titleName.lowercase()
-                    )
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION + AND + TITLE_SELECTION, arrayOf(albumName.toLowerCase(), titleName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
         if (artistName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    ARTIST_SELECTION,
-                    arrayOf(artistName.lowercase())
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION, arrayOf(artistName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
         if (albumName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    ALBUM_SELECTION,
-                    arrayOf(albumName.lowercase())
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION, arrayOf(albumName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
         if (titleName != null) {
-            songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    TITLE_SELECTION,
-                    arrayOf(titleName.lowercase())
-                )
-            )
+            songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, TITLE_SELECTION, arrayOf(titleName.toLowerCase())))
         }
         if (songs.isNotEmpty()) {
             return songs
         }
-        songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                ARTIST_SELECTION,
-                arrayOf(query.lowercase())
-            )
-        )
+        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ARTIST_SELECTION, arrayOf(query.toLowerCase())))
 
         if (songs.isNotEmpty()) {
             return songs
         }
-        songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                ALBUM_SELECTION,
-                arrayOf(query.lowercase())
-            )
-        )
+        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, ALBUM_SELECTION, arrayOf(query.toLowerCase())))
         if (songs.isNotEmpty()) {
             return songs
         }
-        songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                TITLE_SELECTION,
-                arrayOf(query.lowercase())
-            )
-        )
-        return songs.ifEmpty { ArrayList() }
+        songs = SongLoader.getSongs(SongLoader.makeSongCursor(context, TITLE_SELECTION, arrayOf(query.toLowerCase())))
+        return if (songs.isNotEmpty()) {
+            songs
+        } else ArrayList()
     }
+
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt
index 02a621cba..6615f6194 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/ShuffleHelper.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 import code.name.monkey.retromusic.model.Song
 
+
 object ShuffleHelper {
 
     fun makeShuffleList(listToShuffle: MutableList<Song>, current: Int) {
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
index ee3e2a018..56f4a5192 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/SortOrder.kt
@@ -1,21 +1,19 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
 package code.name.monkey.retromusic.helper
 
 import android.provider.MediaStore
-import code.name.monkey.retromusic.ALBUM_ARTIST
 
 class SortOrder {
 
@@ -23,7 +21,6 @@ class SortOrder {
      * Artist sort order entries.
      */
     interface ArtistSortOrder {
-
         companion object {
 
             /* Artist sort order A-Z */
@@ -44,7 +41,6 @@ class SortOrder {
      * Album sort order entries.
      */
     interface AlbumSortOrder {
-
         companion object {
 
             /* Album sort order A-Z */
@@ -54,11 +50,11 @@ class SortOrder {
             const val ALBUM_Z_A = "$ALBUM_A_Z DESC"
 
             /* Album sort order songs */
-            const val ALBUM_NUMBER_OF_SONGS =
-                MediaStore.Audio.AlbumColumns.NUMBER_OF_SONGS + " DESC"
+            const val ALBUM_NUMBER_OF_SONGS = MediaStore.Audio.Albums.NUMBER_OF_SONGS + " DESC"
 
-            /* Album Artist sort order artist */
-            const val ALBUM_ARTIST = "case when lower(album_artist) is null then 1 else 0 end, lower(album_artist)"
+            /* Album sort order artist */
+            const val ALBUM_ARTIST = (MediaStore.Audio.Artists.DEFAULT_SORT_ORDER
+                    + ", " + MediaStore.Audio.Albums.DEFAULT_SORT_ORDER)
 
             /* Album sort order year */
             const val ALBUM_YEAR = MediaStore.Audio.Media.YEAR + " DESC"
@@ -69,13 +65,10 @@ class SortOrder {
      * Song sort order entries.
      */
     interface SongSortOrder {
-
         companion object {
 
-            const val SONG_DEFAULT = MediaStore.Audio.Media.DEFAULT_SORT_ORDER
-
             /* Song sort order A-Z */
-            const val SONG_A_Z = MediaStore.Audio.Media.TITLE
+            const val SONG_A_Z = MediaStore.Audio.Media.DEFAULT_SORT_ORDER
 
             /* Song sort order Z-A */
             const val SONG_Z_A = "$SONG_A_Z DESC"
@@ -83,9 +76,6 @@ class SortOrder {
             /* Song sort order artist */
             const val SONG_ARTIST = MediaStore.Audio.Artists.DEFAULT_SORT_ORDER
 
-            /* Song sort order album artist */
-            const val SONG_ALBUM_ARTIST = ALBUM_ARTIST
-
             /* Song sort order album */
             const val SONG_ALBUM = MediaStore.Audio.Albums.DEFAULT_SORT_ORDER
 
@@ -98,9 +88,6 @@ class SortOrder {
             /* Song sort order date */
             const val SONG_DATE = MediaStore.Audio.Media.DATE_ADDED + " DESC"
 
-            /* Song sort modified date */
-            const val SONG_DATE_MODIFIED = MediaStore.Audio.Media.DATE_MODIFIED + " DESC"
-
             /* Song sort order composer*/
             const val COMPOSER = MediaStore.Audio.Media.COMPOSER
         }
@@ -110,7 +97,6 @@ class SortOrder {
      * Album song sort order entries.
      */
     interface AlbumSongSortOrder {
-
         companion object {
 
             /* Album song sort order A-Z */
@@ -120,8 +106,8 @@ class SortOrder {
             const val SONG_Z_A = "$SONG_A_Z DESC"
 
             /* Album song sort order track list */
-            const val SONG_TRACK_LIST = (MediaStore.Audio.Media.TRACK + ", " +
-                    MediaStore.Audio.Media.DEFAULT_SORT_ORDER)
+            const val SONG_TRACK_LIST = (MediaStore.Audio.Media.TRACK + ", "
+                    + MediaStore.Audio.Media.DEFAULT_SORT_ORDER)
 
             /* Album song sort order duration */
             const val SONG_DURATION = SongSortOrder.SONG_DURATION
@@ -132,7 +118,6 @@ class SortOrder {
      * Artist song sort order entries.
      */
     interface ArtistSongSortOrder {
-
         companion object {
 
             /* Artist song sort order A-Z */
@@ -159,7 +144,6 @@ class SortOrder {
      * Artist album sort order entries.
      */
     interface ArtistAlbumSortOrder {
-
         companion object {
 
             /* Artist album sort order A-Z */
@@ -180,7 +164,6 @@ class SortOrder {
      * Genre sort order entries.
      */
     interface GenreSortOrder {
-
         companion object {
 
             /* Genre sort order A-Z */
@@ -191,24 +174,4 @@ class SortOrder {
         }
     }
 
-    /**
-     * Playlist sort order entries.
-     */
-    interface PlaylistSortOrder {
-
-        companion object {
-
-            /* Playlist sort order A-Z */
-            const val PLAYLIST_A_Z = MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER
-
-            /* Playlist sort order Z-A */
-            const val PLAYLIST_Z_A = "$PLAYLIST_A_Z DESC"
-
-            /* Playlist sort order number of songs */
-            const val PLAYLIST_SONG_COUNT = "playlist_song_count"
-
-            /* Playlist sort order number of songs */
-            const val PLAYLIST_SONG_COUNT_DESC = "$PLAYLIST_SONG_COUNT DESC"
-        }
-    }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java b/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java
index 9c100da91..3e812e8a9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/StackBlur.java
@@ -9,312 +9,325 @@ import java.util.concurrent.Executors;
 
 /**
  * Blur using Java code.
+ * <p/>
+ * This is a compromise between Gaussian Blur and Box blur
+ * It creates much better looking blurs than Box Blur, but is
+ * 7x faster than my Gaussian Blur implementation.
+ * <p/>
+ * I called it Stack Blur because this describes best how this
+ * filter works internally: it creates a kind of moving stack
+ * of colors whilst scanning through the image. Thereby it
+ * just has to add one new block of color to the right side
+ * of the stack and remove the leftmost color. The remaining
+ * colors on the topmost layer of the stack are either added on
+ * or reduced by one, depending on if they are on the right or
+ * on the left side of the stack.
  *
- * <p>This is a compromise between Gaussian Blur and Box blur It creates much better looking blurs
- * than Box Blur, but is 7x faster than my Gaussian Blur implementation.
- *
- * <p>I called it Stack Blur because this describes best how this filter works internally: it
- * creates a kind of moving stack of colors whilst scanning through the image. Thereby it just has
- * to add one new block of color to the right side of the stack and remove the leftmost color. The
- * remaining colors on the topmost layer of the stack are either added on or reduced by one,
- * depending on if they are on the right or on the left side of the stack.
- *
- * @author Enrique López Mañas <eenriquelopez@gmail.com> http://www.neo-tech.es
- *     <p>Author of the original algorithm: Mario Klingemann <mario.quasimondo.com>
- *     <p>Based heavily on http://vitiy.info/Code/stackblur.cpp See
- *     http://vitiy.info/stackblur-algorithm-multi-threaded-blur-for-cpp/
+ * @author Enrique López Mañas <eenriquelopez@gmail.com>
+ *         http://www.neo-tech.es
+ *         <p/>
+ *         Author of the original algorithm: Mario Klingemann <mario.quasimondo.com>
+ *         <p/>
+ *         Based heavily on http://vitiy.info/Code/stackblur.cpp
+ *         See http://vitiy.info/stackblur-algorithm-multi-threaded-blur-for-cpp/
  * @copyright: Enrique López Mañas
  * @license: Apache License 2.0
  */
 public class StackBlur {
 
-  static final int EXECUTOR_THREADS = Runtime.getRuntime().availableProcessors();
-  static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(EXECUTOR_THREADS);
+    static final int EXECUTOR_THREADS = Runtime.getRuntime().availableProcessors();
+    static final ExecutorService EXECUTOR = Executors.newFixedThreadPool(EXECUTOR_THREADS);
 
-  private static final short[] stackblur_mul = {
-    512, 512, 456, 512, 328, 456, 335, 512, 405, 328, 271, 456, 388, 335, 292, 512,
-    454, 405, 364, 328, 298, 271, 496, 456, 420, 388, 360, 335, 312, 292, 273, 512,
-    482, 454, 428, 405, 383, 364, 345, 328, 312, 298, 284, 271, 259, 496, 475, 456,
-    437, 420, 404, 388, 374, 360, 347, 335, 323, 312, 302, 292, 282, 273, 265, 512,
-    497, 482, 468, 454, 441, 428, 417, 405, 394, 383, 373, 364, 354, 345, 337, 328,
-    320, 312, 305, 298, 291, 284, 278, 271, 265, 259, 507, 496, 485, 475, 465, 456,
-    446, 437, 428, 420, 412, 404, 396, 388, 381, 374, 367, 360, 354, 347, 341, 335,
-    329, 323, 318, 312, 307, 302, 297, 292, 287, 282, 278, 273, 269, 265, 261, 512,
-    505, 497, 489, 482, 475, 468, 461, 454, 447, 441, 435, 428, 422, 417, 411, 405,
-    399, 394, 389, 383, 378, 373, 368, 364, 359, 354, 350, 345, 341, 337, 332, 328,
-    324, 320, 316, 312, 309, 305, 301, 298, 294, 291, 287, 284, 281, 278, 274, 271,
-    268, 265, 262, 259, 257, 507, 501, 496, 491, 485, 480, 475, 470, 465, 460, 456,
-    451, 446, 442, 437, 433, 428, 424, 420, 416, 412, 408, 404, 400, 396, 392, 388,
-    385, 381, 377, 374, 370, 367, 363, 360, 357, 354, 350, 347, 344, 341, 338, 335,
-    332, 329, 326, 323, 320, 318, 315, 312, 310, 307, 304, 302, 299, 297, 294, 292,
-    289, 287, 285, 282, 280, 278, 275, 273, 271, 269, 267, 265, 263, 261, 259
-  };
+    private static final short[] stackblur_mul = {
+            512, 512, 456, 512, 328, 456, 335, 512, 405, 328, 271, 456, 388, 335, 292, 512,
+            454, 405, 364, 328, 298, 271, 496, 456, 420, 388, 360, 335, 312, 292, 273, 512,
+            482, 454, 428, 405, 383, 364, 345, 328, 312, 298, 284, 271, 259, 496, 475, 456,
+            437, 420, 404, 388, 374, 360, 347, 335, 323, 312, 302, 292, 282, 273, 265, 512,
+            497, 482, 468, 454, 441, 428, 417, 405, 394, 383, 373, 364, 354, 345, 337, 328,
+            320, 312, 305, 298, 291, 284, 278, 271, 265, 259, 507, 496, 485, 475, 465, 456,
+            446, 437, 428, 420, 412, 404, 396, 388, 381, 374, 367, 360, 354, 347, 341, 335,
+            329, 323, 318, 312, 307, 302, 297, 292, 287, 282, 278, 273, 269, 265, 261, 512,
+            505, 497, 489, 482, 475, 468, 461, 454, 447, 441, 435, 428, 422, 417, 411, 405,
+            399, 394, 389, 383, 378, 373, 368, 364, 359, 354, 350, 345, 341, 337, 332, 328,
+            324, 320, 316, 312, 309, 305, 301, 298, 294, 291, 287, 284, 281, 278, 274, 271,
+            268, 265, 262, 259, 257, 507, 501, 496, 491, 485, 480, 475, 470, 465, 460, 456,
+            451, 446, 442, 437, 433, 428, 424, 420, 416, 412, 408, 404, 400, 396, 392, 388,
+            385, 381, 377, 374, 370, 367, 363, 360, 357, 354, 350, 347, 344, 341, 338, 335,
+            332, 329, 326, 323, 320, 318, 315, 312, 310, 307, 304, 302, 299, 297, 294, 292,
+            289, 287, 285, 282, 280, 278, 275, 273, 271, 269, 267, 265, 263, 261, 259
+    };
 
-  private static final byte[] stackblur_shr = {
-    9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17,
-    17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19,
-    19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20,
-    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21,
-    21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
-    21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22,
-    22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
-    22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
-    23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-    23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-    23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
-    23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
-    24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
-  };
+    private static final byte[] stackblur_shr = {
+            9, 11, 12, 13, 13, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 17,
+            17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 18, 19,
+            19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 20, 20, 20,
+            20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21,
+            21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22,
+            22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
+            22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23,
+            23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+            23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+            23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 23,
+            23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24,
+            24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24
+    };
 
-  public static Bitmap blur(Bitmap original, float radius) {
-    int w = original.getWidth();
-    int h = original.getHeight();
-    int[] currentPixels = new int[w * h];
-    original.getPixels(currentPixels, 0, w, 0, 0, w, h);
-    int cores = EXECUTOR_THREADS;
+    public static Bitmap blur(Bitmap original, float radius) {
+        int w = original.getWidth();
+        int h = original.getHeight();
+        int[] currentPixels = new int[w * h];
+        original.getPixels(currentPixels, 0, w, 0, 0, w, h);
+        int cores = EXECUTOR_THREADS;
 
-    ArrayList<BlurTask> horizontal = new ArrayList<>(cores);
-    ArrayList<BlurTask> vertical = new ArrayList<>(cores);
-    for (int i = 0; i < cores; i++) {
-      horizontal.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 1));
-      vertical.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 2));
-    }
-
-    try {
-      EXECUTOR.invokeAll(horizontal);
-    } catch (InterruptedException e) {
-      return null;
-    }
-
-    try {
-      EXECUTOR.invokeAll(vertical);
-    } catch (InterruptedException e) {
-      return null;
-    }
-
-    return Bitmap.createBitmap(currentPixels, w, h, Bitmap.Config.ARGB_8888);
-  }
-
-  private static void blurIteration(
-      int[] src, int w, int h, int radius, int cores, int core, int step) {
-    int x, y, xp, yp, i;
-    int sp;
-    int stack_start;
-    int stack_i;
-
-    int src_i;
-    int dst_i;
-
-    long sum_r, sum_g, sum_b, sum_in_r, sum_in_g, sum_in_b, sum_out_r, sum_out_g, sum_out_b;
-
-    int wm = w - 1;
-    int hm = h - 1;
-    int div = (radius * 2) + 1;
-    int mul_sum = stackblur_mul[radius];
-    byte shr_sum = stackblur_shr[radius];
-    int[] stack = new int[div];
-
-    if (step == 1) {
-      int minY = core * h / cores;
-      int maxY = (core + 1) * h / cores;
-
-      for (y = minY; y < maxY; y++) {
-        sum_r =
-            sum_g = sum_b = sum_in_r = sum_in_g = sum_in_b = sum_out_r = sum_out_g = sum_out_b = 0;
-
-        src_i = w * y; // start of line (0,y)
-
-        for (i = 0; i <= radius; i++) {
-          stack_i = i;
-          stack[stack_i] = src[src_i];
-          sum_r += ((src[src_i] >>> 16) & 0xff) * (i + 1);
-          sum_g += ((src[src_i] >>> 8) & 0xff) * (i + 1);
-          sum_b += (src[src_i] & 0xff) * (i + 1);
-          sum_out_r += ((src[src_i] >>> 16) & 0xff);
-          sum_out_g += ((src[src_i] >>> 8) & 0xff);
-          sum_out_b += (src[src_i] & 0xff);
+        ArrayList<BlurTask> horizontal = new ArrayList<BlurTask>(cores);
+        ArrayList<BlurTask> vertical = new ArrayList<BlurTask>(cores);
+        for (int i = 0; i < cores; i++) {
+            horizontal.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 1));
+            vertical.add(new BlurTask(currentPixels, w, h, (int) radius, cores, i, 2));
         }
 
-        for (i = 1; i <= radius; i++) {
-          if (i <= wm) src_i += 1;
-          stack_i = i + radius;
-          stack[stack_i] = src[src_i];
-          sum_r += ((src[src_i] >>> 16) & 0xff) * (radius + 1 - i);
-          sum_g += ((src[src_i] >>> 8) & 0xff) * (radius + 1 - i);
-          sum_b += (src[src_i] & 0xff) * (radius + 1 - i);
-          sum_in_r += ((src[src_i] >>> 16) & 0xff);
-          sum_in_g += ((src[src_i] >>> 8) & 0xff);
-          sum_in_b += (src[src_i] & 0xff);
+        try {
+            EXECUTOR.invokeAll(horizontal);
+        } catch (InterruptedException e) {
+            return null;
         }
 
-        sp = radius;
-        xp = radius;
-        if (xp > wm) xp = wm;
-        src_i = xp + y * w; //   img.pix_ptr(xp, y);
-        dst_i = y * w; // img.pix_ptr(0, y);
-        for (x = 0; x < w; x++) {
-          src[dst_i] =
-              (int)
-                  ((src[dst_i])
-                      | ((((sum_r * mul_sum) >>> shr_sum) & 0xff) << 16)
-                      | ((((sum_g * mul_sum) >>> shr_sum) & 0xff) << 8)
-                      | ((((sum_b * mul_sum) >>> shr_sum) & 0xff)));
-          dst_i += 1;
-
-          sum_r -= sum_out_r;
-          sum_g -= sum_out_g;
-          sum_b -= sum_out_b;
-
-          stack_start = sp + div - radius;
-          if (stack_start >= div) stack_start -= div;
-          stack_i = stack_start;
-
-          sum_out_r -= ((stack[stack_i] >>> 16) & 0xff);
-          sum_out_g -= ((stack[stack_i] >>> 8) & 0xff);
-          sum_out_b -= (stack[stack_i] & 0xff);
-
-          if (xp < wm) {
-            src_i += 1;
-            ++xp;
-          }
-
-          stack[stack_i] = src[src_i];
-
-          sum_in_r += ((src[src_i] >>> 16) & 0xff);
-          sum_in_g += ((src[src_i] >>> 8) & 0xff);
-          sum_in_b += (src[src_i] & 0xff);
-          sum_r += sum_in_r;
-          sum_g += sum_in_g;
-          sum_b += sum_in_b;
-
-          ++sp;
-          if (sp >= div) sp = 0;
-          stack_i = sp;
-
-          sum_out_r += ((stack[stack_i] >>> 16) & 0xff);
-          sum_out_g += ((stack[stack_i] >>> 8) & 0xff);
-          sum_out_b += (stack[stack_i] & 0xff);
-          sum_in_r -= ((stack[stack_i] >>> 16) & 0xff);
-          sum_in_g -= ((stack[stack_i] >>> 8) & 0xff);
-          sum_in_b -= (stack[stack_i] & 0xff);
+        try {
+            EXECUTOR.invokeAll(vertical);
+        } catch (InterruptedException e) {
+            return null;
         }
-      }
+
+        return Bitmap.createBitmap(currentPixels, w, h, Bitmap.Config.ARGB_8888);
     }
 
-    // step 2
-    else if (step == 2) {
-      int minX = core * w / cores;
-      int maxX = (core + 1) * w / cores;
+    private static void blurIteration(int[] src, int w, int h, int radius, int cores, int core, int step) {
+        int x, y, xp, yp, i;
+        int sp;
+        int stack_start;
+        int stack_i;
 
-      for (x = minX; x < maxX; x++) {
-        sum_r =
-            sum_g = sum_b = sum_in_r = sum_in_g = sum_in_b = sum_out_r = sum_out_g = sum_out_b = 0;
+        int src_i;
+        int dst_i;
 
-        src_i = x; // x,0
-        for (i = 0; i <= radius; i++) {
-          stack_i = i;
-          stack[stack_i] = src[src_i];
-          sum_r += ((src[src_i] >>> 16) & 0xff) * (i + 1);
-          sum_g += ((src[src_i] >>> 8) & 0xff) * (i + 1);
-          sum_b += (src[src_i] & 0xff) * (i + 1);
-          sum_out_r += ((src[src_i] >>> 16) & 0xff);
-          sum_out_g += ((src[src_i] >>> 8) & 0xff);
-          sum_out_b += (src[src_i] & 0xff);
-        }
-        for (i = 1; i <= radius; i++) {
-          if (i <= hm) src_i += w; // +stride
+        long sum_r, sum_g, sum_b,
+                sum_in_r, sum_in_g, sum_in_b,
+                sum_out_r, sum_out_g, sum_out_b;
 
-          stack_i = i + radius;
-          stack[stack_i] = src[src_i];
-          sum_r += ((src[src_i] >>> 16) & 0xff) * (radius + 1 - i);
-          sum_g += ((src[src_i] >>> 8) & 0xff) * (radius + 1 - i);
-          sum_b += (src[src_i] & 0xff) * (radius + 1 - i);
-          sum_in_r += ((src[src_i] >>> 16) & 0xff);
-          sum_in_g += ((src[src_i] >>> 8) & 0xff);
-          sum_in_b += (src[src_i] & 0xff);
+        int wm = w - 1;
+        int hm = h - 1;
+        int div = (radius * 2) + 1;
+        int mul_sum = stackblur_mul[radius];
+        byte shr_sum = stackblur_shr[radius];
+        int[] stack = new int[div];
+
+        if (step == 1) {
+            int minY = core * h / cores;
+            int maxY = (core + 1) * h / cores;
+
+            for (y = minY; y < maxY; y++) {
+                sum_r = sum_g = sum_b =
+                        sum_in_r = sum_in_g = sum_in_b =
+                                sum_out_r = sum_out_g = sum_out_b = 0;
+
+                src_i = w * y; // start of line (0,y)
+
+                for (i = 0; i <= radius; i++) {
+                    stack_i = i;
+                    stack[stack_i] = src[src_i];
+                    sum_r += ((src[src_i] >>> 16) & 0xff) * (i + 1);
+                    sum_g += ((src[src_i] >>> 8) & 0xff) * (i + 1);
+                    sum_b += (src[src_i] & 0xff) * (i + 1);
+                    sum_out_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_out_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_out_b += (src[src_i] & 0xff);
+                }
+
+
+                for (i = 1; i <= radius; i++) {
+                    if (i <= wm) src_i += 1;
+                    stack_i = i + radius;
+                    stack[stack_i] = src[src_i];
+                    sum_r += ((src[src_i] >>> 16) & 0xff) * (radius + 1 - i);
+                    sum_g += ((src[src_i] >>> 8) & 0xff) * (radius + 1 - i);
+                    sum_b += (src[src_i] & 0xff) * (radius + 1 - i);
+                    sum_in_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_in_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_in_b += (src[src_i] & 0xff);
+                }
+
+
+                sp = radius;
+                xp = radius;
+                if (xp > wm) xp = wm;
+                src_i = xp + y * w; //   img.pix_ptr(xp, y);
+                dst_i = y * w; // img.pix_ptr(0, y);
+                for (x = 0; x < w; x++) {
+                    src[dst_i] = (int)
+                            ((src[dst_i] & 0xFFFFFFFF) |
+                                    ((((sum_r * mul_sum) >>> shr_sum) & 0xff) << 16) |
+                                    ((((sum_g * mul_sum) >>> shr_sum) & 0xff) << 8) |
+                                    ((((sum_b * mul_sum) >>> shr_sum) & 0xff)));
+                    dst_i += 1;
+
+                    sum_r -= sum_out_r;
+                    sum_g -= sum_out_g;
+                    sum_b -= sum_out_b;
+
+                    stack_start = sp + div - radius;
+                    if (stack_start >= div) stack_start -= div;
+                    stack_i = stack_start;
+
+                    sum_out_r -= ((stack[stack_i] >>> 16) & 0xff);
+                    sum_out_g -= ((stack[stack_i] >>> 8) & 0xff);
+                    sum_out_b -= (stack[stack_i] & 0xff);
+
+                    if (xp < wm) {
+                        src_i += 1;
+                        ++xp;
+                    }
+
+                    stack[stack_i] = src[src_i];
+
+                    sum_in_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_in_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_in_b += (src[src_i] & 0xff);
+                    sum_r += sum_in_r;
+                    sum_g += sum_in_g;
+                    sum_b += sum_in_b;
+
+                    ++sp;
+                    if (sp >= div) sp = 0;
+                    stack_i = sp;
+
+                    sum_out_r += ((stack[stack_i] >>> 16) & 0xff);
+                    sum_out_g += ((stack[stack_i] >>> 8) & 0xff);
+                    sum_out_b += (stack[stack_i] & 0xff);
+                    sum_in_r -= ((stack[stack_i] >>> 16) & 0xff);
+                    sum_in_g -= ((stack[stack_i] >>> 8) & 0xff);
+                    sum_in_b -= (stack[stack_i] & 0xff);
+                }
+
+            }
         }
 
-        sp = radius;
-        yp = radius;
-        if (yp > hm) yp = hm;
-        src_i = x + yp * w; // img.pix_ptr(x, yp);
-        dst_i = x; // img.pix_ptr(x, 0);
-        for (y = 0; y < h; y++) {
-          src[dst_i] =
-              (int)
-                  ((src[dst_i])
-                      | ((((sum_r * mul_sum) >>> shr_sum) & 0xff) << 16)
-                      | ((((sum_g * mul_sum) >>> shr_sum) & 0xff) << 8)
-                      | ((((sum_b * mul_sum) >>> shr_sum) & 0xff)));
-          dst_i += w;
+        // step 2
+        else if (step == 2) {
+            int minX = core * w / cores;
+            int maxX = (core + 1) * w / cores;
 
-          sum_r -= sum_out_r;
-          sum_g -= sum_out_g;
-          sum_b -= sum_out_b;
+            for (x = minX; x < maxX; x++) {
+                sum_r = sum_g = sum_b =
+                        sum_in_r = sum_in_g = sum_in_b =
+                                sum_out_r = sum_out_g = sum_out_b = 0;
 
-          stack_start = sp + div - radius;
-          if (stack_start >= div) stack_start -= div;
-          stack_i = stack_start;
+                src_i = x; // x,0
+                for (i = 0; i <= radius; i++) {
+                    stack_i = i;
+                    stack[stack_i] = src[src_i];
+                    sum_r += ((src[src_i] >>> 16) & 0xff) * (i + 1);
+                    sum_g += ((src[src_i] >>> 8) & 0xff) * (i + 1);
+                    sum_b += (src[src_i] & 0xff) * (i + 1);
+                    sum_out_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_out_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_out_b += (src[src_i] & 0xff);
+                }
+                for (i = 1; i <= radius; i++) {
+                    if (i <= hm) src_i += w; // +stride
 
-          sum_out_r -= ((stack[stack_i] >>> 16) & 0xff);
-          sum_out_g -= ((stack[stack_i] >>> 8) & 0xff);
-          sum_out_b -= (stack[stack_i] & 0xff);
+                    stack_i = i + radius;
+                    stack[stack_i] = src[src_i];
+                    sum_r += ((src[src_i] >>> 16) & 0xff) * (radius + 1 - i);
+                    sum_g += ((src[src_i] >>> 8) & 0xff) * (radius + 1 - i);
+                    sum_b += (src[src_i] & 0xff) * (radius + 1 - i);
+                    sum_in_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_in_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_in_b += (src[src_i] & 0xff);
+                }
 
-          if (yp < hm) {
-            src_i += w; // stride
-            ++yp;
-          }
+                sp = radius;
+                yp = radius;
+                if (yp > hm) yp = hm;
+                src_i = x + yp * w; // img.pix_ptr(x, yp);
+                dst_i = x;               // img.pix_ptr(x, 0);
+                for (y = 0; y < h; y++) {
+                    src[dst_i] = (int)
+                            ((src[dst_i] & 0xFFFFFFFF) |
+                                    ((((sum_r * mul_sum) >>> shr_sum) & 0xff) << 16) |
+                                    ((((sum_g * mul_sum) >>> shr_sum) & 0xff) << 8) |
+                                    ((((sum_b * mul_sum) >>> shr_sum) & 0xff)));
+                    dst_i += w;
 
-          stack[stack_i] = src[src_i];
+                    sum_r -= sum_out_r;
+                    sum_g -= sum_out_g;
+                    sum_b -= sum_out_b;
 
-          sum_in_r += ((src[src_i] >>> 16) & 0xff);
-          sum_in_g += ((src[src_i] >>> 8) & 0xff);
-          sum_in_b += (src[src_i] & 0xff);
-          sum_r += sum_in_r;
-          sum_g += sum_in_g;
-          sum_b += sum_in_b;
+                    stack_start = sp + div - radius;
+                    if (stack_start >= div) stack_start -= div;
+                    stack_i = stack_start;
 
-          ++sp;
-          if (sp >= div) sp = 0;
-          stack_i = sp;
+                    sum_out_r -= ((stack[stack_i] >>> 16) & 0xff);
+                    sum_out_g -= ((stack[stack_i] >>> 8) & 0xff);
+                    sum_out_b -= (stack[stack_i] & 0xff);
 
-          sum_out_r += ((stack[stack_i] >>> 16) & 0xff);
-          sum_out_g += ((stack[stack_i] >>> 8) & 0xff);
-          sum_out_b += (stack[stack_i] & 0xff);
-          sum_in_r -= ((stack[stack_i] >>> 16) & 0xff);
-          sum_in_g -= ((stack[stack_i] >>> 8) & 0xff);
-          sum_in_b -= (stack[stack_i] & 0xff);
+                    if (yp < hm) {
+                        src_i += w; // stride
+                        ++yp;
+                    }
+
+                    stack[stack_i] = src[src_i];
+
+                    sum_in_r += ((src[src_i] >>> 16) & 0xff);
+                    sum_in_g += ((src[src_i] >>> 8) & 0xff);
+                    sum_in_b += (src[src_i] & 0xff);
+                    sum_r += sum_in_r;
+                    sum_g += sum_in_g;
+                    sum_b += sum_in_b;
+
+                    ++sp;
+                    if (sp >= div) sp = 0;
+                    stack_i = sp;
+
+                    sum_out_r += ((stack[stack_i] >>> 16) & 0xff);
+                    sum_out_g += ((stack[stack_i] >>> 8) & 0xff);
+                    sum_out_b += (stack[stack_i] & 0xff);
+                    sum_in_r -= ((stack[stack_i] >>> 16) & 0xff);
+                    sum_in_g -= ((stack[stack_i] >>> 8) & 0xff);
+                    sum_in_b -= (stack[stack_i] & 0xff);
+                }
+            }
         }
-      }
-    }
-  }
 
-  private static class BlurTask implements Callable<Void> {
-    private final int[] _src;
-    private final int _w;
-    private final int _h;
-    private final int _radius;
-    private final int _totalCores;
-    private final int _coreIndex;
-    private final int _round;
-
-    public BlurTask(int[] src, int w, int h, int radius, int totalCores, int coreIndex, int round) {
-      _src = src;
-      _w = w;
-      _h = h;
-      _radius = radius;
-      _totalCores = totalCores;
-      _coreIndex = coreIndex;
-      _round = round;
     }
 
-    @Override
-    public Void call() throws Exception {
-      blurIteration(_src, _w, _h, _radius, _totalCores, _coreIndex, _round);
-      return null;
+    private static class BlurTask implements Callable<Void> {
+        private final int[] _src;
+        private final int _w;
+        private final int _h;
+        private final int _radius;
+        private final int _totalCores;
+        private final int _coreIndex;
+        private final int _round;
+
+        public BlurTask(int[] src, int w, int h, int radius, int totalCores, int coreIndex, int round) {
+            _src = src;
+            _w = w;
+            _h = h;
+            _radius = radius;
+            _totalCores = totalCores;
+            _coreIndex = coreIndex;
+            _round = round;
+        }
+
+        @Override
+        public Void call() throws Exception {
+            blurIteration(_src, _w, _h, _radius, _totalCores, _coreIndex, _round);
+            return null;
+        }
+
     }
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt b/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt
index b287bac49..00062167d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/StopWatch.kt
@@ -1,17 +1,17 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper
 
 /**
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt b/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt
deleted file mode 100644
index 8a72c9b45..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/helper/WallpaperAccentManager.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package code.name.monkey.retromusic.helper
-
-import android.app.WallpaperManager
-import android.content.Context
-import android.os.Handler
-import android.os.Looper
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-class WallpaperAccentManager(val context: Context) {
-
-    private val onColorsChangedListener by lazy {
-        WallpaperManager.OnColorsChangedListener { _, _ ->
-            updateColors()
-        }
-    }
-
-    fun init() {
-        if (VersionUtils.hasOreoMR1()) {
-            with(WallpaperManager.getInstance(context)) {
-                updateColors()
-                if (PreferenceUtil.wallpaperAccent) {
-                    addOnColorsChangedListener(
-                        onColorsChangedListener,
-                        Handler(Looper.getMainLooper())
-                    )
-                }
-            }
-        }
-    }
-
-    fun release() {
-        if (VersionUtils.hasOreoMR1()) {
-            WallpaperManager.getInstance(context)
-                .removeOnColorsChangedListener(onColorsChangedListener)
-        }
-    }
-
-    private fun updateColors() {
-        if (VersionUtils.hasOreoMR1()) {
-            val colors = WallpaperManager.getInstance(context)
-                .getWallpaperColors(WallpaperManager.FLAG_SYSTEM)
-            if (colors != null) {
-                val primaryColor = colors.primaryColor.toArgb()
-                ThemeStore.editTheme(context).wallpaperColor(context, primaryColor).commit()
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt
index aa682acea..506104994 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/GenreMenuHelper.kt
@@ -1,67 +1,56 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper.menu
 
+import android.app.Activity
 import android.view.MenuItem
-import androidx.fragment.app.FragmentActivity
+import androidx.appcompat.app.AppCompatActivity
+
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
+import code.name.monkey.retromusic.loaders.GenreLoader
 import code.name.monkey.retromusic.model.Genre
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.GenreRepository
-import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import org.koin.core.component.inject
+import java.util.*
 
-object GenreMenuHelper : KoinComponent {
-    private val genreRepository by inject<GenreRepository>()
-    fun handleMenuClick(activity: FragmentActivity, genre: Genre, item: MenuItem): Boolean {
+object GenreMenuHelper {
+    fun handleMenuClick(activity: AppCompatActivity, genre: Genre, item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_play -> {
-                MusicPlayerRemote.openQueue(getGenreSongs(genre), 0, true)
+                MusicPlayerRemote.openQueue(getGenreSongs(activity, genre), 0, true)
                 return true
             }
             R.id.action_play_next -> {
-                MusicPlayerRemote.playNext(getGenreSongs(genre))
+                MusicPlayerRemote.playNext(getGenreSongs(activity, genre))
                 return true
             }
             R.id.action_add_to_playlist -> {
-                CoroutineScope(Dispatchers.IO).launch {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, getGenreSongs(genre))
-                            .show(activity.supportFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
+                AddToPlaylistDialog.create(getGenreSongs(activity, genre))
+                        .show(activity.supportFragmentManager, "ADD_PLAYLIST")
                 return true
             }
             R.id.action_add_to_current_playing -> {
-                MusicPlayerRemote.enqueue(getGenreSongs(genre))
+                MusicPlayerRemote.enqueue(getGenreSongs(activity, genre))
                 return true
             }
         }
         return false
     }
 
-    private fun getGenreSongs(genre: Genre): List<Song> {
-        return genreRepository.songs(genre.id)
+    private fun getGenreSongs(activity: Activity, genre: Genre): ArrayList<Song> {
+        return GenreLoader.getSongs(activity, genre.id)
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt
index fb9b3cdab..082500dcc 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/PlaylistMenuHelper.kt
@@ -1,83 +1,102 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper.menu
 
+
+import android.app.Activity
+import android.content.Context
 import android.view.MenuItem
-import androidx.fragment.app.FragmentActivity
+import android.widget.Toast
+import androidx.appcompat.app.AppCompatActivity
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.db.toSongs
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeletePlaylistDialog
 import code.name.monkey.retromusic.dialogs.RenamePlaylistDialog
-import code.name.monkey.retromusic.dialogs.SavePlaylistDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.repository.RealRepository
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
+import code.name.monkey.retromusic.misc.WeakContextAsyncTask
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.PlaylistsUtil
+import java.util.*
 
-object PlaylistMenuHelper : KoinComponent {
 
-    fun handleMenuClick(
-        activity: FragmentActivity,
-        playlistWithSongs: PlaylistWithSongs,
-        item: MenuItem
-    ): Boolean {
+object PlaylistMenuHelper {
+
+    fun handleMenuClick(activity: AppCompatActivity,
+                        playlist: Playlist, item: MenuItem): Boolean {
         when (item.itemId) {
             R.id.action_play -> {
-                MusicPlayerRemote.openQueue(playlistWithSongs.songs.toSongs(), 0, true)
+                MusicPlayerRemote.openQueue(getPlaylistSongs(activity, playlist), 9, true)
                 return true
             }
             R.id.action_play_next -> {
-                MusicPlayerRemote.playNext(playlistWithSongs.songs.toSongs())
+                MusicPlayerRemote.playNext(getPlaylistSongs(activity, playlist))
                 return true
             }
             R.id.action_add_to_playlist -> {
-                CoroutineScope(Dispatchers.IO).launch {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, playlistWithSongs.songs.toSongs())
-                            .show(activity.supportFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
+                AddToPlaylistDialog.create(getPlaylistSongs(activity, playlist))
+                        .show(activity.supportFragmentManager, "ADD_PLAYLIST")
                 return true
             }
             R.id.action_add_to_current_playing -> {
-                MusicPlayerRemote.enqueue(playlistWithSongs.songs.toSongs())
+                MusicPlayerRemote.enqueue(getPlaylistSongs(activity, playlist))
                 return true
             }
             R.id.action_rename_playlist -> {
-                RenamePlaylistDialog.create(playlistWithSongs.playlistEntity)
-                    .show(activity.supportFragmentManager, "RENAME_PLAYLIST")
+                RenamePlaylistDialog.create(playlist.id.toLong())
+                        .show(activity.supportFragmentManager, "RENAME_PLAYLIST")
                 return true
             }
             R.id.action_delete_playlist -> {
-                DeletePlaylistDialog.create(playlistWithSongs.playlistEntity)
-                    .show(activity.supportFragmentManager, "DELETE_PLAYLIST")
+                DeletePlaylistDialog.create(playlist)
+                        .show(activity.supportFragmentManager, "DELETE_PLAYLIST")
                 return true
             }
             R.id.action_save_playlist -> {
-                SavePlaylistDialog.create(playlistWithSongs)
-                    .show(activity.supportFragmentManager, "SavePlaylist")
+                SavePlaylistAsyncTask(activity).execute(playlist)
                 return true
             }
         }
         return false
     }
+
+    private fun getPlaylistSongs(activity: Activity,
+                                 playlist: Playlist): ArrayList<Song> {
+        return if (playlist is AbsCustomPlaylist) {
+            playlist.getSongs(activity)
+        } else {
+            PlaylistSongsLoader.getPlaylistSongList(activity, playlist)
+        }
+    }
+
+    private class SavePlaylistAsyncTask internal constructor(context: Context) : WeakContextAsyncTask<Playlist, String, String>(context) {
+
+        override fun doInBackground(vararg params: Playlist): String {
+            return String.format(App.getContext().getString(R.string
+                    .saved_playlist_to), PlaylistsUtil.savePlaylist(App.getContext(), params[0]))
+        }
+
+        override fun onPostExecute(string: String) {
+            super.onPostExecute(string)
+            val context = context
+            if (context != null) {
+                Toast.makeText(context, string, Toast.LENGTH_LONG).show()
+            }
+        }
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
index a6b8009dd..397f7f3f8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongMenuHelper.kt
@@ -1,16 +1,15 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
 
 package code.name.monkey.retromusic.helper.menu
@@ -18,57 +17,39 @@ package code.name.monkey.retromusic.helper.menu
 import android.content.Intent
 import android.view.MenuItem
 import android.view.View
-import androidx.appcompat.widget.PopupMenu
-import androidx.core.os.bundleOf
+import android.widget.PopupMenu
+import androidx.appcompat.app.AppCompatActivity
 import androidx.fragment.app.FragmentActivity
-import androidx.navigation.findNavController
-import code.name.monkey.retromusic.EXTRA_ALBUM_ID
-import code.name.monkey.retromusic.EXTRA_ARTIST_ID
+
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
-import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
 import code.name.monkey.retromusic.dialogs.SongDetailDialog
-import code.name.monkey.retromusic.fragments.LibraryViewModel
-import code.name.monkey.retromusic.fragments.ReloadType
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.interfaces.IPaletteColorHolder
+import code.name.monkey.retromusic.interfaces.PaletteColorHolder
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.repository.RealRepository
+import code.name.monkey.retromusic.activities.tageditor.AbsTagEditorActivity
+import code.name.monkey.retromusic.activities.tageditor.SongTagEditorActivity
 import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.RingtoneManager
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.androidx.viewmodel.ext.android.getViewModel
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import java.io.File
 
-object SongMenuHelper : KoinComponent {
-    const val MENU_RES = R.menu.menu_item_song
+
+object SongMenuHelper {
+    val MENU_RES = R.menu.menu_item_song
 
     fun handleMenuClick(activity: FragmentActivity, song: Song, menuItemId: Int): Boolean {
-        val libraryViewModel = activity.getViewModel() as LibraryViewModel
         when (menuItemId) {
             R.id.action_set_as_ringtone -> {
                 if (RingtoneManager.requiresDialog(activity)) {
-                    RingtoneManager.showDialog(activity)
-                } else {
-                    RingtoneManager.setRingtone(activity, song)
+                    RingtoneManager.getDialog(activity)
                 }
+                val ringtoneManager = RingtoneManager(activity)
+                ringtoneManager.setRingtone(song)
                 return true
             }
             R.id.action_share -> {
-                activity.startActivity(
-                    Intent.createChooser(
-                        MusicUtil.createShareSongFileIntent(activity, song),
-                        null
-                    )
-                )
+                activity.startActivity(Intent.createChooser(MusicUtil.createShareSongFileIntent(song, activity), null))
                 return true
             }
             R.id.action_delete_from_device -> {
@@ -76,13 +57,7 @@ object SongMenuHelper : KoinComponent {
                 return true
             }
             R.id.action_add_to_playlist -> {
-                CoroutineScope(Dispatchers.IO).launch {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, song)
-                            .show(activity.supportFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
+                AddToPlaylistDialog.create(song).show(activity.supportFragmentManager, "ADD_PLAYLIST")
                 return true
             }
             R.id.action_play_next -> {
@@ -96,11 +71,8 @@ object SongMenuHelper : KoinComponent {
             R.id.action_tag_editor -> {
                 val tagEditorIntent = Intent(activity, SongTagEditorActivity::class.java)
                 tagEditorIntent.putExtra(AbsTagEditorActivity.EXTRA_ID, song.id)
-                if (activity is IPaletteColorHolder)
-                    tagEditorIntent.putExtra(
-                        AbsTagEditorActivity.EXTRA_PALETTE,
-                        (activity as IPaletteColorHolder).paletteColor
-                    )
+                if (activity is PaletteColorHolder)
+                    tagEditorIntent.putExtra(AbsTagEditorActivity.EXTRA_PALETTE, (activity as PaletteColorHolder).paletteColor)
                 activity.startActivity(tagEditorIntent)
                 return true
             }
@@ -109,30 +81,18 @@ object SongMenuHelper : KoinComponent {
                 return true
             }
             R.id.action_go_to_album -> {
-                activity.findNavController(R.id.fragment_container).navigate(
-                    R.id.albumDetailsFragment,
-                    bundleOf(EXTRA_ALBUM_ID to song.albumId)
-                )
+                NavigationUtil.goToAlbum(activity, song.albumId)
                 return true
             }
             R.id.action_go_to_artist -> {
-                activity.findNavController(R.id.fragment_container).navigate(
-                    R.id.artistDetailsFragment,
-                    bundleOf(EXTRA_ARTIST_ID to song.artistId)
-                )
-                return true
-            }
-            R.id.action_add_to_blacklist -> {
-                BlacklistStore.getInstance(activity).addPath(File(song.data))
-                libraryViewModel.forceReload(ReloadType.Songs)
+                NavigationUtil.goToArtist(activity, song.artistId)
                 return true
             }
         }
         return false
     }
 
-    abstract class OnClickSongMenu(private val activity: FragmentActivity) :
-        View.OnClickListener, PopupMenu.OnMenuItemClickListener {
+    abstract class OnClickSongMenu protected constructor(private val activity: AppCompatActivity) : View.OnClickListener, PopupMenu.OnMenuItemClickListener {
 
         open val menuRes: Int
             get() = MENU_RES
diff --git a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt
index b5d236734..cd0af61e5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/helper/menu/SongsMenuHelper.kt
@@ -1,41 +1,31 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.helper.menu
 
-import android.content.Intent
 import androidx.fragment.app.FragmentActivity
+
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.AddToPlaylistDialog
 import code.name.monkey.retromusic.dialogs.DeleteSongsDialog
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.RealRepository
-import code.name.monkey.retromusic.util.MusicUtil
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
+import java.util.*
 
-object SongsMenuHelper : KoinComponent {
-    fun handleMenuClick(
-        activity: FragmentActivity,
-        songs: List<Song>,
-        menuItemId: Int
-    ): Boolean {
+
+object SongsMenuHelper {
+    fun handleMenuClick(activity: FragmentActivity, songs: ArrayList<Song>, menuItemId: Int): Boolean {
         when (menuItemId) {
             R.id.action_play_next -> {
                 MusicPlayerRemote.playNext(songs)
@@ -46,27 +36,11 @@ object SongsMenuHelper : KoinComponent {
                 return true
             }
             R.id.action_add_to_playlist -> {
-                CoroutineScope(Dispatchers.IO).launch {
-                    val playlists = get<RealRepository>().fetchPlaylists()
-                    withContext(Dispatchers.Main) {
-                        AddToPlaylistDialog.create(playlists, songs)
-                            .show(activity.supportFragmentManager, "ADD_PLAYLIST")
-                    }
-                }
-                return true
-            }
-            R.id.action_share -> {
-                activity.startActivity(
-                    Intent.createChooser(
-                        MusicUtil.createShareMultipleSongIntent(activity, songs),
-                        null
-                    )
-                )
+                AddToPlaylistDialog.create(songs).show(activity.supportFragmentManager, "ADD_PLAYLIST")
                 return true
             }
             R.id.action_delete_from_device -> {
-                DeleteSongsDialog.create(songs)
-                    .show(activity.supportFragmentManager, "DELETE_SONGS")
+                DeleteSongsDialog.create(songs).show(activity.supportFragmentManager, "DELETE_SONGS")
                 return true
             }
         }
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.kt
similarity index 59%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt
rename to app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.kt
index 4def2ad35..95bb43618 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumArtistClickListener.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/CabHolder.kt
@@ -1,21 +1,23 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.interfaces
 
-import android.view.View
+import com.afollestad.materialcab.MaterialCab
 
-interface IAlbumArtistClickListener {
-    fun onAlbumArtist(artistName: String, view: View)
+
+interface CabHolder {
+
+    fun openCab(menuRes: Int, callback: MaterialCab.Callback): MaterialCab
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/EqualizerInterface.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/EqualizerInterface.kt
new file mode 100644
index 000000000..914136d4b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/EqualizerInterface.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.interfaces
+
+import android.media.audiofx.BassBoost
+import android.media.audiofx.Equalizer
+import android.media.audiofx.Virtualizer
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+
+interface EqualizerInterface {
+    val bandLevelLow: Int
+
+    val bandLevelHigh: Int
+
+    val numberOfBands: Int
+
+    var isBassBoostEnabled: Boolean
+
+    var bassBoostStrength: Int
+
+    var isVirtualizerEnabled: Boolean
+
+    var virtualizerStrength: Int
+
+    val isRunning: Boolean
+
+    val equalizer: Equalizer
+
+    val bassBoost: BassBoost
+
+    val virtualizer: Virtualizer
+
+    fun getCenterFreq(band: Int): Int
+
+    fun getBandLevel(band: Int): Int
+
+    fun setBandLevel(band: Int, level: Int)
+
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt
deleted file mode 100644
index c5412d0f2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IAlbumClickListener.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.interfaces
-
-import android.view.View
-
-interface IAlbumClickListener {
-    fun onAlbumClick(albumId: Long, view: View)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt
deleted file mode 100644
index b44a01f0e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/ICallbacks.kt
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
-package code.name.monkey.retromusic.interfaces
-
-import android.view.MenuItem
-import android.view.View
-import java.io.File
-
-interface ICallbacks {
-    fun onFileSelected(file: File)
-
-    fun onFileMenuClicked(file: File, view: View)
-
-    fun onMultipleItemAction(item: MenuItem, files: ArrayList<File>)
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt
deleted file mode 100644
index f5c6aeb4f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IGenreClickListener.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package code.name.monkey.retromusic.interfaces
-
-import android.view.View
-import code.name.monkey.retromusic.model.Genre
-
-interface IGenreClickListener {
-    fun onClickGenre(genre: Genre, view: View)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt
deleted file mode 100644
index db224ee96..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IHomeClickListener.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package code.name.monkey.retromusic.interfaces
-
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Genre
-
-interface IHomeClickListener {
-    fun onAlbumClick(album: Album)
-
-    fun onArtistClick(artist: Artist)
-
-    fun onGenreClick(genre: Genre)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt
deleted file mode 100644
index 3b0eb141d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPlaylistClickListener.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package code.name.monkey.retromusic.interfaces
-
-import android.view.View
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-
-interface IPlaylistClickListener {
-    fun onPlaylistClick(playlistWithSongs: PlaylistWithSongs, view: View)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt
deleted file mode 100644
index 112bdcdc1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IScrollHelper.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package code.name.monkey.retromusic.interfaces
-
-interface IScrollHelper {
-    fun scrollToTop()
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/LoaderIds.kt
similarity index 62%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt
rename to app/src/main/java/code/name/monkey/retromusic/interfaces/LoaderIds.kt
index f1c1f7450..c1463be7f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IArtistClickListener.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/LoaderIds.kt
@@ -1,21 +1,22 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.interfaces
 
-import android.view.View
 
-interface IArtistClickListener {
-    fun onArtist(artistId: Long, view: View)
+interface LoaderIds {
+    companion object {
+        val FOLDERS_FRAGMENT = 5
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.kt
similarity index 66%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt
rename to app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.kt
index 14a93c47a..e85cc827f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMainActivityFragmentCallbacks.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/MainActivityFragmentCallbacks.kt
@@ -1,22 +1,25 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.interfaces
 
 /**
  * Created by hemanths on 14/08/17.
  */
-interface IMainActivityFragmentCallbacks {
+
+interface MainActivityFragmentCallbacks {
     fun handleBackPress(): Boolean
+
+    //void selectedFragment(Fragment fragment);
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/MusicServiceEventListener.kt
similarity index 73%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt
rename to app/src/main/java/code/name/monkey/retromusic/interfaces/MusicServiceEventListener.kt
index 4d3991809..a62e7ab76 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IMusicServiceEventListener.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/MusicServiceEventListener.kt
@@ -1,28 +1,27 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.interfaces
 
-interface IMusicServiceEventListener {
+
+interface MusicServiceEventListener {
     fun onServiceConnected()
 
     fun onServiceDisconnected()
 
     fun onQueueChanged()
 
-    fun onFavoriteStateChanged()
-
     fun onPlayingMetaChanged()
 
     fun onPlayStateChanged()
diff --git a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt b/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.kt
similarity index 67%
rename from app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt
rename to app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.kt
index 82c617075..7b72bff6b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/interfaces/IPaletteColorHolder.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/interfaces/PaletteColorHolder.kt
@@ -1,22 +1,26 @@
 /*
- * Copyright (c) 2020 Hemanth Savarla.
+ * Copyright (c) 2019 Hemanth Savarala.
  *
  * Licensed under the GNU General Public License v3
  *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
  * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
  */
+
 package code.name.monkey.retromusic.interfaces
 
+import androidx.annotation.ColorInt
+
 /**
  * @author Aidan Follestad (afollestad)
  */
-interface IPaletteColorHolder {
+interface PaletteColorHolder {
+
+    @get:ColorInt
     val paletteColor: Int
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
new file mode 100644
index 000000000..68396d54e
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/AlbumLoader.kt
@@ -0,0 +1,196 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.provider.MediaStore.Audio.AudioColumns
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.Observable
+import java.util.*
+import kotlin.collections.ArrayList
+
+
+/**
+ * Created by hemanths on 11/08/17.
+ */
+
+object AlbumLoader {
+    fun getAllAlbumsFlowable(
+            context: Context
+    ): Observable<ArrayList<Album>> {
+        val songs = SongLoader.getSongsFlowable(
+                SongLoader.makeSongCursor(
+                        context, null, null,
+                        getSongLoaderSortOrder(context))
+        )
+
+        return splitIntoAlbumsFlowable(songs)
+    }
+
+    fun getAlbumsFlowable(
+            context: Context,
+            query: String
+    ): Observable<ArrayList<Album>> {
+        val songs = SongLoader.getSongsFlowable(
+                SongLoader.makeSongCursor(
+                        context,
+                        AudioColumns.ALBUM + " LIKE ?",
+                        arrayOf("%$query%"),
+                        getSongLoaderSortOrder(context))
+        )
+        return splitIntoAlbumsFlowable(songs)
+    }
+
+    fun getAlbums(
+            context: Context,
+            query: String
+    ): ArrayList<Album> {
+        val songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                context,
+                AudioColumns.ALBUM + " LIKE ?",
+                arrayOf("%$query%"),
+                getSongLoaderSortOrder(context))
+        )
+        return splitIntoAlbums(songs)
+    }
+
+    fun getAlbumFlowable(
+            context: Context,
+            albumId: Int
+    ): Observable<Album> {
+        return Observable.create { e ->
+            val songs = SongLoader.getSongsFlowable(
+                    SongLoader.makeSongCursor(
+                            context,
+                            AudioColumns.ALBUM_ID + "=?",
+                            arrayOf(albumId.toString()),
+                            getSongLoaderSortOrder(context)
+                    )
+            )
+            songs.subscribe { songs1 ->
+                e.onNext(Album(songs1))
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getAlbum(
+            context: Context,
+            albumId: Int
+    ): Album {
+        val songs = SongLoader.getSongs(
+                SongLoader.makeSongCursor(
+                        context,
+                        AudioColumns.ALBUM_ID + "=?",
+                        arrayOf(albumId.toString()),
+                        getSongLoaderSortOrder(context)))
+        val album = Album(songs)
+        sortSongsByTrackNumber(album)
+        return album
+    }
+
+    fun splitIntoAlbumsFlowable(
+            songs: Observable<ArrayList<Song>>?
+    ): Observable<ArrayList<Album>> {
+        return Observable.create { e ->
+            val albums = ArrayList<Album>()
+            songs?.subscribe { songs1 ->
+                for (song in songs1) {
+                    getOrCreateAlbumFlowable(albums, song.albumId).subscribe { album ->
+                        album.songs!!.add(song)
+                    }
+                }
+            }
+            for (album in albums) {
+                sortSongsByTrackNumber(album)
+            }
+            e.onNext(albums)
+            e.onComplete()
+        }
+    }
+
+    fun getAllAlbums(
+            context: Context
+    ): ArrayList<Album> {
+        val songs = SongLoader.getSongs(
+                SongLoader.makeSongCursor(
+                        context, null, null,
+                        getSongLoaderSortOrder(context))
+        )
+
+        return splitIntoAlbums(songs)
+    }
+
+    fun splitIntoAlbums(
+            songs: ArrayList<Song>?
+    ): ArrayList<Album> {
+        val albums = ArrayList<Album>()
+        if (songs != null) {
+            for (song in songs) {
+                getOrCreateAlbum(albums, song.albumId).songs?.add(song)
+            }
+        }
+        for (album in albums) {
+            sortSongsByTrackNumber(album)
+        }
+        return albums
+    }
+
+    private fun getOrCreateAlbumFlowable(
+            albums: ArrayList<Album>,
+            albumId: Int
+    ): Observable<Album> {
+        return Observable.create { e ->
+            for (album in albums) {
+                if (!album.songs!!.isEmpty() && album.songs[0].albumId == albumId) {
+                    e.onNext(album)
+                    e.onComplete()
+                    return@create
+                }
+            }
+            val album = Album()
+            albums.add(album)
+            e.onNext(album)
+            e.onComplete()
+        }
+    }
+
+    private fun getOrCreateAlbum(
+            albums: ArrayList<Album>,
+            albumId: Int
+    ): Album {
+        for (album in albums) {
+            if (album.songs!!.isNotEmpty() && album.songs[0].albumId == albumId) {
+                return album
+            }
+        }
+        val album = Album()
+        albums.add(album)
+        return album
+    }
+
+    private fun sortSongsByTrackNumber(
+            album: Album
+    ) {
+        album.songs?.sortWith(Comparator { o1, o2 -> o1.trackNumber - o2.trackNumber })
+    }
+
+    private fun getSongLoaderSortOrder(context: Context): String {
+        return PreferenceUtil.getInstance(context).albumSortOrder + ", " +
+                PreferenceUtil.getInstance(context).albumDetailSongSortOrder
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.kt
new file mode 100644
index 000000000..9b52211f9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/ArtistLoader.kt
@@ -0,0 +1,138 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.provider.MediaStore.Audio.AudioColumns
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.Observable
+
+
+object ArtistLoader {
+    private fun getSongLoaderSortOrder(context: Context): String {
+        return PreferenceUtil.getInstance(context).artistSortOrder + ", " +
+                PreferenceUtil.getInstance(context).artistAlbumSortOrder + ", " +
+                PreferenceUtil.getInstance(context).albumDetailSongSortOrder + ", " +
+                PreferenceUtil.getInstance(context).artistDetailSongSortOrder
+    }
+
+    fun getAllArtistsFlowable(
+            context: Context
+    ): Observable<ArrayList<Artist>> {
+        return Observable.create { e ->
+            SongLoader.getSongsFlowable(SongLoader.makeSongCursor(
+                    context, null, null,
+                    getSongLoaderSortOrder(context))
+            ).subscribe { songs ->
+                e.onNext(splitIntoArtists(AlbumLoader.splitIntoAlbums(songs)))
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getAllArtists(context: Context): ArrayList<Artist> {
+        val songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                context,
+                null, null,
+                getSongLoaderSortOrder(context))
+        )
+        return splitIntoArtists(AlbumLoader.splitIntoAlbums(songs))
+    }
+
+    fun getArtistsFlowable(context: Context, query: String): Observable<ArrayList<Artist>> {
+        return Observable.create { e ->
+            SongLoader.getSongsFlowable(SongLoader.makeSongCursor(
+                    context,
+                    AudioColumns.ARTIST + " LIKE ?",
+                    arrayOf("%$query%"),
+                    getSongLoaderSortOrder(context))
+            ).subscribe { songs ->
+                e.onNext(splitIntoArtists(AlbumLoader.splitIntoAlbums(songs)))
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getArtists(context: Context, query: String): ArrayList<Artist> {
+        val songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                context,
+                AudioColumns.ARTIST + " LIKE ?",
+                arrayOf("%$query%"),
+                getSongLoaderSortOrder(context))
+        )
+        return splitIntoArtists(AlbumLoader.splitIntoAlbums(songs))
+    }
+
+    fun splitIntoArtists(albums: ArrayList<Album>?): ArrayList<Artist> {
+        val artists = ArrayList<Artist>()
+        if (albums != null) {
+            for (album in albums) {
+                getOrCreateArtist(artists, album.artistId).albums!!.add(album)
+            }
+        }
+        return artists
+    }
+
+    private fun getOrCreateArtist(artists: ArrayList<Artist>, artistId: Int): Artist {
+        for (artist in artists) {
+            if (artist.albums!!.isNotEmpty() && artist.albums[0].songs!!.isNotEmpty() && artist.albums[0].songs!![0].artistId == artistId) {
+                return artist
+            }
+        }
+        val album = Artist()
+        artists.add(album)
+        return album
+    }
+
+    fun splitIntoArtists(albums: Observable<ArrayList<Album>>): Observable<ArrayList<Artist>> {
+        return Observable.create { e ->
+            val artists = ArrayList<Artist>()
+            albums.subscribe { localAlbums ->
+                if (localAlbums != null) {
+                    for (album in localAlbums) {
+                        getOrCreateArtist(artists, album.artistId).albums!!.add(album)
+                    }
+                }
+                e.onNext(artists)
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getArtistFlowable(context: Context, artistId: Int): Observable<Artist> {
+        return Observable.create { e ->
+            SongLoader.getSongsFlowable(SongLoader.makeSongCursor(context, AudioColumns.ARTIST_ID + "=?",
+                    arrayOf(artistId.toString()),
+                    getSongLoaderSortOrder(context)))
+                    .subscribe { songs ->
+                        val artist = Artist(AlbumLoader.splitIntoAlbums(songs))
+                        e.onNext(artist)
+                        e.onComplete()
+                    }
+        }
+    }
+
+    fun getArtist(context: Context, artistId: Int): Artist {
+        val songs = SongLoader.getSongs(SongLoader.makeSongCursor(
+                context,
+                AudioColumns.ARTIST_ID + "=?",
+                arrayOf(artistId.toString()),
+                getSongLoaderSortOrder(context))
+        )
+        return Artist(AlbumLoader.splitIntoAlbums(songs))
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.kt
new file mode 100644
index 000000000..03be9beaa
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/GenreLoader.kt
@@ -0,0 +1,148 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.net.Uri
+import android.provider.BaseColumns
+import android.provider.MediaStore.Audio.Genres
+import code.name.monkey.retromusic.Constants.BASE_SELECTION
+import code.name.monkey.retromusic.Constants.baseProjection
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.PreferenceUtil
+
+
+object GenreLoader {
+
+    fun getAllGenres(context: Context): ArrayList<Genre> {
+        return getGenresFromCursor(context, makeGenreCursor(context))
+    }
+
+    fun searchGenres(context: Context): ArrayList<Genre> {
+        return getGenresFromCursorForSearch(context, makeGenreCursor(context));
+    }
+
+    fun getSongs(context: Context, genreId: Int): ArrayList<Song> {
+        // The genres table only stores songs that have a genre specified,
+        // so we need to get songs without a genre a different way.
+        return if (genreId == -1) {
+            getSongsWithNoGenre(context)
+        } else SongLoader.getSongs(makeGenreSongCursor(context, genreId))
+
+    }
+
+    private fun getGenreFromCursor(context: Context, cursor: Cursor): Genre {
+        val id = cursor.getInt(0)
+        val name = cursor.getString(1)
+        val songCount = getSongs(context, id).size
+        return Genre(id, name, songCount)
+
+    }
+
+    private fun getGenreFromCursorWithOutSongs(context: Context, cursor: Cursor): Genre {
+        val id = cursor.getInt(0)
+        val name = cursor.getString(1)
+        return Genre(id, name, -1)
+    }
+
+    private fun getSongsWithNoGenre(context: Context): ArrayList<Song> {
+        val selection = BaseColumns._ID + " NOT IN " +
+                "(SELECT " + Genres.Members.AUDIO_ID + " FROM audio_genres_map)"
+        return SongLoader.getSongs(SongLoader.makeSongCursor(context, selection, null))
+    }
+
+    private fun hasSongsWithNoGenre(context: Context): Boolean {
+        val allSongsCursor = SongLoader.makeSongCursor(context, null, null)
+        val allSongsWithGenreCursor = makeAllSongsWithGenreCursor(context)
+
+        if (allSongsCursor == null || allSongsWithGenreCursor == null) {
+            return false
+        }
+
+        val hasSongsWithNoGenre = allSongsCursor.count > allSongsWithGenreCursor.count
+        allSongsCursor.close()
+        allSongsWithGenreCursor.close()
+        return hasSongsWithNoGenre
+    }
+
+    private fun makeAllSongsWithGenreCursor(context: Context): Cursor? {
+        try {
+            return context.contentResolver.query(
+                    Uri.parse("content://media/external/audio/genres/all/members"),
+                    arrayOf(Genres.Members.AUDIO_ID), null, null, null)
+        } catch (e: SecurityException) {
+            return null
+        }
+
+    }
+
+    private fun makeGenreSongCursor(context: Context, genreId: Int): Cursor? {
+        try {
+            return context.contentResolver.query(
+                    Genres.Members.getContentUri("external", genreId.toLong()),
+                    baseProjection, BASE_SELECTION, null, PreferenceUtil.getInstance(context).songSortOrder)
+        } catch (e: SecurityException) {
+            return null
+        }
+
+    }
+
+    private fun getGenresFromCursor(context: Context, cursor: Cursor?): ArrayList<Genre> {
+        val genres = arrayListOf<Genre>()
+        if (cursor != null) {
+            if (cursor.moveToFirst()) {
+                do {
+                    val genre = getGenreFromCursor(context, cursor)
+                    if (genre.songCount > 0) {
+                        genres.add(genre)
+                    } else {
+                        // try to remove the empty genre from the media store
+                        try {
+                            context.contentResolver.delete(Genres.EXTERNAL_CONTENT_URI, Genres._ID + " == " + genre.id, null)
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
+
+                    }
+                } while (cursor.moveToNext())
+            }
+            cursor.close()
+        }
+        return genres
+    }
+
+    private fun getGenresFromCursorForSearch(context: Context, cursor: Cursor?): ArrayList<Genre> {
+        val genres = arrayListOf<Genre>()
+        if (cursor != null && cursor.moveToFirst()) {
+            do {
+                genres.add(getGenreFromCursorWithOutSongs(context, cursor))
+            } while (cursor.moveToNext())
+        }
+        cursor?.close()
+        return genres
+    }
+
+
+    private fun makeGenreCursor(context: Context): Cursor? {
+        val projection = arrayOf(Genres._ID, Genres.NAME)
+        try {
+            return context.contentResolver.query(Genres.EXTERNAL_CONTENT_URI, projection, null, null, PreferenceUtil.getInstance(context).genreSortOrder)
+        } catch (e: SecurityException) {
+            return null
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
new file mode 100644
index 000000000..998ab7031
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/LastAddedSongsLoader.kt
@@ -0,0 +1,71 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.MediaStore
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.Observable
+import java.util.*
+import kotlin.collections.ArrayList
+
+/**
+ * Created by hemanths on 16/08/17.
+ */
+
+object LastAddedSongsLoader {
+
+
+    fun getLastAddedSongsFlowable(context: Context): Observable<ArrayList<Song>> {
+        return SongLoader.getSongsFlowable(makeLastAddedCursor(context))
+    }
+
+    fun getLastAddedSongs(context: Context): ArrayList<Song> {
+        return SongLoader.getSongs(makeLastAddedCursor(context))
+    }
+
+    private fun makeLastAddedCursor(context: Context): Cursor? {
+        val cutoff = PreferenceUtil.getInstance(context).lastAddedCutoff
+
+        return SongLoader.makeSongCursor(
+                context,
+                MediaStore.Audio.Media.DATE_ADDED + ">?",
+                arrayOf(cutoff.toString()),
+                MediaStore.Audio.Media.DATE_ADDED + " DESC")
+    }
+
+
+    fun getLastAddedAlbumsFlowable(context: Context): Observable<ArrayList<Album>> {
+        return AlbumLoader.splitIntoAlbumsFlowable(getLastAddedSongsFlowable(context))
+    }
+
+
+    fun getLastAddedAlbums(context: Context): ArrayList<Album> {
+        return AlbumLoader.splitIntoAlbums(getLastAddedSongs(context))
+    }
+
+
+    fun getLastAddedArtistsFlowable(context: Context): Observable<ArrayList<Artist>> {
+        return ArtistLoader.splitIntoArtists(getLastAddedAlbumsFlowable(context))
+    }
+
+    fun getLastAddedArtists(context: Context): ArrayList<Artist> {
+        return ArtistLoader.splitIntoArtists(getLastAddedAlbums(context))
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.kt
new file mode 100644
index 000000000..f89cb6b46
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistLoader.kt
@@ -0,0 +1,192 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.BaseColumns
+import android.provider.MediaStore
+import android.provider.MediaStore.Audio.PlaylistsColumns
+import code.name.monkey.retromusic.model.Playlist
+import io.reactivex.Observable
+import java.util.*
+
+
+/**
+ * Created by hemanths on 16/08/17.
+ */
+
+object PlaylistLoader {
+
+    private fun getPlaylistFlowable(
+            cursor: Cursor?
+    ): Observable<Playlist> {
+        return Observable.create { e ->
+            var playlist = Playlist()
+
+            if (cursor != null && cursor.moveToFirst()) {
+                playlist = getPlaylistFromCursorImpl(cursor)
+            }
+            cursor?.close()
+
+            e.onNext(playlist)
+            e.onComplete()
+        }
+    }
+
+    fun getPlaylist(
+            cursor: Cursor?
+    ): Playlist {
+        var playlist = Playlist()
+
+        if (cursor != null && cursor.moveToFirst()) {
+            playlist = getPlaylistFromCursorImpl(cursor)
+        }
+        cursor?.close()
+        return playlist
+    }
+
+    fun getPlaylistFlowable(
+            context: Context,
+            playlistName: String
+    ): Observable<Playlist> {
+        return getPlaylistFlowable(makePlaylistCursor(
+                context,
+                PlaylistsColumns.NAME + "=?",
+                arrayOf(playlistName)
+        ))
+    }
+
+    fun getPlaylist(
+            context: Context,
+            playlistName: String
+    ): Playlist {
+        return getPlaylist(makePlaylistCursor(
+                context,
+                PlaylistsColumns.NAME + "=?",
+                arrayOf(playlistName)
+        ))
+    }
+
+    fun getPlaylistFlowable(
+            context: Context,
+            playlistId: Int
+    ): Observable<Playlist> {
+        return getPlaylistFlowable(makePlaylistCursor(
+                context,
+                BaseColumns._ID + "=?",
+                arrayOf(playlistId.toString())
+        ))
+    }
+
+    fun getAllPlaylistsFlowoable(
+            context: Context
+    ): Observable<ArrayList<Playlist>> {
+        return getAllPlaylistsFlowable(makePlaylistCursor(context, null, null))
+    }
+
+    fun getFavoritePlaylistFlowable(context: Context): Observable<ArrayList<Playlist>> {
+        return getAllPlaylistsFlowable(makePlaylistCursor(
+                context,
+                PlaylistsColumns.NAME + "=?",
+                arrayOf(context.getString(code.name.monkey.retromusic.R.string.favorites))))
+    }
+
+    private fun getAllPlaylistsFlowable(cursor: Cursor?): Observable<ArrayList<Playlist>> {
+        return Observable.create { e ->
+            val playlists = ArrayList<Playlist>()
+
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    playlists.add(getPlaylistFromCursorImpl(cursor))
+                } while (cursor.moveToNext())
+            }
+            cursor?.close()
+
+            e.onNext(playlists)
+            e.onComplete()
+        }
+    }
+
+    fun getAllPlaylists(context: Context): ArrayList<Playlist> {
+        return getAllPlaylists(makePlaylistCursor(context, null, null))
+    }
+
+    fun getFavoritePlaylist(context: Context): ArrayList<Playlist> {
+        return getAllPlaylists(makePlaylistCursor(
+                context,
+                PlaylistsColumns.NAME + "=?",
+                arrayOf(context.getString(code.name.monkey.retromusic.R.string.favorites))))
+    }
+
+    fun getAllPlaylists(cursor: Cursor?): ArrayList<Playlist> {
+        val playlists = ArrayList<Playlist>()
+
+        if (cursor != null && cursor.moveToFirst()) {
+            do {
+                playlists.add(getPlaylistFromCursorImpl(cursor))
+            } while (cursor.moveToNext())
+        }
+        cursor?.close()
+        return playlists
+    }
+
+    fun deletePlaylists(context: Context, playlistId: Long) {
+        val localUri = MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI
+        val localStringBuilder = StringBuilder()
+        localStringBuilder.append("_id IN (")
+        localStringBuilder.append(playlistId)
+        localStringBuilder.append(")")
+        context.contentResolver.delete(localUri, localStringBuilder.toString(), null)
+    }
+
+    private fun makePlaylistCursor(
+            context: Context,
+            selection: String?,
+            values: Array<String>?
+    ): Cursor? {
+        try {
+            return context.contentResolver.query(
+                    MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI,
+                    arrayOf(BaseColumns._ID, /* 0 */
+                            PlaylistsColumns.NAME), /* 1 */
+                    selection,
+                    values,
+                    MediaStore.Audio.Playlists.DEFAULT_SORT_ORDER)
+        } catch (e: SecurityException) {
+            return null
+        }
+    }
+
+    fun getPlaylist(
+            context: Context,
+            playlistId: Int
+    ): Playlist {
+        return getPlaylist(makePlaylistCursor(
+                context,
+                BaseColumns._ID + "=?",
+                arrayOf(playlistId.toString())
+        ))
+    }
+
+    private fun getPlaylistFromCursorImpl(
+            cursor: Cursor
+    ): Playlist {
+        val id = cursor.getInt(0)
+        val name = cursor.getString(1)
+        return Playlist(id, name)
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.kt
new file mode 100644
index 000000000..0a09d9e0d
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/PlaylistSongsLoader.kt
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.MediaStore
+import android.provider.MediaStore.Audio.AudioColumns
+import code.name.monkey.retromusic.Constants.BASE_SELECTION
+import code.name.monkey.retromusic.model.AbsCustomPlaylist
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.model.PlaylistSong
+import code.name.monkey.retromusic.model.Song
+import io.reactivex.Observable
+import java.util.*
+
+
+/**
+ * Created by hemanths on 16/08/17.
+ */
+
+object PlaylistSongsLoader {
+
+    fun getPlaylistSongListFlowable(
+            context: Context,
+            playlist: Playlist
+    ): Observable<ArrayList<Song>> {
+        return (playlist as? AbsCustomPlaylist)?.getSongsFlowable(context)
+                ?: getPlaylistSongListFlowable(context, playlist.id)
+    }
+
+    fun getPlaylistSongList(
+            context: Context,
+            playlist: Playlist
+    ): ArrayList<Song> {
+        return (playlist as? AbsCustomPlaylist)?.getSongs(context)
+                ?: getPlaylistSongList(context, playlist.id)
+    }
+
+
+    fun getPlaylistSongListFlowable(context: Context, playlistId: Int): Observable<ArrayList<Song>> {
+        return Observable.create { e ->
+            val songs = ArrayList<Song>()
+            val cursor = makePlaylistSongCursor(context, playlistId)
+
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    songs.add(getPlaylistSongFromCursorImpl(cursor, playlistId))
+                } while (cursor.moveToNext())
+            }
+            cursor?.close()
+            e.onNext(songs)
+            e.onComplete()
+        }
+    }
+
+    fun getPlaylistSongList(context: Context, playlistId: Int): ArrayList<Song> {
+        val songs = arrayListOf<Song>()
+        val cursor = makePlaylistSongCursor(context, playlistId)
+
+        if (cursor != null && cursor.moveToFirst()) {
+            do {
+                songs.add(getPlaylistSongFromCursorImpl(cursor, playlistId))
+            } while (cursor.moveToNext())
+        }
+        cursor?.close()
+        return songs
+    }
+
+
+    private fun getPlaylistSongFromCursorImpl(cursor: Cursor, playlistId: Int): PlaylistSong {
+        val id = cursor.getInt(0)
+        val title = cursor.getString(1)
+        val trackNumber = cursor.getInt(2)
+        val year = cursor.getInt(3)
+        val duration = cursor.getLong(4)
+        val data = cursor.getString(5)
+        val dateModified = cursor.getLong(6)
+        val albumId = cursor.getInt(7)
+        val albumName = cursor.getString(8)
+        val artistId = cursor.getInt(9)
+        val artistName = cursor.getString(10)
+        val idInPlaylist = cursor.getInt(11)
+        val composer = cursor.getString(12)
+
+        return PlaylistSong(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, playlistId, idInPlaylist, composer)
+    }
+
+    private fun makePlaylistSongCursor(context: Context, playlistId: Int): Cursor? {
+        try {
+            return context.contentResolver.query(
+                    MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId.toLong()),
+                    arrayOf(MediaStore.Audio.Playlists.Members.AUDIO_ID, // 0
+                            AudioColumns.TITLE, // 1
+                            AudioColumns.TRACK, // 2
+                            AudioColumns.YEAR, // 3
+                            AudioColumns.DURATION, // 4
+                            AudioColumns.DATA, // 5
+                            AudioColumns.DATE_MODIFIED, // 6
+                            AudioColumns.ALBUM_ID, // 7
+                            AudioColumns.ALBUM, // 8
+                            AudioColumns.ARTIST_ID, // 9
+                            AudioColumns.ARTIST, // 10
+                            MediaStore.Audio.Playlists.Members._ID,//11
+                            AudioColumns.COMPOSER)// 12
+                    , BASE_SELECTION, null,
+                    MediaStore.Audio.Playlists.Members.DEFAULT_SORT_ORDER)
+        } catch (e: SecurityException) {
+            return null
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.kt
new file mode 100644
index 000000000..974beb41f
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SearchLoader.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.model.Genre
+import java.util.*
+
+
+object SearchLoader {
+    fun searchAll(context: Context, query: String?): MutableList<Any> {
+        val results = mutableListOf<Any>()
+        query?.let { searchString ->
+            val songs = SongLoader.getSongs(context, searchString)
+            if (songs.isNotEmpty()) {
+                results.add(context.resources.getString(R.string.songs))
+                results.addAll(songs)
+            }
+
+            val artists = ArtistLoader.getArtists(context, searchString)
+            if (artists.isNotEmpty()) {
+                results.add(context.resources.getString(R.string.artists))
+                results.addAll(artists)
+            }
+
+            val albums = AlbumLoader.getAlbums(context, searchString)
+            if (albums.isNotEmpty()) {
+                results.add(context.resources.getString(R.string.albums))
+                results.addAll(albums)
+            }
+            val genres: List<Genre> = GenreLoader.searchGenres(context).filter { genre -> genre.name.toLowerCase(Locale.getDefault()).contains(searchString.toLowerCase(Locale.getDefault())) }
+            if (genres.isNotEmpty()) {
+                results.add(context.resources.getString(R.string.genres))
+                results.addAll(genres)
+            }
+        }
+        return results
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt
new file mode 100644
index 000000000..3384f8c52
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SongLoader.kt
@@ -0,0 +1,236 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.MediaStore
+import android.provider.MediaStore.Audio.AudioColumns
+import code.name.monkey.retromusic.Constants.BASE_SELECTION
+import code.name.monkey.retromusic.Constants.baseProjection
+import code.name.monkey.retromusic.helper.ShuffleHelper
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.providers.BlacklistStore
+import code.name.monkey.retromusic.util.PreferenceUtil
+import io.reactivex.Observable
+import java.util.*
+
+
+/**
+ * Created by hemanths on 10/08/17.
+ */
+
+object SongLoader {
+    fun getAllSongsFlowable(
+            context: Context
+    ): Observable<ArrayList<Song>> {
+        val cursor = makeSongCursor(context, null, null)
+        return getSongsFlowable(cursor)
+    }
+
+    fun getAllSongs(
+            context: Context
+    ): ArrayList<Song> {
+        val cursor = makeSongCursor(context, null, null)
+        return getSongs(cursor)
+    }
+
+    fun getSongsFlowable(
+            cursor: Cursor?
+    ): Observable<ArrayList<Song>> {
+        return Observable.create { e ->
+            val songs = ArrayList<Song>()
+            if (cursor != null && cursor.moveToFirst()) {
+                do {
+                    songs.add(getSongFromCursorImpl(cursor))
+                } while (cursor.moveToNext())
+            }
+
+            cursor?.close()
+            e.onNext(songs)
+            e.onComplete()
+        }
+    }
+
+    fun getSongs(
+            cursor: Cursor?
+    ): ArrayList<Song> {
+        val songs = arrayListOf<Song>()
+        if (cursor != null && cursor.moveToFirst()) {
+            do {
+                songs.add(getSongFromCursorImpl(cursor))
+            } while (cursor.moveToNext())
+        }
+
+        cursor?.close()
+        return songs
+    }
+
+    fun getSongsFlowable(
+            context: Context,
+            query: String
+    ): Observable<ArrayList<Song>> {
+        val cursor = makeSongCursor(context, AudioColumns.TITLE + " LIKE ?", arrayOf("%$query%"))
+        return getSongsFlowable(cursor)
+    }
+
+    fun getSongs(
+            context: Context,
+            query: String
+    ): ArrayList<Song> {
+        val cursor = makeSongCursor(context, AudioColumns.TITLE + " LIKE ?", arrayOf("%$query%"))
+        return getSongs(cursor)
+    }
+
+
+    private fun getSongFlowable(
+            cursor: Cursor?
+    ): Observable<Song> {
+        return Observable.create { e ->
+            val song: Song = if (cursor != null && cursor.moveToFirst()) {
+                getSongFromCursorImpl(cursor)
+            } else {
+                Song.emptySong
+            }
+            cursor?.close()
+            e.onNext(song)
+            e.onComplete()
+        }
+    }
+
+    fun getSong(
+            cursor: Cursor?
+    ): Song {
+        val song: Song
+        if (cursor != null && cursor.moveToFirst()) {
+            song = getSongFromCursorImpl(cursor)
+        } else {
+            song = Song.emptySong
+        }
+        cursor?.close()
+        return song
+    }
+
+    fun getSongFlowable(
+            context: Context,
+            queryId: Int
+    ): Observable<Song> {
+        val cursor = makeSongCursor(context, AudioColumns._ID + "=?",
+                arrayOf(queryId.toString()))
+        return getSongFlowable(cursor)
+    }
+
+    fun getSong(context: Context, queryId: Int): Song {
+        val cursor = makeSongCursor(context, AudioColumns._ID + "=?", arrayOf(queryId.toString()))
+        return getSong(cursor)
+    }
+
+    fun suggestSongs(
+            context: Context
+    ): Observable<ArrayList<Song>> {
+        return SongLoader.getAllSongsFlowable(context)
+                .flatMap {
+                    val list = ArrayList<Song>()
+                    ShuffleHelper.makeShuffleList(it, -1)
+                    if (it.size >= 7) {
+                        list.addAll(it.subList(0, 7))
+                    }
+                    return@flatMap Observable.just(list)
+                }
+    }
+
+    private fun getSongFromCursorImpl(
+            cursor: Cursor
+    ): Song {
+        val id = cursor.getInt(0)
+        val title = cursor.getString(1)
+        val trackNumber = cursor.getInt(2)
+        val year = cursor.getInt(3)
+        val duration = cursor.getLong(4)
+        val data = cursor.getString(5)
+        val dateModified = cursor.getLong(6)
+        val albumId = cursor.getInt(7)
+        val albumName = cursor.getString(8)
+        val artistId = cursor.getInt(9)
+        val artistName = cursor.getString(10)
+        val composer = cursor.getString(11)
+
+        return Song(id, title, trackNumber, year, duration, data, dateModified, albumId,
+                albumName ?: "", artistId, artistName, composer ?: "")
+    }
+
+
+    @JvmOverloads
+    fun makeSongCursor(
+            context: Context,
+            selection: String?,
+            selectionValues: Array<String>?,
+            sortOrder: String = PreferenceUtil.getInstance(context).songSortOrder
+    ): Cursor? {
+        var selectionFinal = selection
+        var selectionValuesFinal = selectionValues
+        selectionFinal = if (selection != null && selection.trim { it <= ' ' } != "") {
+            "$BASE_SELECTION AND $selectionFinal"
+        } else {
+            BASE_SELECTION
+        }
+
+        // Blacklist
+        val paths = BlacklistStore.getInstance(context).paths
+        if (paths.isNotEmpty()) {
+            selectionFinal = generateBlacklistSelection(selectionFinal, paths.size)
+            selectionValuesFinal = addBlacklistSelectionValues(selectionValuesFinal, paths)
+        }
+
+        try {
+            return context.contentResolver.query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                    baseProjection, selectionFinal + " AND " + MediaStore.Audio.Media.DURATION + ">= " + (PreferenceUtil.getInstance(context).filterLength * 1000), selectionValuesFinal, sortOrder)
+        } catch (e: SecurityException) {
+            return null
+        }
+
+    }
+
+    private fun generateBlacklistSelection(
+            selection: String?,
+            pathCount: Int
+    ): String {
+        val newSelection = StringBuilder(
+                if (selection != null && selection.trim { it <= ' ' } != "") "$selection AND " else "")
+        newSelection.append(AudioColumns.DATA + " NOT LIKE ?")
+        for (i in 0 until pathCount - 1) {
+            newSelection.append(" AND " + AudioColumns.DATA + " NOT LIKE ?")
+        }
+        return newSelection.toString()
+    }
+
+    private fun addBlacklistSelectionValues(
+            selectionValues: Array<String>?,
+            paths: ArrayList<String>
+    ): Array<String>? {
+        var selectionValuesFinal = selectionValues
+        if (selectionValuesFinal == null) {
+            selectionValuesFinal = emptyArray()
+        }
+        val newSelectionValues = Array(selectionValuesFinal.size + paths.size) {
+            "n = $it"
+        }
+        System.arraycopy(selectionValuesFinal, 0, newSelectionValues, 0, selectionValuesFinal.size)
+        for (i in selectionValuesFinal.size until newSelectionValues.size) {
+            newSelectionValues[i] = paths[i - selectionValuesFinal.size] + "%"
+        }
+        return newSelectionValues
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java
new file mode 100644
index 000000000..2a5095703
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedCursor.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+package code.name.monkey.retromusic.loaders;
+
+import android.database.AbstractCursor;
+import android.database.Cursor;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+/**
+ * This cursor basically wraps a song cursor and is given a list of the order of the ids of the
+ * contents of the cursor. It wraps the Cursor and simulates the internal cursor being sorted
+ * by moving the point to the appropriate spot
+ */
+public class SortedCursor extends AbstractCursor {
+    // cursor to wrap
+    private final Cursor mCursor;
+    // the map of external indices to internal indices
+    private ArrayList<Integer> mOrderedPositions;
+    // this contains the ids that weren't found in the underlying cursor
+    private ArrayList<String> mMissingValues;
+    // this contains the mapped cursor positions and afterwards the extra ids that weren't found
+    private HashMap<String, Integer> mMapCursorPositions;
+
+    /**
+     * @param cursor     to wrap
+     * @param order      the list of unique ids in sorted order to display
+     * @param columnName the column name of the id to look up in the internal cursor
+     */
+    public SortedCursor(@NonNull final Cursor cursor, @Nullable final String[] order, final String columnName) {
+        mCursor = cursor;
+        mMissingValues = buildCursorPositionMapping(order, columnName);
+    }
+
+    /**
+     * This function populates mOrderedPositions with the cursor positions in the order based
+     * on the order passed in
+     *
+     * @param order the target order of the internal cursor
+     * @return returns the ids that aren't found in the underlying cursor
+     */
+    @NonNull
+    private ArrayList<String> buildCursorPositionMapping(@Nullable final String[] order, final String columnName) {
+        ArrayList<String> missingValues = new ArrayList<>();
+
+        mOrderedPositions = new ArrayList<>(mCursor.getCount());
+
+        mMapCursorPositions = new HashMap<>(mCursor.getCount());
+        final int valueColumnIndex = mCursor.getColumnIndex(columnName);
+
+        if (mCursor.moveToFirst()) {
+            // first figure out where each of the ids are in the cursor
+            do {
+                mMapCursorPositions.put(mCursor.getString(valueColumnIndex), mCursor.getPosition());
+            } while (mCursor.moveToNext());
+
+            if (order != null) {
+                // now create the ordered positions to map to the internal cursor given the
+                // external sort order
+                for (final String value : order) {
+                    if (mMapCursorPositions.containsKey(value)) {
+                        mOrderedPositions.add(mMapCursorPositions.get(value));
+                        mMapCursorPositions.remove(value);
+                    } else {
+                        missingValues.add(value);
+                    }
+                }
+            }
+
+            mCursor.moveToFirst();
+        }
+
+        return missingValues;
+    }
+
+    /**
+     * @return the list of ids that weren't found in the underlying cursor
+     */
+    public ArrayList<String> getMissingValues() {
+        return mMissingValues;
+    }
+
+    /**
+     * @return the list of ids that were in the underlying cursor but not part of the ordered list
+     */
+    @NonNull
+    public Collection<String> getExtraValues() {
+        return mMapCursorPositions.keySet();
+    }
+
+    @Override
+    public void close() {
+        mCursor.close();
+
+        super.close();
+    }
+
+    @Override
+    public int getCount() {
+        return mOrderedPositions.size();
+    }
+
+    @Override
+    public String[] getColumnNames() {
+        return mCursor.getColumnNames();
+    }
+
+    @Override
+    public String getString(int column) {
+        return mCursor.getString(column);
+    }
+
+    @Override
+    public short getShort(int column) {
+        return mCursor.getShort(column);
+    }
+
+    @Override
+    public int getInt(int column) {
+        return mCursor.getInt(column);
+    }
+
+    @Override
+    public long getLong(int column) {
+        return mCursor.getLong(column);
+    }
+
+    @Override
+    public float getFloat(int column) {
+        return mCursor.getFloat(column);
+    }
+
+    @Override
+    public double getDouble(int column) {
+        return mCursor.getDouble(column);
+    }
+
+    @Override
+    public boolean isNull(int column) {
+        return mCursor.isNull(column);
+    }
+
+    @Override
+    public boolean onMove(int oldPosition, int newPosition) {
+        if (newPosition >= 0 && newPosition < getCount()) {
+            mCursor.moveToPosition(mOrderedPositions.get(newPosition));
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java
new file mode 100644
index 000000000..4189dfc14
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/SortedLongCursor.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+package code.name.monkey.retromusic.loaders;
+
+import android.database.AbstractCursor;
+import android.database.Cursor;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+
+/**
+ * This cursor basically wraps a song cursor and is given a list of the order of the ids of the
+ * contents of the cursor. It wraps the Cursor and simulates the internal cursor being sorted
+ * by moving the point to the appropriate spot
+ */
+public class SortedLongCursor extends AbstractCursor {
+    // cursor to wrap
+    private final Cursor mCursor;
+    // the map of external indices to internal indices
+    private ArrayList<Integer> mOrderedPositions;
+    // this contains the ids that weren't found in the underlying cursor
+    private ArrayList<Long> mMissingIds;
+    // this contains the mapped cursor positions and afterwards the extra ids that weren't found
+    private HashMap<Long, Integer> mMapCursorPositions;
+
+    /**
+     * @param cursor     to wrap
+     * @param order      the list of unique ids in sorted order to display
+     * @param columnName the column name of the id to look up in the internal cursor
+     */
+    public SortedLongCursor(final Cursor cursor, final long[] order, final String columnName) {
+
+        mCursor = cursor;
+        mMissingIds = buildCursorPositionMapping(order, columnName);
+    }
+
+    /**
+     * This function populates mOrderedPositions with the cursor positions in the order based
+     * on the order passed in
+     *
+     * @param order the target order of the internal cursor
+     * @return returns the ids that aren't found in the underlying cursor
+     */
+    @NonNull
+    private ArrayList<Long> buildCursorPositionMapping(@Nullable final long[] order, final String columnName) {
+        ArrayList<Long> missingIds = new ArrayList<>();
+
+        mOrderedPositions = new ArrayList<>(mCursor.getCount());
+
+        mMapCursorPositions = new HashMap<>(mCursor.getCount());
+        final int idPosition = mCursor.getColumnIndex(columnName);
+
+        if (mCursor.moveToFirst()) {
+            // first figure out where each of the ids are in the cursor
+            do {
+                mMapCursorPositions.put(mCursor.getLong(idPosition), mCursor.getPosition());
+            } while (mCursor.moveToNext());
+
+            // now create the ordered positions to map to the internal cursor given the
+            // external sort order
+            for (int i = 0; order != null && i < order.length; i++) {
+                final long id = order[i];
+                if (mMapCursorPositions.containsKey(id)) {
+                    mOrderedPositions.add(mMapCursorPositions.get(id));
+                    mMapCursorPositions.remove(id);
+                } else {
+                    missingIds.add(id);
+                }
+            }
+
+            mCursor.moveToFirst();
+        }
+
+        return missingIds;
+    }
+
+    /**
+     * @return the list of ids that weren't found in the underlying cursor
+     */
+    public ArrayList<Long> getMissingIds() {
+        return mMissingIds;
+    }
+
+    /**
+     * @return the list of ids that were in the underlying cursor but not part of the ordered list
+     */
+    @NonNull
+    public Collection<Long> getExtraIds() {
+        return mMapCursorPositions.keySet();
+    }
+
+    @Override
+    public void close() {
+        mCursor.close();
+
+        super.close();
+    }
+
+    @Override
+    public int getCount() {
+        return mOrderedPositions.size();
+    }
+
+    @Override
+    public String[] getColumnNames() {
+        return mCursor.getColumnNames();
+    }
+
+    @Override
+    public String getString(int column) {
+        return mCursor.getString(column);
+    }
+
+    @Override
+    public short getShort(int column) {
+        return mCursor.getShort(column);
+    }
+
+    @Override
+    public int getInt(int column) {
+        return mCursor.getInt(column);
+    }
+
+    @Override
+    public long getLong(int column) {
+        return mCursor.getLong(column);
+    }
+
+    @Override
+    public float getFloat(int column) {
+        return mCursor.getFloat(column);
+    }
+
+    @Override
+    public double getDouble(int column) {
+        return mCursor.getDouble(column);
+    }
+
+    @Override
+    public boolean isNull(int column) {
+        return mCursor.isNull(column);
+    }
+
+    @Override
+    public boolean onMove(int oldPosition, int newPosition) {
+        if (newPosition >= 0 && newPosition < getCount()) {
+            mCursor.moveToPosition(mOrderedPositions.get(newPosition));
+            return true;
+        }
+
+        return false;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.kt b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.kt
new file mode 100644
index 000000000..c868fb915
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/loaders/TopAndRecentlyPlayedTracksLoader.kt
@@ -0,0 +1,175 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.loaders
+
+import android.content.Context
+import android.database.Cursor
+import android.provider.BaseColumns
+import code.name.monkey.retromusic.Constants.NUMBER_OF_TOP_TRACKS
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.providers.HistoryStore
+import code.name.monkey.retromusic.providers.SongPlayCountStore
+import io.reactivex.Observable
+import java.util.*
+
+/**
+ * Created by hemanths on 16/08/17.
+ */
+
+object TopAndRecentlyPlayedTracksLoader {
+
+    fun getRecentlyPlayedTracksFlowable(context: Context): Observable<ArrayList<Song>> {
+        return SongLoader.getSongsFlowable(makeRecentTracksCursorAndClearUpDatabase(context))
+    }
+
+    fun getRecentlyPlayedTracks(context: Context): ArrayList<Song> {
+        return SongLoader.getSongs(makeRecentTracksCursorAndClearUpDatabase(context))
+    }
+
+    fun getTopTracksFlowable(context: Context): Observable<ArrayList<Song>> {
+        return SongLoader.getSongsFlowable(makeTopTracksCursorAndClearUpDatabase(context))
+    }
+
+    fun getTopTracks(context: Context): ArrayList<Song> {
+        return SongLoader.getSongs(makeTopTracksCursorAndClearUpDatabase(context))
+    }
+
+    private fun makeRecentTracksCursorAndClearUpDatabase(context: Context): Cursor? {
+        val retCursor = makeRecentTracksCursorImpl(context)
+
+        // clean up the databases with any ids not found
+        if (retCursor != null) {
+            val missingIds = retCursor.missingIds
+            if (missingIds != null && missingIds.size > 0) {
+                for (id in missingIds) {
+                    HistoryStore.getInstance(context).removeSongId(id)
+                }
+            }
+        }
+        return retCursor
+    }
+
+    private fun makeTopTracksCursorAndClearUpDatabase(context: Context): Cursor? {
+        val retCursor = makeTopTracksCursorImpl(context)
+
+        // clean up the databases with any ids not found
+        if (retCursor != null) {
+            val missingIds = retCursor.missingIds
+            if (missingIds != null && missingIds.size > 0) {
+                for (id in missingIds) {
+                    SongPlayCountStore.getInstance(context).removeItem(id)
+                }
+            }
+        }
+        return retCursor
+    }
+
+    private fun makeRecentTracksCursorImpl(context: Context): SortedLongCursor? {
+        // first get the top results ids from the internal database
+        val songs = HistoryStore.getInstance(context).queryRecentIds()
+
+        try {
+            return makeSortedCursor(context, songs,
+                    songs!!.getColumnIndex(HistoryStore.RecentStoreColumns.ID))
+        } finally {
+            songs?.close()
+        }
+    }
+
+    private fun makeTopTracksCursorImpl(context: Context): SortedLongCursor? {
+        // first get the top results ids from the internal database
+        val songs = SongPlayCountStore.getInstance(context)
+                .getTopPlayedResults(NUMBER_OF_TOP_TRACKS)
+
+        songs.use { localSongs ->
+            return makeSortedCursor(context, localSongs,
+                    localSongs.getColumnIndex(SongPlayCountStore.SongPlayCountColumns.ID))
+        }
+    }
+
+    private fun makeSortedCursor(context: Context,
+                                 cursor: Cursor?, idColumn: Int): SortedLongCursor? {
+
+        if (cursor != null && cursor.moveToFirst()) {
+            // create the list of ids to select against
+            val selection = StringBuilder()
+            selection.append(BaseColumns._ID)
+            selection.append(" IN (")
+
+            // this tracks the order of the ids
+            val order = LongArray(cursor.count)
+
+            var id = cursor.getLong(idColumn)
+            selection.append(id)
+            order[cursor.position] = id
+
+            while (cursor.moveToNext()) {
+                selection.append(",")
+
+                id = cursor.getLong(idColumn)
+                order[cursor.position] = id
+                selection.append(id.toString())
+            }
+
+            selection.append(")")
+
+            // get a list of songs with the data given the selection statement
+            val songCursor = SongLoader.makeSongCursor(context, selection.toString(), null)
+            if (songCursor != null) {
+                // now return the wrapped TopTracksCursor to handle sorting given order
+                return SortedLongCursor(songCursor, order, BaseColumns._ID)
+            }
+        }
+
+        return null
+    }
+
+    fun getTopAlbumsFlowable(
+            context: Context
+    ): Observable<ArrayList<Album>> {
+        return Observable.create { e ->
+            getTopTracksFlowable(context).subscribe { songs ->
+                if (songs.size > 0) {
+                    e.onNext(AlbumLoader.splitIntoAlbums(songs))
+                }
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getTopAlbums(
+            context: Context
+    ): ArrayList<Album> {
+        arrayListOf<Album>()
+        return AlbumLoader.splitIntoAlbums(getTopTracks(context))
+    }
+
+    fun getTopArtistsFlowable(context: Context): Observable<ArrayList<Artist>> {
+        return Observable.create { e ->
+            getTopAlbumsFlowable(context).subscribe { albums ->
+                if (albums.size > 0) {
+                    e.onNext(ArtistLoader.splitIntoArtists(albums))
+                }
+                e.onComplete()
+            }
+        }
+    }
+
+    fun getTopArtists(context: Context): ArrayList<Artist> {
+        return ArtistLoader.splitIntoArtists(getTopAlbums(context))
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt b/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt
deleted file mode 100644
index 891181c3d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/CoverLrcView.kt
+++ /dev/null
@@ -1,582 +0,0 @@
-/*
- * Copyright (C) 2017 wangchenyan
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-package code.name.monkey.retromusic.lyrics
-
-import android.animation.ValueAnimator
-import android.annotation.SuppressLint
-import android.content.Context
-import android.graphics.Canvas
-import android.graphics.Paint
-import android.graphics.drawable.Drawable
-import android.os.Looper
-import android.text.Layout
-import android.text.StaticLayout
-import android.text.TextPaint
-import android.text.format.DateUtils
-import android.util.AttributeSet
-import android.view.GestureDetector
-import android.view.GestureDetector.SimpleOnGestureListener
-import android.view.MotionEvent
-import android.view.View
-import android.view.animation.LinearInterpolator
-import android.widget.Scroller
-import androidx.core.content.ContextCompat
-import androidx.core.graphics.withSave
-import code.name.monkey.retromusic.R
-import kotlinx.coroutines.*
-import java.io.File
-import java.lang.Runnable
-import kotlin.math.abs
-
-/**
- * 歌词 Created by wcy on 2015/11/9.
- */
-@SuppressLint("StaticFieldLeak")
-class CoverLrcView @JvmOverloads constructor(
-    context: Context?,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : View(context, attrs, defStyleAttr) {
-    private val mLrcEntryList: MutableList<LrcEntry> = ArrayList()
-    private val mLrcPaint = TextPaint()
-    private val mTimePaint = TextPaint()
-    private var mTimeFontMetrics: Paint.FontMetrics? = null
-    private var mPlayDrawable: Drawable? = null
-    private var mDividerHeight = 0f
-    private var mAnimationDuration: Long = 0
-    private var mNormalTextColor = 0
-    private var mNormalTextSize = 0f
-    private var mCurrentTextColor = 0
-    private var mCurrentTextSize = 0f
-    private var mTimelineTextColor = 0
-    private var mTimelineColor = 0
-    private var mTimeTextColor = 0
-    private var mDrawableWidth = 0
-    private var mTimeTextWidth = 0
-    private var mDefaultLabel: String? = null
-    private var mLrcPadding = 0f
-    private var mOnPlayClickListener: OnPlayClickListener? = null
-    private var mAnimator: ValueAnimator? = null
-    private var mGestureDetector: GestureDetector? = null
-    private var mScroller: Scroller? = null
-    private var mOffset = 0f
-    private var mCurrentLine = 0
-    private var isShowTimeline = false
-    private var isTouching = false
-    private var isFling = false
-    private var mTextGravity // 歌词显示位置，靠左/居中/靠右
-            = 0
-    private val hideTimelineRunnable = Runnable {
-        if (hasLrc() && isShowTimeline) {
-            isShowTimeline = false
-            smoothScrollTo(mCurrentLine)
-        }
-    }
-
-    private val viewScope = CoroutineScope(Dispatchers.Main + Job())
-
-    private val mSimpleOnGestureListener: SimpleOnGestureListener =
-        object : SimpleOnGestureListener() {
-            override fun onDown(e: MotionEvent): Boolean {
-                if (hasLrc() && mOnPlayClickListener != null) {
-                    if (mOffset != getOffset(0)) {
-                        parent.requestDisallowInterceptTouchEvent(true)
-                    }
-                    mScroller!!.forceFinished(true)
-                    removeCallbacks(hideTimelineRunnable)
-                    isTouching = true
-                    isShowTimeline = true
-                    invalidate()
-                    return true
-                }
-                return super.onDown(e)
-            }
-
-            override fun onScroll(
-                e1: MotionEvent,
-                e2: MotionEvent,
-                distanceX: Float,
-                distanceY: Float,
-            ): Boolean {
-                if (mOffset == getOffset(0) && distanceY < 0F) {
-                    return super.onScroll(e1, e2, distanceX, distanceY)
-                }
-                if (hasLrc()) {
-                    mOffset += -distanceY
-                    mOffset = mOffset.coerceAtMost(getOffset(0))
-                    mOffset = mOffset.coerceAtLeast(getOffset(mLrcEntryList.size - 1))
-                    invalidate()
-                    parent.requestDisallowInterceptTouchEvent(true)
-                    return true
-                }
-                return super.onScroll(e1, e2, distanceX, distanceY)
-            }
-
-            override fun onFling(
-                e1: MotionEvent,
-                e2: MotionEvent,
-                velocityX: Float,
-                velocityY: Float,
-            ): Boolean {
-                if (hasLrc()) {
-                    mScroller!!.fling(
-                        0,
-                        mOffset.toInt(),
-                        0,
-                        velocityY.toInt(),
-                        0,
-                        0,
-                        getOffset(mLrcEntryList.size - 1).toInt(),
-                        getOffset(0).toInt()
-                    )
-                    isFling = true
-                    return true
-                }
-                return super.onFling(e1, e2, velocityX, velocityY)
-            }
-
-            override fun onSingleTapConfirmed(e: MotionEvent): Boolean {
-                if (hasLrc()
-                    && isShowTimeline
-                    && mPlayDrawable!!.bounds.contains(e.x.toInt(), e.y.toInt())
-                ) {
-                    val centerLine = centerLine
-                    val centerLineTime = mLrcEntryList[centerLine].time
-                    // onPlayClick 消费了才更新 UI
-                    if (mOnPlayClickListener != null && mOnPlayClickListener!!.onPlayClick(
-                            centerLineTime
-                        )
-                    ) {
-                        isShowTimeline = false
-                        removeCallbacks(hideTimelineRunnable)
-                        mCurrentLine = centerLine
-                        animateCurrentTextSize()
-                        return true
-                    }
-                } else {
-                    callOnClick()
-                    return true
-                }
-                return super.onSingleTapConfirmed(e)
-            }
-        }
-
-    private fun init(attrs: AttributeSet?) {
-        val ta = context.obtainStyledAttributes(attrs, R.styleable.LrcView)
-        mCurrentTextSize = ta.getDimension(
-            R.styleable.LrcView_lrcTextSize, resources.getDimension(R.dimen.lrc_text_size)
-        )
-        mNormalTextSize = ta.getDimension(
-            R.styleable.LrcView_lrcNormalTextSize,
-            resources.getDimension(R.dimen.lrc_text_size)
-        )
-        if (mNormalTextSize == 0f) {
-            mNormalTextSize = mCurrentTextSize
-        }
-        mDividerHeight = ta.getDimension(
-            R.styleable.LrcView_lrcDividerHeight,
-            resources.getDimension(R.dimen.lrc_divider_height)
-        )
-        val defDuration = resources.getInteger(R.integer.lrc_animation_duration)
-        mAnimationDuration =
-            ta.getInt(R.styleable.LrcView_lrcAnimationDuration, defDuration).toLong()
-        mAnimationDuration =
-            if (mAnimationDuration < 0) defDuration.toLong() else mAnimationDuration
-        mNormalTextColor = ta.getColor(
-            R.styleable.LrcView_lrcNormalTextColor,
-            ContextCompat.getColor(context, R.color.lrc_normal_text_color)
-        )
-        mCurrentTextColor = ta.getColor(
-            R.styleable.LrcView_lrcCurrentTextColor,
-            ContextCompat.getColor(context, R.color.lrc_current_text_color)
-        )
-        mTimelineTextColor = ta.getColor(
-            R.styleable.LrcView_lrcTimelineTextColor,
-            ContextCompat.getColor(context, R.color.lrc_timeline_text_color)
-        )
-        mDefaultLabel = ta.getString(R.styleable.LrcView_lrcLabel)
-        mDefaultLabel =
-            if (mDefaultLabel.isNullOrEmpty()) context.getString(R.string.empty) else mDefaultLabel
-        mLrcPadding = ta.getDimension(R.styleable.LrcView_lrcPadding, 0f)
-        mTimelineColor = ta.getColor(
-            R.styleable.LrcView_lrcTimelineColor,
-            ContextCompat.getColor(context, R.color.lrc_timeline_color)
-        )
-        val timelineHeight = ta.getDimension(
-            R.styleable.LrcView_lrcTimelineHeight,
-            resources.getDimension(R.dimen.lrc_timeline_height)
-        )
-        mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable)
-        mPlayDrawable =
-            if (mPlayDrawable == null) ContextCompat.getDrawable(
-                context,
-                R.drawable.ic_play_arrow
-            ) else mPlayDrawable
-        mTimeTextColor = ta.getColor(
-            R.styleable.LrcView_lrcTimeTextColor,
-            ContextCompat.getColor(context, R.color.lrc_time_text_color)
-        )
-        val timeTextSize = ta.getDimension(
-            R.styleable.LrcView_lrcTimeTextSize,
-            resources.getDimension(R.dimen.lrc_time_text_size)
-        )
-        mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER)
-        ta.recycle()
-        mDrawableWidth = resources.getDimension(R.dimen.lrc_drawable_width).toInt()
-        mTimeTextWidth = resources.getDimension(R.dimen.lrc_time_width).toInt()
-        mLrcPaint.isAntiAlias = true
-        mLrcPaint.textSize = mCurrentTextSize
-        mLrcPaint.textAlign = Paint.Align.LEFT
-        mTimePaint.isAntiAlias = true
-        mTimePaint.textSize = timeTextSize
-        mTimePaint.textAlign = Paint.Align.CENTER
-        mTimePaint.strokeWidth = timelineHeight
-        mTimePaint.strokeCap = Paint.Cap.ROUND
-        mTimeFontMetrics = mTimePaint.fontMetrics
-        mGestureDetector = GestureDetector(context, mSimpleOnGestureListener)
-        mGestureDetector!!.setIsLongpressEnabled(false)
-        mScroller = Scroller(context)
-    }
-
-    fun setNormalColor(normalColor: Int) {
-        mNormalTextColor = normalColor
-        postInvalidate()
-    }
-
-    fun setCurrentColor(currentColor: Int) {
-        mCurrentTextColor = currentColor
-        postInvalidate()
-    }
-
-    fun setTimelineTextColor(timelineTextColor: Int) {
-        mTimelineTextColor = timelineTextColor
-        postInvalidate()
-    }
-
-    fun setTimelineColor(timelineColor: Int) {
-        mTimelineColor = timelineColor
-        postInvalidate()
-    }
-
-    fun setTimeTextColor(timeTextColor: Int) {
-        mTimeTextColor = timeTextColor
-        postInvalidate()
-    }
-
-    fun setDraggable(draggable: Boolean, onPlayClickListener: OnPlayClickListener?) {
-        mOnPlayClickListener = if (draggable) {
-            requireNotNull(onPlayClickListener) { "if draggable == true, onPlayClickListener must not be null" }
-            onPlayClickListener
-        } else {
-            null
-        }
-    }
-
-    fun setLabel(label: String?) {
-        runOnUi {
-            mDefaultLabel = label
-            invalidate()
-        }
-    }
-
-    fun loadLrc(lrcFile: File) {
-        runOnUi {
-            reset()
-            viewScope.launch(Dispatchers.IO) {
-                val lrcEntries = LrcUtils.parseLrc(arrayOf(lrcFile, null))
-                withContext(Dispatchers.Main) {
-                    onLrcLoaded(lrcEntries)
-                }
-            }
-        }
-    }
-
-    fun loadLrc(lrcText: String?) {
-        runOnUi {
-            reset()
-            viewScope.launch(Dispatchers.IO) {
-                val lrcEntries = LrcUtils.parseLrc(arrayOf(lrcText, null))
-                withContext(Dispatchers.Main) {
-                    onLrcLoaded(lrcEntries)
-                }
-            }
-        }
-    }
-
-    fun hasLrc(): Boolean {
-        return mLrcEntryList.isNotEmpty()
-    }
-
-    fun updateTime(time: Long) {
-        runOnUi {
-            if (!hasLrc()) {
-                return@runOnUi
-            }
-            val line = findShowLine(time + 300L)
-            if (line != mCurrentLine) {
-                mCurrentLine = line
-                if (!isShowTimeline) {
-                    smoothScrollTo(line)
-                    animateCurrentTextSize()
-                } else {
-                    invalidate()
-                }
-            }
-        }
-    }
-
-    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
-        super.onLayout(changed, left, top, right, bottom)
-        if (changed) {
-            initPlayDrawable()
-            initEntryList()
-            if (hasLrc()) {
-                smoothScrollTo(mCurrentLine, 0L)
-            }
-        }
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        super.onDraw(canvas)
-        val centerY = height / 2
-
-        if (!hasLrc()) {
-            mLrcPaint.color = mCurrentTextColor
-            @Suppress("Deprecation")
-            @SuppressLint("DrawAllocation") val staticLayout = StaticLayout(
-                mDefaultLabel,
-                mLrcPaint,
-                lrcWidth.toInt(),
-                Layout.Alignment.ALIGN_CENTER,
-                1f,
-                0f,
-                false
-            )
-            drawText(canvas, staticLayout, centerY.toFloat())
-            return
-        }
-        val centerLine = centerLine
-        if (isShowTimeline) {
-            mPlayDrawable?.draw(canvas)
-            mTimePaint.color = mTimeTextColor
-            val timeText = LrcUtils.formatTime(mLrcEntryList[centerLine].time)
-            val timeX = (width - mTimeTextWidth / 2).toFloat()
-            val timeY = centerY - (mTimeFontMetrics!!.descent + mTimeFontMetrics!!.ascent) / 2
-            canvas.drawText(timeText, timeX, timeY, mTimePaint)
-        }
-        canvas.translate(0f, mOffset)
-        var y = 0f
-        for (i in mLrcEntryList.indices) {
-            if (i > 0) {
-                y += ((mLrcEntryList[i - 1].height + mLrcEntryList[i].height shr 1)
-                        + mDividerHeight)
-            }
-            if (i == mCurrentLine) {
-                mLrcPaint.textSize = mCurrentTextSize
-                mLrcPaint.color = mCurrentTextColor
-            } else if (isShowTimeline && i == centerLine) {
-                mLrcPaint.color = mTimelineTextColor
-            } else {
-                mLrcPaint.textSize = mNormalTextSize
-                mLrcPaint.color = mNormalTextColor
-            }
-            drawText(canvas, mLrcEntryList[i].staticLayout, y)
-        }
-    }
-
-    private fun drawText(canvas: Canvas, staticLayout: StaticLayout, y: Float) {
-        canvas.withSave {
-            translate(mLrcPadding, y - (staticLayout.height shr 1))
-            staticLayout.draw(this)
-        }
-    }
-
-    fun animateCurrentTextSize() {
-        val currentTextSize = mCurrentTextSize
-        ValueAnimator.ofFloat(mNormalTextSize, currentTextSize).apply {
-            addUpdateListener {
-                mCurrentTextSize = it.animatedValue as Float
-                invalidate()
-            }
-            duration = 300L
-            start()
-        }
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(event: MotionEvent): Boolean {
-        if (event.action == MotionEvent.ACTION_UP
-            || event.action == MotionEvent.ACTION_CANCEL
-        ) {
-            isTouching = false
-            if (hasLrc() && !isFling) {
-                adjustCenter()
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME)
-            }
-        }
-        return mGestureDetector!!.onTouchEvent(event)
-    }
-
-    override fun computeScroll() {
-        if (mScroller!!.computeScrollOffset()) {
-            mOffset = mScroller!!.currY.toFloat()
-            invalidate()
-        }
-        if (isFling && mScroller!!.isFinished) {
-            isFling = false
-            if (hasLrc() && !isTouching) {
-                adjustCenter()
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME)
-            }
-        }
-    }
-
-    override fun onDetachedFromWindow() {
-        removeCallbacks(hideTimelineRunnable)
-        viewScope.cancel()
-        super.onDetachedFromWindow()
-    }
-
-    private fun onLrcLoaded(entryList: List<LrcEntry>?) {
-        if (entryList != null && entryList.isNotEmpty()) {
-            mLrcEntryList.addAll(entryList)
-        }
-        mLrcEntryList.sort()
-        initEntryList()
-        invalidate()
-    }
-
-    private fun initPlayDrawable() {
-        val l = (mTimeTextWidth - mDrawableWidth) / 2
-        val t = height / 2 - mDrawableWidth / 2
-        val r = l + mDrawableWidth
-        val b = t + mDrawableWidth
-        mPlayDrawable!!.setBounds(l, t, r, b)
-    }
-
-    private fun initEntryList() {
-        if (!hasLrc() || width == 0) {
-            return
-        }
-        for (lrcEntry in mLrcEntryList) {
-            lrcEntry.init(mLrcPaint, lrcWidth.toInt(), mTextGravity)
-        }
-        mOffset = (height / 2).toFloat()
-    }
-
-    fun reset() {
-        endAnimation()
-        mScroller!!.forceFinished(true)
-        isShowTimeline = false
-        isTouching = false
-        isFling = false
-        removeCallbacks(hideTimelineRunnable)
-        mLrcEntryList.clear()
-        mOffset = 0f
-        mCurrentLine = 0
-        invalidate()
-    }
-
-    private fun adjustCenter() {
-        smoothScrollTo(centerLine, ADJUST_DURATION)
-    }
-
-    private fun smoothScrollTo(line: Int, duration: Long = mAnimationDuration) {
-        val offset = getOffset(line)
-        endAnimation()
-        mAnimator = ValueAnimator.ofFloat(mOffset, offset).apply {
-            this.duration = duration
-            interpolator = LinearInterpolator()
-            addUpdateListener { animation: ValueAnimator ->
-                mOffset = animation.animatedValue as Float
-                invalidate()
-            }
-            start()
-        }
-    }
-
-    private fun endAnimation() {
-        if (mAnimator != null && mAnimator!!.isRunning) {
-            mAnimator!!.end()
-        }
-    }
-
-    private fun findShowLine(time: Long): Int {
-        var left = 0
-        var right = mLrcEntryList.size
-        while (left <= right) {
-            val middle = (left + right) / 2
-            val middleTime = mLrcEntryList[middle].time
-            if (time < middleTime) {
-                right = middle - 1
-            } else {
-                if (middle + 1 >= mLrcEntryList.size || time < mLrcEntryList[middle + 1].time) {
-                    return middle
-                }
-                left = middle + 1
-            }
-        }
-        return 0
-    }
-
-    private val centerLine: Int
-        get() {
-            var centerLine = 0
-            var minDistance = Float.MAX_VALUE
-            for (i in mLrcEntryList.indices) {
-                if (abs(mOffset - getOffset(i)) < minDistance) {
-                    minDistance = abs(mOffset - getOffset(i))
-                    centerLine = i
-                }
-            }
-            return centerLine
-        }
-
-    private fun getOffset(line: Int): Float {
-        if (mLrcEntryList.isEmpty()) return 0F
-        if (mLrcEntryList[line].offset == Float.MIN_VALUE) {
-            var offset = (height / 2).toFloat()
-            for (i in 1..line) {
-                offset -= ((mLrcEntryList[i - 1].height + mLrcEntryList[i].height shr 1)
-                        + mDividerHeight)
-            }
-            mLrcEntryList[line].offset = offset
-        }
-        return mLrcEntryList[line].offset
-    }
-
-    private val lrcWidth: Float
-        get() = width - mLrcPadding * 2
-
-    private fun runOnUi(r: Runnable) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            r.run()
-        } else {
-            post(r)
-        }
-    }
-
-    fun interface OnPlayClickListener {
-        fun onPlayClick(time: Long): Boolean
-    }
-
-    companion object {
-        private const val ADJUST_DURATION: Long = 100
-        private const val TIMELINE_KEEP_TIME = 4 * DateUtils.SECOND_IN_MILLIS
-    }
-
-    init {
-        init(attrs)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java
index b3a0c736c..bd326af97 100644
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java
+++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/Lrc.java
@@ -1,26 +1,44 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
 package code.name.monkey.retromusic.lyrics;
 
 /**
- * Desc : 歌词实体 Author : Lauzy Date : 2017/10/13 Blog : http://www.jianshu.com/u/e76853f863a9 Email :
- * freedompaladin@gmail.com
+ * Desc : 歌词实体
+ * Author : Lauzy
+ * Date : 2017/10/13
+ * Blog : http://www.jianshu.com/u/e76853f863a9
+ * Email : freedompaladin@gmail.com
  */
 public class Lrc {
-  private long time;
-  private String text;
+    private long time;
+    private String text;
 
-  public long getTime() {
-    return time;
-  }
+    public long getTime() {
+        return time;
+    }
 
-  public void setTime(long time) {
-    this.time = time;
-  }
+    public void setTime(long time) {
+        this.time = time;
+    }
 
-  public String getText() {
-    return text;
-  }
+    public String getText() {
+        return text;
+    }
 
-  public void setText(String text) {
-    this.text = text;
-  }
-}
+    public void setText(String text) {
+        this.text = text;
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java
deleted file mode 100644
index 75fc63a4d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcEntry.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright (C) 2017 wangchenyan
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package code.name.monkey.retromusic.lyrics;
-
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import android.text.TextUtils;
-
-/**
- * 一行歌词实体
- */
-class LrcEntry implements Comparable<LrcEntry> {
-  public static final int GRAVITY_CENTER = 0;
-  public static final int GRAVITY_LEFT = 1;
-  public static final int GRAVITY_RIGHT = 2;
-  private final long time;
-  private final String text;
-  private String secondText;
-  private StaticLayout staticLayout;
-  /** 歌词距离视图顶部的距离 */
-  private float offset = Float.MIN_VALUE;
-
-  LrcEntry(long time, String text) {
-    this.time = time;
-    this.text = text;
-  }
-
-  LrcEntry(long time, String text, String secondText) {
-    this.time = time;
-    this.text = text;
-    this.secondText = secondText;
-  }
-
-  void init(TextPaint paint, int width, int gravity) {
-    Layout.Alignment align;
-    switch (gravity) {
-      case GRAVITY_LEFT:
-        align = Layout.Alignment.ALIGN_NORMAL;
-        break;
-
-      default:
-      case GRAVITY_CENTER:
-        align = Layout.Alignment.ALIGN_CENTER;
-        break;
-
-      case GRAVITY_RIGHT:
-        align = Layout.Alignment.ALIGN_OPPOSITE;
-        break;
-    }
-    staticLayout = new StaticLayout(getShowText(), paint, width, align, 1f, 0f, false);
-
-    offset = Float.MIN_VALUE;
-  }
-
-  long getTime() {
-    return time;
-  }
-
-  StaticLayout getStaticLayout() {
-    return staticLayout;
-  }
-
-  int getHeight() {
-    if (staticLayout == null) {
-      return 0;
-    }
-    return staticLayout.getHeight();
-  }
-
-  public float getOffset() {
-    return offset;
-  }
-
-  public void setOffset(float offset) {
-    this.offset = offset;
-  }
-
-  String getText() {
-    return text;
-  }
-
-  void setSecondText(String secondText) {
-    this.secondText = secondText;
-  }
-
-  private String getShowText() {
-    if (!TextUtils.isEmpty(secondText)) {
-      return text + "\n" + secondText;
-    } else {
-      return text;
-    }
-  }
-
-  @Override
-  public int compareTo(LrcEntry entry) {
-    if (entry == null) {
-      return -1;
-    }
-    return (int) (time - entry.getTime());
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcHelper.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcHelper.java
new file mode 100644
index 000000000..d2c05193b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcHelper.java
@@ -0,0 +1,157 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.lyrics;
+
+import android.content.Context;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Desc : 歌词解析
+ * Author : Lauzy
+ * Date : 2017/10/13
+ * Blog : http://www.jianshu.com/u/e76853f863a9
+ * Email : freedompaladin@gmail.com
+ */
+public class LrcHelper {
+
+    private static final String CHARSET = "utf-8";
+    //[03:56.00][03:18.00][02:06.00][01:07.00]原谅我这一生不羁放纵爱自由
+    private static final String LINE_REGEX = "((\\[\\d{2}:\\d{2}\\.\\d{2,3}])+)(.*)";
+    private static final String TIME_REGEX = "\\[(\\d{2}):(\\d{2})\\.(\\d{2,3})]";
+
+    public static List<Lrc> parseLrcFromAssets(Context context, String fileName) {
+        try {
+            return parseInputStream(context.getResources().getAssets().open(fileName));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static List<Lrc> parseLrcFromFile(File file) {
+        try {
+            return parseInputStream(new FileInputStream(file));
+        } catch (FileNotFoundException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    private static List<Lrc> parseInputStream(InputStream inputStream) {
+        List<Lrc> lrcs = new ArrayList<>();
+        InputStreamReader isr = null;
+        BufferedReader br = null;
+        try {
+            isr = new InputStreamReader(inputStream, CHARSET);
+            br = new BufferedReader(isr);
+            String line;
+            while ((line = br.readLine()) != null) {
+                List<Lrc> lrcList = parseLrc(line);
+                if (lrcList != null && lrcList.size() != 0) {
+                    lrcs.addAll(lrcList);
+                }
+            }
+            sortLrcs(lrcs);
+            return lrcs;
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                if (isr != null) {
+                    isr.close();
+                }
+                if (br != null) {
+                    br.close();
+                }
+            } catch (IOException e1) {
+                e1.printStackTrace();
+            }
+        }
+        return lrcs;
+    }
+
+    private static void sortLrcs(List<Lrc> lrcs) {
+        Collections.sort(lrcs, new Comparator<Lrc>() {
+            @Override
+            public int compare(Lrc o1, Lrc o2) {
+                return (int) (o1.getTime() - o2.getTime());
+            }
+        });
+    }
+
+    private static List<Lrc> parseLrc(String lrcLine) {
+        if (lrcLine.trim().isEmpty()) {
+            return null;
+        }
+        List<Lrc> lrcs = new ArrayList<>();
+        Matcher matcher = Pattern.compile(LINE_REGEX).matcher(lrcLine);
+        if (!matcher.matches()) {
+            return null;
+        }
+
+        String time = matcher.group(1);
+        String content = matcher.group(3);
+        Matcher timeMatcher = Pattern.compile(TIME_REGEX).matcher(time);
+
+        while (timeMatcher.find()) {
+            String min = timeMatcher.group(1);
+            String sec = timeMatcher.group(2);
+            String mil = timeMatcher.group(3);
+            Lrc lrc = new Lrc();
+            if (content != null && content.length() != 0) {
+                 if(Integer.parseInt(mil)< 100){
+             lrc.setTime(Long.parseLong(min) * 60 * 1000 + Long.parseLong(sec) * 1000
+                        + Long.parseLong(mil) * 10);}
+                else{
+                    lrc.setTime(Long.parseLong(min) * 60 * 1000 + Long.parseLong(sec) * 1000
+                            + Long.parseLong(mil)
+                    );
+                }
+                lrc.setText(content);
+                lrcs.add(lrc);
+            }
+        }
+        return lrcs;
+    }
+
+    public static String formatTime(long time) {
+        int min = (int) (time / 60000);
+        int sec = (int) (time / 1000 % 60);
+        return adjustFormat(min) + ":" + adjustFormat(sec);
+    }
+
+    private static String adjustFormat(int time) {
+        if (time < 10) {
+            return "0" + time;
+        }
+        return time + "";
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java
deleted file mode 100644
index 7b7eba15e..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcUtils.java
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2017 wangchenyan
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package code.name.monkey.retromusic.lyrics;
-
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-
-import java.io.BufferedReader;
-import java.io.ByteArrayOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/** 工具类 */
-class LrcUtils {
-  private static final Pattern PATTERN_LINE =
-      Pattern.compile("((\\[\\d\\d:\\d\\d\\.\\d{2,3}\\])+)(.+)");
-  private static final Pattern PATTERN_TIME =
-      Pattern.compile("\\[(\\d\\d):(\\d\\d)\\.(\\d{2,3})\\]");
-
-  /** 从文件解析双语歌词 */
-  static List<LrcEntry> parseLrc(File[] lrcFiles) {
-    if (lrcFiles == null || lrcFiles.length != 2 || lrcFiles[0] == null) {
-      return null;
-    }
-
-    File mainLrcFile = lrcFiles[0];
-    File secondLrcFile = lrcFiles[1];
-    List<LrcEntry> mainEntryList = parseLrc(mainLrcFile);
-    List<LrcEntry> secondEntryList = parseLrc(secondLrcFile);
-
-    if (mainEntryList != null && secondEntryList != null) {
-      for (LrcEntry mainEntry : mainEntryList) {
-        for (LrcEntry secondEntry : secondEntryList) {
-          if (mainEntry.getTime() == secondEntry.getTime()) {
-            mainEntry.setSecondText(secondEntry.getText());
-          }
-        }
-      }
-    }
-    return mainEntryList;
-  }
-
-  /** 从文件解析歌词 */
-  private static List<LrcEntry> parseLrc(File lrcFile) {
-    if (lrcFile == null || !lrcFile.exists()) {
-      return null;
-    }
-
-    List<LrcEntry> entryList = new ArrayList<>();
-    try {
-      BufferedReader br =
-          new BufferedReader(
-              new InputStreamReader(new FileInputStream(lrcFile), StandardCharsets.UTF_8));
-      String line;
-      while ((line = br.readLine()) != null) {
-        List<LrcEntry> list = parseLine(line);
-        if (list != null && !list.isEmpty()) {
-          entryList.addAll(list);
-        }
-      }
-      br.close();
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-
-    Collections.sort(entryList);
-    return entryList;
-  }
-
-  /** 从文本解析双语歌词 */
-  static List<LrcEntry> parseLrc(String[] lrcTexts) {
-    if (lrcTexts == null || lrcTexts.length != 2 || TextUtils.isEmpty(lrcTexts[0])) {
-      return null;
-    }
-
-    String mainLrcText = lrcTexts[0];
-    String secondLrcText = lrcTexts[1];
-    List<LrcEntry> mainEntryList = parseLrc(mainLrcText);
-    List<LrcEntry> secondEntryList = parseLrc(secondLrcText);
-
-    if (mainEntryList != null && secondEntryList != null) {
-      for (LrcEntry mainEntry : mainEntryList) {
-        for (LrcEntry secondEntry : secondEntryList) {
-          if (mainEntry.getTime() == secondEntry.getTime()) {
-            mainEntry.setSecondText(secondEntry.getText());
-          }
-        }
-      }
-    }
-    return mainEntryList;
-  }
-
-  /** 从文本解析歌词 */
-  private static List<LrcEntry> parseLrc(String lrcText) {
-    if (TextUtils.isEmpty(lrcText)) {
-      return null;
-    }
-
-    if (lrcText.startsWith("\uFEFF")) {
-      lrcText = lrcText.replace("\uFEFF", "");
-    }
-
-    List<LrcEntry> entryList = new ArrayList<>();
-    String[] array = lrcText.split("\\n");
-    for (String line : array) {
-      List<LrcEntry> list = parseLine(line);
-      if (list != null && !list.isEmpty()) {
-        entryList.addAll(list);
-      }
-    }
-
-    Collections.sort(entryList);
-    return entryList;
-  }
-
-  /** 获取网络文本，需要在工作线程中执行 */
-  static String getContentFromNetwork(String url, String charset) {
-    String lrcText = null;
-    try {
-      URL _url = new URL(url);
-      HttpURLConnection conn = (HttpURLConnection) _url.openConnection();
-      conn.setRequestMethod("GET");
-      conn.setConnectTimeout(10000);
-      conn.setReadTimeout(10000);
-      if (conn.getResponseCode() == 200) {
-        InputStream is = conn.getInputStream();
-        ByteArrayOutputStream bos = new ByteArrayOutputStream();
-        byte[] buffer = new byte[1024];
-        int len;
-        while ((len = is.read(buffer)) != -1) {
-          bos.write(buffer, 0, len);
-        }
-        is.close();
-        bos.close();
-        lrcText = bos.toString(charset);
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-    return lrcText;
-  }
-
-  /** 解析一行歌词 */
-  private static List<LrcEntry> parseLine(String line) {
-    if (TextUtils.isEmpty(line)) {
-      return null;
-    }
-
-    line = line.trim();
-    // [00:17.65]让我掉下眼泪的
-    Matcher lineMatcher = PATTERN_LINE.matcher(line);
-    if (!lineMatcher.matches()) {
-      return null;
-    }
-
-    String times = lineMatcher.group(1);
-    String text = lineMatcher.group(3);
-    List<LrcEntry> entryList = new ArrayList<>();
-
-    // [00:17.65]
-    Matcher timeMatcher = PATTERN_TIME.matcher(times);
-    while (timeMatcher.find()) {
-      long min = Long.parseLong(timeMatcher.group(1));
-      long sec = Long.parseLong(timeMatcher.group(2));
-      String milString = timeMatcher.group(3);
-      long mil = Long.parseLong(milString);
-      // 如果毫秒是两位数，需要乘以10
-      if (milString.length() == 2) {
-        mil = mil * 10;
-      }
-      long time = min * DateUtils.MINUTE_IN_MILLIS + sec * DateUtils.SECOND_IN_MILLIS + mil;
-      entryList.add(new LrcEntry(time, text));
-    }
-    return entryList;
-  }
-
-  /** 转为[分:秒] */
-  static String formatTime(long milli) {
-    int m = (int) (milli / DateUtils.MINUTE_IN_MILLIS);
-    int s = (int) ((milli / DateUtils.SECOND_IN_MILLIS) % 60);
-    String mm = String.format(Locale.getDefault(), "%02d", m);
-    String ss = String.format(Locale.getDefault(), "%02d", s);
-    return mm + ":" + ss;
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
deleted file mode 100644
index 25ec996e8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.java
+++ /dev/null
@@ -1,649 +0,0 @@
-/*
- * Copyright (C) 2017 wangchenyan
- *
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the specific language governing
- * permissions and limitations under the License.
- */
-
-package code.name.monkey.retromusic.lyrics;
-
-import android.animation.ValueAnimator;
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.graphics.Canvas;
-import android.graphics.Paint;
-import android.graphics.drawable.Drawable;
-import android.os.AsyncTask;
-import android.os.Looper;
-import android.text.Layout;
-import android.text.StaticLayout;
-import android.text.TextPaint;
-import android.text.TextUtils;
-import android.text.format.DateUtils;
-import android.util.AttributeSet;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.animation.LinearInterpolator;
-import android.widget.Scroller;
-
-import androidx.core.content.ContextCompat;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import code.name.monkey.retromusic.BuildConfig;
-import code.name.monkey.retromusic.R;
-
-/**
- * 歌词 Created by wcy on 2015/11/9.
- */
-@SuppressLint("StaticFieldLeak")
-public class LrcView extends View {
-    private static final long ADJUST_DURATION = 100;
-    private static final long TIMELINE_KEEP_TIME = 4 * DateUtils.SECOND_IN_MILLIS;
-
-    private final List<LrcEntry> mLrcEntryList = new ArrayList<>();
-    private final TextPaint mLrcPaint = new TextPaint();
-    private final TextPaint mTimePaint = new TextPaint();
-    private Paint.FontMetrics mTimeFontMetrics;
-    private Drawable mPlayDrawable;
-    private float mDividerHeight;
-    private long mAnimationDuration;
-    private int mNormalTextColor;
-    private float mNormalTextSize;
-    private int mCurrentTextColor;
-    private float mCurrentTextSize;
-    private int mTimelineTextColor;
-    private int mTimelineColor;
-    private int mTimeTextColor;
-    private int mDrawableWidth;
-    private int mTimeTextWidth;
-    private String mDefaultLabel;
-    private float mLrcPadding;
-    private OnPlayClickListener mOnPlayClickListener;
-    private ValueAnimator mAnimator;
-    private GestureDetector mGestureDetector;
-    private Scroller mScroller;
-    private float mOffset;
-    private int mCurrentLine;
-    private Object mFlag;
-    private boolean isShowTimeline;
-    private boolean isTouching;
-    private boolean isFling;
-    private int mTextGravity; // 歌词显示位置，靠左/居中/靠右
-    private final Runnable hideTimelineRunnable =
-            new Runnable() {
-                @Override
-                public void run() {
-                    if (hasLrc() && isShowTimeline) {
-                        isShowTimeline = false;
-                        smoothScrollTo(mCurrentLine);
-                    }
-                }
-            };
-
-    private final GestureDetector.SimpleOnGestureListener mSimpleOnGestureListener =
-            new GestureDetector.SimpleOnGestureListener() {
-                @Override
-                public boolean onDown(MotionEvent e) {
-                    if (hasLrc() && mOnPlayClickListener != null) {
-                        mScroller.forceFinished(true);
-                        removeCallbacks(hideTimelineRunnable);
-                        isTouching = true;
-                        isShowTimeline = true;
-                        invalidate();
-                        return true;
-                    }
-                    return super.onDown(e);
-                }
-
-                @Override
-                public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
-                    if (hasLrc()) {
-                        mOffset -= distanceY;
-                        mOffset = Math.min(mOffset, getOffset(0));
-                        mOffset = Math.max(mOffset, getOffset(mLrcEntryList.size() - 1));
-                        invalidate();
-                        getParent().requestDisallowInterceptTouchEvent(true);
-                        return true;
-                    }
-                    return super.onScroll(e1, e2, distanceX, distanceY);
-                }
-
-                @Override
-                public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) {
-                    if (hasLrc()) {
-                        mScroller.fling(
-                                0,
-                                (int) mOffset,
-                                0,
-                                (int) velocityY,
-                                0,
-                                0,
-                                (int) getOffset(mLrcEntryList.size() - 1),
-                                (int) getOffset(0));
-                        isFling = true;
-                        return true;
-                    }
-                    return super.onFling(e1, e2, velocityX, velocityY);
-                }
-
-                @Override
-                public boolean onSingleTapConfirmed(MotionEvent e) {
-                    if (hasLrc()
-                            && isShowTimeline
-                            && mPlayDrawable.getBounds().contains((int) e.getX(), (int) e.getY())) {
-                        int centerLine = getCenterLine();
-                        long centerLineTime = mLrcEntryList.get(centerLine).getTime();
-                        // onPlayClick 消费了才更新 UI
-                        if (mOnPlayClickListener != null && mOnPlayClickListener.onPlayClick(centerLineTime)) {
-                            isShowTimeline = false;
-                            removeCallbacks(hideTimelineRunnable);
-                            mCurrentLine = centerLine;
-                            invalidate();
-                            return true;
-                        }
-                    }
-                    return super.onSingleTapConfirmed(e);
-                }
-            };
-
-    public LrcView(Context context) {
-        this(context, null);
-    }
-
-    public LrcView(Context context, AttributeSet attrs) {
-        this(context, attrs, 0);
-    }
-
-    public LrcView(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(attrs);
-    }
-
-    private void init(AttributeSet attrs) {
-        TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.LrcView);
-        mCurrentTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTextSize, getResources().getDimension(R.dimen.lrc_text_size));
-        mNormalTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcNormalTextSize,
-                        getResources().getDimension(R.dimen.lrc_text_size));
-        if (mNormalTextSize == 0) {
-            mNormalTextSize = mCurrentTextSize;
-        }
-
-        mDividerHeight =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcDividerHeight,
-                        getResources().getDimension(R.dimen.lrc_divider_height));
-        int defDuration = getResources().getInteger(R.integer.lrc_animation_duration);
-        mAnimationDuration = ta.getInt(R.styleable.LrcView_lrcAnimationDuration, defDuration);
-        mAnimationDuration = (mAnimationDuration < 0) ? defDuration : mAnimationDuration;
-        mNormalTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcNormalTextColor,
-                        getResources().getColor(R.color.lrc_normal_text_color));
-        mCurrentTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcCurrentTextColor,
-                        getResources().getColor(R.color.lrc_current_text_color));
-        mTimelineTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimelineTextColor,
-                        getResources().getColor(R.color.lrc_timeline_text_color));
-        mDefaultLabel = ta.getString(R.styleable.LrcView_lrcLabel);
-        mDefaultLabel =
-                TextUtils.isEmpty(mDefaultLabel) ? getContext().getString(R.string.empty) : mDefaultLabel;
-        mLrcPadding = ta.getDimension(R.styleable.LrcView_lrcPadding, 0);
-        mTimelineColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimelineColor,
-                        getResources().getColor(R.color.lrc_timeline_color));
-        float timelineHeight =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTimelineHeight,
-                        getResources().getDimension(R.dimen.lrc_timeline_height));
-        mPlayDrawable = ta.getDrawable(R.styleable.LrcView_lrcPlayDrawable);
-        mPlayDrawable =
-                (mPlayDrawable == null)
-                        ? ContextCompat.getDrawable(getContext(), R.drawable.ic_play_arrow)
-                        : mPlayDrawable;
-        mTimeTextColor =
-                ta.getColor(
-                        R.styleable.LrcView_lrcTimeTextColor,
-                        getResources().getColor(R.color.lrc_time_text_color));
-        float timeTextSize =
-                ta.getDimension(
-                        R.styleable.LrcView_lrcTimeTextSize,
-                        getResources().getDimension(R.dimen.lrc_time_text_size));
-        mTextGravity = ta.getInteger(R.styleable.LrcView_lrcTextGravity, LrcEntry.GRAVITY_CENTER);
-
-        ta.recycle();
-
-        mDrawableWidth = (int) getResources().getDimension(R.dimen.lrc_drawable_width);
-        mTimeTextWidth = (int) getResources().getDimension(R.dimen.lrc_time_width);
-
-        mLrcPaint.setAntiAlias(true);
-        mLrcPaint.setTextSize(mCurrentTextSize);
-        mLrcPaint.setTextAlign(Paint.Align.LEFT);
-        mTimePaint.setAntiAlias(true);
-        mTimePaint.setTextSize(timeTextSize);
-        mTimePaint.setTextAlign(Paint.Align.CENTER);
-        //noinspection SuspiciousNameCombination
-        mTimePaint.setStrokeWidth(timelineHeight);
-        mTimePaint.setStrokeCap(Paint.Cap.ROUND);
-        mTimeFontMetrics = mTimePaint.getFontMetrics();
-
-        mGestureDetector = new GestureDetector(getContext(), mSimpleOnGestureListener);
-        mGestureDetector.setIsLongpressEnabled(false);
-        mScroller = new Scroller(getContext());
-    }
-
-    public void setCurrentColor(int currentColor) {
-        mCurrentTextColor = currentColor;
-        postInvalidate();
-    }
-
-    public void setTimelineTextColor(int timelineTextColor) {
-        mTimelineTextColor = timelineTextColor;
-        postInvalidate();
-    }
-
-    public void setTimelineColor(int timelineColor) {
-        mTimelineColor = timelineColor;
-        postInvalidate();
-    }
-
-
-    public void setTimeTextColor(int timeTextColor) {
-        mTimeTextColor = timeTextColor;
-        postInvalidate();
-    }
-
-
-    public void setDraggable(boolean draggable, OnPlayClickListener onPlayClickListener) {
-        if (draggable) {
-            if (onPlayClickListener == null) {
-                throw new IllegalArgumentException(
-                        "if draggable == true, onPlayClickListener must not be null");
-            }
-            mOnPlayClickListener = onPlayClickListener;
-        } else {
-            mOnPlayClickListener = null;
-        }
-    }
-
-    public void setLabel(String label) {
-        runOnUi(
-                () -> {
-                    mDefaultLabel = label;
-                    invalidate();
-                });
-    }
-
-    public void loadLrc(File lrcFile) {
-        loadLrc(lrcFile, null);
-    }
-
-    public void loadLrc(File mainLrcFile, File secondLrcFile) {
-        runOnUi(() -> {
-            reset();
-
-            StringBuilder sb = new StringBuilder("file://");
-            sb.append(mainLrcFile.getPath());
-            if (secondLrcFile != null) {
-                sb.append("#").append(secondLrcFile.getPath());
-            }
-            String flag = sb.toString();
-            setFlag(flag);
-            new AsyncTask<File, Integer, List<LrcEntry>>() {
-                @Override
-                protected List<LrcEntry> doInBackground(File... params) {
-                    return LrcUtils.parseLrc(params);
-                }
-
-                @Override
-                protected void onPostExecute(List<LrcEntry> lrcEntries) {
-                    if (getFlag() == flag) {
-                        onLrcLoaded(lrcEntries);
-                        setFlag(null);
-                    }
-                }
-            }.execute(mainLrcFile, secondLrcFile);
-        });
-    }
-
-    public void loadLrc(String lrcText) {
-        loadLrc(lrcText, null);
-    }
-
-    public void loadLrc(String mainLrcText, String secondLrcText) {
-        runOnUi(
-                () -> {
-                    reset();
-
-                    StringBuilder sb = new StringBuilder("file://");
-                    sb.append(mainLrcText);
-                    if (secondLrcText != null) {
-                        sb.append("#").append(secondLrcText);
-                    }
-                    String flag = sb.toString();
-                    setFlag(flag);
-                    new AsyncTask<String, Integer, List<LrcEntry>>() {
-                        @Override
-                        protected List<LrcEntry> doInBackground(String... params) {
-                            return LrcUtils.parseLrc(params);
-                        }
-
-                        @Override
-                        protected void onPostExecute(List<LrcEntry> lrcEntries) {
-                            if (getFlag() == flag) {
-                                onLrcLoaded(lrcEntries);
-                                setFlag(null);
-                            }
-                        }
-                    }.execute(mainLrcText, secondLrcText);
-                });
-    }
-
-    public boolean hasLrc() {
-        return !mLrcEntryList.isEmpty();
-    }
-
-    public void updateTime(long time) {
-        runOnUi(
-                () -> {
-                    if (!hasLrc()) {
-                        return;
-                    }
-
-                    int line = findShowLine(time);
-                    if (line != mCurrentLine) {
-                        mCurrentLine = line;
-                        if (!isShowTimeline) {
-                            smoothScrollTo(line);
-                        } else {
-                            invalidate();
-                        }
-                    }
-                });
-    }
-
-    @Deprecated
-    public void onDrag(long time) {
-        updateTime(time);
-    }
-
-    @Override
-    protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
-        super.onLayout(changed, left, top, right, bottom);
-        if (changed) {
-            initPlayDrawable();
-            initEntryList();
-            if (hasLrc()) {
-                smoothScrollTo(mCurrentLine, 0L);
-            }
-        }
-    }
-
-    @Override
-    protected void onDraw(Canvas canvas) {
-        super.onDraw(canvas);
-
-        int centerY = getHeight() / 2;
-
-        if (!hasLrc()) {
-            mLrcPaint.setColor(mCurrentTextColor);
-            @SuppressLint("DrawAllocation")
-            StaticLayout staticLayout =
-                    new StaticLayout(
-                            mDefaultLabel,
-                            mLrcPaint,
-                            (int) getLrcWidth(),
-                            Layout.Alignment.ALIGN_CENTER,
-                            1f,
-                            0f,
-                            false);
-            drawText(canvas, staticLayout, centerY);
-            return;
-        }
-
-        int centerLine = getCenterLine();
-
-        if (isShowTimeline) {
-            mPlayDrawable.draw(canvas);
-
-            mTimePaint.setColor(mTimelineColor);
-            canvas.drawLine(mTimeTextWidth, centerY, getWidth() - mTimeTextWidth, centerY, mTimePaint);
-
-            mTimePaint.setColor(mTimeTextColor);
-            String timeText = LrcUtils.formatTime(mLrcEntryList.get(centerLine).getTime());
-            float timeX = getWidth() - mTimeTextWidth / 2F;
-            float timeY = centerY - (mTimeFontMetrics.descent + mTimeFontMetrics.ascent) / 2;
-            canvas.drawText(timeText, timeX, timeY, mTimePaint);
-        }
-
-        canvas.translate(0, mOffset);
-
-        float y = 0;
-        for (int i = 0; i < mLrcEntryList.size(); i++) {
-            if (i > 0) {
-                y +=
-                        ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
-                                + mDividerHeight;
-            }
-            if (BuildConfig.DEBUG) {
-                // mLrcPaint.setTypeface(ResourcesCompat.getFont(getContext(), R.font.sans));
-            }
-            if (i == mCurrentLine) {
-                mLrcPaint.setTextSize(mCurrentTextSize);
-                mLrcPaint.setColor(mCurrentTextColor);
-            } else if (isShowTimeline && i == centerLine) {
-                mLrcPaint.setColor(mTimelineTextColor);
-            } else {
-                mLrcPaint.setTextSize(mNormalTextSize);
-                mLrcPaint.setColor(mNormalTextColor);
-            }
-            drawText(canvas, mLrcEntryList.get(i).getStaticLayout(), y);
-        }
-    }
-
-    private void drawText(Canvas canvas, StaticLayout staticLayout, float y) {
-        canvas.save();
-        canvas.translate(mLrcPadding, y - (staticLayout.getHeight() >> 1));
-        staticLayout.draw(canvas);
-        canvas.restore();
-    }
-
-    @Override
-    public boolean onTouchEvent(MotionEvent event) {
-        if (event.getAction() == MotionEvent.ACTION_UP
-                || event.getAction() == MotionEvent.ACTION_CANCEL) {
-            isTouching = false;
-            if (hasLrc() && !isFling) {
-                adjustCenter();
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
-            }
-        }
-        return mGestureDetector.onTouchEvent(event);
-    }
-
-    @Override
-    public void computeScroll() {
-        if (mScroller.computeScrollOffset()) {
-            mOffset = mScroller.getCurrY();
-            invalidate();
-        }
-
-        if (isFling && mScroller.isFinished()) {
-            isFling = false;
-            if (hasLrc() && !isTouching) {
-                adjustCenter();
-                postDelayed(hideTimelineRunnable, TIMELINE_KEEP_TIME);
-            }
-        }
-    }
-
-    @Override
-    protected void onDetachedFromWindow() {
-        removeCallbacks(hideTimelineRunnable);
-        super.onDetachedFromWindow();
-    }
-
-    private void onLrcLoaded(List<LrcEntry> entryList) {
-        if (entryList != null && !entryList.isEmpty()) {
-            mLrcEntryList.addAll(entryList);
-        }
-
-        Collections.sort(mLrcEntryList);
-
-        initEntryList();
-        invalidate();
-    }
-
-    private void initPlayDrawable() {
-        int l = (mTimeTextWidth - mDrawableWidth) / 2;
-        int t = getHeight() / 2 - mDrawableWidth / 2;
-        int r = l + mDrawableWidth;
-        int b = t + mDrawableWidth;
-        mPlayDrawable.setBounds(l, t, r, b);
-    }
-
-    private void initEntryList() {
-        if (!hasLrc() || getWidth() == 0) {
-            return;
-        }
-
-        for (LrcEntry lrcEntry : mLrcEntryList) {
-            lrcEntry.init(mLrcPaint, (int) getLrcWidth(), mTextGravity);
-        }
-
-        mOffset = getHeight() / 2F;
-    }
-
-    private void reset() {
-        endAnimation();
-        mScroller.forceFinished(true);
-        isShowTimeline = false;
-        isTouching = false;
-        isFling = false;
-        removeCallbacks(hideTimelineRunnable);
-        mLrcEntryList.clear();
-        mOffset = 0;
-        mCurrentLine = 0;
-        //invalidate();
-    }
-
-    private void adjustCenter() {
-        smoothScrollTo(getCenterLine(), ADJUST_DURATION);
-    }
-
-    private void smoothScrollTo(int line) {
-        smoothScrollTo(line, mAnimationDuration);
-    }
-
-    private void smoothScrollTo(int line, long duration) {
-        float offset = getOffset(line);
-        endAnimation();
-
-        mAnimator = ValueAnimator.ofFloat(mOffset, offset);
-        mAnimator.setDuration(duration);
-        mAnimator.setInterpolator(new LinearInterpolator());
-        mAnimator.addUpdateListener(
-                animation -> {
-                    mOffset = (float) animation.getAnimatedValue();
-                    invalidate();
-                });
-        mAnimator.start();
-    }
-
-    private void endAnimation() {
-        if (mAnimator != null && mAnimator.isRunning()) {
-            mAnimator.end();
-        }
-    }
-
-    private int findShowLine(long time) {
-        int left = 0;
-        int right = mLrcEntryList.size();
-        while (left <= right) {
-            int middle = (left + right) / 2;
-            long middleTime = mLrcEntryList.get(middle).getTime();
-
-            if (time < middleTime) {
-                right = middle - 1;
-            } else {
-                if (middle + 1 >= mLrcEntryList.size() || time < mLrcEntryList.get(middle + 1).getTime()) {
-                    return middle;
-                }
-
-                left = middle + 1;
-            }
-        }
-
-        return 0;
-    }
-
-    private int getCenterLine() {
-        int centerLine = 0;
-        float minDistance = Float.MAX_VALUE;
-        for (int i = 0; i < mLrcEntryList.size(); i++) {
-            if (Math.abs(mOffset - getOffset(i)) < minDistance) {
-                minDistance = Math.abs(mOffset - getOffset(i));
-                centerLine = i;
-            }
-        }
-        return centerLine;
-    }
-
-    private float getOffset(int line) {
-        if (mLrcEntryList.get(line).getOffset() == Float.MIN_VALUE) {
-            float offset = getHeight() / 2F;
-            for (int i = 1; i <= line; i++) {
-                offset -=
-                        ((mLrcEntryList.get(i - 1).getHeight() + mLrcEntryList.get(i).getHeight()) >> 1)
-                                + mDividerHeight;
-            }
-            mLrcEntryList.get(line).setOffset(offset);
-        }
-
-        return mLrcEntryList.get(line).getOffset();
-    }
-
-    private float getLrcWidth() {
-        return getWidth() - mLrcPadding * 2;
-    }
-
-    private void runOnUi(Runnable r) {
-        if (Looper.myLooper() == Looper.getMainLooper()) {
-            r.run();
-        } else {
-            post(r);
-        }
-    }
-
-    private Object getFlag() {
-        return mFlag;
-    }
-
-    private void setFlag(Object flag) {
-        this.mFlag = flag;
-    }
-
-    public interface OnPlayClickListener {
-        boolean onPlayClick(long time);
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt
new file mode 100644
index 000000000..eb00f0dbc
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/lyrics/LrcView.kt
@@ -0,0 +1,635 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+package code.name.monkey.retromusic.lyrics
+
+
+import android.animation.ValueAnimator
+import android.content.Context
+import android.graphics.Canvas
+import android.graphics.Color
+import android.graphics.Paint
+import android.graphics.Rect
+import android.graphics.drawable.Drawable
+import android.os.Looper
+import android.text.Layout
+import android.text.StaticLayout
+import android.text.TextPaint
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.MotionEvent
+import android.view.VelocityTracker
+import android.view.View
+import android.view.ViewConfiguration
+import android.view.animation.DecelerateInterpolator
+import android.widget.OverScroller
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
+import androidx.core.content.res.ResourcesCompat
+import androidx.core.view.ViewCompat
+import code.name.monkey.retromusic.R
+import java.util.*
+
+/**
+ * Desc : 歌词
+ * Author : Lauzy
+ * Date : 2017/10/13
+ * Blog : http://www.jianshu.com/u/e76853f863a9
+ * Email : freedompaladin@gmail.com
+ */
+class LrcView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : View(context, attrs, defStyleAttr) {
+    private var mLrcData: MutableList<Lrc>? = null
+    private var mTextPaint: TextPaint? = null
+    private var mDefaultContent: String? = null
+    private var mCurrentLine: Int = 0
+    private var mOffset: Float = 0.toFloat()
+    private var mLastMotionX: Float = 0.toFloat()
+    private var mLastMotionY: Float = 0.toFloat()
+    private var mScaledTouchSlop: Int = 0
+    private var mOverScroller: OverScroller? = null
+    private var mVelocityTracker: VelocityTracker? = null
+    private var mMaximumFlingVelocity: Int = 0
+    private var mMinimumFlingVelocity: Int = 0
+    private var mLrcTextSize: Float = 0.toFloat()
+    private var mLrcLineSpaceHeight: Float = 0.toFloat()
+    private var mTouchDelay: Int = 0
+    private var mNormalColor: Int = 0
+    private var mCurrentPlayLineColor: Int = 0
+    private var mNoLrcTextSize: Float = 0.toFloat()
+    private var mNoLrcTextColor: Int = 0
+    //是否拖拽中，否的话响应onClick事件
+    private var isDragging: Boolean = false
+    //用户开始操作
+    private var isUserScroll: Boolean = false
+    private var isAutoAdjustPosition = true
+    private var mPlayDrawable: Drawable? = null
+    private var isShowTimeIndicator: Boolean = false
+    private var mPlayRect: Rect? = null
+    private var mIndicatorPaint: Paint? = null
+    private var mIndicatorLineWidth: Float = 0.toFloat()
+    private var mIndicatorTextSize: Float = 0.toFloat()
+    private var mCurrentIndicateLineTextColor: Int = 0
+    private var mIndicatorLineColor: Int = 0
+    private var mIndicatorMargin: Float = 0.toFloat()
+    private var mIconLineGap: Float = 0.toFloat()
+    private var mIconWidth: Float = 0.toFloat()
+    private var mIconHeight: Float = 0.toFloat()
+    private var isEnableShowIndicator = true
+    private var mIndicatorTextColor: Int = 0
+    private var mIndicatorTouchDelay: Int = 0
+    private val mLrcMap = HashMap<String, StaticLayout>()
+    private val mHideIndicatorRunnable = Runnable {
+        isShowTimeIndicator = false
+        invalidateView()
+    }
+    private val mStaticLayoutHashMap = HashMap<String, StaticLayout>()
+    private val mScrollRunnable = Runnable {
+        isUserScroll = false
+        scrollToPosition(mCurrentLine)
+    }
+    private var mOnPlayIndicatorLineListener: OnPlayIndicatorLineListener? = null
+
+    private val lrcWidth: Int
+        get() = width - paddingLeft - paddingRight
+
+    private val lrcHeight: Int
+        get() = height
+
+    private val isLrcEmpty: Boolean
+        get() = mLrcData == null || lrcCount == 0
+
+    private val lrcCount: Int
+        get() = mLrcData!!.size
+
+    //itemOffset 和 mOffset 最小即当前位置
+    val indicatePosition: Int
+        get() {
+            var pos = 0
+            var min = java.lang.Float.MAX_VALUE
+            for (i in mLrcData!!.indices) {
+                val offsetY = getItemOffsetY(i)
+                val abs = Math.abs(offsetY - mOffset)
+                if (abs < min) {
+                    min = abs
+                    pos = i
+                }
+            }
+            return pos
+        }
+
+    var playDrawable: Drawable?
+        get() = mPlayDrawable
+        set(playDrawable) {
+            mPlayDrawable = playDrawable
+            mPlayDrawable!!.bounds = mPlayRect!!
+            invalidateView()
+        }
+
+    init {
+        init(context, attrs)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet?) {
+
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.LrcView)
+        mLrcTextSize = typedArray.getDimension(R.styleable.LrcView_lrcTextSize, sp2px(context, 15f).toFloat())
+        mLrcLineSpaceHeight = typedArray.getDimension(R.styleable.LrcView_lrcLineSpaceSize, dp2px(context, 20f).toFloat())
+        mTouchDelay = typedArray.getInt(R.styleable.LrcView_lrcTouchDelay, 3500)
+        mIndicatorTouchDelay = typedArray.getInt(R.styleable.LrcView_indicatorTouchDelay, 2500)
+        mNormalColor = typedArray.getColor(R.styleable.LrcView_lrcNormalTextColor, Color.GRAY)
+        mCurrentPlayLineColor = typedArray.getColor(R.styleable.LrcView_lrcCurrentTextColor, Color.BLUE)
+        mNoLrcTextSize = typedArray.getDimension(R.styleable.LrcView_noLrcTextSize, dp2px(context, 20f).toFloat())
+        mNoLrcTextColor = typedArray.getColor(R.styleable.LrcView_noLrcTextColor, Color.BLACK)
+        mIndicatorLineWidth = typedArray.getDimension(R.styleable.LrcView_indicatorLineHeight, dp2px(context, 0.5f).toFloat())
+        mIndicatorTextSize = typedArray.getDimension(R.styleable.LrcView_indicatorTextSize, sp2px(context, 13f).toFloat())
+        mIndicatorTextColor = typedArray.getColor(R.styleable.LrcView_indicatorTextColor, Color.GRAY)
+        mCurrentIndicateLineTextColor = typedArray.getColor(R.styleable.LrcView_currentIndicateLrcColor, Color.GRAY)
+        mIndicatorLineColor = typedArray.getColor(R.styleable.LrcView_indicatorLineColor, Color.GRAY)
+        mIndicatorMargin = typedArray.getDimension(R.styleable.LrcView_indicatorStartEndMargin, dp2px(context, 5f).toFloat())
+        mIconLineGap = typedArray.getDimension(R.styleable.LrcView_iconLineGap, dp2px(context, 3f).toFloat())
+        mIconWidth = typedArray.getDimension(R.styleable.LrcView_playIconWidth, dp2px(context, 20f).toFloat())
+        mIconHeight = typedArray.getDimension(R.styleable.LrcView_playIconHeight, dp2px(context, 20f).toFloat())
+        mPlayDrawable = typedArray.getDrawable(R.styleable.LrcView_playIcon)
+        mPlayDrawable = if (mPlayDrawable == null) ContextCompat.getDrawable(context, R.drawable.ic_play_arrow_white_24dp) else mPlayDrawable
+        typedArray.recycle()
+
+        setupConfigs(context)
+    }
+
+    private fun setupConfigs(context: Context) {
+        mScaledTouchSlop = ViewConfiguration.get(context).scaledTouchSlop
+        mMaximumFlingVelocity = ViewConfiguration.get(context).scaledMaximumFlingVelocity
+        mMinimumFlingVelocity = ViewConfiguration.get(context).scaledMinimumFlingVelocity
+        mOverScroller = OverScroller(context, DecelerateInterpolator())
+        mOverScroller!!.setFriction(0.1f)
+        //        ViewConfiguration.getScrollFriction();  默认摩擦力 0.015f
+
+        mTextPaint = TextPaint()
+        mTextPaint!!.apply {
+            isAntiAlias = true
+            textAlign = Paint.Align.LEFT
+            textSize = mLrcTextSize
+            typeface = ResourcesCompat.getFont(context, R.font.circular)
+        }
+        mDefaultContent = DEFAULT_CONTENT
+
+        mIndicatorPaint = Paint()
+        mIndicatorPaint!!.isAntiAlias = true
+        mIndicatorPaint!!.strokeWidth = mIndicatorLineWidth
+        mIndicatorPaint!!.color = mIndicatorLineColor
+        mPlayRect = Rect()
+        mIndicatorPaint!!.textSize = mIndicatorTextSize
+    }
+
+    override fun onLayout(changed: Boolean, left: Int, top: Int, right: Int, bottom: Int) {
+        super.onLayout(changed, left, top, right, bottom)
+        if (changed) {
+            mPlayRect!!.left = mIndicatorMargin.toInt()
+            mPlayRect!!.top = (height / 2 - mIconHeight / 2).toInt()
+            mPlayRect!!.right = (mPlayRect!!.left + mIconWidth).toInt()
+            mPlayRect!!.bottom = (mPlayRect!!.top + mIconHeight).toInt()
+            mPlayDrawable!!.bounds = mPlayRect!!
+        }
+    }
+
+    fun setLrcData(lrcData: MutableList<Lrc>) {
+        resetView(DEFAULT_CONTENT)
+        mLrcData = lrcData
+        invalidate()
+    }
+
+    override fun onDraw(canvas: Canvas) {
+        super.onDraw(canvas)
+        if (isLrcEmpty) {
+            drawEmptyText(canvas)
+            return
+        }
+        val indicatePosition = indicatePosition
+        mTextPaint!!.textSize = mLrcTextSize
+        mTextPaint!!.textAlign = Paint.Align.LEFT
+        var y = (lrcHeight / 2).toFloat()
+        val x = dip2px(context, 16f).toFloat()
+        for (i in 0 until lrcCount) {
+            if (i > 0) {
+                y += (getTextHeight(i - 1) + getTextHeight(i)) / 2 + mLrcLineSpaceHeight
+            }
+            if (mCurrentLine == i) {
+                mTextPaint!!.color = mCurrentPlayLineColor
+            } else if (indicatePosition == i && isShowTimeIndicator) {
+                mTextPaint!!.color = mCurrentIndicateLineTextColor
+            } else {
+                mTextPaint!!.color = mNormalColor
+            }
+            drawLrc(canvas, x, y, i)
+        }
+
+        if (isShowTimeIndicator) {
+            mPlayDrawable!!.draw(canvas)
+            val time = mLrcData!![indicatePosition].time
+            val timeWidth = mIndicatorPaint!!.measureText(LrcHelper.formatTime(time))
+            mIndicatorPaint!!.color = mIndicatorLineColor
+            canvas.drawLine(mPlayRect!!.right + mIconLineGap, (height / 2).toFloat(),
+                    width - timeWidth * 1.3f, (height / 2).toFloat(), mIndicatorPaint!!)
+            val baseX = (width - timeWidth * 1.1f).toInt()
+            val baseline = (height / 2).toFloat() - (mIndicatorPaint!!.descent() - mIndicatorPaint!!.ascent()) / 2 - mIndicatorPaint!!.ascent()
+            mIndicatorPaint!!.color = mIndicatorTextColor
+            canvas.drawText(LrcHelper.formatTime(time), baseX.toFloat(), baseline, mIndicatorPaint!!)
+        }
+    }
+
+    private fun dip2px(context: Context, dpVale: Float): Int {
+        val scale = context.resources.displayMetrics.density
+        return (dpVale * scale + 0.5f).toInt()
+    }
+
+    private fun drawLrc(canvas: Canvas, x: Float, y: Float, i: Int) {
+        val text = mLrcData!![i].text
+        var staticLayout: StaticLayout? = mLrcMap[text]
+        if (staticLayout == null) {
+            mTextPaint!!.textSize = mLrcTextSize
+            staticLayout = StaticLayout(text, mTextPaint, lrcWidth, Layout.Alignment.ALIGN_NORMAL, 1f, 0f, false)
+            mLrcMap[text] = staticLayout
+        }
+        canvas.save()
+        canvas.translate(x, y - (staticLayout.height / 2).toFloat() - mOffset)
+        staticLayout.draw(canvas)
+        canvas.restore()
+    }
+
+    //中间空文字
+    private fun drawEmptyText(canvas: Canvas) {
+        mTextPaint!!.textAlign = Paint.Align.LEFT
+        mTextPaint!!.color = mNoLrcTextColor
+        mTextPaint!!.textSize = mNoLrcTextSize
+        canvas.save()
+        val staticLayout = StaticLayout(mDefaultContent, mTextPaint,
+                lrcWidth, Layout.Alignment.ALIGN_NORMAL, 1f, 0f, false)
+        val margin = dip2px(context, 16f).toFloat();
+        canvas.translate(margin, margin)
+        staticLayout.draw(canvas)
+        canvas.restore()
+    }
+
+    fun updateTime(time: Long) {
+        if (isLrcEmpty) {
+            return
+        }
+        val linePosition = getUpdateTimeLinePosition(time)
+        if (mCurrentLine != linePosition) {
+            mCurrentLine = linePosition
+            if (isUserScroll) {
+                invalidateView()
+                return
+            }
+            ViewCompat.postOnAnimation(this@LrcView, mScrollRunnable)
+        }
+    }
+
+    private fun getUpdateTimeLinePosition(time: Long): Int {
+        var linePos = 0
+        for (i in 0 until lrcCount) {
+            val lrc = mLrcData!![i]
+            if (time >= lrc.time) {
+                if (i == lrcCount - 1) {
+                    linePos = lrcCount - 1
+                } else if (time < mLrcData!![i + 1].time) {
+                    linePos = i
+                    break
+                }
+            }
+        }
+        return linePos
+    }
+
+    private fun scrollToPosition(linePosition: Int) {
+        val scrollY = getItemOffsetY(linePosition)
+        val animator = ValueAnimator.ofFloat(mOffset, scrollY)
+        animator.addUpdateListener { animation ->
+            mOffset = animation.animatedValue as Float
+            invalidateView()
+        }
+        animator.duration = 300
+        animator.start()
+    }
+
+    private fun getItemOffsetY(linePosition: Int): Float {
+        var tempY = 0f
+        for (i in 1..linePosition) {
+            tempY += (getTextHeight(i - 1) + getTextHeight(i)) / 2 + mLrcLineSpaceHeight
+        }
+        return tempY
+    }
+
+    private fun getTextHeight(linePosition: Int): Float {
+        val text = mLrcData!![linePosition].text
+        var staticLayout: StaticLayout? = mStaticLayoutHashMap[text]
+        if (staticLayout == null) {
+            mTextPaint!!.textSize = mLrcTextSize
+            staticLayout = StaticLayout(text, mTextPaint,
+                    lrcWidth, Layout.Alignment.ALIGN_NORMAL, 1f, 0f, false)
+            mStaticLayoutHashMap[text] = staticLayout
+        }
+        return staticLayout.height.toFloat()
+    }
+
+    private fun overScrolled(): Boolean {
+        return mOffset > getItemOffsetY(lrcCount - 1) || mOffset < 0
+    }
+
+    override fun onTouchEvent(event: MotionEvent): Boolean {
+        if (isLrcEmpty) {
+            return super.onTouchEvent(event)
+        }
+        if (mVelocityTracker == null) {
+            mVelocityTracker = VelocityTracker.obtain()
+        }
+        mVelocityTracker!!.addMovement(event)
+        when (event.action) {
+            MotionEvent.ACTION_DOWN -> {
+                removeCallbacks(mScrollRunnable)
+                removeCallbacks(mHideIndicatorRunnable)
+                if (!mOverScroller!!.isFinished) {
+                    mOverScroller!!.abortAnimation()
+                }
+                mLastMotionX = event.x
+                mLastMotionY = event.y
+                isUserScroll = true
+                isDragging = false
+            }
+
+            MotionEvent.ACTION_MOVE -> {
+                var moveY = event.y - mLastMotionY
+                if (Math.abs(moveY) > mScaledTouchSlop) {
+                    isDragging = true
+                    isShowTimeIndicator = isEnableShowIndicator
+                }
+                if (isDragging) {
+
+                    //                    if (mOffset < 0) {
+                    //                        mOffset = Math.max(mOffset, -getTextHeight(0) - mLrcLineSpaceHeight);
+                    //                    }
+                    val maxHeight = getItemOffsetY(lrcCount - 1)
+                    //                    if (mOffset > maxHeight) {
+                    //                        mOffset = Math.min(mOffset, maxHeight + getTextHeight(getLrcCount() - 1) + mLrcLineSpaceHeight);
+                    //                    }
+                    if (mOffset < 0 || mOffset > maxHeight) {
+                        moveY /= 3.5f
+                    }
+                    mOffset -= moveY
+                    mLastMotionY = event.y
+                    invalidateView()
+                }
+            }
+            MotionEvent.ACTION_CANCEL, MotionEvent.ACTION_UP -> {
+                if (!isDragging && (!isShowTimeIndicator || !onClickPlayButton(event))) {
+                    isShowTimeIndicator = false
+                    invalidateView()
+                    performClick()
+                }
+                handleActionUp(event)
+            }
+        }
+        //        return isDragging || super.onTouchEvent(event);
+        return true
+    }
+
+    private fun handleActionUp(event: MotionEvent) {
+        if (isEnableShowIndicator) {
+            ViewCompat.postOnAnimationDelayed(this@LrcView, mHideIndicatorRunnable, mIndicatorTouchDelay.toLong())
+        }
+        if (isShowTimeIndicator && mPlayRect != null && onClickPlayButton(event)) {
+            isShowTimeIndicator = false
+            invalidateView()
+            if (mOnPlayIndicatorLineListener != null) {
+                mOnPlayIndicatorLineListener!!.onPlay(mLrcData!![indicatePosition].time,
+                        mLrcData!![indicatePosition].text)
+            }
+        }
+        if (overScrolled() && mOffset < 0) {
+            scrollToPosition(0)
+            if (isAutoAdjustPosition) {
+                ViewCompat.postOnAnimationDelayed(this@LrcView, mScrollRunnable, mTouchDelay.toLong())
+            }
+            return
+        }
+
+        if (overScrolled() && mOffset > getItemOffsetY(lrcCount - 1)) {
+            scrollToPosition(lrcCount - 1)
+            if (isAutoAdjustPosition) {
+                ViewCompat.postOnAnimationDelayed(this@LrcView, mScrollRunnable, mTouchDelay.toLong())
+            }
+            return
+        }
+
+        mVelocityTracker!!.computeCurrentVelocity(1000, mMaximumFlingVelocity.toFloat())
+        val YVelocity = mVelocityTracker!!.yVelocity
+        val absYVelocity = Math.abs(YVelocity)
+        if (absYVelocity > mMinimumFlingVelocity) {
+            mOverScroller!!.fling(0, mOffset.toInt(), 0, (-YVelocity).toInt(), 0,
+                    0, 0, getItemOffsetY(lrcCount - 1).toInt(),
+                    0, getTextHeight(0).toInt())
+            invalidateView()
+        }
+        releaseVelocityTracker()
+        if (isAutoAdjustPosition) {
+            ViewCompat.postOnAnimationDelayed(this@LrcView, mScrollRunnable, mTouchDelay.toLong())
+        }
+    }
+
+    private fun onClickPlayButton(event: MotionEvent): Boolean {
+        val left = mPlayRect!!.left.toFloat()
+        val right = mPlayRect!!.right.toFloat()
+        val top = mPlayRect!!.top.toFloat()
+        val bottom = mPlayRect!!.bottom.toFloat()
+        val x = event.x
+        val y = event.y
+        return (mLastMotionX > left && mLastMotionX < right && mLastMotionY > top
+                && mLastMotionY < bottom && x > left && x < right && y > top && y < bottom)
+    }
+
+    override fun computeScroll() {
+        super.computeScroll()
+        if (mOverScroller!!.computeScrollOffset()) {
+            mOffset = mOverScroller!!.currY.toFloat()
+            invalidateView()
+        }
+    }
+
+    private fun releaseVelocityTracker() {
+        if (null != mVelocityTracker) {
+            mVelocityTracker!!.clear()
+            mVelocityTracker!!.recycle()
+            mVelocityTracker = null
+        }
+    }
+
+    fun resetView(defaultContent: String) {
+        if (mLrcData != null) {
+            mLrcData!!.clear()
+        }
+        mLrcMap.clear()
+        mStaticLayoutHashMap.clear()
+        mCurrentLine = 0
+        mOffset = 0f
+        isUserScroll = false
+        isDragging = false
+        mDefaultContent = defaultContent
+        removeCallbacks(mScrollRunnable)
+        invalidate()
+    }
+
+    override fun performClick(): Boolean {
+        return super.performClick()
+    }
+
+    fun dp2px(context: Context, dpVal: Float): Int {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP,
+                dpVal, context.resources.displayMetrics).toInt()
+    }
+
+    fun sp2px(context: Context, spVal: Float): Int {
+        return TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_SP,
+                spVal, context.resources.displayMetrics).toInt()
+    }
+
+    /**
+     * 暂停（手动滑动歌词后，不再自动回滚至当前播放位置）
+     */
+    fun pause() {
+        isAutoAdjustPosition = false
+        invalidateView()
+    }
+
+    /**
+     * 恢复（继续自动回滚）
+     */
+    fun resume() {
+        isAutoAdjustPosition = true
+        ViewCompat.postOnAnimationDelayed(this@LrcView, mScrollRunnable, mTouchDelay.toLong())
+        invalidateView()
+    }
+
+
+    /*------------------Config-------------------*/
+
+    private fun invalidateView() {
+        if (Looper.getMainLooper().thread === Thread.currentThread()) {
+            invalidate()
+        } else {
+            postInvalidate()
+        }
+    }
+
+    fun setOnPlayIndicatorLineListener(onPlayIndicatorLineListener: OnPlayIndicatorLineListener) {
+        mOnPlayIndicatorLineListener = onPlayIndicatorLineListener
+    }
+
+    fun setEmptyContent(defaultContent: String) {
+        mDefaultContent = defaultContent
+        invalidateView()
+    }
+
+    fun setLrcTextSize(lrcTextSize: Float) {
+        mLrcTextSize = lrcTextSize
+        invalidateView()
+    }
+
+    fun setLrcLineSpaceHeight(lrcLineSpaceHeight: Float) {
+        mLrcLineSpaceHeight = lrcLineSpaceHeight
+        invalidateView()
+    }
+
+    fun setTouchDelay(touchDelay: Int) {
+        mTouchDelay = touchDelay
+        invalidateView()
+    }
+
+    fun setNormalColor(@ColorInt normalColor: Int) {
+        mNormalColor = normalColor
+        invalidateView()
+    }
+
+    fun setCurrentPlayLineColor(@ColorInt currentPlayLineColor: Int) {
+        mCurrentPlayLineColor = currentPlayLineColor
+        invalidateView()
+    }
+
+    fun setNoLrcTextSize(noLrcTextSize: Float) {
+        mNoLrcTextSize = noLrcTextSize
+        invalidateView()
+    }
+
+    fun setNoLrcTextColor(@ColorInt noLrcTextColor: Int) {
+        mNoLrcTextColor = noLrcTextColor
+        invalidateView()
+    }
+
+    fun setIndicatorLineWidth(indicatorLineWidth: Float) {
+        mIndicatorLineWidth = indicatorLineWidth
+        invalidateView()
+    }
+
+    fun setIndicatorTextSize(indicatorTextSize: Float) {
+        //        mIndicatorTextSize = indicatorTextSize;
+        mIndicatorPaint!!.textSize = indicatorTextSize
+        invalidateView()
+    }
+
+    fun setCurrentIndicateLineTextColor(currentIndicateLineTextColor: Int) {
+        mCurrentIndicateLineTextColor = currentIndicateLineTextColor
+        invalidateView()
+    }
+
+    fun setIndicatorLineColor(indicatorLineColor: Int) {
+        mIndicatorLineColor = indicatorLineColor
+        invalidateView()
+    }
+
+    fun setIndicatorMargin(indicatorMargin: Float) {
+        mIndicatorMargin = indicatorMargin
+        invalidateView()
+    }
+
+    fun setIconLineGap(iconLineGap: Float) {
+        mIconLineGap = iconLineGap
+        invalidateView()
+    }
+
+    fun setIconWidth(iconWidth: Float) {
+        mIconWidth = iconWidth
+        invalidateView()
+    }
+
+    fun setIconHeight(iconHeight: Float) {
+        mIconHeight = iconHeight
+        invalidateView()
+    }
+
+    fun setEnableShowIndicator(enableShowIndicator: Boolean) {
+        isEnableShowIndicator = enableShowIndicator
+        invalidateView()
+    }
+
+    fun setIndicatorTextColor(indicatorTextColor: Int) {
+        mIndicatorTextColor = indicatorTextColor
+        invalidateView()
+    }
+
+    interface OnPlayIndicatorLineListener {
+        fun onPlay(time: Long, content: String)
+    }
+
+    companion object {
+        private const val DEFAULT_CONTENT = "Empty"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.kt b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.kt
new file mode 100644
index 000000000..cd42abdee
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/AppBarStateChangeListener.kt
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.misc
+
+import com.google.android.material.appbar.AppBarLayout
+
+/**
+ * @author Hemanth S (h4h13).
+ * https://stackoverflow.com/a/33891727
+ */
+
+abstract class AppBarStateChangeListener : AppBarLayout.OnOffsetChangedListener {
+
+    private var mCurrentState = State.IDLE
+
+    override fun onOffsetChanged(appBarLayout: AppBarLayout, i: Int) {
+        if (i == 0) {
+            if (mCurrentState != State.EXPANDED) {
+                onStateChanged(appBarLayout, State.EXPANDED)
+            }
+            mCurrentState = State.EXPANDED
+        } else if (Math.abs(i) >= appBarLayout.totalScrollRange) {
+            if (mCurrentState != State.COLLAPSED) {
+                onStateChanged(appBarLayout, State.COLLAPSED)
+            }
+            mCurrentState = State.COLLAPSED
+        } else {
+            if (mCurrentState != State.IDLE) {
+                onStateChanged(appBarLayout, State.IDLE)
+            }
+            mCurrentState = State.IDLE
+        }
+    }
+
+    abstract fun onStateChanged(appBarLayout: AppBarLayout, state: State)
+
+    enum class State {
+        EXPANDED,
+        COLLAPSED,
+        IDLE
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/AsyncSearchResultLoader.kt b/app/src/main/java/code/name/monkey/retromusic/misc/AsyncSearchResultLoader.kt
new file mode 100644
index 000000000..a9c9486a4
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/AsyncSearchResultLoader.kt
@@ -0,0 +1,50 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.misc
+
+import android.content.Context
+import android.text.TextUtils
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.loaders.AlbumLoader
+import code.name.monkey.retromusic.loaders.ArtistLoader
+import code.name.monkey.retromusic.loaders.SongLoader
+import java.util.*
+
+internal class AsyncSearchResultLoader(context: Context, private val query: String) : WrappedAsyncTaskLoader<List<Any>>(context) {
+
+    override fun loadInBackground(): List<Any>? {
+        val results = ArrayList<Any>()
+        if (!TextUtils.isEmpty(query)) {
+            val songs = SongLoader.getSongs(context, query.trim { it <= ' ' })
+            if (!songs.isEmpty()) {
+                results.add(context.resources.getString(R.string.songs))
+                results.addAll(songs)
+            }
+
+            val artists = ArtistLoader.getArtists(context, query.trim { it <= ' ' })
+            if (!artists.isEmpty()) {
+                results.add(context.resources.getString(R.string.artists))
+                results.addAll(artists)
+            }
+
+            val albums = AlbumLoader.getAlbums(context, query.trim { it <= ' ' })
+            if (!albums.isEmpty()) {
+                results.add(context.resources.getString(R.string.albums))
+                results.addAll(albums)
+            }
+        }
+        return results
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java b/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
index c1de399a2..f9e68b658 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/CustomFragmentStatePagerAdapter.java
@@ -16,10 +16,6 @@ package code.name.monkey.retromusic.misc;
 
 import android.os.Bundle;
 import android.os.Parcelable;
-import android.util.Log;
-import android.view.View;
-import android.view.ViewGroup;
-
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
@@ -27,216 +23,215 @@ import androidx.fragment.app.FragmentPagerAdapter;
 import androidx.fragment.app.FragmentTransaction;
 import androidx.viewpager.widget.PagerAdapter;
 
+import android.util.Log;
+import android.view.View;
+import android.view.ViewGroup;
+
 import java.util.ArrayList;
 
 /**
- * Implementation of {@link PagerAdapter} that uses a {@link Fragment} to manage each page. This
- * class also handles saving and restoring of fragment's state.
- *
- * <p>
- *
- * <p>This version of the pager is more useful when there are a large number of pages, working more
- * like a list view. When pages are not visible to the user, their entire fragment may be destroyed,
- * only keeping the saved state of that fragment. This allows the pager to hold on to much less
- * memory associated with each visited page as compared to {@link FragmentPagerAdapter} at the cost
- * of potentially more overhead when switching between pages.
- *
- * <p>
- *
- * <p>When using FragmentPagerAdapter the host ViewPager must have a valid ID set.
- *
- * <p>
- *
- * <p>Subclasses only need to implement {@link #getItem(int)} and {@link #getCount()} to have a
- * working adapter.
- *
- * <p>
- *
- * <p>Here is an example implementation of a pager containing fragments of lists:
- *
- * <p>{@sample
- * development/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
+ * Implementation of {@link PagerAdapter} that
+ * uses a {@link Fragment} to manage each page. This class also handles
+ * saving and restoring of fragment's state.
+ * <p/>
+ * <p>This version of the pager is more useful when there are a large number
+ * of pages, working more like a list view.  When pages are not visible to
+ * the user, their entire fragment may be destroyed, only keeping the saved
+ * state of that fragment.  This allows the pager to hold on to much less
+ * memory associated with each visited page as compared to
+ * {@link FragmentPagerAdapter} at the cost of potentially more overhead when
+ * switching between pages.
+ * <p/>
+ * <p>When using FragmentPagerAdapter the host ViewPager must have a
+ * valid ID set.</p>
+ * <p/>
+ * <p>Subclasses only need to implement {@link #getItem(int)}
+ * and {@link #getCount()} to have a working adapter.
+ * <p/>
+ * <p>Here is an example implementation of a pager containing fragments of
+ * lists:
+ * <p/>
+ * {@sample development/samples/Support13Demos/src/com/example/android/supportv13/app/FragmentStatePagerSupport.java
  * complete}
- *
- * <p>
- *
+ * <p/>
  * <p>The <code>R.layout.fragment_pager</code> resource of the top-level fragment is:
- *
- * <p>{@sample development/samples/Support13Demos/res/layout/fragment_pager.xml complete}
- *
- * <p>
- *
- * <p>The <code>R.layout.fragment_pager_list</code> resource containing each individual fragment's
- * layout is:
- *
- * <p>{@sample development/samples/Support13Demos/res/layout/fragment_pager_list.xml complete}
+ * <p/>
+ * {@sample development/samples/Support13Demos/res/layout/fragment_pager.xml
+ * complete}
+ * <p/>
+ * <p>The <code>R.layout.fragment_pager_list</code> resource containing each
+ * individual fragment's layout is:
+ * <p/>
+ * {@sample development/samples/Support13Demos/res/layout/fragment_pager_list.xml
+ * complete}
  */
 public abstract class CustomFragmentStatePagerAdapter extends PagerAdapter {
-  public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
-  private static final boolean DEBUG = false;
+    public static final String TAG = CustomFragmentStatePagerAdapter.class.getSimpleName();
+    private static final boolean DEBUG = false;
 
-  private final FragmentManager mFragmentManager;
-  private FragmentTransaction mCurTransaction = null;
+    private final FragmentManager mFragmentManager;
+    private FragmentTransaction mCurTransaction = null;
 
-  private final ArrayList<Fragment.SavedState> mSavedState = new ArrayList<>();
-  private final ArrayList<Fragment> mFragments = new ArrayList<>();
-  private Fragment mCurrentPrimaryItem = null;
+    private ArrayList<Fragment.SavedState> mSavedState = new ArrayList<Fragment.SavedState>();
+    private ArrayList<Fragment> mFragments = new ArrayList<Fragment>();
+    private Fragment mCurrentPrimaryItem = null;
 
-  public CustomFragmentStatePagerAdapter(FragmentManager fm) {
-    mFragmentManager = fm;
-  }
-
-  /**
-   * Return the Fragment associated with a specified position.
-   */
-  public abstract Fragment getItem(int position);
-
-  @Override
-  public void startUpdate(@NonNull ViewGroup container) {}
-
-  @NonNull
-  @Override
-  public Object instantiateItem(@NonNull ViewGroup container, int position) {
-    // If we already have this item instantiated, there is nothing
-    // to do.  This can happen when we are restoring the entire pager
-    // from its saved state, where the fragment manager has already
-    // taken care of restoring the fragments we previously had instantiated.
-    if (mFragments.size() > position) {
-      Fragment f = mFragments.get(position);
-      if (f != null) {
-        return f;
-      }
+    public CustomFragmentStatePagerAdapter(FragmentManager fm) {
+        mFragmentManager = fm;
     }
 
-    if (mCurTransaction == null) {
-      mCurTransaction = mFragmentManager.beginTransaction();
+    /**
+     * Return the Fragment associated with a specified position.
+     */
+    public abstract Fragment getItem(int position);
+
+    @Override
+    public void startUpdate(ViewGroup container) {
     }
 
-    Fragment fragment = getItem(position);
-    if (DEBUG) Log.v(TAG, "Adding item #" + position + ": f=" + fragment);
-    if (mSavedState.size() > position) {
-      Fragment.SavedState fss = mSavedState.get(position);
-      if (fss != null) {
-        fragment.setInitialSavedState(fss);
-      }
-    }
-    while (mFragments.size() <= position) {
-      mFragments.add(null);
-    }
-    fragment.setMenuVisibility(false);
-    fragment.setUserVisibleHint(false);
-    mFragments.set(position, fragment);
-    mCurTransaction.add(container.getId(), fragment);
-
-    return fragment;
-  }
-
-  @Override
-  public void destroyItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-    Fragment fragment = (Fragment) object;
-
-    if (mCurTransaction == null) {
-      mCurTransaction = mFragmentManager.beginTransaction();
-    }
-    if (DEBUG)
-      Log.v(
-          TAG,
-          "Removing item #" + position + ": f=" + object + " v=" + ((Fragment) object).getView());
-    while (mSavedState.size() <= position) {
-      mSavedState.add(null);
-    }
-    mSavedState.set(position, mFragmentManager.saveFragmentInstanceState(fragment));
-    mFragments.set(position, null);
-
-    mCurTransaction.remove(fragment);
-  }
-
-  @Override
-  public void setPrimaryItem(@NonNull ViewGroup container, int position, @NonNull Object object) {
-    Fragment fragment = (Fragment) object;
-    if (fragment != mCurrentPrimaryItem) {
-      if (mCurrentPrimaryItem != null) {
-        mCurrentPrimaryItem.setMenuVisibility(false);
-        mCurrentPrimaryItem.setUserVisibleHint(false);
-      }
-      fragment.setMenuVisibility(true);
-      fragment.setUserVisibleHint(true);
-      mCurrentPrimaryItem = fragment;
-    }
-  }
-
-  @Override
-  public void finishUpdate(@NonNull ViewGroup container) {
-    if (mCurTransaction != null) {
-      mCurTransaction.commitAllowingStateLoss();
-      mCurTransaction = null;
-      mFragmentManager.executePendingTransactions();
-    }
-  }
-
-  @Override
-  public boolean isViewFromObject(@NonNull View view, @NonNull Object object) {
-    return ((Fragment) object).getView() == view;
-  }
-
-  @Override
-  public Parcelable saveState() {
-    Bundle state = null;
-    if (mSavedState.size() > 0) {
-      state = new Bundle();
-      Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
-      mSavedState.toArray(fss);
-      state.putParcelableArray("states", fss);
-    }
-    for (int i = 0; i < mFragments.size(); i++) {
-      Fragment f = mFragments.get(i);
-      if (f != null && f.isAdded()) {
-        if (state == null) {
-          state = new Bundle();
-        }
-        String key = "f" + i;
-        mFragmentManager.putFragment(state, key, f);
-      }
-    }
-    return state;
-  }
-
-  @Override
-  public void restoreState(Parcelable state, ClassLoader loader) {
-    if (state != null) {
-      Bundle bundle = (Bundle) state;
-      bundle.setClassLoader(loader);
-      Parcelable[] fss = bundle.getParcelableArray("states");
-      mSavedState.clear();
-      mFragments.clear();
-      if (fss != null) {
-        for (Parcelable parcelable : fss) {
-          mSavedState.add((Fragment.SavedState) parcelable);
-        }
-      }
-      Iterable<String> keys = bundle.keySet();
-      for (String key : keys) {
-        if (key.startsWith("f")) {
-          int index = Integer.parseInt(key.substring(1));
-          Fragment f = mFragmentManager.getFragment(bundle, key);
-          if (f != null) {
-            while (mFragments.size() <= index) {
-              mFragments.add(null);
+    @NonNull
+    @Override
+    public Object instantiateItem(ViewGroup container, int position) {
+        // If we already have this item instantiated, there is nothing
+        // to do.  This can happen when we are restoring the entire pager
+        // from its saved state, where the fragment manager has already
+        // taken care of restoring the fragments we previously had instantiated.
+        if (mFragments.size() > position) {
+            Fragment f = mFragments.get(position);
+            if (f != null) {
+                return f;
             }
-            f.setMenuVisibility(false);
-            mFragments.set(index, f);
-          } else {
-            Log.w(TAG, "Bad fragment at key " + key);
-          }
         }
-      }
-    }
-  }
 
-  public Fragment getFragment(int position) {
-    if (position < mFragments.size() && position >= 0) {
-      return mFragments.get(position);
+        if (mCurTransaction == null) {
+            mCurTransaction = mFragmentManager.beginTransaction();
+        }
+
+        Fragment fragment = getItem(position);
+        if (DEBUG) Log.v(TAG, "Adding item #" + position + ": f=" + fragment);
+        if (mSavedState.size() > position) {
+            Fragment.SavedState fss = mSavedState.get(position);
+            if (fss != null) {
+                fragment.setInitialSavedState(fss);
+            }
+        }
+        while (mFragments.size() <= position) {
+            mFragments.add(null);
+        }
+        fragment.setMenuVisibility(false);
+        fragment.setUserVisibleHint(false);
+        mFragments.set(position, fragment);
+        mCurTransaction.add(container.getId(), fragment);
+
+        return fragment;
+    }
+
+    @Override
+    public void destroyItem(ViewGroup container, int position, Object object) {
+        Fragment fragment = (Fragment) object;
+
+        if (mCurTransaction == null) {
+            mCurTransaction = mFragmentManager.beginTransaction();
+        }
+        if (DEBUG) Log.v(TAG, "Removing item #" + position + ": f=" + object
+                + " v=" + ((Fragment) object).getView());
+        while (mSavedState.size() <= position) {
+            mSavedState.add(null);
+        }
+        mSavedState.set(position, mFragmentManager.saveFragmentInstanceState(fragment));
+        mFragments.set(position, null);
+
+        mCurTransaction.remove(fragment);
+    }
+
+    @Override
+    public void setPrimaryItem(ViewGroup container, int position, Object object) {
+        Fragment fragment = (Fragment) object;
+        if (fragment != mCurrentPrimaryItem) {
+            if (mCurrentPrimaryItem != null) {
+                mCurrentPrimaryItem.setMenuVisibility(false);
+                mCurrentPrimaryItem.setUserVisibleHint(false);
+            }
+            if (fragment != null) {
+                fragment.setMenuVisibility(true);
+                fragment.setUserVisibleHint(true);
+            }
+            mCurrentPrimaryItem = fragment;
+        }
+    }
+
+    @Override
+    public void finishUpdate(ViewGroup container) {
+        if (mCurTransaction != null) {
+            mCurTransaction.commitAllowingStateLoss();
+            mCurTransaction = null;
+            mFragmentManager.executePendingTransactions();
+        }
+    }
+
+    @Override
+    public boolean isViewFromObject(View view, Object object) {
+        return ((Fragment) object).getView() == view;
+    }
+
+    @Override
+    public Parcelable saveState() {
+        Bundle state = null;
+        if (mSavedState.size() > 0) {
+            state = new Bundle();
+            Fragment.SavedState[] fss = new Fragment.SavedState[mSavedState.size()];
+            mSavedState.toArray(fss);
+            state.putParcelableArray("states", fss);
+        }
+        for (int i = 0; i < mFragments.size(); i++) {
+            Fragment f = mFragments.get(i);
+            if (f != null && f.isAdded()) {
+                if (state == null) {
+                    state = new Bundle();
+                }
+                String key = "f" + i;
+                mFragmentManager.putFragment(state, key, f);
+            }
+        }
+        return state;
+    }
+
+    @Override
+    public void restoreState(Parcelable state, ClassLoader loader) {
+        if (state != null) {
+            Bundle bundle = (Bundle) state;
+            bundle.setClassLoader(loader);
+            Parcelable[] fss = bundle.getParcelableArray("states");
+            mSavedState.clear();
+            mFragments.clear();
+            if (fss != null) {
+                for (int i = 0; i < fss.length; i++) {
+                    mSavedState.add((Fragment.SavedState) fss[i]);
+                }
+            }
+            Iterable<String> keys = bundle.keySet();
+            for (String key : keys) {
+                if (key.startsWith("f")) {
+                    int index = Integer.parseInt(key.substring(1));
+                    Fragment f = mFragmentManager.getFragment(bundle, key);
+                    if (f != null) {
+                        while (mFragments.size() <= index) {
+                            mFragments.add(null);
+                        }
+                        f.setMenuVisibility(false);
+                        mFragments.set(index, f);
+                    } else {
+                        Log.w(TAG, "Bad fragment at key " + key);
+                    }
+                }
+            }
+        }
+    }
+
+    public Fragment getFragment(int position) {
+        if (position < mFragments.size() && position >= 0) {
+            return mFragments.get(position);
+        }
+        return null;
     }
-    return null;
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java b/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java
new file mode 100644
index 000000000..2a2026cee
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/DialogAsyncTask.java
@@ -0,0 +1,105 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.misc;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Handler;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.lang.ref.WeakReference;
+
+
+public abstract class DialogAsyncTask<Params, Progress, Result> extends WeakContextAsyncTask<Params, Progress, Result> {
+    private final int delay;
+
+    private WeakReference<Dialog> dialogWeakReference;
+
+    private boolean supposedToBeDismissed;
+
+    public DialogAsyncTask(Context context) {
+        this(context, 0);
+    }
+
+    public DialogAsyncTask(Context context, int showDelay) {
+        super(context);
+        this.delay = showDelay;
+        dialogWeakReference = new WeakReference<>(null);
+    }
+
+    @Override
+    protected void onPreExecute() {
+        super.onPreExecute();
+        if (delay > 0) {
+            new Handler().postDelayed(this::initAndShowDialog, delay);
+        } else {
+            initAndShowDialog();
+        }
+    }
+
+    private void initAndShowDialog() {
+        Context context = getContext();
+        if (!supposedToBeDismissed && context != null) {
+            Dialog dialog = createDialog(context);
+            dialogWeakReference = new WeakReference<>(dialog);
+            dialog.show();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    protected void onProgressUpdate(Progress... values) {
+        super.onProgressUpdate(values);
+        Dialog dialog = getDialog();
+        if (dialog != null) {
+            onProgressUpdate(dialog, values);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void onProgressUpdate(@NonNull Dialog dialog, Progress... values) {
+    }
+
+    @Nullable
+    protected Dialog getDialog() {
+        return dialogWeakReference.get();
+    }
+
+    @Override
+    protected void onCancelled(Result result) {
+        super.onCancelled(result);
+        tryToDismiss();
+    }
+
+    @Override
+    protected void onPostExecute(Result result) {
+        super.onPostExecute(result);
+        tryToDismiss();
+    }
+
+    private void tryToDismiss() {
+        supposedToBeDismissed = true;
+        try {
+            Dialog dialog = getDialog();
+            if (dialog != null)
+                dialog.dismiss();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    protected abstract Dialog createDialog(@NonNull Context context);
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt b/app/src/main/java/code/name/monkey/retromusic/misc/GenericFileProvider.java
similarity index 80%
rename from app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt
rename to app/src/main/java/code/name/monkey/retromusic/misc/GenericFileProvider.java
index 948cd7432..1e87ad8e4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/GenericFileProvider.java
@@ -11,8 +11,10 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.volume
 
-interface OnAudioVolumeChangedListener {
-    fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int)
+package code.name.monkey.retromusic.misc;
+
+import androidx.core.content.FileProvider;
+
+public class GenericFileProvider extends FileProvider {
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/LagTracker.java b/app/src/main/java/code/name/monkey/retromusic/misc/LagTracker.java
new file mode 100755
index 000000000..48baf8d0e
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/LagTracker.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.misc;
+
+import android.util.Log;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class LagTracker {
+    private static Map<String, Long> mMap;
+    private static LagTracker mSingleton;
+    private boolean mEnabled = true;
+
+    private LagTracker() {
+        mMap = new HashMap();
+    }
+
+    public static LagTracker get() {
+        if (mSingleton == null) {
+            mSingleton = new LagTracker();
+        }
+        return mSingleton;
+    }
+
+    private void print(String str, long j) {
+        long toMillis = TimeUnit.NANOSECONDS.toMillis(j);
+        Log.d("LagTracker", "[" + str + " completed in]: " + j + " ns (" + toMillis + "ms, " + TimeUnit.NANOSECONDS.toSeconds(j) + "s)");
+    }
+
+    public LagTracker disable() {
+        this.mEnabled = false;
+        return this;
+    }
+
+    public LagTracker enable() {
+        this.mEnabled = true;
+        return this;
+    }
+
+    public void end(String str) {
+        long nanoTime = System.nanoTime();
+        if (this.mEnabled) {
+            if (mMap.containsKey(str)) {
+                print(str, nanoTime - mMap.get(str).longValue());
+                mMap.remove(str);
+                return;
+            }
+            throw new IllegalStateException("No start time found for " + str);
+        } else if (!mMap.isEmpty()) {
+            mMap.clear();
+        }
+    }
+
+    public void start(String str) {
+        long nanoTime = System.nanoTime();
+        if (this.mEnabled) {
+            mMap.put(str, Long.valueOf(nanoTime));
+        } else if (!mMap.isEmpty()) {
+            mMap.clear();
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/SimpleAnimatorListener.kt b/app/src/main/java/code/name/monkey/retromusic/misc/SimpleAnimatorListener.kt
new file mode 100644
index 000000000..2ee76b78e
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/SimpleAnimatorListener.kt
@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.misc
+
+import android.animation.Animator
+
+
+abstract class SimpleAnimatorListener : Animator.AnimatorListener {
+    override fun onAnimationStart(animation: Animator) {
+
+    }
+
+    override fun onAnimationEnd(animation: Animator) {
+
+    }
+
+    override fun onAnimationCancel(animation: Animator) {
+
+    }
+
+    override fun onAnimationRepeat(animation: Animator) {
+
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
index d749cf223..aaeda9e7c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/UpdateToastMediaScannerCompletionListener.java
@@ -21,27 +21,23 @@ import android.net.Uri;
 import android.widget.Toast;
 
 import java.lang.ref.WeakReference;
-import java.util.List;
 
 import code.name.monkey.retromusic.R;
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
-public class UpdateToastMediaScannerCompletionListener
-        implements MediaScannerConnection.OnScanCompletedListener {
-
-    private final WeakReference<Activity> activityWeakReference;
-
-    private final String couldNotScanFiles;
+public class UpdateToastMediaScannerCompletionListener implements MediaScannerConnection.OnScanCompletedListener {
+    private final String[] toBeScanned;
     private final String scannedFiles;
-    private final List<String> toBeScanned;
-    private int failed = 0;
+    private final String couldNotScanFiles;
+    private final WeakReference<Activity> activityWeakReference;
     private int scanned = 0;
-  private final Toast toast;
+    private int failed = 0;
+    private Toast toast;
 
     @SuppressLint("ShowToast")
-    public UpdateToastMediaScannerCompletionListener(Activity activity, List<String> toBeScanned) {
+    public UpdateToastMediaScannerCompletionListener(Activity activity, String[] toBeScanned) {
         this.toBeScanned = toBeScanned;
         scannedFiles = activity.getString(R.string.scanned_files);
         couldNotScanFiles = activity.getString(R.string.could_not_scan_files);
@@ -53,20 +49,16 @@ public class UpdateToastMediaScannerCompletionListener
     public void onScanCompleted(final String path, final Uri uri) {
         Activity activity = activityWeakReference.get();
         if (activity != null) {
-            activity.runOnUiThread(
-                    () -> {
-                        if (uri == null) {
-                            failed++;
-                        } else {
-                            scanned++;
-                        }
-                        String text =
-                                " "
-                                        + String.format(scannedFiles, scanned, toBeScanned.size())
-                                        + (failed > 0 ? " " + String.format(couldNotScanFiles, failed) : "");
-                        toast.setText(text);
-                        toast.show();
-                    });
+            activity.runOnUiThread(() -> {
+                if (uri == null) {
+                    failed++;
+                } else {
+                    scanned++;
+                }
+                String text = " " + String.format(scannedFiles, scanned, toBeScanned.length) + (failed > 0 ? " " + String.format(couldNotScanFiles, failed) : "");
+                toast.setText(text);
+                toast.show();
+            });
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.kt b/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.kt
new file mode 100644
index 000000000..f81a3dcec
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/WeakContextAsyncTask.kt
@@ -0,0 +1 @@
+/*
 * Copyright (c) 2019 Hemanth Savarala.
 *
 * Licensed under the GNU General Public License v3
 *
 * This is free software: you can redistribute it and/or modify it under
 * the terms of the GNU General Public License as published by
 *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
 *
 * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
 * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 * See the GNU General Public License for more details.
 */

package code.name.monkey.retromusic.misc

import android.content.Context
import android.os.AsyncTask

import java.lang.ref.WeakReference

abstract class WeakContextAsyncTask<Params, Progress, Result>(context: Context) : AsyncTask<Params, Progress, Result>() {
    private val contextWeakReference: WeakReference<Context> = WeakReference(context)

    protected val context: Context?
        get() = contextWeakReference.get()

}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt b/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt
index 7c596c5fc..6c717bea3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/misc/WrappedAsyncTaskLoader.kt
@@ -29,7 +29,7 @@ abstract class WrappedAsyncTaskLoader<D>
  *
  * @param context The [Context] to use.
  */
-    (context: Context) : AsyncTaskLoader<D>(context) {
+(context: Context) : AsyncTaskLoader<D>(context) {
 
     private var mData: D? = null
 
@@ -40,6 +40,8 @@ abstract class WrappedAsyncTaskLoader<D>
         if (!isReset) {
             this.mData = data
             super.deliverResult(data)
+        } else {
+            // An asynchronous query came in while the loader is stopped
         }
     }
 
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java
new file mode 100644
index 000000000..cf3dc05dc
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+import io.reactivex.Observable;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+
+public abstract class AbsCustomPlaylist extends Playlist {
+    public AbsCustomPlaylist(int id, String name) {
+        super(id, name);
+    }
+
+    public AbsCustomPlaylist() {
+    }
+
+    public AbsCustomPlaylist(Parcel in) {
+        super(in);
+    }
+
+    @NonNull
+    public abstract Observable<ArrayList<Song>> getSongsFlowable(@NotNull Context context);
+
+    @NonNull
+    public abstract ArrayList<Song> getSongs(@NotNull Context context);
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt
deleted file mode 100644
index ad5f3b1e2..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/AbsCustomPlaylist.kt
+++ /dev/null
@@ -1,21 +0,0 @@
-package code.name.monkey.retromusic.model
-
-import code.name.monkey.retromusic.repository.LastAddedRepository
-import code.name.monkey.retromusic.repository.SongRepository
-import code.name.monkey.retromusic.repository.TopPlayedRepository
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
-
-abstract class AbsCustomPlaylist(
-    id: Long,
-    name: String
-) : Playlist(id, name), KoinComponent {
-
-    abstract fun songs(): List<Song>
-
-    protected val songRepository by inject<SongRepository>()
-
-    protected val topPlayedRepository by inject<TopPlayedRepository>()
-
-    protected val lastAddedRepository by inject<LastAddedRepository>()
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Album.kt b/app/src/main/java/code/name/monkey/retromusic/model/Album.kt
index c894955bd..af53ff0c5 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Album.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Album.kt
@@ -14,18 +14,22 @@
 
 package code.name.monkey.retromusic.model
 
-data class Album(
-    val id: Long,
-    val songs: List<Song>
-) {
+import java.util.*
 
-    val title: String
+
+class Album {
+    val songs: ArrayList<Song>?
+
+    val id: Int
+        get() = safeGetFirstSong().albumId
+
+    val title: String?
         get() = safeGetFirstSong().albumName
 
-    val artistId: Long
+    val artistId: Int
         get() = safeGetFirstSong().artistId
 
-    val artistName: String
+    val artistName: String?
         get() = safeGetFirstSong().artistName
 
     val year: Int
@@ -35,17 +39,17 @@ data class Album(
         get() = safeGetFirstSong().dateModified
 
     val songCount: Int
-        get() = songs.size
+        get() = songs!!.size
 
-    val albumArtist: String?
-        get() = safeGetFirstSong().albumArtist
+    constructor(songs: ArrayList<Song>) {
+        this.songs = songs
+    }
+
+    constructor() {
+        this.songs = ArrayList()
+    }
 
     fun safeGetFirstSong(): Song {
-        return songs.firstOrNull() ?: Song.emptySong
+        return if (songs!!.isEmpty()) Song.emptySong else songs[0]
     }
-
-    companion object {
-        val empty = Album(-1, emptyList())
-    }
-
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt b/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
index e82aed2d8..d167b91f9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Artist.kt
@@ -14,99 +14,58 @@
 
 package code.name.monkey.retromusic.model
 
-import code.name.monkey.retromusic.helper.SortOrder
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.PreferenceUtil
-import java.text.Collator
+import java.util.*
 
-data class Artist(
-    val id: Long,
-    val albums: List<Album>,
-    val isAlbumArtist: Boolean = false
-) {
-    constructor(
-        artistName: String,
-        albums: List<Album>,
-        isAlbumArtist: Boolean = false
-    ) : this(albums[0].artistId, albums, isAlbumArtist) {
-        name = artistName
-    }
 
-    var name: String = "-"
+class Artist {
+    val albums: ArrayList<Album>?
+
+    val id: Int
+        get() = safeGetFirstAlbum().artistId
+
+    val name: String
         get() {
-            val name = if (isAlbumArtist) getAlbumArtistName()
-            else getArtistName()
-            return when {
-                MusicUtil.isVariousArtists(name) ->
-                    VARIOUS_ARTISTS_DISPLAY_NAME
-                MusicUtil.isArtistNameUnknown(name) ->
-                    UNKNOWN_ARTIST_DISPLAY_NAME
-                else -> name!!
-            }
+            val name = safeGetFirstAlbum().artistName
+            return if (MusicUtil.isArtistNameUnknown(name)) {
+                UNKNOWN_ARTIST_DISPLAY_NAME
+            } else name!!
         }
 
     val songCount: Int
         get() {
             var songCount = 0
-            for (album in albums) {
+            for (album in albums!!) {
                 songCount += album.songCount
             }
             return songCount
         }
 
     val albumCount: Int
-        get() = albums.size
+        get() = albums!!.size
 
-    val songs: List<Song>
-        get() = albums.flatMap { it.songs }
-
-    val sortedSongs: List<Song>
+    val songs: ArrayList<Song>
         get() {
-            val collator = Collator.getInstance()
-            return songs.sortedWith(
-                when (PreferenceUtil.artistDetailSongSortOrder) {
-                    SortOrder.ArtistSongSortOrder.SONG_A_Z -> { o1, o2 ->
-                        collator.compare(o1.title, o2.title)
-                    }
-                    SortOrder.ArtistSongSortOrder.SONG_Z_A -> { o1, o2 ->
-                        collator.compare(o2.title, o1.title)
-                    }
-                    SortOrder.ArtistSongSortOrder.SONG_ALBUM -> { o1, o2 ->
-                        collator.compare(o1.albumName, o2.albumName)
-                    }
-                    SortOrder.ArtistSongSortOrder.SONG_YEAR -> { o1, o2 ->
-                        o2.year.compareTo(
-                            o1.year
-                        )
-                    }
-                    SortOrder.ArtistSongSortOrder.SONG_DURATION -> { o1, o2 ->
-                        o1.duration.compareTo(
-                            o2.duration
-                        )
-                    }
-                    else -> {
-                        throw IllegalArgumentException("invalid ${PreferenceUtil.artistDetailSongSortOrder}")
-                    }
-                })
+            val songs = ArrayList<Song>()
+            for (album in albums!!) {
+                songs.addAll(album.songs!!)
+            }
+            return songs
         }
 
+    constructor(albums: ArrayList<Album>) {
+        this.albums = albums
+    }
+
+    constructor() {
+        this.albums = ArrayList()
+    }
+
     fun safeGetFirstAlbum(): Album {
-        return albums.firstOrNull() ?: Album.empty
-    }
-
-    private fun getArtistName(): String {
-        return safeGetFirstAlbum().safeGetFirstSong().artistName
-    }
-
-    private fun getAlbumArtistName(): String? {
-        return safeGetFirstAlbum().safeGetFirstSong().albumArtist
+        return if (albums!!.isEmpty()) Album() else albums[0]
     }
 
     companion object {
         const val UNKNOWN_ARTIST_DISPLAY_NAME = "Unknown Artist"
-        const val VARIOUS_ARTISTS_DISPLAY_NAME = "Various Artists"
-        const val VARIOUS_ARTISTS_ID: Long = -2
-        val empty = Artist(-1, emptyList())
-
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt b/app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt
deleted file mode 100644
index a0bfead2b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/ArtworkInfo.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package code.name.monkey.retromusic.model
-
-import android.graphics.Bitmap
-
-class ArtworkInfo constructor(val albumId: Long, val artwork: Bitmap?)
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt b/app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt
deleted file mode 100644
index 3ac895df0..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/AudioTagInfo.kt
+++ /dev/null
@@ -1,9 +0,0 @@
-package code.name.monkey.retromusic.model
-
-import org.jaudiotagger.tag.FieldKey
-
-class AudioTagInfo(
-    val filePaths: List<String>?,
-    val fieldKeyValueMap: Map<FieldKey, String>?,
-    val artworkInfo: ArtworkInfo?
-)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java
new file mode 100644
index 000000000..7c3999ff9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import code.name.monkey.retromusic.R;
+
+
+public class CategoryInfo implements Parcelable {
+    public static final Creator<CategoryInfo> CREATOR = new Creator<CategoryInfo>() {
+        public CategoryInfo createFromParcel(Parcel source) {
+            return new CategoryInfo(source);
+        }
+
+        public CategoryInfo[] newArray(int size) {
+            return new CategoryInfo[size];
+        }
+    };
+    public Category category;
+    public boolean visible;
+
+    public CategoryInfo(Category category, boolean visible) {
+        this.category = category;
+        this.visible = visible;
+    }
+
+
+    private CategoryInfo(Parcel source) {
+        category = (Category) source.readSerializable();
+        visible = source.readInt() == 1;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeSerializable(category);
+        dest.writeInt(visible ? 1 : 0);
+    }
+
+    public enum Category {
+        HOME(R.id.action_home, R.string.home, R.drawable.toggle_home),
+        SONGS(R.id.action_song, R.string.songs, R.drawable.toggle_audiotrack),
+        ALBUMS(R.id.action_album, R.string.albums, R.drawable.toggle_album),
+        ARTISTS(R.id.action_artist, R.string.artists, R.drawable.toggle_artist),
+        PLAYLISTS(R.id.action_playlist, R.string.playlists, R.drawable.toggle_playlist),
+        GENRES(R.id.action_genre, R.string.genres, R.drawable.toggle_guitar),
+        QUEUE(R.id.action_playing_queue, R.string.queue, R.drawable.toggle_queue_music);
+
+        public final int stringRes;
+        public final int id;
+        public final int icon;
+
+        Category(int id, int stringRes, int icon) {
+            this.stringRes = stringRes;
+            this.id = id;
+            this.icon = icon;
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt
deleted file mode 100644
index 19218e9c3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.model
-
-import android.os.Parcelable
-import androidx.annotation.DrawableRes
-import androidx.annotation.StringRes
-import code.name.monkey.retromusic.R
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-data class CategoryInfo(
-    val category: Category,
-    var visible: Boolean
-) : Parcelable {
-
-    enum class Category(
-        val id: Int,
-        @StringRes val stringRes: Int,
-        @DrawableRes val icon: Int
-    ) {
-        Home(R.id.action_home, R.string.for_you, R.drawable.asld_face),
-        Songs(R.id.action_song, R.string.songs, R.drawable.asld_music_note),
-        Albums(R.id.action_album, R.string.albums, R.drawable.asld_album),
-        Artists(R.id.action_artist, R.string.artists, R.drawable.asld_artist),
-        Playlists(R.id.action_playlist, R.string.playlists, R.drawable.asld_playlist),
-        Genres(R.id.action_genre, R.string.genres, R.drawable.asld_guitar),
-        Folder(R.id.action_folder, R.string.folders, R.drawable.asld_folder),
-        Search(R.id.action_search, R.string.action_search, R.drawable.ic_search);
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Contributor.kt b/app/src/main/java/code/name/monkey/retromusic/model/Contributor.kt
new file mode 100644
index 000000000..fa71cdce1
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Contributor.kt
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model
+
+import com.google.gson.annotations.SerializedName
+
+class Contributor(val name: String, val summary: String, val link: String, @SerializedName("profile_image") val profileImage: String)
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt b/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt
index 782c2bccb..c2a7e2740 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Genre.kt
@@ -15,11 +15,7 @@
 package code.name.monkey.retromusic.model
 
 import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import kotlinx.android.parcel.Parcelize
 
 @Parcelize
-data class Genre(
-    val id: Long,
-    val name: String,
-    val songCount: Int
-) : Parcelable
\ No newline at end of file
+data class Genre(val id: Int = -1, val name: String, val songCount: Int) : Parcelable
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
index 9a12344f3..4a625f29a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Home.kt
@@ -14,13 +14,14 @@
 
 package code.name.monkey.retromusic.model
 
+import androidx.annotation.DrawableRes
 import androidx.annotation.StringRes
-import code.name.monkey.retromusic.HomeSection
+import code.name.monkey.retromusic.adapter.HomeAdapter.Companion.HomeSection
 
-data class Home(
-    val arrayList: List<Any>,
-    @HomeSection
-    val homeSection: Int,
-    @StringRes
-    val titleRes: Int
-)
\ No newline at end of file
+class Home(val priority: Int,
+           @StringRes val title: Int,
+           val arrayList: ArrayList<*>,
+           @HomeSection
+           val homeSection: Int,
+           @DrawableRes
+           val icon: Int)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java
new file mode 100644
index 000000000..85da31bec
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.java
@@ -0,0 +1,108 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader;
+import io.reactivex.Observable;
+
+
+public class Playlist implements Parcelable {
+    public static final Creator<Playlist> CREATOR = new Creator<Playlist>() {
+        public Playlist createFromParcel(Parcel source) {
+            return new Playlist(source);
+        }
+
+        public Playlist[] newArray(int size) {
+            return new Playlist[size];
+        }
+    };
+    public final int id;
+    public final String name;
+
+    public Playlist(final int id, final String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public Playlist() {
+        this.id = -1;
+        this.name = "";
+    }
+
+    protected Playlist(Parcel in) {
+        this.id = in.readInt();
+        this.name = in.readString();
+    }
+
+    @NonNull
+    public Observable<ArrayList<Song>> getSongsFlowable(@NonNull Context context) {
+        // this default implementation covers static playlists
+        return PlaylistSongsLoader.INSTANCE.getPlaylistSongListFlowable(context, id);
+    }
+
+    @NonNull
+    public  ArrayList<Song> getSongs(@NonNull Context context) {
+        // this default implementation covers static playlists
+        return PlaylistSongsLoader.INSTANCE.getPlaylistSongList(context, id);
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        Playlist playlist = (Playlist) o;
+
+        if (id != playlist.id) return false;
+        return name != null ? name.equals(playlist.name) : playlist.name == null;
+
+    }
+
+    @Override
+    public int hashCode() {
+        int result = id;
+        result = 31 * result + (name != null ? name.hashCode() : 0);
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        return "Playlist{" +
+                "id=" + id +
+                ", name='" + name + '\'' +
+                '}';
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeInt(this.id);
+        dest.writeString(this.name);
+    }
+
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt b/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
deleted file mode 100644
index f822540a9..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/Playlist.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package code.name.monkey.retromusic.model
-
-import android.content.Context
-import android.os.Parcelable
-import code.name.monkey.retromusic.repository.RealPlaylistRepository
-import code.name.monkey.retromusic.util.MusicUtil
-import kotlinx.parcelize.Parcelize
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-
-@Parcelize
-open class Playlist(
-    val id: Long,
-    val name: String
-) : Parcelable, KoinComponent {
-
-    companion object {
-        val empty = Playlist(-1, "")
-    }
-
-    // this default implementation covers static playlists
-    fun getSongs(): List<Song> {
-        return RealPlaylistRepository(get()).playlistSongs(id)
-    }
-
-    open fun getInfoString(context: Context): String {
-        val songCount = getSongs().size
-        val songCountString = MusicUtil.getSongCountString(context, songCount)
-        return MusicUtil.buildInfoString(
-            songCountString,
-            ""
-        )
-    }
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Playlist
-
-        if (id != other.id) return false
-        if (name != other.name) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + name.hashCode()
-        return result
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java b/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java
new file mode 100644
index 000000000..e69ca3f8a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.java
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model;
+
+import org.jetbrains.annotations.NotNull;
+
+import kotlinx.android.parcel.Parcelize;
+
+/**
+ * Created by hemanths on 3/4/19
+ */
+@Parcelize
+public class PlaylistSong extends Song {
+    final int playlistId;
+    final int idInPlayList;
+
+    public PlaylistSong(int id,
+                        @NotNull String title,
+                        int trackNumber,
+                        int year,
+                        long duration,
+                        @NotNull String data,
+                        long dateModified,
+                        int albumId,
+                        @NotNull String albumName,
+                        int artistId,
+                        @NotNull String artistName,
+                        int playlistId,
+                        int idInPlayList,
+                        @NotNull String composer) {
+        super(id, title, trackNumber, year, duration, data, dateModified, albumId, albumName, artistId, artistName, composer);
+        this.playlistId = playlistId;
+        this.idInPlayList = idInPlayList;
+    }
+
+    public int getPlaylistId() {
+        return playlistId;
+    }
+
+    public int getIdInPlayList() {
+        return idInPlayList;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt b/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt
deleted file mode 100644
index ccbb31c2f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/PlaylistSong.kt
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.model
-
-import kotlinx.parcelize.Parcelize
-
-/**
- * Created by hemanths on 3/4/19
- */
-@Parcelize
-class PlaylistSong(
-    override val id: Long,
-    override val title: String,
-    override val trackNumber: Int,
-    override val year: Int,
-    override val duration: Long,
-    override val data: String,
-    override val dateModified: Long,
-    override val albumId: Long,
-    override val albumName: String,
-    override val artistId: Long,
-    override val artistName: String,
-    val playlistId: Long,
-    val idInPlayList: Long,
-    override val composer: String?,
-    override val albumArtist: String?
-) : Song(
-    id = id,
-    title = title,
-    trackNumber = trackNumber,
-    year = year,
-    duration = duration,
-    data = data,
-    dateModified = dateModified,
-    albumId = albumId,
-    albumName = albumName,
-    artistId = artistId,
-    artistName = artistName,
-    composer = composer,
-    albumArtist = albumArtist
-) {
-
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-        if (!super.equals(other)) return false
-
-        other as PlaylistSong
-
-        if (id != other.id) return false
-        if (title != other.title) return false
-        if (trackNumber != other.trackNumber) return false
-        if (year != other.year) return false
-        if (duration != other.duration) return false
-        if (data != other.data) return false
-        if (dateModified != other.dateModified) return false
-        if (albumId != other.albumId) return false
-        if (albumName != other.albumName) return false
-        if (artistId != other.artistId) return false
-        if (artistName != other.artistName) return false
-        if (playlistId != other.playlistId) return false
-        if (idInPlayList != other.idInPlayList) return false
-        if (composer != other.composer) return false
-        if (albumArtist != other.albumArtist) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = super.hashCode()
-        result = 31 * result + id.hashCode()
-        result = 31 * result + title.hashCode()
-        result = 31 * result + trackNumber
-        result = 31 * result + year
-        result = 31 * result + duration.hashCode()
-        result = 31 * result + data.hashCode()
-        result = 31 * result + dateModified.hashCode()
-        result = 31 * result + albumId.hashCode()
-        result = 31 * result + albumName.hashCode()
-        result = 31 * result + artistId.hashCode()
-        result = 31 * result + artistName.hashCode()
-        result = 31 * result + playlistId.hashCode()
-        result = 31 * result + idInPlayList.hashCode()
-        result = 31 * result + composer.hashCode()
-        result = 31 * result + (albumArtist?.hashCode() ?: 0)
-        return result
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/Song.kt b/app/src/main/java/code/name/monkey/retromusic/model/Song.kt
index cfd61a937..711bd8907 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/Song.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/model/Song.kt
@@ -14,86 +14,40 @@
 package code.name.monkey.retromusic.model
 
 import android.os.Parcelable
-import kotlinx.parcelize.Parcelize
+import kotlinx.android.parcel.Parcelize
 
-// update equals and hashcode if fields changes
 @Parcelize
 open class Song(
-    open val id: Long,
-    open val title: String,
-    open val trackNumber: Int,
-    open val year: Int,
-    open val duration: Long,
-    open val data: String,
-    open val dateModified: Long,
-    open val albumId: Long,
-    open val albumName: String,
-    open val artistId: Long,
-    open val artistName: String,
-    open val composer: String?,
-    open val albumArtist: String?
+        val id: Int,
+        val title: String,
+        val trackNumber: Int,
+        val year: Int,
+        val duration: Long,
+        val data: String,
+        val dateModified: Long,
+        val albumId: Int,
+        val albumName: String,
+        val artistId: Int,
+        val artistName: String,
+        val composer: String?
 ) : Parcelable {
 
 
-    // need to override manually because is open and cannot be a data class
-    override fun equals(other: Any?): Boolean {
-        if (this === other) return true
-        if (javaClass != other?.javaClass) return false
-
-        other as Song
-
-        if (id != other.id) return false
-        if (title != other.title) return false
-        if (trackNumber != other.trackNumber) return false
-        if (year != other.year) return false
-        if (duration != other.duration) return false
-        if (data != other.data) return false
-        if (dateModified != other.dateModified) return false
-        if (albumId != other.albumId) return false
-        if (albumName != other.albumName) return false
-        if (artistId != other.artistId) return false
-        if (artistName != other.artistName) return false
-        if (composer != other.composer) return false
-        if (albumArtist != other.albumArtist) return false
-
-        return true
-    }
-
-    override fun hashCode(): Int {
-        var result = id.hashCode()
-        result = 31 * result + title.hashCode()
-        result = 31 * result + trackNumber
-        result = 31 * result + year
-        result = 31 * result + duration.hashCode()
-        result = 31 * result + data.hashCode()
-        result = 31 * result + dateModified.hashCode()
-        result = 31 * result + albumId.hashCode()
-        result = 31 * result + albumName.hashCode()
-        result = 31 * result + artistId.hashCode()
-        result = 31 * result + artistName.hashCode()
-        result = 31 * result + (composer?.hashCode() ?: 0)
-        result = 31 * result + (albumArtist?.hashCode() ?: 0)
-        return result
-    }
-
-
     companion object {
-
         @JvmStatic
         val emptySong = Song(
-            id = -1,
-            title = "",
-            trackNumber = -1,
-            year = -1,
-            duration = -1,
-            data = "",
-            dateModified = -1,
-            albumId = -1,
-            albumName = "",
-            artistId = -1,
-            artistName = "",
-            composer = "",
-            albumArtist = ""
+                -1,
+                "",
+                -1,
+                -1,
+                -1,
+                "",
+                -1,
+                -1,
+                "",
+                -1,
+                "",
+                ""
         )
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java
index f939003e9..0a9029ad0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/AbsSynchronizedLyrics.java
@@ -17,56 +17,53 @@ package code.name.monkey.retromusic.model.lyrics;
 import android.util.SparseArray;
 
 public abstract class AbsSynchronizedLyrics extends Lyrics {
+    private static final int TIME_OFFSET_MS = 500; // time adjustment to display line before it actually starts
 
-  private static final int TIME_OFFSET_MS =
-      500; // time adjustment to display line before it actually starts
+    protected final SparseArray<String> lines = new SparseArray<>();
+    protected int offset = 0;
 
-  protected final SparseArray<String> lines = new SparseArray<>();
+    public String getLine(int time) {
+        time += offset + AbsSynchronizedLyrics.TIME_OFFSET_MS;
 
-  protected int offset = 0;
+        int lastLineTime = lines.keyAt(0);
 
-  public String getLine(int time) {
-    time += offset + AbsSynchronizedLyrics.TIME_OFFSET_MS;
+        for (int i = 0; i < lines.size(); i++) {
+            int lineTime = lines.keyAt(i);
 
-    int lastLineTime = lines.keyAt(0);
+            if (time >= lineTime) {
+                lastLineTime = lineTime;
+            } else {
+                break;
+            }
+        }
 
-    for (int i = 0; i < lines.size(); i++) {
-      int lineTime = lines.keyAt(i);
-
-      if (time >= lineTime) {
-        lastLineTime = lineTime;
-      } else {
-        break;
-      }
+        return lines.get(lastLineTime);
     }
 
-    return lines.get(lastLineTime);
-  }
-
-  @Override
-  public String getText() {
-    parse(false);
-
-    if (valid) {
-      StringBuilder sb = new StringBuilder();
-
-      for (int i = 0; i < lines.size(); i++) {
-        String line = lines.valueAt(i);
-        sb.append(line).append("\r\n");
-      }
-
-      return sb.toString().trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
+    public boolean isSynchronized() {
+        return true;
     }
 
-    return super.getText();
-  }
+    public boolean isValid() {
+        parse(true);
+        return valid;
+    }
 
-  public boolean isSynchronized() {
-    return true;
-  }
+    @Override
+    public String getText() {
+        parse(false);
 
-  public boolean isValid() {
-    parse(true);
-    return valid;
-  }
+        if (valid) {
+            StringBuilder sb = new StringBuilder();
+
+            for (int i = 0; i < lines.size(); i++) {
+                String line = lines.valueAt(i);
+                sb.append(line).append("\r\n");
+            }
+
+            return sb.toString().trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
+        }
+
+        return super.getText();
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
index c466949f8..1cc252649 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/Lyrics.java
@@ -14,73 +14,69 @@
 
 package code.name.monkey.retromusic.model.lyrics;
 
+
 import java.util.ArrayList;
 
 import code.name.monkey.retromusic.model.Song;
 
 public class Lyrics {
+    private static final ArrayList<Class<? extends Lyrics>> FORMATS = new ArrayList<>();
 
-  private static final ArrayList<Class<? extends Lyrics>> FORMATS = new ArrayList<>();
-
-  static {
-    Lyrics.FORMATS.add(SynchronizedLyricsLRC.class);
-  }
-
-  public String data;
-  public Song song;
-  protected boolean parsed = false;
-  protected boolean valid = false;
-
-  public static boolean isSynchronized(String data) {
-    for (Class<? extends Lyrics> format : Lyrics.FORMATS) {
-      try {
-        Lyrics lyrics = format.newInstance().setData(null, data);
-        if (lyrics.isValid()) {
-          return true;
-        }
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
+    static {
+        Lyrics.FORMATS.add(SynchronizedLyricsLRC.class);
     }
-    return false;
-  }
 
-  public static Lyrics parse(Song song, String data) {
-    for (Class<? extends Lyrics> format : Lyrics.FORMATS) {
-      try {
-        Lyrics lyrics = format.newInstance().setData(song, data);
-        if (lyrics.isValid()) {
-          return lyrics.parse(false);
+    public Song song;
+    public String data;
+    protected boolean parsed = false;
+    protected boolean valid = false;
+
+    public static Lyrics parse(Song song, String data) {
+        for (Class<? extends Lyrics> format : Lyrics.FORMATS) {
+            try {
+                Lyrics lyrics = format.newInstance().setData(song, data);
+                if (lyrics.isValid()) return lyrics.parse(false);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
         }
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
+        return new Lyrics().setData(song, data).parse(false);
     }
-    return new Lyrics().setData(song, data).parse(false);
-  }
 
-  public String getText() {
-    return this.data.trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
-  }
+    public static boolean isSynchronized(String data) {
+        for (Class<? extends Lyrics> format : Lyrics.FORMATS) {
+            try {
+                Lyrics lyrics = format.newInstance().setData(null, data);
+                if (lyrics.isValid()) return true;
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+        return false;
+    }
 
-  public boolean isSynchronized() {
-    return false;
-  }
+    public Lyrics setData(Song song, String data) {
+        this.song = song;
+        this.data = data;
+        return this;
+    }
 
-  public boolean isValid() {
-    this.parse(true);
-    return this.valid;
-  }
+    public Lyrics parse(boolean check) {
+        this.valid = true;
+        this.parsed = true;
+        return this;
+    }
 
-  public Lyrics parse(boolean check) {
-    this.valid = true;
-    this.parsed = true;
-    return this;
-  }
+    public boolean isSynchronized() {
+        return false;
+    }
 
-  public Lyrics setData(Song song, String data) {
-    this.song = song;
-    this.data = data;
-    return this;
-  }
+    public boolean isValid() {
+        this.parse(true);
+        return this.valid;
+    }
+
+    public String getText() {
+        return this.data.trim().replaceAll("(\r?\n){3,}", "\r\n\r\n");
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java
index 409184913..6ce092d02 100644
--- a/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java
+++ b/app/src/main/java/code/name/monkey/retromusic/model/lyrics/SynchronizedLyricsLRC.java
@@ -18,74 +18,69 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 class SynchronizedLyricsLRC extends AbsSynchronizedLyrics {
+    private static final Pattern LRC_LINE_PATTERN = Pattern.compile("((?:\\[.*?\\])+)(.*)");
+    private static final Pattern LRC_TIME_PATTERN = Pattern.compile("\\[(\\d+):(\\d{2}(?:\\.\\d+)?)\\]");
+    private static final Pattern LRC_ATTRIBUTE_PATTERN = Pattern.compile("\\[(\\D+):(.+)\\]");
 
-  private static final Pattern LRC_LINE_PATTERN = Pattern.compile("((?:\\[.*?\\])+)(.*)");
+    private static final float LRC_SECONDS_TO_MS_MULTIPLIER = 1000f;
+    private static final int LRC_MINUTES_TO_MS_MULTIPLIER = 60000;
 
-  private static final Pattern LRC_TIME_PATTERN =
-      Pattern.compile("\\[(\\d+):(\\d{2}(?:\\.\\d+)?)\\]");
-
-  private static final Pattern LRC_ATTRIBUTE_PATTERN = Pattern.compile("\\[(\\D+):(.+)\\]");
-
-  private static final float LRC_SECONDS_TO_MS_MULTIPLIER = 1000f;
-
-  private static final int LRC_MINUTES_TO_MS_MULTIPLIER = 60000;
-
-  @Override
-  public SynchronizedLyricsLRC parse(boolean check) {
-    if (this.parsed || this.data == null || this.data.isEmpty()) {
-      return this;
-    }
-
-    String[] lines = this.data.split("\r?\n");
-
-    for (String line : lines) {
-      line = line.trim();
-      if (line.isEmpty()) {
-        continue;
-      }
-
-      Matcher attrMatcher = SynchronizedLyricsLRC.LRC_ATTRIBUTE_PATTERN.matcher(line);
-      if (attrMatcher.find()) {
-        try {
-          String attr = attrMatcher.group(1).toLowerCase().trim();
-          String value = attrMatcher.group(2).toLowerCase().trim();
-          if ("offset".equals(attr)) {
-            this.offset = Integer.parseInt(value);
-          }
-        } catch (Exception ex) {
-          ex.printStackTrace();
+    @Override
+    public SynchronizedLyricsLRC parse(boolean check) {
+        if (this.parsed || this.data == null || this.data.isEmpty()) {
+            return this;
         }
-      } else {
-        Matcher matcher = SynchronizedLyricsLRC.LRC_LINE_PATTERN.matcher(line);
-        if (matcher.find()) {
-          String time = matcher.group(1);
-          String text = matcher.group(2);
 
-          Matcher timeMatcher = SynchronizedLyricsLRC.LRC_TIME_PATTERN.matcher(time);
-          while (timeMatcher.find()) {
-            int m = 0;
-            float s = 0f;
-            try {
-              m = Integer.parseInt(timeMatcher.group(1));
-              s = Float.parseFloat(timeMatcher.group(2));
-            } catch (NumberFormatException ex) {
-              ex.printStackTrace();
-            }
-            int ms = (int) (s * LRC_SECONDS_TO_MS_MULTIPLIER) + m * LRC_MINUTES_TO_MS_MULTIPLIER;
+        String[] lines = this.data.split("\r?\n");
 
-            this.valid = true;
-            if (check) {
-              return this;
+        for (String line : lines) {
+            line = line.trim();
+            if (line.isEmpty()) {
+                continue;
             }
 
-            this.lines.append(ms, text);
-          }
+            Matcher attrMatcher = SynchronizedLyricsLRC.LRC_ATTRIBUTE_PATTERN.matcher(line);
+            if (attrMatcher.find()) {
+                try {
+                    String attr = attrMatcher.group(1).toLowerCase().trim();
+                    String value = attrMatcher.group(2).toLowerCase().trim();
+                    switch (attr) {
+                        case "offset":
+                            this.offset = Integer.parseInt(value);
+                            break;
+                    }
+                } catch (Exception ex) {
+                    ex.printStackTrace();
+                }
+            } else {
+                Matcher matcher = SynchronizedLyricsLRC.LRC_LINE_PATTERN.matcher(line);
+                if (matcher.find()) {
+                    String time = matcher.group(1);
+                    String text = matcher.group(2);
+
+                    Matcher timeMatcher = SynchronizedLyricsLRC.LRC_TIME_PATTERN.matcher(time);
+                    while (timeMatcher.find()) {
+                        int m = 0;
+                        float s = 0f;
+                        try {
+                            m = Integer.parseInt(timeMatcher.group(1));
+                            s = Float.parseFloat(timeMatcher.group(2));
+                        } catch (NumberFormatException ex) {
+                            ex.printStackTrace();
+                        }
+                        int ms = (int) (s * LRC_SECONDS_TO_MS_MULTIPLIER) + m * LRC_MINUTES_TO_MS_MULTIPLIER;
+
+                        this.valid = true;
+                        if (check) return this;
+
+                        this.lines.append(ms, text);
+                    }
+                }
+            }
         }
-      }
+
+        this.parsed = true;
+
+        return this;
     }
-
-    this.parsed = true;
-
-    return this;
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
new file mode 100644
index 000000000..cc1f98d61
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.java
@@ -0,0 +1,82 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model.smartplaylist;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.DrawableRes;
+import androidx.annotation.Nullable;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.model.AbsCustomPlaylist;
+
+
+public abstract class AbsSmartPlaylist extends AbsCustomPlaylist {
+    @DrawableRes
+    public final int iconRes;
+
+    public AbsSmartPlaylist(final String name, final int iconRes) {
+        super(-Math.abs(31 * name.hashCode() + (iconRes * name.hashCode() * 31 * 31)), name);
+        this.iconRes = iconRes;
+    }
+
+    public AbsSmartPlaylist() {
+        super();
+        this.iconRes = R.drawable.ic_queue_music_white_24dp;
+    }
+
+    public abstract void clear(Context context);
+
+    public boolean isClearable() {
+        return true;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = super.hashCode();
+        result = prime * result + iconRes;
+        return result;
+    }
+
+    @Override
+    public boolean equals(@Nullable final Object obj) {
+        if (super.equals(obj)) {
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            final AbsSmartPlaylist other = (AbsSmartPlaylist) obj;
+            return iconRes == other.iconRes;
+        }
+        return false;
+    }
+
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeInt(this.iconRes);
+    }
+
+    protected AbsSmartPlaylist(Parcel in) {
+        super(in);
+        this.iconRes = in.readInt();
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt
deleted file mode 100644
index 8098f2c07..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/AbsSmartPlaylist.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import androidx.annotation.DrawableRes
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.AbsCustomPlaylist
-
-abstract class AbsSmartPlaylist(
-    name: String,
-    @DrawableRes val iconRes: Int = R.drawable.ic_queue_music
-) : AbsCustomPlaylist(
-    id = PlaylistIdGenerator(name, iconRes),
-    name = name
-)
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
new file mode 100644
index 000000000..11fae6a6b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model.smartplaylist;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.loaders.TopAndRecentlyPlayedTracksLoader;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.providers.HistoryStore;
+import io.reactivex.Observable;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class HistoryPlaylist extends AbsSmartPlaylist {
+
+    public static final Creator<HistoryPlaylist> CREATOR = new Creator<HistoryPlaylist>() {
+        public HistoryPlaylist createFromParcel(Parcel source) {
+            return new HistoryPlaylist(source);
+        }
+
+        public HistoryPlaylist[] newArray(int size) {
+            return new HistoryPlaylist[size];
+        }
+    };
+
+    public HistoryPlaylist(@NonNull Context context) {
+        super(context.getString(R.string.history), R.drawable.ic_access_time_white_24dp);
+    }
+
+    protected HistoryPlaylist(Parcel in) {
+        super(in);
+    }
+
+    @NonNull
+    @Override
+    public Observable<ArrayList<Song>> getSongsFlowable(@NotNull @NonNull Context context) {
+        return TopAndRecentlyPlayedTracksLoader.INSTANCE.getRecentlyPlayedTracksFlowable(context);
+    }
+
+    @NonNull
+    @Override
+    public ArrayList<Song> getSongs(@NotNull @NonNull Context context) {
+        return TopAndRecentlyPlayedTracksLoader.INSTANCE.getRecentlyPlayedTracks(context);
+    }
+
+    @Override
+    public void clear(@NonNull Context context) {
+        HistoryStore.getInstance(context).clear();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt
deleted file mode 100644
index c3becdf66..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/HistoryPlaylist.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import kotlinx.parcelize.Parcelize
-import org.koin.core.component.KoinComponent
-
-@Parcelize
-class HistoryPlaylist : AbsSmartPlaylist(
-    name = App.getContext().getString(R.string.history),
-    iconRes = R.drawable.ic_history
-), KoinComponent {
-
-    override fun songs(): List<Song> {
-        return topPlayedRepository.recentlyPlayedTracks()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
new file mode 100644
index 000000000..dc781a77a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.java
@@ -0,0 +1,77 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model.smartplaylist;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.loaders.LastAddedSongsLoader;
+import code.name.monkey.retromusic.model.Song;
+import io.reactivex.Observable;
+
+
+public class LastAddedPlaylist extends AbsSmartPlaylist {
+
+    public static final Creator<LastAddedPlaylist> CREATOR = new Creator<LastAddedPlaylist>() {
+        public LastAddedPlaylist createFromParcel(Parcel source) {
+            return new LastAddedPlaylist(source);
+        }
+
+        public LastAddedPlaylist[] newArray(int size) {
+            return new LastAddedPlaylist[size];
+        }
+    };
+
+    public LastAddedPlaylist(@NonNull Context context) {
+        super(context.getString(R.string.last_added), R.drawable.ic_library_add_white_24dp);
+    }
+
+    protected LastAddedPlaylist(Parcel in) {
+        super(in);
+    }
+
+    @NonNull
+    @Override
+    public Observable<ArrayList<Song>> getSongsFlowable(@NotNull @NonNull Context context) {
+        return LastAddedSongsLoader.INSTANCE.getLastAddedSongsFlowable(context);
+    }
+
+    @NonNull
+    @Override
+    public ArrayList<Song> getSongs(@NotNull @NonNull Context context) {
+        return LastAddedSongsLoader.INSTANCE.getLastAddedSongs(context);
+    }
+
+    @Override
+    public void clear(@NonNull Context context) {
+    }
+
+    @Override
+    public boolean isClearable() {
+        return false;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt
deleted file mode 100644
index f3b7b1b13..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/LastAddedPlaylist.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class LastAddedPlaylist : AbsSmartPlaylist(
-    name = App.getContext().getString(R.string.last_added),
-    iconRes = R.drawable.ic_library_add
-) {
-    override fun songs(): List<Song> {
-        return lastAddedRepository.recentSongs()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
new file mode 100644
index 000000000..d54459372
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/MyTopTracksPlaylist.java
@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model.smartplaylist;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.loaders.TopAndRecentlyPlayedTracksLoader;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.providers.SongPlayCountStore;
+import io.reactivex.Observable;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class MyTopTracksPlaylist extends AbsSmartPlaylist {
+
+    public static final Creator<MyTopTracksPlaylist> CREATOR = new Creator<MyTopTracksPlaylist>() {
+        public MyTopTracksPlaylist createFromParcel(Parcel source) {
+            return new MyTopTracksPlaylist(source);
+        }
+
+        public MyTopTracksPlaylist[] newArray(int size) {
+            return new MyTopTracksPlaylist[size];
+        }
+    };
+
+    public MyTopTracksPlaylist(@NonNull Context context) {
+        super(context.getString(R.string.my_top_tracks), R.drawable.ic_trending_up_white_24dp);
+    }
+
+    protected MyTopTracksPlaylist(Parcel in) {
+        super(in);
+    }
+
+    @NonNull
+    @Override
+    public Observable<ArrayList<Song>> getSongsFlowable(@NotNull @NonNull Context context) {
+        return TopAndRecentlyPlayedTracksLoader.INSTANCE.getTopTracksFlowable(context);
+    }
+
+    @NonNull
+    @Override
+    public ArrayList<Song> getSongs(@NotNull @NonNull Context context) {
+        return TopAndRecentlyPlayedTracksLoader.INSTANCE.getTopTracks(context);
+    }
+
+    @Override
+    public void clear(@NonNull Context context) {
+        SongPlayCountStore.getInstance(context).clear();
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt
deleted file mode 100644
index a6786ac78..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/NotPlayedPlaylist.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class NotPlayedPlaylist : AbsSmartPlaylist(
-    name = App.getContext().getString(R.string.not_recently_played),
-    iconRes = R.drawable.ic_audiotrack
-) {
-    override fun songs(): List<Song> {
-        return topPlayedRepository.notRecentlyPlayedTracks()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt
deleted file mode 100644
index baefff7b9..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/PlaylistIdGenerator.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import androidx.annotation.DrawableRes
-import kotlin.math.abs
-
-object PlaylistIdGenerator {
-
-    operator fun invoke(name: String, @DrawableRes iconRes: Int): Long {
-        return abs(31L * name.hashCode() + iconRes * name.hashCode() * 31L * 31L)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
new file mode 100644
index 000000000..ab3cecfc6
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.java
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.model.smartplaylist;
+
+import android.content.Context;
+import android.os.Parcel;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.loaders.SongLoader;
+import code.name.monkey.retromusic.model.Song;
+import io.reactivex.Observable;
+
+public class ShuffleAllPlaylist extends AbsSmartPlaylist {
+
+    public static final Creator<ShuffleAllPlaylist> CREATOR = new Creator<ShuffleAllPlaylist>() {
+        public ShuffleAllPlaylist createFromParcel(Parcel source) {
+            return new ShuffleAllPlaylist(source);
+        }
+
+        public ShuffleAllPlaylist[] newArray(int size) {
+            return new ShuffleAllPlaylist[size];
+        }
+    };
+
+    public ShuffleAllPlaylist(@NonNull Context context) {
+        super(context.getString(R.string.action_shuffle_all), R.drawable.ic_shuffle_white_24dp);
+    }
+
+    protected ShuffleAllPlaylist(Parcel in) {
+        super(in);
+    }
+
+    @NonNull
+    @Override
+    public Observable<ArrayList<Song>> getSongsFlowable(@NotNull @NonNull Context context) {
+        return SongLoader.INSTANCE.getAllSongsFlowable(context);
+    }
+
+    @NonNull
+    @Override
+    public ArrayList<Song> getSongs(@NotNull Context context) {
+        return SongLoader.INSTANCE.getAllSongs(context);
+    }
+
+    @Override
+    public void clear(@NonNull Context context) {
+        // Shuffle all is not a real "Smart Playlist"
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt
deleted file mode 100644
index 35c07d71c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/ShuffleAllPlaylist.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class ShuffleAllPlaylist : AbsSmartPlaylist(
-    name = App.getContext().getString(R.string.action_shuffle_all),
-    iconRes = R.drawable.ic_shuffle
-) {
-    override fun songs(): List<Song> {
-        return songRepository.songs()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt b/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt
deleted file mode 100644
index d33be0207..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/model/smartplaylist/TopTracksPlaylist.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package code.name.monkey.retromusic.model.smartplaylist
-
-import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import kotlinx.parcelize.Parcelize
-
-@Parcelize
-class TopTracksPlaylist : AbsSmartPlaylist(
-    name = App.getContext().getString(R.string.my_top_tracks),
-    iconRes = R.drawable.ic_trending_up
-) {
-    override fun songs(): List<Song> {
-        return topPlayedRepository.topTracks()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/BaseView.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/BaseView.kt
new file mode 100644
index 000000000..818853fc2
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/BaseView.kt
@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp
+
+/**
+ * Created by hemanths on 09/08/17.
+ */
+
+interface BaseView {
+    fun showEmptyView()
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.kt
new file mode 100644
index 000000000..3e6889ad9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/Presenter.kt
@@ -0,0 +1,30 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp
+
+import androidx.annotation.CallSuper
+
+/**
+ * Created by hemanths on 16/08/17.
+ */
+
+
+interface Presenter<T> {
+    @CallSuper
+    fun attachView(view: T)
+
+    @CallSuper
+    fun detachView()
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/PresenterImpl.java
similarity index 62%
rename from app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt
rename to app/src/main/java/code/name/monkey/retromusic/mvp/PresenterImpl.java
index 0045669c1..82d9950b2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/glide/audiocover/AudioFileCover.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/PresenterImpl.java
@@ -11,18 +11,20 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.glide.audiocover
 
-/** @author Karim Abou Zeid (kabouzeid)
+package code.name.monkey.retromusic.mvp;
+
+/**
+ * Created by hemanths on 2019-09-04.
  */
-class AudioFileCover(val filePath: String) {
-    override fun hashCode(): Int {
-        return filePath.hashCode()
+public abstract class PresenterImpl<T> {
+    protected T view;
+
+    public void attachView(T view) {
+        this.view = view;
     }
 
-    override fun equals(other: Any?): Boolean {
-        return if (other is AudioFileCover) {
-            other.filePath == filePath
-        } else false
+    public void detachView() {
+        view = null;
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
new file mode 100644
index 000000000..ed242c560
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumDetailsPresenter.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+
+
+/**
+ * Created by hemanths on 20/08/17.
+ */
+interface AlbumDetailsView {
+    fun album(album: Album)
+
+    fun complete()
+
+    fun loadArtistImage(artist: Artist)
+
+    fun moreAlbums(albums: ArrayList<Album>)
+}
+
+interface AlbumDetailsPresenter : Presenter<AlbumDetailsView> {
+    fun loadAlbum(albumId: Int)
+
+    fun loadMore(artistId: Int)
+
+    class AlbumDetailsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<AlbumDetailsView>(), AlbumDetailsPresenter {
+
+        private lateinit var album: Album
+
+        private var disposable: CompositeDisposable = CompositeDisposable()
+
+        override fun loadMore(artistId: Int) {
+            disposable += repository.getArtistByIdFlowable(artistId)
+                    .map {
+                        view?.loadArtistImage(it)
+                        return@map it.albums
+                    }
+                    .map {
+                        it.filter { filterAlbum -> album.id != filterAlbum.id }
+                    }
+                    .subscribe({
+                        if (it.isEmpty()) {
+                            return@subscribe
+                        }
+                        view?.moreAlbums(ArrayList(it))
+                    }, { t -> println(t) })
+        }
+
+
+        override fun loadAlbum(albumId: Int) {
+            disposable += repository.getAlbumFlowable(albumId)
+                    .doOnComplete {
+                        view?.complete()
+                    }
+                    .subscribe({
+                        album = it
+                        view?.album(it)
+                    }, { t -> println(t) })
+        }
+
+        override fun detachView() {
+            super.detachView()
+            disposable.dispose()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt
new file mode 100644
index 000000000..69ee58947
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/AlbumPresenter.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Album
+import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Created by hemanths on 12/08/17.
+ */
+interface AlbumsView : BaseView {
+	fun albums(albums: ArrayList<Album>)
+}
+
+interface AlbumsPresenter : Presenter<AlbumsView> {
+
+	fun loadAlbums()
+
+	class AlbumsPresenterImpl @Inject constructor(
+			private val repository: Repository
+	) : PresenterImpl<AlbumsView>(), AlbumsPresenter, CoroutineScope {
+		private val job = Job()
+
+		override val coroutineContext: CoroutineContext
+			get() = Dispatchers.IO + job
+
+		override fun detachView() {
+			super.detachView()
+			job.cancel()
+		}
+
+		override fun loadAlbums() {
+			launch {
+				when (val result = repository.allAlbums()) {
+					is Result.Success -> withContext(Dispatchers.Main) {
+						view?.albums(result.data)
+					}
+					is Result.Error   -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
new file mode 100644
index 000000000..ad5ffdc90
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistDetailsPresenter.kt
@@ -0,0 +1,86 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import code.name.monkey.retromusic.rest.model.LastFmArtist
+import kotlinx.coroutines.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Created by hemanths on 20/08/17.
+ */
+interface ArtistDetailsView : BaseView {
+    fun artist(artist: Artist)
+    fun artistInfo(lastFmArtist: LastFmArtist?)
+    fun complete()
+}
+
+interface ArtistDetailsPresenter : Presenter<ArtistDetailsView> {
+
+    fun loadArtist(artistId: Int)
+
+    fun loadBiography(
+            name: String, lang: String? = Locale.getDefault().language, cache: String?
+    )
+
+    class ArtistDetailsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<ArtistDetailsView>(), ArtistDetailsPresenter, CoroutineScope {
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        private val job = Job()
+
+        override fun loadBiography(name: String, lang: String?, cache: String?) {
+            launch {
+                when (val result = repository.artistInfo(name, lang, cache)) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.artistInfo(result.data)
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) {
+
+                    }
+                }
+            }
+        }
+
+        override fun loadArtist(artistId: Int) {
+            launch {
+                when (val result = repository.artistById(artistId)) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.artist(result.data)
+                        view?.complete()
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) {
+                        view?.showEmptyView()
+                    }
+                }
+            }
+        }
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
new file mode 100644
index 000000000..7af0365e5
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/ArtistPresenter.kt
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Artist
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+interface ArtistsView : BaseView {
+    fun artists(artists: ArrayList<Artist>)
+}
+
+interface ArtistsPresenter : Presenter<ArtistsView> {
+
+    fun loadArtists()
+
+    class ArtistsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<ArtistsView>(), ArtistsPresenter, CoroutineScope {
+        private val job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+        override fun loadArtists() {
+            launch {
+                when (val result = repository.allArtists()) {
+                    is Result.Success -> withContext(Dispatchers.Main) { view?.artists(result.data) }
+                    is Result.Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
new file mode 100644
index 000000000..4fe21bf7a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenreDetailsPresenter.kt
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+
+/**
+ * Created by hemanths on 20/08/17.
+ */
+
+interface GenreDetailsView : BaseView {
+    fun songs(songs: ArrayList<Song>)
+}
+
+interface GenreDetailsPresenter : Presenter<GenreDetailsView> {
+    fun loadGenreSongs(genreId: Int)
+
+    class GenreDetailsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<GenreDetailsView>(), GenreDetailsPresenter, CoroutineScope {
+        private val job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+
+        override fun loadGenreSongs(genreId: Int) {
+            launch {
+                when (val result = repository.getGenre(genreId)) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.songs(result.data)
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) {
+                        view?.showEmptyView()
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
new file mode 100644
index 000000000..c929ab226
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/GenrePresenter.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Genre
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+interface GenresView : BaseView {
+    fun genres(genres: ArrayList<Genre>)
+}
+
+interface GenresPresenter : Presenter<GenresView> {
+    fun loadGenres()
+
+    class GenresPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<GenresView>(), GenresPresenter, CoroutineScope {
+        private val job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+        override fun loadGenres() {
+            launch {
+                when (val result = repository.allGenres()) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.genres(result.data)
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
new file mode 100644
index 000000000..ea2dca6a8
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/HomePresenter.kt
@@ -0,0 +1,74 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Home
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.disposables.Disposable
+import kotlinx.coroutines.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+operator fun CompositeDisposable.plusAssign(disposable: Disposable) {
+    add(disposable)
+}
+
+interface HomeView : BaseView {
+    fun sections(sections: ArrayList<Home>)
+}
+
+interface HomePresenter : Presenter<HomeView> {
+    fun loadSections()
+
+    class HomePresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<HomeView>(), HomePresenter, CoroutineScope {
+        private val job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+        override fun loadSections() {
+            launch {
+                val list = ArrayList<Home>()
+                val recentArtistResult = listOf(
+                        repository.topArtists(),
+                        repository.topAlbums(),
+                        repository.recentArtists(),
+                        repository.recentAlbums(),
+                        repository.favoritePlaylist()
+                )
+                for (r in recentArtistResult) {
+                    when (r) {
+                        is Result.Success -> list.add(r.data)
+                    }
+                }
+                withContext(Dispatchers.Main) {
+                    if (list.isNotEmpty()) view?.sections(list) else view?.showEmptyView()
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
new file mode 100644
index 000000000..e41deeb76
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistPresenter.kt
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Playlist
+import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+
+/**
+ * Created by hemanths on 19/08/17.
+ */
+
+interface PlaylistView : BaseView {
+    fun playlists(playlists: ArrayList<Playlist>)
+}
+
+interface PlaylistsPresenter : Presenter<PlaylistView> {
+
+    fun playlists()
+
+    class PlaylistsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<PlaylistView>(), PlaylistsPresenter, CoroutineScope {
+
+        private val job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+        override fun playlists() {
+            launch {
+                when (val result = repository.allPlaylists()) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.playlists(result.data)
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
+    }
+}
+
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
new file mode 100644
index 000000000..407c4b83a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/PlaylistSongsPresenter.kt
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Created by hemanths on 20/08/17.
+ */
+interface PlaylistSongsView : BaseView {
+    fun songs(songs: ArrayList<Song>)
+}
+
+interface PlaylistSongsPresenter : Presenter<PlaylistSongsView> {
+    fun loadPlaylistSongs(playlist: Playlist)
+
+    class PlaylistSongsPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<PlaylistSongsView>(), PlaylistSongsPresenter, CoroutineScope {
+
+        private var job: Job = Job()
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        override fun loadPlaylistSongs(playlist: Playlist) {
+            launch {
+                when (val songs = repository.getPlaylistSongs(playlist)) {
+                    is Result.Success -> withContext(Dispatchers.Main) {
+                        view?.songs(songs.data)
+                    }
+                    is Result.Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt
new file mode 100644
index 000000000..994040b6b
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SearchPresenter.kt
@@ -0,0 +1,64 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result.Error
+import code.name.monkey.retromusic.Result.Success
+import code.name.monkey.retromusic.mvp.BaseView
+import code.name.monkey.retromusic.mvp.Presenter
+import code.name.monkey.retromusic.mvp.PresenterImpl
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Created by hemanths on 20/08/17.
+ */
+
+interface SearchView : BaseView {
+    fun showData(data: MutableList<Any>)
+}
+
+interface SearchPresenter : Presenter<SearchView> {
+
+    fun search(query: String?)
+
+    class SearchPresenterImpl @Inject constructor(
+            private val repository: Repository
+    ) : PresenterImpl<SearchView>(), SearchPresenter, CoroutineScope {
+
+        override val coroutineContext: CoroutineContext
+            get() = Dispatchers.IO + job
+
+        private var job: Job = Job()
+
+        override fun detachView() {
+            super.detachView()
+            job.cancel()
+        }
+
+        override fun search(query: String?) {
+            launch {
+                when (val result = repository.search(query)) {
+                    is Success -> withContext(Dispatchers.Main) { view?.showData(result.data) }
+                    is Error -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+                }
+            }
+        }
+    }
+}
+
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
new file mode 100644
index 000000000..89ab6351d
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/mvp/presenter/SongPresenter.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.mvp.presenter
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.mvp.*
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import kotlinx.coroutines.*
+import java.util.*
+import javax.inject.Inject
+import kotlin.coroutines.CoroutineContext
+
+/**
+ * Created by hemanths on 10/08/17.
+ */
+interface SongView {
+	fun songs(songs: ArrayList<Song>)
+
+	fun showEmptyView()
+}
+
+interface SongPresenter : Presenter<SongView> {
+	fun loadSongs()
+	class SongPresenterImpl @Inject constructor(
+			private val repository: Repository
+	) : PresenterImpl<SongView>(), SongPresenter, CoroutineScope {
+
+		private var job: Job = Job()
+
+		override val coroutineContext: CoroutineContext
+			get() = Dispatchers.IO + job
+
+		override fun loadSongs() {
+			launch {
+				when (val songs = repository.allSongs()) {
+					is Result.Success -> withContext(Dispatchers.Main) { view?.songs(songs.data) }
+					is Result.Error   -> withContext(Dispatchers.Main) { view?.showEmptyView() }
+				}
+			}
+		}
+
+		override fun detachView() {
+			super.detachView()
+			job.cancel();
+		}
+	}
+}
+
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
index f86723b71..6667a330a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/AlbumCoverStylePreferenceDialog.kt
@@ -14,77 +14,80 @@
 
 package code.name.monkey.retromusic.preferences
 
+import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.Context
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
-import androidx.fragment.app.DialogFragment
+import android.widget.ImageView
+import android.widget.TextView
+import androidx.preference.PreferenceDialogFragmentCompat
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogNowPlayingScreenBinding
-import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBinding
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle.*
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.customview.customView
 import com.bumptech.glide.Glide
 
-class AlbumCoverStylePreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : ATEDialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+
+class AlbumCoverStylePreference : ATEDialogPreference {
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
 
     private val mLayoutRes = R.layout.preference_dialog_now_playing_screen
 
     override fun getDialogLayoutResource(): Int {
-        return mLayoutRes
+        return mLayoutRes;
     }
 
     init {
-        icon?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-                context.colorControlNormal(),
-                SRC_IN
-            )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
 
-class AlbumCoverStylePreferenceDialog : DialogFragment(),
-    ViewPager.OnPageChangeListener {
+class AlbumCoverStylePreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
+    override fun onDialogClosed(positiveResult: Boolean) {
+
+    }
 
     private var viewPagerPosition: Int = 0
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = PreferenceDialogNowPlayingScreenBinding.inflate(layoutInflater)
-        binding.nowPlayingScreenViewPager.apply {
-            adapter = AlbumCoverStyleAdapter(requireContext())
-            addOnPageChangeListener(this@AlbumCoverStylePreferenceDialog)
-            pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
-            currentItem = PreferenceUtil.albumCoverStyle.ordinal
-        }
+        @SuppressLint("InflateParams") val view = LayoutInflater.from(activity).inflate(R.layout.preference_dialog_now_playing_screen, null)
+        val viewPager = view.findViewById<ViewPager>(R.id.now_playing_screen_view_pager)
+        viewPager.adapter = AlbumCoverStyleAdapter(activity!!)
+        viewPager.addOnPageChangeListener(this)
+        viewPager.pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
+        viewPager.currentItem = PreferenceUtil.getInstance(requireContext()).albumCoverStyle.ordinal
 
-        return materialDialog(R.string.pref_title_album_cover_style)
-            .setPositiveButton(R.string.set) { _, _ ->
-                val coverStyle = values()[viewPagerPosition]
-                PreferenceUtil.albumCoverStyle = coverStyle
+        return MaterialDialog(requireActivity()).show {
+            title(R.string.pref_title_album_cover_style)
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            positiveButton(R.string.set) {
+                val nowPlayingScreen = AlbumCoverStyle.values()[viewPagerPosition]
+                PreferenceUtil.getInstance(requireContext()).albumCoverStyle = nowPlayingScreen
             }
-            .setView(binding.root)
-            .create()
-            .colorButtons()
+            negativeButton(android.R.string.cancel)
+            customView(view = view, scrollable = false, noVerticalPadding = false)
+        }
     }
 
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+
     }
 
     override fun onPageSelected(position: Int) {
@@ -92,48 +95,54 @@ class AlbumCoverStylePreferenceDialog : DialogFragment(),
     }
 
     override fun onPageScrollStateChanged(state: Int) {
+
     }
 
-    private class AlbumCoverStyleAdapter(private val context: Context) :
-        PagerAdapter() {
+    private class AlbumCoverStyleAdapter internal constructor(private val context: Context) : PagerAdapter() {
 
         override fun instantiateItem(collection: ViewGroup, position: Int): Any {
-            val albumCoverStyle = values()[position]
+            val albumCoverStyle = AlbumCoverStyle.values()[position]
 
             val inflater = LayoutInflater.from(context)
-            val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, true)
+            val layout = inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false) as ViewGroup
+            collection.addView(layout)
 
-            Glide.with(context).load(albumCoverStyle.drawableResId).into(binding.image)
-            binding.title.setText(albumCoverStyle.titleRes)
-            return binding.root
+            val image = layout.findViewById<ImageView>(R.id.image)
+            val title = layout.findViewById<TextView>(R.id.title)
+            Glide.with(context).load(albumCoverStyle.drawableResId).into(image)
+            title.setText(albumCoverStyle.titleRes)
+
+            return layout
         }
 
-        override fun destroyItem(
-            collection: ViewGroup,
-            position: Int,
-            view: Any
-        ) {
+        override fun destroyItem(collection: ViewGroup,
+                                 position: Int,
+                                 view: Any) {
             collection.removeView(view as View)
         }
 
         override fun getCount(): Int {
-            return values().size
+            return AlbumCoverStyle.values().size
         }
 
-        override fun isViewFromObject(view: View, instace: Any): Boolean {
-            return view === instace
+        override fun isViewFromObject(view: View, `object`: Any): Boolean {
+            return view === `object`
         }
 
-        override fun getPageTitle(position: Int): CharSequence {
-            return context.getString(values()[position].titleRes)
+        override fun getPageTitle(position: Int): CharSequence? {
+            return context.getString(AlbumCoverStyle.values()[position].titleRes)
         }
     }
 
     companion object {
         val TAG: String = AlbumCoverStylePreferenceDialog::class.java.simpleName
 
-        fun newInstance(): AlbumCoverStylePreferenceDialog {
-            return AlbumCoverStylePreferenceDialog()
+        fun newInstance(key: String): AlbumCoverStylePreferenceDialog {
+            val bundle = Bundle()
+            bundle.putString(ARG_KEY, key)
+            val fragment = AlbumCoverStylePreferenceDialog()
+            fragment.arguments = bundle
+            return fragment
         }
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
index 15e95fedc..ab856a409 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/BlacklistPreferenceDialog.kt
@@ -16,37 +16,35 @@ package code.name.monkey.retromusic.preferences
 
 import android.app.Dialog
 import android.content.Context
+import android.graphics.PorterDuff
 import android.os.Bundle
+import android.text.Html
 import android.util.AttributeSet
-import androidx.appcompat.app.AlertDialog
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
-import androidx.core.text.parseAsHtml
 import androidx.fragment.app.DialogFragment
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.dialogs.BlacklistFolderChooserDialog
-import code.name.monkey.retromusic.extensions.accentTextColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
 import code.name.monkey.retromusic.providers.BlacklistStore
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItems
 import java.io.File
+import java.util.*
 
-class BlacklistPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1,
-) : ATEDialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+class BlacklistPreference : ATEDialogPreference {
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
 
     init {
-        icon?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-                context.colorControlNormal(),
-                SRC_IN
-            )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
 
@@ -57,68 +55,60 @@ class BlacklistPreferenceDialog : DialogFragment(), BlacklistFolderChooserDialog
         }
     }
 
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val chooserDialog =
-            childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
-        chooserDialog?.setCallback(this)
-        val context = requireActivity()
 
-        refreshBlacklistData(context)
-        return materialDialog(R.string.blacklist)
-            .setPositiveButton(R.string.done) { _, _ ->
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val blacklistFolderChooserDialog = childFragmentManager.findFragmentByTag("FOLDER_CHOOSER") as BlacklistFolderChooserDialog?
+        blacklistFolderChooserDialog?.setCallback(this)
+        refreshBlacklistData()
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+            title(code.name.monkey.retromusic.R.string.blacklist)
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            positiveButton(android.R.string.ok) {
                 dismiss()
             }
-            .setNeutralButton(R.string.clear_action) { _, _ ->
-                materialDialog(R.string.clear_blacklist)
-                    .setMessage(R.string.do_you_want_to_clear_the_blacklist)
-                    .setPositiveButton(R.string.clear_action) { _, _ ->
+            neutralButton(text = getString(R.string.clear_action)) {
+                MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                    title(code.name.monkey.retromusic.R.string.clear_blacklist)
+                    message(code.name.monkey.retromusic.R.string.do_you_want_to_clear_the_blacklist)
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    positiveButton(code.name.monkey.retromusic.R.string.clear_action) {
                         BlacklistStore.getInstance(context).clear()
+                        refreshBlacklistData()
                     }
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .create()
-                    .colorButtons()
-                    .show()
-            }
-            .setNegativeButton(R.string.add_action) { _, _ ->
-                val dialog = BlacklistFolderChooserDialog.create()
-                dialog.setCallback(this@BlacklistPreferenceDialog)
-                dialog.show(requireActivity().supportFragmentManager, "FOLDER_CHOOSER")
-            }
-            .setItems(paths.toTypedArray()) { _, which ->
-                materialDialog(R.string.remove_from_blacklist)
-                    .setMessage(
-                        String.format(
-                            getString(R.string.do_you_want_to_remove_from_the_blacklist),
-                            paths[which]
-                        ).parseAsHtml()
-                    )
-                    .setPositiveButton(R.string.remove_action) { _, _ ->
-                        BlacklistStore.getInstance(context).removePath(File(paths[which]))
-                    }
-                    .setNegativeButton(android.R.string.cancel, null)
-                    .create()
-                    .colorButtons()
-                    .show()
-            }
-            .create().apply {
-                setOnShowListener {
-                    getButton(AlertDialog.BUTTON_POSITIVE).accentTextColor()
-                    getButton(AlertDialog.BUTTON_NEGATIVE).accentTextColor()
-                    getButton(AlertDialog.BUTTON_NEUTRAL).accentTextColor()
+                    negativeButton(android.R.string.cancel)
                 }
             }
+            negativeButton(R.string.add_action) {
+                val dialog = BlacklistFolderChooserDialog.create()
+                dialog.setCallback(this@BlacklistPreferenceDialog)
+                dialog.show(childFragmentManager, "FOLDER_CHOOSER");
+            }
+            listItems(items = paths, waitForPositiveButton = false) { _, _, text ->
+                MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                    cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                    title(code.name.monkey.retromusic.R.string.remove_from_blacklist)
+                    message(text = Html.fromHtml(getString(code.name.monkey.retromusic.R.string.do_you_want_to_remove_from_the_blacklist, text)))
+                    positiveButton(code.name.monkey.retromusic.R.string.remove_action) {
+                        BlacklistStore.getInstance(context).removePath(File(text.toString()))
+                        refreshBlacklistData()
+                    }
+                    negativeButton(android.R.string.cancel)
+                }
+            }
+            noAutoDismiss()
+        }
     }
 
     private lateinit var paths: ArrayList<String>
 
-    private fun refreshBlacklistData(context: Context?) {
-        if (context == null) return
-        this.paths = BlacklistStore.getInstance(context).paths
-        val dialog = dialog as MaterialAlertDialogBuilder?
-        dialog?.setItems(paths.toTypedArray(), null)
+    private fun refreshBlacklistData() {
+        this.paths = BlacklistStore.getInstance(context!!).paths
+        val dialog = dialog as MaterialDialog?
+        dialog?.listItems(items = paths)
     }
 
-    override fun onFolderSelection(context: Context, folder: File) {
-        BlacklistStore.getInstance(context).addPath(folder)
+    override fun onFolderSelection(dialog: BlacklistFolderChooserDialog, folder: File) {
+        BlacklistStore.getInstance(context!!).addPath(folder);
+        refreshBlacklistData();
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
deleted file mode 100644
index 6f7445c25..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/DurationPreference.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package code.name.monkey.retromusic.preferences
-
-import android.app.Dialog
-import android.content.Context
-import android.os.Bundle
-import android.util.AttributeSet
-import android.widget.TextView
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
-import androidx.fragment.app.DialogFragment
-import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogAudioFadeBinding
-import code.name.monkey.retromusic.extensions.addAccentColor
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.slider.Slider
-
-
-class DurationPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
-) : ATEDialogPreference(context, attrs, defStyleAttr, defStyleRes) {
-    init {
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            context.colorControlNormal(),
-            SRC_IN
-        )
-    }
-}
-
-class DurationPreferenceDialog : DialogFragment() {
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = PreferenceDialogAudioFadeBinding.inflate(layoutInflater)
-
-        binding.slider.apply {
-            addAccentColor()
-            value = PreferenceUtil.audioFadeDuration.toFloat()
-            updateText(value.toInt(), binding.duration)
-            addOnChangeListener(Slider.OnChangeListener { _, value, fromUser ->
-                if (fromUser) {
-                    updateText(value.toInt(), binding.duration)
-                }
-            })
-        }
-
-
-        return materialDialog(R.string.audio_fade_duration)
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.save) { _, _ -> updateDuration(binding.slider.value.toInt()) }
-            .setView(binding.root)
-            .create()
-            .colorButtons()
-    }
-
-    private fun updateText(value: Int, duration: TextView) {
-        var durationText = "$value ms"
-        if (value == 0) durationText += " / Off"
-        duration.text = durationText
-    }
-
-    private fun updateDuration(duration: Int) {
-        PreferenceUtil.audioFadeDuration = duration
-    }
-
-    companion object {
-        fun newInstance(): DurationPreferenceDialog {
-            return DurationPreferenceDialog()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
index 16603b6af..bce327549 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/LibraryPreference.kt
@@ -16,69 +16,93 @@ package code.name.monkey.retromusic.preferences
 
 import android.app.Dialog
 import android.content.Context
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.util.AttributeSet
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
-import androidx.fragment.app.DialogFragment
+import android.widget.Toast
+import androidx.preference.PreferenceDialogFragmentCompat
 import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.adapter.CategoryInfoAdapter
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceDialogLibraryCategoriesBinding
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import code.name.monkey.retromusic.extensions.showToast
+import code.name.monkey.retromusic.adapter.CategoryInfoAdapter
 import code.name.monkey.retromusic.model.CategoryInfo
 import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.customview.customView
+import java.util.*
+
+
+class LibraryPreference : ATEDialogPreference {
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr)
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
 
-class LibraryPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
-) : ATEDialogPreference(context, attrs, defStyleAttr, defStyleRes) {
     init {
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            context.colorControlNormal(),
-            SRC_IN
-        )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
 
-class LibraryPreferenceDialog : DialogFragment() {
+class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+
+    }
+
+    lateinit var adapter: CategoryInfoAdapter
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val binding = PreferenceDialogLibraryCategoriesBinding.inflate(layoutInflater)
+        val view = requireActivity().layoutInflater.inflate(R.layout.preference_dialog_library_categories, null)
 
-        val categoryAdapter = CategoryInfoAdapter()
-        binding.recyclerView.apply {
-            layoutManager = LinearLayoutManager(requireContext())
-            adapter = categoryAdapter
-            categoryAdapter.attachToRecyclerView(this)
+        val categoryInfos: List<CategoryInfo> = if (savedInstanceState != null) {
+            savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES)!!
+        } else {
+            PreferenceUtil.getInstance(requireContext()).libraryCategoryInfos
         }
+        adapter = CategoryInfoAdapter(categoryInfos)
 
-        return materialDialog(R.string.library_categories)
-            .setNeutralButton(
-                R.string.reset_action
-            ) { _, _ ->
-                updateCategories(PreferenceUtil.defaultCategories)
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .setPositiveButton(R.string.done) { _, _ -> updateCategories(categoryAdapter.categoryInfos) }
-            .setView(binding.root)
-            .create()
-            .colorButtons()
+        val recyclerView = view.findViewById<RecyclerView>(R.id.recycler_view)
+        recyclerView.layoutManager = LinearLayoutManager(activity)
+        recyclerView.adapter = adapter
+
+        adapter.attachToRecyclerView(recyclerView)
+
+        return MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .title(R.string.library_categories)
+                .cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                .customView(view = view)
+                .positiveButton(android.R.string.ok) {
+                    updateCategories(adapter.categoryInfos)
+                    dismiss()
+                }
+                .negativeButton(android.R.string.cancel) {
+                    dismiss()
+                }
+                .neutralButton(R.string.reset_action) {
+                    adapter.categoryInfos = PreferenceUtil.getInstance(requireContext()).defaultLibraryCategoryInfos
+                }
+                .noAutoDismiss()
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES, ArrayList(adapter.categoryInfos))
     }
 
     private fun updateCategories(categories: List<CategoryInfo>) {
         if (getSelected(categories) == 0) return
         if (getSelected(categories) > 5) {
-            showToast(R.string.message_limit_tabs)
+            Toast.makeText(context, "Not more than 5 items", Toast.LENGTH_SHORT).show()
             return
         }
-        PreferenceUtil.libraryCategory = categories
+        PreferenceUtil.getInstance(requireContext()).libraryCategoryInfos = categories
     }
 
     private fun getSelected(categories: List<CategoryInfo>): Int {
@@ -91,8 +115,13 @@ class LibraryPreferenceDialog : DialogFragment() {
     }
 
     companion object {
-        fun newInstance(): LibraryPreferenceDialog {
-            return LibraryPreferenceDialog()
+
+        fun newInstance(key: String): LibraryPreferenceDialog {
+            val bundle = Bundle()
+            bundle.putString(ARG_KEY, key)
+            val fragment = LibraryPreferenceDialog()
+            fragment.arguments = bundle
+            return fragment
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt
new file mode 100644
index 000000000..8c02e28b3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/MaterialListPreference.kt
@@ -0,0 +1,140 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.preferences
+
+import android.app.Dialog
+import android.content.Context
+import android.content.res.TypedArray
+import android.graphics.PorterDuff
+import android.os.Bundle
+import android.util.AttributeSet
+import androidx.preference.ListPreference
+import androidx.preference.PreferenceDialogFragmentCompat
+import code.name.monkey.appthemehelper.ThemeStore
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.util.PreferenceUtil
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+import com.afollestad.materialdialogs.list.listItemsSingleChoice
+
+
+class MaterialListPreference : ListPreference {
+    private val mLayoutRes = R.layout.ate_preference_list
+
+    constructor(context: Context) : super(context) {
+        init(context)
+    }
+
+    private fun init(context: Context) {
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init(context)
+    }
+
+    override fun getDialogLayoutResource(): Int {
+        return mLayoutRes
+    }
+
+    override fun onGetDefaultValue(a: TypedArray, index: Int): String {
+        // Default value from attribute. Fallback value is set to 0.
+        return a.getString(index)!!
+    }
+
+    fun setCustomValue(any: Any) {
+        when (any) {
+            is String -> persistString(any)
+            is Int -> persistInt(any)
+            is Boolean -> persistBoolean(any)
+        }
+    }
+}
+
+class MaterialListPreferenceDialog : PreferenceDialogFragmentCompat() {
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val materialListPreference = preference as MaterialListPreference
+        val entries = arguments?.getStringArrayList(EXTRA_ENTRIES)
+        val entriesValues = arguments?.getStringArrayList(EXTRA_ENTRIES_VALUES)
+        val position: Int = arguments?.getInt(EXTRA_POSITION) ?: 0
+        materialDialog = MaterialDialog(requireContext(), BottomSheet(LayoutMode.WRAP_CONTENT))
+                .title(text = materialListPreference.title.toString())
+                .positiveButton(R.string.set)
+                .cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+                .listItemsSingleChoice(items = entries, initialSelection = position, waitForPositiveButton = true) { _, index, _ ->
+                    entriesValues?.let {
+                        materialListPreference.callChangeListener(it[index])
+                        materialListPreference.setCustomValue(it[index])
+                    }
+                    entries?.let {
+                        materialListPreference.summary = it[index]
+                        val value = materialListPreference.entryValues[index].toString()
+                        if (materialListPreference.callChangeListener(value)) {
+                            materialListPreference.value = value
+                        }
+                    }
+                    dismiss()
+                }
+        return materialDialog
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        materialDialog.dismiss()
+    }
+
+    private lateinit var materialDialog: MaterialDialog
+
+    override fun onDialogClosed(positiveResult: Boolean) {
+        if (positiveResult) {
+            materialDialog.dismiss()
+        }
+    }
+
+    companion object {
+
+        private const val EXTRA_KEY = "key"
+        private const val EXTRA_TITLE = "title"
+        private const val EXTRA_POSITION = "position"
+        private const val EXTRA_ENTRIES = "extra_entries"
+        private const val EXTRA_ENTRIES_VALUES = "extra_entries_values"
+
+        fun newInstance(listPreference: ListPreference): MaterialListPreferenceDialog {
+            val entries = listPreference.entries.toList() as ArrayList<String>
+            val entriesValues = listPreference.entryValues.toList() as ArrayList<String>
+            println("List value: ${listPreference.value}")
+            val position = listPreference.findIndexOfValue(listPreference.value)
+            val args = Bundle()
+            args.putString(ARG_KEY, listPreference.key)
+            args.putString(EXTRA_TITLE, listPreference.title.toString())
+            args.putInt(EXTRA_POSITION, position)
+            args.putStringArrayList(EXTRA_ENTRIES, entries)
+            args.putStringArrayList(EXTRA_ENTRIES_VALUES, entriesValues)
+            val fragment = MaterialListPreferenceDialog()
+            fragment.arguments = args
+            return fragment
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
index cd8aa21a2..364f60d3b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/preferences/NowPlayingScreenPreferenceDialog.kt
@@ -16,119 +16,159 @@ package code.name.monkey.retromusic.preferences
 
 import android.app.Dialog
 import android.content.Context
+import android.graphics.PorterDuff
 import android.os.Bundle
 import android.util.AttributeSet
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
-import androidx.fragment.app.DialogFragment
+import android.widget.ImageView
+import android.widget.TextView
+import android.widget.Toast
+import androidx.preference.PreferenceDialogFragmentCompat
 import androidx.viewpager.widget.PagerAdapter
 import androidx.viewpager.widget.ViewPager
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEDialogPreference
-import code.name.monkey.retromusic.extensions.colorButtons
-import code.name.monkey.retromusic.extensions.colorControlNormal
-import code.name.monkey.retromusic.extensions.materialDialog
-import com.bumptech.glide.Glide
+import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.PreferenceNowPlayingScreenItemBinding
-import code.name.monkey.retromusic.fragments.NowPlayingScreen.*
+import code.name.monkey.retromusic.fragments.NowPlayingScreen
+import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.ViewUtil
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.customview.customView
+import com.bumptech.glide.Glide
 
-class NowPlayingScreenPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : ATEDialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+class NowPlayingScreenPreference : ATEDialogPreference {
+
+    constructor(context: Context) : super(context) {}
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {}
 
     private val mLayoutRes = R.layout.preference_dialog_now_playing_screen
 
     override fun getDialogLayoutResource(): Int {
-        return mLayoutRes
+        return mLayoutRes;
     }
 
     init {
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            context.colorControlNormal(),
-            SRC_IN
-        )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
 
-class NowPlayingScreenPreferenceDialog : DialogFragment(), ViewPager.OnPageChangeListener {
+class NowPlayingScreenPreferenceDialog : PreferenceDialogFragmentCompat(), ViewPager.OnPageChangeListener {
 
     private var viewPagerPosition: Int = 0
 
     override fun onPageScrollStateChanged(state: Int) {
+
     }
 
     override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+
     }
 
     override fun onPageSelected(position: Int) {
         this.viewPagerPosition = position
     }
 
+    override fun onDialogClosed(positiveResult: Boolean) {
+
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val view = layoutInflater
-            .inflate(R.layout.preference_dialog_now_playing_screen, null)
+        val view = LayoutInflater.from(activity).inflate(R.layout.preference_dialog_now_playing_screen, null)
         val viewPager = view.findViewById<ViewPager>(R.id.now_playing_screen_view_pager)
-            ?: throw  IllegalStateException("Dialog view must contain a ViewPager with id 'now_playing_screen_view_pager'")
-        viewPager.adapter = NowPlayingScreenAdapter(requireContext())
+                ?: throw  IllegalStateException("Dialog view must contain a ViewPager with id 'now_playing_screen_view_pager'")
+        viewPager.adapter = NowPlayingScreenAdapter(activity!!)
         viewPager.addOnPageChangeListener(this)
         viewPager.pageMargin = ViewUtil.convertDpToPixel(32f, resources).toInt()
-        viewPager.currentItem = PreferenceUtil.nowPlayingScreen.ordinal
+        viewPager.currentItem = PreferenceUtil.getInstance(requireContext()).nowPlayingScreen.ordinal
 
-        return materialDialog(R.string.pref_title_now_playing_screen_appearance)
-            .setCancelable(false)
-            .setPositiveButton(R.string.set) { _, _ ->
-                val nowPlayingScreen = values()[viewPagerPosition]
-                PreferenceUtil.nowPlayingScreen = nowPlayingScreen
+
+        return MaterialDialog(requireContext()).show {
+            title(R.string.pref_title_now_playing_screen_appearance)
+            positiveButton(R.string.set) {
+                val nowPlayingScreen = NowPlayingScreen.values()[viewPagerPosition]
+                if (isNowPlayingThemes(nowPlayingScreen)) {
+                    val result = getString(nowPlayingScreen.titleRes) + " theme is Pro version feature."
+                    Toast.makeText(context, result, Toast.LENGTH_SHORT).show()
+                    NavigationUtil.goToProVersion(activity!!)
+                } else {
+                    PreferenceUtil.getInstance(requireContext()).nowPlayingScreen = nowPlayingScreen
+                }
             }
-            .setView(view)
-            .create()
-            .colorButtons()
+            cornerRadius(PreferenceUtil.getInstance(requireContext()).dialogCorner)
+            negativeButton(android.R.string.cancel)
+            customView(view = view, scrollable = false, noVerticalPadding = false)
+        }
+    }
+
+    private fun isNowPlayingThemes(nowPlayingScreen: NowPlayingScreen): Boolean {
+        if (nowPlayingScreen == NowPlayingScreen.BLUR_CARD) {
+            PreferenceUtil.getInstance(requireContext()).resetCarouselEffect()
+            PreferenceUtil.getInstance(requireContext()).resetCircularAlbumArt()
+        }
+
+        return (nowPlayingScreen == NowPlayingScreen.FULL ||
+                nowPlayingScreen == NowPlayingScreen.CARD ||
+                nowPlayingScreen == NowPlayingScreen.PLAIN ||
+                nowPlayingScreen == NowPlayingScreen.BLUR ||
+                nowPlayingScreen == NowPlayingScreen.COLOR ||
+                nowPlayingScreen == NowPlayingScreen.SIMPLE ||
+                nowPlayingScreen == NowPlayingScreen.BLUR_CARD ||
+                nowPlayingScreen == NowPlayingScreen.ADAPTIVE)
+                && !App.isProVersion()
     }
 
     companion object {
-        fun newInstance(): NowPlayingScreenPreferenceDialog {
-            return NowPlayingScreenPreferenceDialog()
+        fun newInstance(key: String): NowPlayingScreenPreferenceDialog {
+            val bundle = Bundle()
+            bundle.putString(ARG_KEY, key)
+            val fragment = NowPlayingScreenPreferenceDialog()
+            fragment.arguments = bundle
+            return fragment
         }
     }
 }
 
-private class NowPlayingScreenAdapter(private val context: Context) : PagerAdapter() {
+private class NowPlayingScreenAdapter internal constructor(private val context: Context) : PagerAdapter() {
 
     override fun instantiateItem(collection: ViewGroup, position: Int): Any {
-        val nowPlayingScreen = values()[position]
+        val nowPlayingScreen = NowPlayingScreen.values()[position]
 
         val inflater = LayoutInflater.from(context)
-        val binding = PreferenceNowPlayingScreenItemBinding.inflate(inflater, collection, true)
-        Glide.with(context).load(nowPlayingScreen.drawableResId).into(binding.image)
-        binding.title.setText(nowPlayingScreen.titleRes)
-        return binding.root
+        val layout = inflater.inflate(R.layout.preference_now_playing_screen_item, collection, false) as ViewGroup
+        collection.addView(layout)
+
+        val image = layout.findViewById<ImageView>(R.id.image)
+        val title = layout.findViewById<TextView>(R.id.title)
+        Glide.with(context).load(nowPlayingScreen.drawableResId).into(image)
+        title.setText(nowPlayingScreen.titleRes)
+
+        return layout
     }
 
-    override fun destroyItem(
-        collection: ViewGroup,
-        position: Int,
-        view: Any
-    ) {
+    override fun destroyItem(collection: ViewGroup,
+                             position: Int,
+                             view: Any) {
         collection.removeView(view as View)
     }
 
     override fun getCount(): Int {
-        return values().size
+        return NowPlayingScreen.values().size
     }
 
-    override fun isViewFromObject(view: View, instance: Any): Boolean {
-        return view === instance
+    override fun isViewFromObject(view: View, `object`: Any): Boolean {
+        return view === `object`
     }
 
-    override fun getPageTitle(position: Int): CharSequence {
-        return context.getString(values()[position].titleRes)
+    override fun getPageTitle(position: Int): CharSequence? {
+        return context.getString(NowPlayingScreen.values()[position].titleRes)
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
index b125385a6..8efe52597 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/BlacklistStore.java
@@ -14,9 +14,6 @@
 
 package code.name.monkey.retromusic.providers;
 
-import static code.name.monkey.retromusic.service.MusicService.MEDIA_STORE_CHANGED;
-import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStoragePublicDirectory;
-
 import android.content.ContentValues;
 import android.content.Context;
 import android.content.Intent;
@@ -33,158 +30,141 @@ import java.util.ArrayList;
 import code.name.monkey.retromusic.util.FileUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 
+import static code.name.monkey.retromusic.service.MusicService.MEDIA_STORE_CHANGED;
+
 public class BlacklistStore extends SQLiteOpenHelper {
-  public static final String DATABASE_NAME = "blacklist.db";
-  private static final int VERSION = 2;
-  private static BlacklistStore sInstance = null;
-  private final Context context;
+    public static final String DATABASE_NAME = "blacklist.db";
+    private static final int VERSION = 2;
+    private static BlacklistStore sInstance = null;
+    private Context context;
 
-  public BlacklistStore(final Context context) {
-    super(context, DATABASE_NAME, null, VERSION);
-    this.context = context;
-  }
-
-  @NonNull
-  public static synchronized BlacklistStore getInstance(@NonNull final Context context) {
-    if (sInstance == null) {
-      sInstance = new BlacklistStore(context.getApplicationContext());
-      if (!PreferenceUtil.INSTANCE.isInitializedBlacklist()) {
-        // blacklisted by default
-        sInstance.addPathImpl(
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_ALARMS));
-        sInstance.addPathImpl(
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_NOTIFICATIONS));
-        sInstance.addPathImpl(
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES));
-
-        PreferenceUtil.INSTANCE.setInitializedBlacklist(true);
-      }
-    }
-    return sInstance;
-  }
-
-  @Override
-  public void onCreate(@NonNull final SQLiteDatabase db) {
-    db.execSQL(
-        "CREATE TABLE IF NOT EXISTS "
-            + BlacklistStoreColumns.NAME
-            + " ("
-            + BlacklistStoreColumns.PATH
-            + " STRING NOT NULL);");
-  }
-
-  @Override
-  public void onUpgrade(
-      @NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
-    db.execSQL("DROP TABLE IF EXISTS " + BlacklistStoreColumns.NAME);
-    onCreate(db);
-  }
-
-  @Override
-  public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-    db.execSQL("DROP TABLE IF EXISTS " + BlacklistStoreColumns.NAME);
-    onCreate(db);
-  }
-
-  public void addPath(File file) {
-    addPathImpl(file);
-    notifyMediaStoreChanged();
-  }
-
-  private void addPathImpl(File file) {
-    if (file == null || contains(file)) {
-      return;
-    }
-    String path = FileUtil.safeGetCanonicalPath(file);
-
-    final SQLiteDatabase database = getWritableDatabase();
-    database.beginTransaction();
-
-    try {
-      // add the entry
-      final ContentValues values = new ContentValues(1);
-      values.put(BlacklistStoreColumns.PATH, path);
-      database.insert(BlacklistStoreColumns.NAME, null, values);
-
-      database.setTransactionSuccessful();
-    } finally {
-      database.endTransaction();
-    }
-  }
-
-  public boolean contains(File file) {
-    if (file == null) {
-      return false;
-    }
-    String path = FileUtil.safeGetCanonicalPath(file);
-
-    final SQLiteDatabase database = getReadableDatabase();
-    Cursor cursor =
-        database.query(
-            BlacklistStoreColumns.NAME,
-            new String[] {BlacklistStoreColumns.PATH},
-            BlacklistStoreColumns.PATH + "=?",
-            new String[] {path},
-            null,
-            null,
-            null,
-            null);
-
-    boolean containsPath = cursor != null && cursor.moveToFirst();
-    if (cursor != null) {
-      cursor.close();
-    }
-    return containsPath;
-  }
-
-  public void removePath(File file) {
-    final SQLiteDatabase database = getWritableDatabase();
-    String path = FileUtil.safeGetCanonicalPath(file);
-
-    database.delete(
-        BlacklistStoreColumns.NAME, BlacklistStoreColumns.PATH + "=?", new String[] {path});
-
-    notifyMediaStoreChanged();
-  }
-
-  public void clear() {
-    final SQLiteDatabase database = getWritableDatabase();
-    database.delete(BlacklistStoreColumns.NAME, null, null);
-
-    notifyMediaStoreChanged();
-  }
-
-  private void notifyMediaStoreChanged() {
-    context.sendBroadcast(new Intent(MEDIA_STORE_CHANGED));
-  }
-
-  @NonNull
-  public ArrayList<String> getPaths() {
-    Cursor cursor =
-        getReadableDatabase()
-            .query(
-                BlacklistStoreColumns.NAME,
-                new String[] {BlacklistStoreColumns.PATH},
-                null,
-                null,
-                null,
-                null,
-                null);
-
-    ArrayList<String> paths = new ArrayList<>();
-    if (cursor != null && cursor.moveToFirst()) {
-      do {
-        paths.add(cursor.getString(0));
-      } while (cursor.moveToNext());
+    public BlacklistStore(final Context context) {
+        super(context, DATABASE_NAME, null, VERSION);
+        this.context = context;
     }
 
-    if (cursor != null) cursor.close();
-    return paths;
-  }
+    @NonNull
+    public static synchronized BlacklistStore getInstance(@NonNull final Context context) {
+        if (sInstance == null) {
+            sInstance = new BlacklistStore(context.getApplicationContext());
+            if (!PreferenceUtil.getInstance(context).initializedBlacklist()) {
+                // blacklisted by default
+                sInstance.addPathImpl(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_ALARMS));
+                sInstance.addPathImpl(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_NOTIFICATIONS));
+                sInstance.addPathImpl(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES));
 
-  public interface BlacklistStoreColumns {
-    String NAME = "blacklist";
+                PreferenceUtil.getInstance(context).setInitializedBlacklist();
+            }
+        }
+        return sInstance;
+    }
 
-    String PATH = "path";
-  }
-}
+    @Override
+    public void onCreate(@NonNull final SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS " + BlacklistStoreColumns.NAME + " (" + BlacklistStoreColumns.PATH + " STRING NOT NULL);");
+    }
+
+    @Override
+    public void onUpgrade(@NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + BlacklistStoreColumns.NAME);
+        onCreate(db);
+    }
+
+    @Override
+    public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + BlacklistStoreColumns.NAME);
+        onCreate(db);
+    }
+
+    public void addPath(File file) {
+        addPathImpl(file);
+        notifyMediaStoreChanged();
+    }
+
+    private void addPathImpl(File file) {
+        if (file == null || contains(file)) {
+            return;
+        }
+        String path = FileUtil.safeGetCanonicalPath(file);
+
+        final SQLiteDatabase database = getWritableDatabase();
+        database.beginTransaction();
+
+        try {
+            // add the entry
+            final ContentValues values = new ContentValues(1);
+            values.put(BlacklistStoreColumns.PATH, path);
+            database.insert(BlacklistStoreColumns.NAME, null, values);
+
+            database.setTransactionSuccessful();
+        } finally {
+            database.endTransaction();
+        }
+    }
+
+    public boolean contains(File file) {
+        if (file == null) {
+            return false;
+        }
+        String path = FileUtil.safeGetCanonicalPath(file);
+
+        final SQLiteDatabase database = getReadableDatabase();
+        Cursor cursor = database.query(BlacklistStoreColumns.NAME,
+                new String[]{BlacklistStoreColumns.PATH},
+                BlacklistStoreColumns.PATH + "=?",
+                new String[]{path},
+                null, null, null, null);
+
+        boolean containsPath = cursor != null && cursor.moveToFirst();
+        if (cursor != null) {
+            cursor.close();
+        }
+        return containsPath;
+    }
+
+    public void removePath(File file) {
+        final SQLiteDatabase database = getWritableDatabase();
+        String path = FileUtil.safeGetCanonicalPath(file);
+
+        database.delete(BlacklistStoreColumns.NAME,
+                BlacklistStoreColumns.PATH + "=?",
+                new String[]{path});
+
+        notifyMediaStoreChanged();
+    }
+
+    public void clear() {
+        final SQLiteDatabase database = getWritableDatabase();
+        database.delete(BlacklistStoreColumns.NAME, null, null);
+
+        notifyMediaStoreChanged();
+    }
+
+    private void notifyMediaStoreChanged() {
+        context.sendBroadcast(new Intent(MEDIA_STORE_CHANGED));
+    }
+
+    @NonNull
+    public ArrayList<String> getPaths() {
+        Cursor cursor = getReadableDatabase().query(BlacklistStoreColumns.NAME,
+                new String[]{BlacklistStoreColumns.PATH},
+                null, null, null, null, null);
+
+        ArrayList<String> paths = new ArrayList<>();
+        if (cursor != null && cursor.moveToFirst()) {
+            do {
+                paths.add(cursor.getString(0));
+            } while (cursor.moveToNext());
+        }
+
+        if (cursor != null)
+            cursor.close();
+        return paths;
+    }
+
+    public interface BlacklistStoreColumns {
+        String NAME = "blacklist";
+
+        String PATH = "path";
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
index 36ba86299..c6708f44a 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/HistoryStore.java
@@ -19,163 +19,132 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
-
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 public class HistoryStore extends SQLiteOpenHelper {
-  public static final String DATABASE_NAME = "history.db";
-  private static final int MAX_ITEMS_IN_DB = 100;
-  private static final int VERSION = 1;
-  @Nullable private static HistoryStore sInstance = null;
+    public static final String DATABASE_NAME = "history.db";
+    private static final int MAX_ITEMS_IN_DB = 100;
+    private static final int VERSION = 1;
+    @Nullable
+    private static HistoryStore sInstance = null;
 
-  public HistoryStore(final Context context) {
-    super(context, DATABASE_NAME, null, VERSION);
-  }
-
-  @NonNull
-  public static synchronized HistoryStore getInstance(@NonNull final Context context) {
-    if (sInstance == null) {
-      sInstance = new HistoryStore(context.getApplicationContext());
-    }
-    return sInstance;
-  }
-
-  @Override
-  public void onCreate(@NonNull final SQLiteDatabase db) {
-    db.execSQL(
-        "CREATE TABLE IF NOT EXISTS "
-            + RecentStoreColumns.NAME
-            + " ("
-            + RecentStoreColumns.ID
-            + " LONG NOT NULL,"
-            + RecentStoreColumns.TIME_PLAYED
-            + " LONG NOT NULL);");
-  }
-
-  @Override
-  public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-    db.execSQL("DROP TABLE IF EXISTS " + RecentStoreColumns.NAME);
-    onCreate(db);
-  }
-
-  @Override
-  public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-    db.execSQL("DROP TABLE IF EXISTS " + RecentStoreColumns.NAME);
-    onCreate(db);
-  }
-
-  public void addSongId(final long songId) {
-    if (songId == -1) {
-      return;
+    public HistoryStore(final Context context) {
+        super(context, DATABASE_NAME, null, VERSION);
     }
 
-    final SQLiteDatabase database = getWritableDatabase();
-    database.beginTransaction();
-
-    try {
-      // remove previous entries
-      removeSongId(songId);
-
-      // add the entry
-      final ContentValues values = new ContentValues(2);
-      values.put(RecentStoreColumns.ID, songId);
-      values.put(RecentStoreColumns.TIME_PLAYED, System.currentTimeMillis());
-      database.insert(RecentStoreColumns.NAME, null, values);
-
-      // if our db is too large, delete the extra items
-      try (Cursor oldest = database.query(
-              RecentStoreColumns.NAME,
-              new String[]{RecentStoreColumns.TIME_PLAYED},
-              null,
-              null,
-              null,
-              null,
-              RecentStoreColumns.TIME_PLAYED + " ASC")) {
-
-        if (oldest != null && oldest.getCount() > MAX_ITEMS_IN_DB) {
-          oldest.moveToPosition(oldest.getCount() - MAX_ITEMS_IN_DB);
-          long timeOfRecordToKeep = oldest.getLong(0);
-
-          database.delete(
-                  RecentStoreColumns.NAME,
-                  RecentStoreColumns.TIME_PLAYED + " < ?",
-                  new String[]{String.valueOf(timeOfRecordToKeep)});
+    @NonNull
+    public static synchronized HistoryStore getInstance(@NonNull final Context context) {
+        if (sInstance == null) {
+            sInstance = new HistoryStore(context.getApplicationContext());
         }
-      }
-    } finally {
-      database.setTransactionSuccessful();
-      database.endTransaction();
+        return sInstance;
     }
-  }
 
-  public void removeSongId(final long songId) {
-    final SQLiteDatabase database = getWritableDatabase();
-    database.delete(
-        RecentStoreColumns.NAME,
-        RecentStoreColumns.ID + " = ?",
-        new String[] {String.valueOf(songId)});
-  }
-
-  public void clear() {
-    final SQLiteDatabase database = getWritableDatabase();
-    database.delete(RecentStoreColumns.NAME, null, null);
-  }
-
-  public boolean contains(long id) {
-    final SQLiteDatabase database = getReadableDatabase();
-    Cursor cursor =
-        database.query(
-            RecentStoreColumns.NAME,
-            new String[] {RecentStoreColumns.ID},
-            RecentStoreColumns.ID + "=?",
-            new String[] {String.valueOf(id)},
-            null,
-            null,
-            null,
-            null);
-
-    boolean containsId = cursor != null && cursor.moveToFirst();
-    if (cursor != null) {
-      cursor.close();
+    @Override
+    public void onCreate(@NonNull final SQLiteDatabase db) {
+        db.execSQL("CREATE TABLE IF NOT EXISTS " + RecentStoreColumns.NAME + " ("
+                + RecentStoreColumns.ID + " LONG NOT NULL," + RecentStoreColumns.TIME_PLAYED
+                + " LONG NOT NULL);");
     }
-    return containsId;
-  }
 
-  public Cursor queryRecentIds() {
-    final SQLiteDatabase database = getReadableDatabase();
-    return database.query(
-        RecentStoreColumns.NAME,
-        new String[] {RecentStoreColumns.ID},
-        null,
-        null,
-        null,
-        null,
-        RecentStoreColumns.TIME_PLAYED + " DESC");
-  }
+    @Override
+    public void onUpgrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + RecentStoreColumns.NAME);
+        onCreate(db);
+    }
 
-  public Cursor queryRecentIds(long cutoff) {
-    final boolean noCutoffTime = (cutoff == 0);
-    final boolean reverseOrder = (cutoff < 0);
-    if (reverseOrder) cutoff = -cutoff;
+    @Override
+    public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + RecentStoreColumns.NAME);
+        onCreate(db);
+    }
 
-    final SQLiteDatabase database = getReadableDatabase();
+    public void addSongId(final long songId) {
+        if (songId == -1) {
+            return;
+        }
 
-    return database.query(
-        RecentStoreColumns.NAME,
-        new String[] {RecentStoreColumns.ID},
-        noCutoffTime ? null : RecentStoreColumns.TIME_PLAYED + (reverseOrder ? "<?" : ">?"),
-        noCutoffTime ? null : new String[] {String.valueOf(cutoff)},
-        null,
-        null,
-        RecentStoreColumns.TIME_PLAYED + (reverseOrder ? " ASC" : " DESC"));
-  }
+        final SQLiteDatabase database = getWritableDatabase();
+        database.beginTransaction();
 
-  public interface RecentStoreColumns {
-    String NAME = "recent_history";
+        try {
+            // remove previous entries
+            removeSongId(songId);
 
-    String ID = "song_id";
+            // add the entry
+            final ContentValues values = new ContentValues(2);
+            values.put(RecentStoreColumns.ID, songId);
+            values.put(RecentStoreColumns.TIME_PLAYED, System.currentTimeMillis());
+            database.insert(RecentStoreColumns.NAME, null, values);
 
-    String TIME_PLAYED = "time_played";
-  }
+            // if our db is too large, delete the extra items
+            Cursor oldest = null;
+            try {
+                oldest = database.query(RecentStoreColumns.NAME,
+                        new String[]{RecentStoreColumns.TIME_PLAYED}, null, null, null, null,
+                        RecentStoreColumns.TIME_PLAYED + " ASC");
+
+                if (oldest != null && oldest.getCount() > MAX_ITEMS_IN_DB) {
+                    oldest.moveToPosition(oldest.getCount() - MAX_ITEMS_IN_DB);
+                    long timeOfRecordToKeep = oldest.getLong(0);
+
+                    database.delete(RecentStoreColumns.NAME,
+                            RecentStoreColumns.TIME_PLAYED + " < ?",
+                            new String[]{String.valueOf(timeOfRecordToKeep)});
+
+                }
+            } finally {
+                if (oldest != null) {
+                    oldest.close();
+                }
+            }
+        } finally {
+            database.setTransactionSuccessful();
+            database.endTransaction();
+        }
+    }
+
+    public void removeSongId(final long songId) {
+        final SQLiteDatabase database = getWritableDatabase();
+        database.delete(RecentStoreColumns.NAME, RecentStoreColumns.ID + " = ?", new String[]{
+                String.valueOf(songId)
+        });
+
+    }
+
+    public void clear() {
+        final SQLiteDatabase database = getWritableDatabase();
+        database.delete(RecentStoreColumns.NAME, null, null);
+    }
+
+    public boolean contains(long id) {
+        final SQLiteDatabase database = getReadableDatabase();
+        Cursor cursor = database.query(RecentStoreColumns.NAME,
+                new String[]{RecentStoreColumns.ID},
+                RecentStoreColumns.ID + "=?",
+                new String[]{String.valueOf(id)},
+                null, null, null, null);
+
+        boolean containsId = cursor != null && cursor.moveToFirst();
+        if (cursor != null) {
+            cursor.close();
+        }
+        return containsId;
+    }
+
+    public Cursor queryRecentIds() {
+        final SQLiteDatabase database = getReadableDatabase();
+        return database.query(RecentStoreColumns.NAME,
+                new String[]{RecentStoreColumns.ID}, null, null, null, null,
+                RecentStoreColumns.TIME_PLAYED + " DESC");
+    }
+
+    public interface RecentStoreColumns {
+        String NAME = "recent_history";
+
+        String ID = "song_id";
+
+        String TIME_PLAYED = "time_played";
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
index f1349ad7a..009787be3 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/MusicPlaybackQueueStore.java
@@ -24,190 +24,199 @@ import android.provider.MediaStore.Audio.AudioColumns;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
-import java.util.List;
+import java.util.ArrayList;
 
-import code.name.monkey.retromusic.App;
-import code.name.monkey.retromusic.Constants;
+import code.name.monkey.retromusic.loaders.SongLoader;
 import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.repository.RealSongRepository;
+import io.reactivex.Observable;
 
 /**
  * @author Andrew Neal, modified for Phonograph by Karim Abou Zeid
- *     <p>This keeps track of the music playback and history state of the playback service
+ * <p/>
+ * This keeps track of the music playback and history state of the playback service
  */
 public class MusicPlaybackQueueStore extends SQLiteOpenHelper {
+    public static final String DATABASE_NAME = "music_playback_state.db";
+    public static final String PLAYING_QUEUE_TABLE_NAME = "playing_queue";
+    public static final String ORIGINAL_PLAYING_QUEUE_TABLE_NAME = "original_playing_queue";
+    private static final int VERSION = 10;
+    @Nullable
+    private static MusicPlaybackQueueStore sInstance = null;
 
-  public static final String DATABASE_NAME = "music_playback_state.db";
-
-  public static final String PLAYING_QUEUE_TABLE_NAME = "playing_queue";
-
-  public static final String ORIGINAL_PLAYING_QUEUE_TABLE_NAME = "original_playing_queue";
-
-  private static final int VERSION = 12;
-
-  @Nullable private static MusicPlaybackQueueStore sInstance = null;
-
-  /**
-   * Constructor of <code>MusicPlaybackState</code>
-   *
-   * @param context The {@link Context} to use
-   */
-  public MusicPlaybackQueueStore(final @NonNull Context context) {
-    super(context, DATABASE_NAME, null, VERSION);
-  }
-
-  /**
-   * @param context The {@link Context} to use
-   * @return A new instance of this class.
-   */
-  @NonNull
-  public static synchronized MusicPlaybackQueueStore getInstance(@NonNull final Context context) {
-    if (sInstance == null) {
-      sInstance = new MusicPlaybackQueueStore(context.getApplicationContext());
-    }
-    return sInstance;
-  }
-
-  @Override
-  public void onCreate(@NonNull final SQLiteDatabase db) {
-    createTable(db, PLAYING_QUEUE_TABLE_NAME);
-    createTable(db, ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
-  }
-
-  @NonNull
-  public List<Song> getSavedOriginalPlayingQueue() {
-    return getQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
-  }
-
-  @NonNull
-  public List<Song> getSavedPlayingQueue() {
-    return getQueue(PLAYING_QUEUE_TABLE_NAME);
-  }
-
-  @Override
-  public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-    // If we ever have downgrade, drop the table to be safe
-    db.execSQL("DROP TABLE IF EXISTS " + PLAYING_QUEUE_TABLE_NAME);
-    db.execSQL("DROP TABLE IF EXISTS " + ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
-    onCreate(db);
-  }
-
-  @Override
-  public void onUpgrade(
-      @NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
-    // not necessary yet
-    db.execSQL("DROP TABLE IF EXISTS " + PLAYING_QUEUE_TABLE_NAME);
-    db.execSQL("DROP TABLE IF EXISTS " + ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
-    onCreate(db);
-  }
-
-  public synchronized void saveQueues(
-      @NonNull final List<Song> playingQueue, @NonNull final List<Song> originalPlayingQueue) {
-    saveQueue(PLAYING_QUEUE_TABLE_NAME, playingQueue);
-    saveQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME, originalPlayingQueue);
-  }
-
-  private void createTable(@NonNull final SQLiteDatabase db, final String tableName) {
-    //noinspection StringBufferReplaceableByString
-    StringBuilder builder = new StringBuilder();
-    builder.append("CREATE TABLE IF NOT EXISTS ");
-    builder.append(tableName);
-    builder.append("(");
-
-    builder.append(BaseColumns._ID);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(AudioColumns.TITLE);
-    builder.append(" STRING NOT NULL,");
-
-    builder.append(AudioColumns.TRACK);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(AudioColumns.YEAR);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(AudioColumns.DURATION);
-    builder.append(" LONG NOT NULL,");
-
-    builder.append(Constants.DATA);
-    builder.append(" STRING NOT NULL,");
-
-    builder.append(AudioColumns.DATE_MODIFIED);
-    builder.append(" LONG NOT NULL,");
-
-    builder.append(AudioColumns.ALBUM_ID);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(AudioColumns.ALBUM);
-    builder.append(" STRING NOT NULL,");
-
-    builder.append(AudioColumns.ARTIST_ID);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(AudioColumns.ARTIST);
-    builder.append(" STRING NOT NULL,");
-
-    builder.append(AudioColumns.COMPOSER);
-    builder.append(" STRING,");
-
-    builder.append("album_artist");
-    builder.append(" STRING);");
-
-    db.execSQL(builder.toString());
-  }
-
-  @NonNull
-  private List<Song> getQueue(@NonNull final String tableName) {
-    Cursor cursor = getReadableDatabase().query(tableName, null, null, null, null, null, null);
-    return new RealSongRepository(App.Companion.getContext()).songs(cursor);
-  }
-
-  /**
-   * Clears the existing database and saves the queue into the db so that when the app is restarted,
-   * the tracks you were listening to is restored
-   *
-   * @param queue the queue to save
-   */
-  private synchronized void saveQueue(final String tableName, @NonNull final List<Song> queue) {
-    final SQLiteDatabase database = getWritableDatabase();
-    database.beginTransaction();
-
-    try {
-      database.delete(tableName, null, null);
-      database.setTransactionSuccessful();
-    } finally {
-      database.endTransaction();
+    /**
+     * Constructor of <code>MusicPlaybackState</code>
+     *
+     * @param context The {@link Context} to use
+     */
+    public MusicPlaybackQueueStore(final @NonNull Context context) {
+        super(context, DATABASE_NAME, null, VERSION);
     }
 
-    final int NUM_PROCESS = 20;
-    int position = 0;
-    while (position < queue.size()) {
-      database.beginTransaction();
-      try {
-        for (int i = position; i < queue.size() && i < position + NUM_PROCESS; i++) {
-          Song song = queue.get(i);
-          ContentValues values = new ContentValues(4);
-
-          values.put(BaseColumns._ID, song.getId());
-          values.put(AudioColumns.TITLE, song.getTitle());
-          values.put(AudioColumns.TRACK, song.getTrackNumber());
-          values.put(AudioColumns.YEAR, song.getYear());
-          values.put(AudioColumns.DURATION, song.getDuration());
-          values.put(Constants.DATA, song.getData());
-          values.put(AudioColumns.DATE_MODIFIED, song.getDateModified());
-          values.put(AudioColumns.ALBUM_ID, song.getAlbumId());
-          values.put(AudioColumns.ALBUM, song.getAlbumName());
-          values.put(AudioColumns.ARTIST_ID, song.getArtistId());
-          values.put(AudioColumns.ARTIST, song.getArtistName());
-          values.put(AudioColumns.COMPOSER, song.getComposer());
-
-          database.insert(tableName, null, values);
+    /**
+     * @param context The {@link Context} to use
+     * @return A new instance of this class.
+     */
+    @NonNull
+    public static synchronized MusicPlaybackQueueStore getInstance(@NonNull final Context context) {
+        if (sInstance == null) {
+            sInstance = new MusicPlaybackQueueStore(context.getApplicationContext());
         }
-        database.setTransactionSuccessful();
-      } finally {
-        database.endTransaction();
-        position += NUM_PROCESS;
-      }
+        return sInstance;
+    }
+
+    @Override
+    public void onCreate(@NonNull final SQLiteDatabase db) {
+        createTable(db, PLAYING_QUEUE_TABLE_NAME);
+        createTable(db, ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
+    }
+
+    private void createTable(@NonNull final SQLiteDatabase db, final String tableName) {
+        //noinspection StringBufferReplaceableByString
+        StringBuilder builder = new StringBuilder();
+        builder.append("CREATE TABLE IF NOT EXISTS ");
+        builder.append(tableName);
+        builder.append("(");
+
+        builder.append(BaseColumns._ID);
+        builder.append(" INT NOT NULL,");
+
+        builder.append(AudioColumns.TITLE);
+        builder.append(" STRING NOT NULL,");
+
+        builder.append(AudioColumns.TRACK);
+        builder.append(" INT NOT NULL,");
+
+        builder.append(AudioColumns.YEAR);
+        builder.append(" INT NOT NULL,");
+
+        builder.append(AudioColumns.DURATION);
+        builder.append(" LONG NOT NULL,");
+
+        builder.append(AudioColumns.DATA);
+        builder.append(" STRING NOT NULL,");
+
+        builder.append(AudioColumns.DATE_MODIFIED);
+        builder.append(" LONG NOT NULL,");
+
+        builder.append(AudioColumns.ALBUM_ID);
+        builder.append(" INT NOT NULL,");
+
+        builder.append(AudioColumns.ALBUM);
+        builder.append(" STRING NOT NULL,");
+
+        builder.append(AudioColumns.ARTIST_ID);
+        builder.append(" INT NOT NULL,");
+
+        builder.append(AudioColumns.ARTIST);
+        builder.append(" STRING NOT NULL,");
+
+        builder.append(AudioColumns.COMPOSER);
+        builder.append(" STRING);");
+
+        db.execSQL(builder.toString());
+    }
+
+    @Override
+    public void onUpgrade(@NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+        // not necessary yet
+        db.execSQL("DROP TABLE IF EXISTS " + PLAYING_QUEUE_TABLE_NAME);
+        db.execSQL("DROP TABLE IF EXISTS " + ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
+        onCreate(db);
+    }
+
+    @Override
+    public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
+        // If we ever have downgrade, drop the table to be safe
+        db.execSQL("DROP TABLE IF EXISTS " + PLAYING_QUEUE_TABLE_NAME);
+        db.execSQL("DROP TABLE IF EXISTS " + ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
+        onCreate(db);
+    }
+
+    public synchronized void saveQueues(@NonNull final ArrayList<Song> playingQueue, @NonNull final ArrayList<Song> originalPlayingQueue) {
+        saveQueue(PLAYING_QUEUE_TABLE_NAME, playingQueue);
+        saveQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME, originalPlayingQueue);
+    }
+
+    /**
+     * Clears the existing database and saves the queue into the db so that when the
+     * app is restarted, the tracks you were listening to is restored
+     *
+     * @param queue the queue to save
+     */
+    private synchronized void saveQueue(final String tableName, @NonNull final ArrayList<Song> queue) {
+        final SQLiteDatabase database = getWritableDatabase();
+        database.beginTransaction();
+
+        try {
+            database.delete(tableName, null, null);
+            database.setTransactionSuccessful();
+        } finally {
+            database.endTransaction();
+        }
+
+        final int NUM_PROCESS = 20;
+        int position = 0;
+        while (position < queue.size()) {
+            database.beginTransaction();
+            try {
+                for (int i = position; i < queue.size() && i < position + NUM_PROCESS; i++) {
+                    Song song = queue.get(i);
+                    ContentValues values = new ContentValues(4);
+
+                    values.put(BaseColumns._ID, song.getId());
+                    values.put(AudioColumns.TITLE, song.getTitle());
+                    values.put(AudioColumns.TRACK, song.getTrackNumber());
+                    values.put(AudioColumns.YEAR, song.getYear());
+                    values.put(AudioColumns.DURATION, song.getDuration());
+                    values.put(AudioColumns.DATA, song.getData());
+                    values.put(AudioColumns.DATE_MODIFIED, song.getDateModified());
+                    values.put(AudioColumns.ALBUM_ID, song.getAlbumId());
+                    values.put(AudioColumns.ALBUM, song.getAlbumName());
+                    values.put(AudioColumns.ARTIST_ID, song.getArtistId());
+                    values.put(AudioColumns.ARTIST, song.getArtistName());
+                    values.put(AudioColumns.COMPOSER, song.getComposer());
+
+                    database.insert(tableName, null, values);
+                }
+                database.setTransactionSuccessful();
+            } finally {
+                database.endTransaction();
+                position += NUM_PROCESS;
+            }
+        }
+    }
+
+    @NonNull
+    public Observable<ArrayList<Song>> getSavedPlayingQueueFlowable() {
+        return getQueueFlowable(PLAYING_QUEUE_TABLE_NAME);
+    }
+
+    @NonNull
+    public Observable<ArrayList<Song>> getSavedOriginalPlayingQueueFlowable() {
+        return getQueueFlowable(ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
+    }
+
+    @NonNull
+    public ArrayList<Song> getSavedPlayingQueue() {
+        return getQueue(PLAYING_QUEUE_TABLE_NAME);
+    }
+
+    @NonNull
+    public ArrayList<Song> getSavedOriginalPlayingQueue() {
+        return getQueue(ORIGINAL_PLAYING_QUEUE_TABLE_NAME);
+    }
+
+    @NonNull
+    private Observable<ArrayList<Song>> getQueueFlowable(@NonNull final String tableName) {
+        Cursor cursor = getReadableDatabase().query(tableName, null,
+                null, null, null, null, null);
+        return SongLoader.INSTANCE.getSongsFlowable(cursor);
+    }
+
+    @NonNull
+    private ArrayList<Song> getQueue(@NonNull final String tableName) {
+        Cursor cursor = getReadableDatabase().query(tableName, null,
+                null, null, null, null, null);
+        return SongLoader.INSTANCE.getSongs(cursor);
     }
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt
new file mode 100644
index 000000000..2b3757a45
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/RepositoryImpl.kt
@@ -0,0 +1,292 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.providers
+
+import android.content.Context
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.Result.Error
+import code.name.monkey.retromusic.Result.Success
+import code.name.monkey.retromusic.adapter.HomeAdapter
+import code.name.monkey.retromusic.loaders.*
+import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.providers.interfaces.Repository
+import code.name.monkey.retromusic.rest.LastFMRestClient
+import code.name.monkey.retromusic.rest.model.LastFmArtist
+import io.reactivex.Observable
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.schedulers.Schedulers
+import java.io.IOException
+
+class RepositoryImpl(private val context: Context) : Repository {
+
+    override suspend fun allAlbums(): Result<ArrayList<Album>> {
+        return try {
+            val albums = AlbumLoader.getAllAlbums(context)
+            if (albums.isNotEmpty()) {
+                Success(albums)
+            } else {
+                Error(Throwable("No items found"))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun allArtists(): Result<ArrayList<Artist>> {
+        return try {
+            val artists = ArtistLoader.getAllArtists(context)
+            if (artists.isNotEmpty()) {
+                Success(artists)
+            } else {
+                Error(Throwable("No items found"))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun allPlaylists(): Result<ArrayList<Playlist>> {
+        return try {
+            val playlists = PlaylistLoader.getAllPlaylists(context)
+            if (playlists.isNotEmpty()) {
+                Success(playlists)
+            } else {
+                Error(Throwable("No items found"))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun allGenres(): Result<ArrayList<Genre>> {
+        return try {
+            val genres = GenreLoader.getAllGenres(context)
+            if (genres.isNotEmpty()) {
+                Success(genres)
+            } else {
+                Error(Throwable("No items found"))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun search(query: String?): Result<MutableList<Any>> {
+        return try {
+            val result = SearchLoader.searchAll(context, query)
+            if (result.isNotEmpty()) {
+                Success(result)
+            } else {
+                Error(Throwable("No items found"))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun allSongs(): Result<ArrayList<Song>> {
+        return try {
+            val songs = SongLoader.getAllSongs(context)
+            if (songs.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(songs)
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun getPlaylistSongs(playlist: Playlist): Result<ArrayList<Song>> {
+        return try {
+            val songs: ArrayList<Song> = if (playlist is AbsCustomPlaylist) {
+                playlist.getSongs(context)
+            } else {
+                PlaylistSongsLoader.getPlaylistSongList(context, playlist.id)
+            }
+            Success(songs)
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun getGenre(genreId: Int): Result<ArrayList<Song>> {
+        return try {
+            val songs = GenreLoader.getSongs(context, genreId)
+            if (songs.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(songs)
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun recentArtists(): Result<Home> {
+        return try {
+            val artists = LastAddedSongsLoader.getLastAddedArtists(context)
+            if (artists.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(Home(0,
+                        R.string.recent_artists,
+                        artists,
+                        HomeAdapter.RECENT_ARTISTS,
+                        R.drawable.ic_artist_white_24dp))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun recentAlbums(): Result<Home> {
+        return try {
+            val albums = LastAddedSongsLoader.getLastAddedAlbums(context)
+            if (albums.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(Home(1,
+                        R.string.recent_albums,
+                        albums,
+                        HomeAdapter.RECENT_ALBUMS,
+                        R.drawable.ic_album_white_24dp
+                ))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun topAlbums(): Result<Home> {
+        return try {
+            val albums = TopAndRecentlyPlayedTracksLoader.getTopAlbums(context)
+            if (albums.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(Home(3,
+                        R.string.top_albums,
+                        albums,
+                        HomeAdapter.TOP_ALBUMS,
+                        R.drawable.ic_album_white_24dp
+                ))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+
+    override suspend fun topArtists(): Result<Home> {
+        return try {
+            val artists = TopAndRecentlyPlayedTracksLoader.getTopArtists(context)
+            if (artists.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(Home(2,
+                        R.string.top_artists,
+                        artists,
+                        HomeAdapter.TOP_ARTISTS,
+                        R.drawable.ic_artist_white_24dp
+                ))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun favoritePlaylist(): Result<Home> {
+        return try {
+            val playlists = PlaylistLoader.getFavoritePlaylist(context)
+            if (playlists.isEmpty()) {
+                Error(Throwable("No items found"))
+            } else {
+                Success(Home(4,
+                        R.string.favorites,
+                        playlists,
+                        HomeAdapter.PLAYLISTS,
+                        R.drawable.ic_favorite_white_24dp
+                ))
+            }
+        } catch (e: Exception) {
+            Error(e)
+        }
+    }
+
+    override suspend fun artistInfo(
+            name: String,
+            lang: String?,
+            cache: String?
+    ): Result<LastFmArtist> = safeApiCall(
+            call = {
+                Success(LastFMRestClient(context).apiService.artistInfo(name, lang, cache))
+            },
+            errorMessage = "Error"
+
+    )
+
+    override suspend fun artistById(artistId: Int): Result<Artist> {
+        return try {
+            val artist = ArtistLoader.getArtist(context, artistId)
+            return Success(artist)
+        } catch (e: Exception) {
+            Error(Throwable("Error loading artist"))
+        }
+    }
+
+    override fun getAlbumFlowable(albumId: Int): Observable<Album> {
+        return AlbumLoader.getAlbumFlowable(context, albumId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+    }
+
+    override fun getArtistByIdFlowable(artistId: Int): Observable<Artist> {
+        return ArtistLoader.getArtistFlowable(context, artistId)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+    }
+
+    override fun getPlaylistSongsFlowable(playlist: Playlist): Observable<ArrayList<Song>> {
+        return PlaylistSongsLoader.getPlaylistSongListFlowable(context, playlist)
+                .subscribeOn(Schedulers.computation())
+                .observeOn(AndroidSchedulers.mainThread())
+    }
+
+    override val favoritePlaylistFlowable: Observable<ArrayList<Playlist>>
+        get() = PlaylistLoader.getFavoritePlaylistFlowable(context)
+                .subscribeOn(Schedulers.io())
+                .observeOn(AndroidSchedulers.mainThread())
+
+
+    override fun getSong(id: Int): Song {
+        return SongLoader.getSong(context, id)
+    }
+
+    override fun getAlbum(albumId: Int): Album {
+        return AlbumLoader.getAlbum(context, albumId)
+    }
+
+    override fun getArtistById(artistId: Long): Artist {
+        return ArtistLoader.getArtist(context, artistId.toInt())
+    }
+
+}
+
+suspend fun <T : Any> safeApiCall(call: suspend () -> Result<T>, errorMessage: String): Result<T> = try {
+    call.invoke()
+} catch (e: Exception) {
+    Error(IOException(errorMessage, e))
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
index 9d3112969..6201e5a09 100644
--- a/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/SongPlayCountStore.java
@@ -26,396 +26,378 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 /**
- * This database tracks the number of play counts for an individual song. This is used to drive the
- * top played tracks as well as the playlist images
+ * This database tracks the number of play counts for an individual song.  This is used to drive
+ * the top played tracks as well as the playlist images
  */
 public class SongPlayCountStore extends SQLiteOpenHelper {
-  public static final String DATABASE_NAME = "song_play_count.db";
-  private static final int VERSION = 3;
-  // how many weeks worth of playback to track
-  private static final int NUM_WEEKS = 52;
-  @Nullable
-  private static SongPlayCountStore sInstance = null;
-  // interpolator curve applied for measuring the curve
-  @NonNull
-  private static final Interpolator sInterpolator = new AccelerateInterpolator(1.5f);
-  // how high to multiply the interpolation curve
-  private static final int INTERPOLATOR_HEIGHT = 50;
+    public static final String DATABASE_NAME = "song_play_count.db";
+    private static final int VERSION = 3;
+    // how many weeks worth of playback to track
+    private static final int NUM_WEEKS = 52;
+    @Nullable
+    private static SongPlayCountStore sInstance = null;
+    // interpolator curve applied for measuring the curve
+    @NonNull
+    private static Interpolator sInterpolator = new AccelerateInterpolator(1.5f);
+    // how high to multiply the interpolation curve
+    @SuppressWarnings("FieldCanBeLocal")
+    private static int INTERPOLATOR_HEIGHT = 50;
 
-  // how high the base value is. The ratio of the Height to Base is what really matters
-  private static final int INTERPOLATOR_BASE = 25;
+    // how high the base value is. The ratio of the Height to Base is what really matters
+    @SuppressWarnings("FieldCanBeLocal")
+    private static int INTERPOLATOR_BASE = 25;
 
-  private static final int ONE_WEEK_IN_MS = 1000 * 60 * 60 * 24 * 7;
+    @SuppressWarnings("FieldCanBeLocal")
+    private static int ONE_WEEK_IN_MS = 1000 * 60 * 60 * 24 * 7;
 
-  @NonNull
-  private static final String WHERE_ID_EQUALS = SongPlayCountColumns.ID + "=?";
+    @NonNull
+    private static String WHERE_ID_EQUALS = SongPlayCountColumns.ID + "=?";
 
-  // number of weeks since epoch time
-  private final int mNumberOfWeeksSinceEpoch;
+    // number of weeks since epoch time
+    private int mNumberOfWeeksSinceEpoch;
 
-  // used to track if we've walked through the db and updated all the rows
-  private boolean mDatabaseUpdated;
+    // used to track if we've walked through the db and updated all the rows
+    private boolean mDatabaseUpdated;
 
-  public SongPlayCountStore(final Context context) {
-    super(context, DATABASE_NAME, null, VERSION);
+    public SongPlayCountStore(final Context context) {
+        super(context, DATABASE_NAME, null, VERSION);
 
-    long msSinceEpoch = System.currentTimeMillis();
-    mNumberOfWeeksSinceEpoch = (int) (msSinceEpoch / ONE_WEEK_IN_MS);
+        long msSinceEpoch = System.currentTimeMillis();
+        mNumberOfWeeksSinceEpoch = (int) (msSinceEpoch / ONE_WEEK_IN_MS);
 
-    mDatabaseUpdated = false;
-  }
-
-  /**
-   * @param context The {@link Context} to use
-   * @return A new instance of this class.
-   */
-  @NonNull
-  public static synchronized SongPlayCountStore getInstance(@NonNull final Context context) {
-    if (sInstance == null) {
-      sInstance = new SongPlayCountStore(context.getApplicationContext());
-    }
-    return sInstance;
-  }
-
-  /**
-   * Calculates the score of the song given the play counts
-   *
-   * @param playCounts an array of the # of times a song has been played for each week where
-   *     playCounts[N] is the # of times it was played N weeks ago
-   * @return the score
-   */
-  private static float calculateScore(@Nullable final int[] playCounts) {
-    if (playCounts == null) {
-      return 0;
+        mDatabaseUpdated = false;
     }
 
-    float score = 0;
-    for (int i = 0; i < Math.min(playCounts.length, NUM_WEEKS); i++) {
-      score += playCounts[i] * getScoreMultiplierForWeek(i);
-    }
-
-    return score;
-  }
-
-  /**
-   * Gets the column name for each week #
-   *
-   * @param week number
-   * @return the column name
-   */
-  @NonNull
-  private static String getColumnNameForWeek(final int week) {
-    return SongPlayCountColumns.WEEK_PLAY_COUNT + week;
-  }
-
-  /**
-   * Gets the score multiplier for each week
-   *
-   * @param week number
-   * @return the multiplier to apply
-   */
-  private static float getScoreMultiplierForWeek(final int week) {
-    return sInterpolator.getInterpolation(1 - (week / (float) NUM_WEEKS)) * INTERPOLATOR_HEIGHT
-        + INTERPOLATOR_BASE;
-  }
-
-  /**
-   * For some performance gain, return a static value for the column index for a week WARNING: This
-   * function assumes you have selected all columns for it to work
-   *
-   * @param week number
-   * @return column index of that week
-   */
-  private static int getColumnIndexForWeek(final int week) {
-    // ID, followed by the weeks columns
-    return 1 + week;
-  }
-
-  @Override
-  public void onCreate(@NonNull final SQLiteDatabase db) {
-    // create the play count table
-    // WARNING: If you change the order of these columns
-    // please update getColumnIndexForWeek
-    StringBuilder builder = new StringBuilder();
-    builder.append("CREATE TABLE IF NOT EXISTS ");
-    builder.append(SongPlayCountColumns.NAME);
-    builder.append("(");
-    builder.append(SongPlayCountColumns.ID);
-    builder.append(" INT UNIQUE,");
-
-    for (int i = 0; i < NUM_WEEKS; i++) {
-      builder.append(getColumnNameForWeek(i));
-      builder.append(" INT DEFAULT 0,");
-    }
-
-    builder.append(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX);
-    builder.append(" INT NOT NULL,");
-
-    builder.append(SongPlayCountColumns.PLAY_COUNT_SCORE);
-    builder.append(" REAL DEFAULT 0);");
-
-    db.execSQL(builder.toString());
-  }
-
-  @Override
-  public void onUpgrade(
-      @NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
-    db.execSQL("DROP TABLE IF EXISTS " + SongPlayCountColumns.NAME);
-    onCreate(db);
-  }
-
-  @Override
-  public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
-    // If we ever have downgrade, drop the table to be safe
-    db.execSQL("DROP TABLE IF EXISTS " + SongPlayCountColumns.NAME);
-    onCreate(db);
-  }
-
-  /**
-   * Increases the play count of a song by 1
-   *
-   * @param songId The song id to increase the play count
-   */
-  public void bumpPlayCount(final long songId) {
-    if (songId == -1) {
-      return;
-    }
-
-    final SQLiteDatabase database = getWritableDatabase();
-    updateExistingRow(database, songId, true);
-  }
-
-  /**
-   * This creates a new entry that indicates a song has been played once as well as its score
-   *
-   * @param database a write able database
-   * @param songId the id of the track
-   */
-  private void createNewPlayedEntry(@NonNull final SQLiteDatabase database, final long songId) {
-    // no row exists, create a new one
-    float newScore = getScoreMultiplierForWeek(0);
-    int newPlayCount = 1;
-
-    final ContentValues values = new ContentValues(3);
-    values.put(SongPlayCountColumns.ID, songId);
-    values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, newScore);
-    values.put(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX, mNumberOfWeeksSinceEpoch);
-    values.put(getColumnNameForWeek(0), newPlayCount);
-
-    database.insert(SongPlayCountColumns.NAME, null, values);
-  }
-
-  /**
-   * This function will take a song entry and update it to the latest week and increase the count
-   * for the current week by 1 if necessary
-   *
-   * @param database a writeable database
-   * @param id the id of the track to bump
-   * @param bumpCount whether to bump the current's week play count by 1 and adjust the score
-   */
-  private void updateExistingRow(
-      @NonNull final SQLiteDatabase database, final long id, boolean bumpCount) {
-    String stringId = String.valueOf(id);
-
-    // begin the transaction
-    database.beginTransaction();
-
-    // get the cursor of this content inside the transaction
-    final Cursor cursor =
-        database.query(
-            SongPlayCountColumns.NAME,
-            null,
-            WHERE_ID_EQUALS,
-            new String[] {stringId},
-            null,
-            null,
-            null);
-
-    // if we have a result
-    if (cursor != null && cursor.moveToFirst()) {
-      // figure how many weeks since we last updated
-      int lastUpdatedIndex = cursor.getColumnIndex(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX);
-      int lastUpdatedWeek = cursor.getInt(lastUpdatedIndex);
-      int weekDiff = mNumberOfWeeksSinceEpoch - lastUpdatedWeek;
-
-      // if it's more than the number of weeks we track, delete it and create a new entry
-      if (Math.abs(weekDiff) >= NUM_WEEKS) {
-        // this entry needs to be dropped since it is too outdated
-        deleteEntry(database, stringId);
-        if (bumpCount) {
-          createNewPlayedEntry(database, id);
+    /**
+     * @param context The {@link Context} to use
+     * @return A new instance of this class.
+     */
+    @NonNull
+    public static synchronized SongPlayCountStore getInstance(@NonNull final Context context) {
+        if (sInstance == null) {
+            sInstance = new SongPlayCountStore(context.getApplicationContext());
         }
-      } else if (weekDiff != 0) {
-        // else, shift the weeks
-        int[] playCounts = new int[NUM_WEEKS];
+        return sInstance;
+    }
 
-        if (weekDiff > 0) {
-          // time is shifted forwards
-          for (int i = 0; i < NUM_WEEKS - weekDiff; i++) {
-            playCounts[i + weekDiff] = cursor.getInt(getColumnIndexForWeek(i));
-          }
-        } else {
-          // time is shifted backwards (by user) - nor typical behavior but we
-          // will still handle it
-
-          // since weekDiff is -ve, NUM_WEEKS + weekDiff is the real # of weeks we have to
-          // transfer.  Then we transfer the old week i - weekDiff to week i
-          // for example if the user shifted back 2 weeks, ie -2, then for 0 to
-          // NUM_WEEKS + (-2) we set the new week i = old week i - (-2) or i+2
-          for (int i = 0; i < NUM_WEEKS + weekDiff; i++) {
-            playCounts[i] = cursor.getInt(getColumnIndexForWeek(i - weekDiff));
-          }
+    /**
+     * Calculates the score of the song given the play counts
+     *
+     * @param playCounts an array of the # of times a song has been played for each week
+     *                   where playCounts[N] is the # of times it was played N weeks ago
+     * @return the score
+     */
+    private static float calculateScore(@Nullable final int[] playCounts) {
+        if (playCounts == null) {
+            return 0;
         }
 
-        // bump the count
-        if (bumpCount) {
-          playCounts[0]++;
+        float score = 0;
+        for (int i = 0; i < Math.min(playCounts.length, NUM_WEEKS); i++) {
+            score += playCounts[i] * getScoreMultiplierForWeek(i);
         }
 
-        float score = calculateScore(playCounts);
+        return score;
+    }
 
-        // if the score is non-existant, then delete it
-        if (score < .01f) {
-          deleteEntry(database, stringId);
-        } else {
-          // create the content values
-          ContentValues values = new ContentValues(NUM_WEEKS + 2);
-          values.put(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX, mNumberOfWeeksSinceEpoch);
-          values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, score);
+    /**
+     * Gets the column name for each week #
+     *
+     * @param week number
+     * @return the column name
+     */
+    @NonNull
+    private static String getColumnNameForWeek(final int week) {
+        return SongPlayCountColumns.WEEK_PLAY_COUNT + String.valueOf(week);
+    }
 
-          for (int i = 0; i < NUM_WEEKS; i++) {
-            values.put(getColumnNameForWeek(i), playCounts[i]);
-          }
+    /**
+     * Gets the score multiplier for each week
+     *
+     * @param week number
+     * @return the multiplier to apply
+     */
+    private static float getScoreMultiplierForWeek(final int week) {
+        return sInterpolator.getInterpolation(1 - (week / (float) NUM_WEEKS)) * INTERPOLATOR_HEIGHT
+                + INTERPOLATOR_BASE;
+    }
 
-          // update the entry
-          database.update(
-              SongPlayCountColumns.NAME, values, WHERE_ID_EQUALS, new String[] {stringId});
+    /**
+     * For some performance gain, return a static value for the column index for a week
+     * WARNING: This function assumes you have selected all columns for it to work
+     *
+     * @param week number
+     * @return column index of that week
+     */
+    private static int getColumnIndexForWeek(final int week) {
+        // ID, followed by the weeks columns
+        return 1 + week;
+    }
+
+    @Override
+    public void onCreate(@NonNull final SQLiteDatabase db) {
+        // create the play count table
+        // WARNING: If you change the order of these columns
+        // please update getColumnIndexForWeek
+        StringBuilder builder = new StringBuilder();
+        builder.append("CREATE TABLE IF NOT EXISTS ");
+        builder.append(SongPlayCountColumns.NAME);
+        builder.append("(");
+        builder.append(SongPlayCountColumns.ID);
+        builder.append(" INT UNIQUE,");
+
+        for (int i = 0; i < NUM_WEEKS; i++) {
+            builder.append(getColumnNameForWeek(i));
+            builder.append(" INT DEFAULT 0,");
         }
-      } else if (bumpCount) {
-        // else no shifting, just update the scores
-        ContentValues values = new ContentValues(2);
 
-        // increase the score by a single score amount
-        int scoreIndex = cursor.getColumnIndex(SongPlayCountColumns.PLAY_COUNT_SCORE);
-        float score = cursor.getFloat(scoreIndex) + getScoreMultiplierForWeek(0);
-        values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, score);
+        builder.append(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX);
+        builder.append(" INT NOT NULL,");
 
-        // increase the play count by 1
-        values.put(getColumnNameForWeek(0), cursor.getInt(getColumnIndexForWeek(0)) + 1);
+        builder.append(SongPlayCountColumns.PLAY_COUNT_SCORE);
+        builder.append(" REAL DEFAULT 0);");
 
-        // update the entry
-        database.update(
-            SongPlayCountColumns.NAME, values, WHERE_ID_EQUALS, new String[] {stringId});
-      }
-
-      cursor.close();
-    } else if (bumpCount) {
-      // if we have no existing results, create a new one
-      createNewPlayedEntry(database, id);
+        db.execSQL(builder.toString());
     }
 
-    database.setTransactionSuccessful();
-    database.endTransaction();
-  }
-
-  public void clear() {
-    final SQLiteDatabase database = getWritableDatabase();
-    database.delete(SongPlayCountColumns.NAME, null, null);
-  }
-
-  /**
-   * Gets a cursor containing the top songs played. Note this only returns songs that have been
-   * played at least once in the past NUM_WEEKS
-   *
-   * @param numResults number of results to limit by. If <= 0 it returns all results
-   * @return the top tracks
-   */
-  public Cursor getTopPlayedResults(int numResults) {
-    updateResults();
-
-    final SQLiteDatabase database = getReadableDatabase();
-    return database.query(
-        SongPlayCountColumns.NAME,
-        new String[] {SongPlayCountColumns.ID},
-        null,
-        null,
-        null,
-        null,
-        SongPlayCountColumns.PLAY_COUNT_SCORE + " DESC",
-        (numResults <= 0 ? null : String.valueOf(numResults)));
-  }
-
-  /**
-   * This updates all the results for the getTopPlayedResults so that we can get an accurate list of
-   * the top played results
-   */
-  private synchronized void updateResults() {
-    if (mDatabaseUpdated) {
-      return;
+    @Override
+    public void onUpgrade(@NonNull final SQLiteDatabase db, final int oldVersion, final int newVersion) {
+        db.execSQL("DROP TABLE IF EXISTS " + SongPlayCountColumns.NAME);
+        onCreate(db);
     }
 
-    final SQLiteDatabase database = getWritableDatabase();
-
-    database.beginTransaction();
-
-    int oldestWeekWeCareAbout = mNumberOfWeeksSinceEpoch - NUM_WEEKS + 1;
-    // delete rows we don't care about anymore
-    database.delete(
-        SongPlayCountColumns.NAME,
-        SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX + " < " + oldestWeekWeCareAbout,
-        null);
-
-    // get the remaining rows
-    Cursor cursor =
-        database.query(
-            SongPlayCountColumns.NAME,
-            new String[] {SongPlayCountColumns.ID},
-            null,
-            null,
-            null,
-            null,
-            null);
-
-    if (cursor != null && cursor.moveToFirst()) {
-      // for each row, update it
-      do {
-        updateExistingRow(database, cursor.getLong(0), false);
-      } while (cursor.moveToNext());
-
-      cursor.close();
+    @Override
+    public void onDowngrade(@NonNull SQLiteDatabase db, int oldVersion, int newVersion) {
+        // If we ever have downgrade, drop the table to be safe
+        db.execSQL("DROP TABLE IF EXISTS " + SongPlayCountColumns.NAME);
+        onCreate(db);
     }
 
-    mDatabaseUpdated = true;
-    database.setTransactionSuccessful();
-    database.endTransaction();
-  }
+    /**
+     * Increases the play count of a song by 1
+     *
+     * @param songId The song id to increase the play count
+     */
+    public void bumpPlayCount(final long songId) {
+        if (songId == -1) {
+            return;
+        }
 
-  /** @param songId The song Id to remove. */
-  public void removeItem(final long songId) {
-    final SQLiteDatabase database = getWritableDatabase();
-    deleteEntry(database, String.valueOf(songId));
-  }
+        final SQLiteDatabase database = getWritableDatabase();
+        updateExistingRow(database, songId, true);
+    }
 
-  /**
-   * Deletes the entry
-   *
-   * @param database database to use
-   * @param stringId id to delete
-   */
-  private void deleteEntry(@NonNull final SQLiteDatabase database, final String stringId) {
-    database.delete(SongPlayCountColumns.NAME, WHERE_ID_EQUALS, new String[] {stringId});
-  }
+    /**
+     * This creates a new entry that indicates a song has been played once as well as its score
+     *
+     * @param database a write able database
+     * @param songId   the id of the track
+     */
+    private void createNewPlayedEntry(@NonNull final SQLiteDatabase database, final long songId) {
+        // no row exists, create a new one
+        float newScore = getScoreMultiplierForWeek(0);
+        int newPlayCount = 1;
 
-  public interface SongPlayCountColumns {
+        final ContentValues values = new ContentValues(3);
+        values.put(SongPlayCountColumns.ID, songId);
+        values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, newScore);
+        values.put(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX, mNumberOfWeeksSinceEpoch);
+        values.put(getColumnNameForWeek(0), newPlayCount);
 
-    String NAME = "song_play_count";
+        database.insert(SongPlayCountColumns.NAME, null, values);
+    }
 
-    String ID = "song_id";
+    /**
+     * This function will take a song entry and update it to the latest week and increase the count
+     * for the current week by 1 if necessary
+     *
+     * @param database  a writeable database
+     * @param id        the id of the track to bump
+     * @param bumpCount whether to bump the current's week play count by 1 and adjust the score
+     */
+    private void updateExistingRow(@NonNull final SQLiteDatabase database, final long id, boolean bumpCount) {
+        String stringId = String.valueOf(id);
 
-    String WEEK_PLAY_COUNT = "week";
+        // begin the transaction
+        database.beginTransaction();
 
-    String LAST_UPDATED_WEEK_INDEX = "week_index";
+        // get the cursor of this content inside the transaction
+        final Cursor cursor = database.query(SongPlayCountColumns.NAME, null, WHERE_ID_EQUALS,
+                new String[]{stringId}, null, null, null);
 
-    String PLAY_COUNT_SCORE = "play_count_score";
-  }
+        // if we have a result
+        if (cursor != null && cursor.moveToFirst()) {
+            // figure how many weeks since we last updated
+            int lastUpdatedIndex = cursor.getColumnIndex(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX);
+            int lastUpdatedWeek = cursor.getInt(lastUpdatedIndex);
+            int weekDiff = mNumberOfWeeksSinceEpoch - lastUpdatedWeek;
+
+            // if it's more than the number of weeks we track, delete it and create a new entry
+            if (Math.abs(weekDiff) >= NUM_WEEKS) {
+                // this entry needs to be dropped since it is too outdated
+                deleteEntry(database, stringId);
+                if (bumpCount) {
+                    createNewPlayedEntry(database, id);
+                }
+            } else if (weekDiff != 0) {
+                // else, shift the weeks
+                int[] playCounts = new int[NUM_WEEKS];
+
+                if (weekDiff > 0) {
+                    // time is shifted forwards
+                    for (int i = 0; i < NUM_WEEKS - weekDiff; i++) {
+                        playCounts[i + weekDiff] = cursor.getInt(getColumnIndexForWeek(i));
+                    }
+                } else if (weekDiff < 0) {
+                    // time is shifted backwards (by user) - nor typical behavior but we
+                    // will still handle it
+
+                    // since weekDiff is -ve, NUM_WEEKS + weekDiff is the real # of weeks we have to
+                    // transfer.  Then we transfer the old week i - weekDiff to week i
+                    // for example if the user shifted back 2 weeks, ie -2, then for 0 to
+                    // NUM_WEEKS + (-2) we set the new week i = old week i - (-2) or i+2
+                    for (int i = 0; i < NUM_WEEKS + weekDiff; i++) {
+                        playCounts[i] = cursor.getInt(getColumnIndexForWeek(i - weekDiff));
+                    }
+                }
+
+                // bump the count
+                if (bumpCount) {
+                    playCounts[0]++;
+                }
+
+                float score = calculateScore(playCounts);
+
+                // if the score is non-existant, then delete it
+                if (score < .01f) {
+                    deleteEntry(database, stringId);
+                } else {
+                    // create the content values
+                    ContentValues values = new ContentValues(NUM_WEEKS + 2);
+                    values.put(SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX, mNumberOfWeeksSinceEpoch);
+                    values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, score);
+
+                    for (int i = 0; i < NUM_WEEKS; i++) {
+                        values.put(getColumnNameForWeek(i), playCounts[i]);
+                    }
+
+                    // update the entry
+                    database.update(SongPlayCountColumns.NAME, values, WHERE_ID_EQUALS,
+                            new String[]{stringId});
+                }
+            } else if (bumpCount) {
+                // else no shifting, just update the scores
+                ContentValues values = new ContentValues(2);
+
+                // increase the score by a single score amount
+                int scoreIndex = cursor.getColumnIndex(SongPlayCountColumns.PLAY_COUNT_SCORE);
+                float score = cursor.getFloat(scoreIndex) + getScoreMultiplierForWeek(0);
+                values.put(SongPlayCountColumns.PLAY_COUNT_SCORE, score);
+
+                // increase the play count by 1
+                values.put(getColumnNameForWeek(0), cursor.getInt(getColumnIndexForWeek(0)) + 1);
+
+                // update the entry
+                database.update(SongPlayCountColumns.NAME, values, WHERE_ID_EQUALS,
+                        new String[]{stringId});
+            }
+
+            cursor.close();
+        } else if (bumpCount) {
+            // if we have no existing results, create a new one
+            createNewPlayedEntry(database, id);
+        }
+
+        database.setTransactionSuccessful();
+        database.endTransaction();
+    }
+
+    public void clear() {
+        final SQLiteDatabase database = getWritableDatabase();
+        database.delete(SongPlayCountColumns.NAME, null, null);
+    }
+
+    /**
+     * Gets a cursor containing the top songs played.  Note this only returns songs that have been
+     * played at least once in the past NUM_WEEKS
+     *
+     * @param numResults number of results to limit by.  If <= 0 it returns all results
+     * @return the top tracks
+     */
+    public Cursor getTopPlayedResults(int numResults) {
+        updateResults();
+
+        final SQLiteDatabase database = getReadableDatabase();
+        return database.query(SongPlayCountColumns.NAME, new String[]{SongPlayCountColumns.ID},
+                null, null, null, null, SongPlayCountColumns.PLAY_COUNT_SCORE + " DESC",
+                (numResults <= 0 ? null : String.valueOf(numResults)));
+    }
+
+    /**
+     * This updates all the results for the getTopPlayedResults so that we can get an
+     * accurate list of the top played results
+     */
+    private synchronized void updateResults() {
+        if (mDatabaseUpdated) {
+            return;
+        }
+
+        final SQLiteDatabase database = getWritableDatabase();
+
+        database.beginTransaction();
+
+        int oldestWeekWeCareAbout = mNumberOfWeeksSinceEpoch - NUM_WEEKS + 1;
+        // delete rows we don't care about anymore
+        database.delete(SongPlayCountColumns.NAME, SongPlayCountColumns.LAST_UPDATED_WEEK_INDEX
+                + " < " + oldestWeekWeCareAbout, null);
+
+        // get the remaining rows
+        Cursor cursor = database.query(SongPlayCountColumns.NAME,
+                new String[]{SongPlayCountColumns.ID},
+                null, null, null, null, null);
+
+        if (cursor != null && cursor.moveToFirst()) {
+            // for each row, update it
+            do {
+                updateExistingRow(database, cursor.getLong(0), false);
+            } while (cursor.moveToNext());
+
+            cursor.close();
+        }
+
+        mDatabaseUpdated = true;
+        database.setTransactionSuccessful();
+        database.endTransaction();
+    }
+
+    /**
+     * @param songId The song Id to remove.
+     */
+    public void removeItem(final long songId) {
+        final SQLiteDatabase database = getWritableDatabase();
+        deleteEntry(database, String.valueOf(songId));
+    }
+
+    /**
+     * Deletes the entry
+     *
+     * @param database database to use
+     * @param stringId id to delete
+     */
+    private void deleteEntry(@NonNull final SQLiteDatabase database, final String stringId) {
+        database.delete(SongPlayCountColumns.NAME, WHERE_ID_EQUALS, new String[]{stringId});
+    }
+
+    public interface SongPlayCountColumns {
+
+        String NAME = "song_play_count";
+
+        String ID = "song_id";
+
+        String WEEK_PLAY_COUNT = "week";
+
+        String LAST_UPDATED_WEEK_INDEX = "week_index";
+
+        String PLAY_COUNT_SCORE = "play_count_score";
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
new file mode 100644
index 000000000..d8ce2363a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/providers/interfaces/Repository.kt
@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.providers.interfaces
+
+import code.name.monkey.retromusic.Result
+import code.name.monkey.retromusic.model.*
+import code.name.monkey.retromusic.rest.model.LastFmArtist
+import io.reactivex.Observable
+
+/**
+ * Created by hemanths on 11/08/17.
+ */
+
+interface Repository {
+
+    suspend fun allAlbums(): Result<ArrayList<Album>>
+
+    suspend fun allSongs(): Result<ArrayList<Song>>
+
+    suspend fun allArtists(): Result<ArrayList<Artist>>
+
+    suspend fun allPlaylists(): Result<ArrayList<Playlist>>
+
+    suspend fun allGenres(): Result<ArrayList<Genre>>
+
+    suspend fun search(query: String?): Result<MutableList<Any>>
+
+    suspend fun getPlaylistSongs(playlist: Playlist): Result<ArrayList<Song>>
+
+    suspend fun getGenre(genreId: Int): Result<ArrayList<Song>>
+
+    suspend fun recentArtists(): Result<Home>
+
+    suspend fun topArtists(): Result<Home>
+
+    suspend fun topAlbums(): Result<Home>
+
+    suspend fun recentAlbums(): Result<Home>
+
+    suspend fun favoritePlaylist(): Result<Home>
+
+    suspend fun artistInfo(name: String, lang: String?, cache: String?): Result<LastFmArtist>
+
+    suspend fun artistById(artistId: Int): Result<Artist>
+
+    fun getSong(id: Int): Song
+
+    fun getAlbumFlowable(albumId: Int): Observable<Album>
+
+    fun getAlbum(albumId: Int): Album
+
+    fun getArtistByIdFlowable(artistId: Int): Observable<Artist>
+
+    fun getArtistById(artistId: Long): Artist
+
+    fun getPlaylistSongsFlowable(playlist: Playlist): Observable<ArrayList<Song>>
+
+    val favoritePlaylistFlowable: Observable<ArrayList<Playlist>>
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
deleted file mode 100644
index 541d98cba..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/AlbumRepository.kt
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.provider.MediaStore.Audio.AudioColumns
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-import java.text.Collator
-
-
-/**
- * Created by hemanths on 11/08/17.
- */
-interface AlbumRepository {
-    fun albums(): List<Album>
-
-    fun albums(query: String): List<Album>
-
-    fun album(albumId: Long): Album
-}
-
-class RealAlbumRepository(private val songRepository: RealSongRepository) :
-    AlbumRepository {
-
-    override fun albums(): List<Album> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                null,
-                null,
-                getSongLoaderSortOrder()
-            )
-        )
-        return splitIntoAlbums(songs)
-    }
-
-    override fun albums(query: String): List<Album> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                AudioColumns.ALBUM + " LIKE ?",
-                arrayOf("%$query%"),
-                getSongLoaderSortOrder()
-            )
-        )
-        return splitIntoAlbums(songs)
-    }
-
-    override fun album(albumId: Long): Album {
-        val cursor = songRepository.makeSongCursor(
-            AudioColumns.ALBUM_ID + "=?",
-            arrayOf(albumId.toString()),
-            getSongLoaderSortOrder()
-        )
-        val songs = songRepository.songs(cursor)
-        val album = Album(albumId, songs)
-        return sortAlbumSongs(album)
-    }
-
-    // We don't need sorted list of songs (with sortAlbumSongs())
-    // cuz we are just displaying Albums(Cover Arts) anyway and not songs
-    fun splitIntoAlbums(
-        songs: List<Song>,
-        sorted: Boolean = true
-    ): List<Album> {
-        val grouped = songs.groupBy { it.albumId }.map { Album(it.key, it.value) }
-        if (!sorted) return grouped
-        val collator = Collator.getInstance()
-        return when (PreferenceUtil.albumSortOrder) {
-            SortOrder.AlbumSortOrder.ALBUM_A_Z -> {
-                grouped.sortedWith { a1, a2 -> collator.compare(a1.title, a2.title) }
-            }
-            SortOrder.AlbumSortOrder.ALBUM_Z_A -> {
-                grouped.sortedWith { a1, a2 -> collator.compare(a2.title, a1.title) }
-            }
-            SortOrder.AlbumSortOrder.ALBUM_ARTIST -> {
-                grouped.sortedWith { a1, a2 -> collator.compare(a1.albumArtist, a2.albumArtist) }
-            }
-            SortOrder.AlbumSortOrder.ALBUM_NUMBER_OF_SONGS -> {
-                grouped.sortedByDescending { it.songCount }
-            }
-            else -> grouped
-        }
-    }
-
-    private fun sortAlbumSongs(album: Album): Album {
-        val collator = Collator.getInstance()
-        val songs = when (PreferenceUtil.albumDetailSongSortOrder) {
-            SortOrder.AlbumSongSortOrder.SONG_TRACK_LIST -> album.songs.sortedWith { o1, o2 ->
-                o1.trackNumber.compareTo(o2.trackNumber)
-            }
-            SortOrder.AlbumSongSortOrder.SONG_A_Z -> {
-                album.songs.sortedWith { o1, o2 -> collator.compare(o1.title, o2.title) }
-            }
-            SortOrder.AlbumSongSortOrder.SONG_Z_A -> {
-                album.songs.sortedWith { o1, o2 -> collator.compare(o2.title, o1.title) }
-            }
-            SortOrder.AlbumSongSortOrder.SONG_DURATION -> album.songs.sortedWith { o1, o2 ->
-                o1.duration.compareTo(o2.duration)
-            }
-            else -> throw IllegalArgumentException("invalid ${PreferenceUtil.albumDetailSongSortOrder}")
-        }
-        return album.copy(songs = songs)
-    }
-
-    private fun getSongLoaderSortOrder(): String {
-        var albumSortOrder = PreferenceUtil.albumSortOrder
-        if (albumSortOrder == SortOrder.AlbumSortOrder.ALBUM_NUMBER_OF_SONGS)
-            albumSortOrder = SortOrder.AlbumSortOrder.ALBUM_A_Z
-        return albumSortOrder + ", " +
-                PreferenceUtil.albumSongSortOrder
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
deleted file mode 100644
index 8b11976ff..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/ArtistRepository.kt
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.provider.MediaStore.Audio.AudioColumns
-import code.name.monkey.retromusic.ALBUM_ARTIST
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.util.PreferenceUtil
-import java.text.Collator
-
-interface ArtistRepository {
-    fun artists(): List<Artist>
-
-    fun albumArtists(): List<Artist>
-
-    fun albumArtists(query: String): List<Artist>
-
-    fun artists(query: String): List<Artist>
-
-    fun artist(artistId: Long): Artist
-
-    fun albumArtist(artistName: String): Artist
-}
-
-class RealArtistRepository(
-    private val songRepository: RealSongRepository,
-    private val albumRepository: RealAlbumRepository
-) : ArtistRepository {
-
-    private fun getSongLoaderSortOrder(): String {
-        return PreferenceUtil.artistSortOrder + ", " +
-                PreferenceUtil.artistAlbumSortOrder + ", " +
-                PreferenceUtil.artistSongSortOrder
-    }
-
-    override fun artist(artistId: Long): Artist {
-        if (artistId == Artist.VARIOUS_ARTISTS_ID) {
-            // Get Various Artists
-            val songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    null,
-                    null,
-                    getSongLoaderSortOrder()
-                )
-            )
-            val albums = albumRepository.splitIntoAlbums(songs)
-                .filter { it.albumArtist == Artist.VARIOUS_ARTISTS_DISPLAY_NAME }
-            return Artist(Artist.VARIOUS_ARTISTS_ID, albums)
-        }
-
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                AudioColumns.ARTIST_ID + "=?",
-                arrayOf(artistId.toString()),
-                getSongLoaderSortOrder()
-            )
-        )
-        return Artist(artistId, albumRepository.splitIntoAlbums(songs))
-    }
-
-    override fun albumArtist(artistName: String): Artist {
-        if (artistName == Artist.VARIOUS_ARTISTS_DISPLAY_NAME) {
-            // Get Various Artists
-            val songs = songRepository.songs(
-                songRepository.makeSongCursor(
-                    null,
-                    null,
-                    getSongLoaderSortOrder()
-                )
-            )
-            val albums = albumRepository.splitIntoAlbums(songs)
-                .filter { it.albumArtist == Artist.VARIOUS_ARTISTS_DISPLAY_NAME }
-            return Artist(Artist.VARIOUS_ARTISTS_ID, albums, true)
-        }
-
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                "album_artist" + "=?",
-                arrayOf(artistName),
-                getSongLoaderSortOrder()
-            )
-        )
-        return Artist(artistName, albumRepository.splitIntoAlbums(songs), true)
-    }
-
-    override fun artists(): List<Artist> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                null, null,
-                getSongLoaderSortOrder()
-            )
-        )
-        val artists = splitIntoArtists(albumRepository.splitIntoAlbums(songs))
-        return sortArtists(artists)
-    }
-
-    override fun albumArtists(): List<Artist> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                null,
-                null,
-                "lower($ALBUM_ARTIST)" +
-                        if (PreferenceUtil.artistSortOrder == SortOrder.ArtistSortOrder.ARTIST_A_Z) "" else " DESC"
-            )
-        )
-        val artists = splitIntoAlbumArtists(albumRepository.splitIntoAlbums(songs))
-        return sortArtists(artists)
-    }
-
-    override fun albumArtists(query: String): List<Artist> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                "album_artist" + " LIKE ?",
-                arrayOf("%$query%"),
-                getSongLoaderSortOrder()
-            )
-        )
-        val artists = splitIntoAlbumArtists(albumRepository.splitIntoAlbums(songs))
-        return sortArtists(artists)
-    }
-
-    override fun artists(query: String): List<Artist> {
-        val songs = songRepository.songs(
-            songRepository.makeSongCursor(
-                AudioColumns.ARTIST + " LIKE ?",
-                arrayOf("%$query%"),
-                getSongLoaderSortOrder()
-            )
-        )
-        val artists = splitIntoArtists(albumRepository.splitIntoAlbums(songs))
-        return sortArtists(artists)
-    }
-
-
-    private fun splitIntoAlbumArtists(albums: List<Album>): List<Artist> {
-        return albums.groupBy { it.albumArtist }
-            .filter {
-                !it.key.isNullOrEmpty()
-            }
-            .map {
-                val currentAlbums = it.value
-                if (currentAlbums.isNotEmpty()) {
-                    if (currentAlbums[0].albumArtist == Artist.VARIOUS_ARTISTS_DISPLAY_NAME) {
-                        Artist(Artist.VARIOUS_ARTISTS_ID, currentAlbums, true)
-                    } else {
-                        Artist(currentAlbums[0].artistId, currentAlbums, true)
-                    }
-                } else {
-                    Artist.empty
-                }
-            }
-    }
-
-
-    fun splitIntoArtists(albums: List<Album>): List<Artist> {
-        return albums.groupBy { it.artistId }
-            .map { Artist(it.key, it.value) }
-    }
-
-    private fun sortArtists(artists: List<Artist>): List<Artist> {
-        val collator = Collator.getInstance()
-        return when (PreferenceUtil.artistSortOrder) {
-            SortOrder.ArtistSortOrder.ARTIST_A_Z -> {
-                artists.sortedWith { a1, a2 -> collator.compare(a1.name, a2.name) }
-            }
-            SortOrder.ArtistSortOrder.ARTIST_Z_A -> {
-                artists.sortedWith { a1, a2 -> collator.compare(a2.name, a1.name) }
-            }
-            else -> artists
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt
deleted file mode 100644
index 668bdc64f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/GenreRepository.kt
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.ContentResolver
-import android.database.Cursor
-import android.provider.BaseColumns
-import android.provider.MediaStore.Audio.Genres
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.Constants.baseProjection
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.Genre
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-interface GenreRepository {
-    fun genres(query: String): List<Genre>
-
-    fun genres(): List<Genre>
-
-    fun songs(genreId: Long): List<Song>
-
-    fun song(genreId: Long): Song
-}
-
-class RealGenreRepository(
-    private val contentResolver: ContentResolver,
-    private val songRepository: RealSongRepository
-) : GenreRepository {
-
-    override fun genres(query: String): List<Genre> {
-        return getGenresFromCursor(makeGenreCursor(query))
-    }
-
-    override fun genres(): List<Genre> {
-        return getGenresFromCursor(makeGenreCursor())
-    }
-
-    override fun songs(genreId: Long): List<Song> {
-        // The genres table only stores songs that have a genre specified,
-        // so we need to get songs without a genre a different way.
-        return if (genreId == -1L) {
-            getSongsWithNoGenre()
-        } else songRepository.songs(makeGenreSongCursor(genreId))
-    }
-
-    override fun song(genreId: Long): Song {
-        return songRepository.song(makeGenreSongCursor(genreId))
-    }
-
-    private fun getSongCount(genreId: Long): Int {
-        contentResolver.query(
-            Genres.Members.getContentUri("external", genreId),
-            null,
-            null,
-            null,
-            null
-        ).use {
-            return it?.count ?: 0
-        }
-    }
-
-    private fun getGenreFromCursor(cursor: Cursor): Genre {
-        val id = cursor.getLong(Genres._ID)
-        val name = cursor.getStringOrNull(Genres.NAME)
-        val songCount = getSongCount(id)
-        return Genre(id, name ?: "", songCount)
-    }
-
-    private fun getSongsWithNoGenre(): List<Song> {
-        val selection =
-            BaseColumns._ID + " NOT IN " + "(SELECT " + Genres.Members.AUDIO_ID + " FROM audio_genres_map)"
-        return songRepository.songs(songRepository.makeSongCursor(selection, null))
-    }
-
-    private fun makeGenreSongCursor(genreId: Long): Cursor? {
-        return try {
-            contentResolver.query(
-                Genres.Members.getContentUri("external", genreId),
-                baseProjection,
-                IS_MUSIC,
-                null,
-                PreferenceUtil.songSortOrder
-            )
-        } catch (e: SecurityException) {
-            return null
-        }
-    }
-
-    private fun getGenresFromCursor(cursor: Cursor?): ArrayList<Genre> {
-        val genres = arrayListOf<Genre>()
-        cursor?.use {
-            if (cursor.moveToFirst()) {
-                do {
-                    val genre = getGenreFromCursor(cursor)
-                    if (genre.songCount > 0) {
-                        genres.add(genre)
-                    }
-                } while (cursor.moveToNext())
-            }
-        }
-        return genres
-    }
-
-    private fun makeGenreCursor(): Cursor? {
-        val projection = arrayOf(Genres._ID, Genres.NAME)
-        return try {
-            contentResolver.query(
-                Genres.EXTERNAL_CONTENT_URI,
-                projection,
-                null,
-                null,
-                PreferenceUtil.genreSortOrder
-            )
-        } catch (e: SecurityException) {
-            return null
-        }
-    }
-
-    private fun makeGenreCursor(query: String): Cursor? {
-        val projection = arrayOf(Genres._ID, Genres.NAME)
-        return try {
-            contentResolver.query(
-                Genres.EXTERNAL_CONTENT_URI,
-                projection,
-                Genres.NAME + " = ?",
-                arrayOf(query),
-                PreferenceUtil.genreSortOrder
-            )
-        } catch (e: SecurityException) {
-            return null
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt
deleted file mode 100644
index dae6854c7..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/LastAddedSongsRepository.kt
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.database.Cursor
-import android.provider.MediaStore
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-/**
- * Created by hemanths on 16/08/17.
- */
-interface LastAddedRepository {
-    fun recentSongs(): List<Song>
-
-    fun recentAlbums(): List<Album>
-
-    fun recentArtists(): List<Artist>
-}
-
-class RealLastAddedRepository(
-    private val songRepository: RealSongRepository,
-    private val albumRepository: RealAlbumRepository,
-    private val artistRepository: RealArtistRepository
-) : LastAddedRepository {
-    override fun recentSongs(): List<Song> {
-        return songRepository.songs(makeLastAddedCursor())
-    }
-
-    override fun recentAlbums(): List<Album> {
-        return albumRepository.splitIntoAlbums(recentSongs(), sorted = false)
-    }
-
-    override fun recentArtists(): List<Artist> {
-        return artistRepository.splitIntoArtists(recentAlbums())
-    }
-
-    private fun makeLastAddedCursor(): Cursor? {
-        val cutoff = PreferenceUtil.lastAddedCutoff
-        return songRepository.makeSongCursor(
-            MediaStore.Audio.Media.DATE_ADDED + ">?",
-            arrayOf(cutoff.toString()),
-            MediaStore.Audio.Media.DATE_ADDED + " DESC"
-        )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
deleted file mode 100644
index 75fbeaca1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistRepository.kt
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.ContentResolver
-import android.database.Cursor
-import android.provider.BaseColumns
-import android.provider.MediaStore.Audio.AudioColumns
-import android.provider.MediaStore.Audio.Playlists.*
-import android.provider.MediaStore.Audio.PlaylistsColumns
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.Playlist
-import code.name.monkey.retromusic.model.PlaylistSong
-import code.name.monkey.retromusic.model.Song
-
-/**
- * Created by hemanths on 16/08/17.
- */
-interface PlaylistRepository {
-    fun playlist(cursor: Cursor?): Playlist
-
-    fun searchPlaylist(query: String): List<Playlist>
-
-    fun playlist(playlistName: String): Playlist
-
-    fun playlists(): List<Playlist>
-
-    fun playlists(cursor: Cursor?): List<Playlist>
-
-    fun favoritePlaylist(playlistName: String): List<Playlist>
-
-    fun deletePlaylist(playlistId: Long)
-
-    fun playlist(playlistId: Long): Playlist
-
-    fun playlistSongs(playlistId: Long): List<Song>
-}
-@Suppress("Deprecation")
-class RealPlaylistRepository(
-    private val contentResolver: ContentResolver
-) : PlaylistRepository {
-
-    override fun playlist(cursor: Cursor?): Playlist {
-        return cursor.use {
-            if (cursor?.moveToFirst() == true) {
-                getPlaylistFromCursorImpl(cursor)
-            } else {
-                Playlist.empty
-            }
-        }
-    }
-
-    override fun playlist(playlistName: String): Playlist {
-        return playlist(makePlaylistCursor(PlaylistsColumns.NAME + "=?", arrayOf(playlistName)))
-    }
-
-    override fun playlist(playlistId: Long): Playlist {
-        return playlist(
-            makePlaylistCursor(
-                BaseColumns._ID + "=?",
-                arrayOf(playlistId.toString())
-            )
-        )
-    }
-
-    override fun searchPlaylist(query: String): List<Playlist> {
-        return playlists(makePlaylistCursor(PlaylistsColumns.NAME + "=?", arrayOf(query)))
-    }
-
-    override fun playlists(): List<Playlist> {
-        return playlists(makePlaylistCursor(null, null))
-    }
-
-    override fun playlists(cursor: Cursor?): List<Playlist> {
-        val playlists = mutableListOf<Playlist>()
-        if (cursor != null && cursor.moveToFirst()) {
-            do {
-                playlists.add(getPlaylistFromCursorImpl(cursor))
-            } while (cursor.moveToNext())
-        }
-        cursor?.close()
-        return playlists
-    }
-
-    override fun favoritePlaylist(playlistName: String): List<Playlist> {
-        return playlists(
-            makePlaylistCursor(
-                PlaylistsColumns.NAME + "=?",
-                arrayOf(playlistName)
-            )
-        )
-    }
-
-    override fun deletePlaylist(playlistId: Long) {
-        val localUri = EXTERNAL_CONTENT_URI
-        val localStringBuilder = StringBuilder()
-        localStringBuilder.append("_id IN (")
-        localStringBuilder.append(playlistId)
-        localStringBuilder.append(")")
-        contentResolver.delete(localUri, localStringBuilder.toString(), null)
-    }
-
-    private fun getPlaylistFromCursorImpl(
-        cursor: Cursor
-    ): Playlist {
-        val id = cursor.getLong(0)
-        val name = cursor.getString(1)
-        return if (name != null) {
-            Playlist(id, name)
-        } else {
-            Playlist.empty
-        }
-    }
-
-    override fun playlistSongs(playlistId: Long): List<Song> {
-        val songs = arrayListOf<Song>()
-        if (playlistId == -1L) return songs
-        val cursor = makePlaylistSongCursor(playlistId)
-
-        if (cursor != null && cursor.moveToFirst()) {
-            do {
-                songs.add(getPlaylistSongFromCursorImpl(cursor, playlistId))
-            } while (cursor.moveToNext())
-        }
-        cursor?.close()
-        return songs
-    }
-
-    private fun getPlaylistSongFromCursorImpl(cursor: Cursor, playlistId: Long): PlaylistSong {
-        val id = cursor.getLong(Members.AUDIO_ID)
-        val title = cursor.getString(AudioColumns.TITLE)
-        val trackNumber = cursor.getInt(AudioColumns.TRACK)
-        val year = cursor.getInt(AudioColumns.YEAR)
-        val duration = cursor.getLong(AudioColumns.DURATION)
-        val data = cursor.getString(Constants.DATA)
-        val dateModified = cursor.getLong(AudioColumns.DATE_MODIFIED)
-        val albumId = cursor.getLong(AudioColumns.ALBUM_ID)
-        val albumName = cursor.getString(AudioColumns.ALBUM)
-        val artistId = cursor.getLong(AudioColumns.ARTIST_ID)
-        val artistName = cursor.getString(AudioColumns.ARTIST)
-        val idInPlaylist = cursor.getLong(Members._ID)
-        val composer = cursor.getStringOrNull(AudioColumns.COMPOSER)
-        val albumArtist = cursor.getStringOrNull("album_artist")
-        return PlaylistSong(
-            id,
-            title,
-            trackNumber,
-            year,
-            duration,
-            data,
-            dateModified,
-            albumId,
-            albumName,
-            artistId,
-            artistName,
-            playlistId,
-            idInPlaylist,
-            composer ?: "",
-            albumArtist
-        )
-    }
-
-    private fun makePlaylistCursor(
-        selection: String?,
-        values: Array<String>?
-    ): Cursor? {
-        return contentResolver.query(
-            EXTERNAL_CONTENT_URI,
-            arrayOf(
-                BaseColumns._ID, /* 0 */
-                PlaylistsColumns.NAME /* 1 */
-            ),
-            selection,
-            values,
-            DEFAULT_SORT_ORDER
-        )
-    }
-
-
-    private fun makePlaylistSongCursor(playlistId: Long): Cursor? {
-        return contentResolver.query(
-            Members.getContentUri("external", playlistId),
-            arrayOf(
-                Members.AUDIO_ID, // 0
-                AudioColumns.TITLE, // 1
-                AudioColumns.TRACK, // 2
-                AudioColumns.YEAR, // 3
-                AudioColumns.DURATION, // 4
-                Constants.DATA, // 5
-                AudioColumns.DATE_MODIFIED, // 6
-                AudioColumns.ALBUM_ID, // 7
-                AudioColumns.ALBUM, // 8
-                AudioColumns.ARTIST_ID, // 9
-                AudioColumns.ARTIST, // 10
-                Members._ID,//11
-                AudioColumns.COMPOSER,//12
-                "album_artist"//13
-            ), Constants.IS_MUSIC, null, Members.DEFAULT_SORT_ORDER
-        )
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt b/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
deleted file mode 100644
index abdec08fb..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/PlaylistSongsLoader.kt
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.MediaStore.Audio.AudioColumns
-import android.provider.MediaStore.Audio.Playlists.Members
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.model.PlaylistSong
-import code.name.monkey.retromusic.model.Song
-
-/**
- * Created by hemanths on 16/08/17.
- */
-@Suppress("Deprecation")
-object PlaylistSongsLoader {
-
-    @JvmStatic
-    fun getPlaylistSongList(context: Context, playlistId: Long): List<Song> {
-        val songs = mutableListOf<Song>()
-        val cursor =
-            makePlaylistSongCursor(
-                context,
-                playlistId
-            )
-
-        if (cursor != null && cursor.moveToFirst()) {
-            do {
-                songs.add(
-                    getPlaylistSongFromCursorImpl(
-                        cursor,
-                        playlistId
-                    )
-                )
-            } while (cursor.moveToNext())
-        }
-        cursor?.close()
-        return songs
-    }
-
-    // TODO duplicated in [PlaylistRepository.kt]
-    private fun getPlaylistSongFromCursorImpl(cursor: Cursor, playlistId: Long): PlaylistSong {
-        val id = cursor.getLong(Members.AUDIO_ID)
-        val title = cursor.getString(AudioColumns.TITLE)
-        val trackNumber = cursor.getInt(AudioColumns.TRACK)
-        val year = cursor.getInt(AudioColumns.YEAR)
-        val duration = cursor.getLong(AudioColumns.DURATION)
-        val data = cursor.getString(Constants.DATA)
-        val dateModified = cursor.getLong(AudioColumns.DATE_MODIFIED)
-        val albumId = cursor.getLong(AudioColumns.ALBUM_ID)
-        val albumName = cursor.getString(AudioColumns.ALBUM)
-        val artistId = cursor.getLong(AudioColumns.ARTIST_ID)
-        val artistName = cursor.getString(AudioColumns.ARTIST)
-        val idInPlaylist = cursor.getLong(Members._ID)
-        val composer = cursor.getStringOrNull(AudioColumns.COMPOSER)
-        val albumArtist = cursor.getStringOrNull("album_artist")
-        return PlaylistSong(
-            id,
-            title,
-            trackNumber,
-            year,
-            duration,
-            data,
-            dateModified,
-            albumId,
-            albumName,
-            artistId,
-            artistName,
-            playlistId,
-            idInPlaylist,
-            composer,
-            albumArtist
-        )
-    }
-
-    private fun makePlaylistSongCursor(context: Context, playlistId: Long): Cursor? {
-        try {
-            return context.contentResolver.query(
-                Members.getContentUri("external", playlistId),
-                arrayOf(
-                    Members.AUDIO_ID, // 0
-                    AudioColumns.TITLE, // 1
-                    AudioColumns.TRACK, // 2
-                    AudioColumns.YEAR, // 3
-                    AudioColumns.DURATION, // 4
-                    Constants.DATA, // 5
-                    AudioColumns.DATE_MODIFIED, // 6
-                    AudioColumns.ALBUM_ID, // 7
-                    AudioColumns.ALBUM, // 8
-                    AudioColumns.ARTIST_ID, // 9
-                    AudioColumns.ARTIST, // 10
-                    Members._ID,//11
-                    AudioColumns.COMPOSER,//12
-                    "album_artist"//13
-                ), IS_MUSIC, null, Members.DEFAULT_SORT_ORDER
-            )
-        } catch (e: SecurityException) {
-            return null
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
deleted file mode 100644
index abad14fbb..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/Repository.kt
+++ /dev/null
@@ -1,316 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import androidx.lifecycle.LiveData
-import androidx.lifecycle.map
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.fragments.search.Filter
-import code.name.monkey.retromusic.model.*
-import code.name.monkey.retromusic.model.smartplaylist.NotPlayedPlaylist
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.MutableStateFlow
-
-interface Repository {
-
-    fun historySong(): List<HistoryEntity>
-    fun favorites(): LiveData<List<SongEntity>>
-    fun observableHistorySongs(): LiveData<List<Song>>
-    fun albumById(albumId: Long): Album
-    fun playlistSongs(playListId: Long): LiveData<List<SongEntity>>
-    suspend fun fetchAlbums(): List<Album>
-    suspend fun albumByIdAsync(albumId: Long): Album
-    suspend fun allSongs(): List<Song>
-    suspend fun fetchArtists(): List<Artist>
-    suspend fun albumArtists(): List<Artist>
-    suspend fun fetchLegacyPlaylist(): List<Playlist>
-    suspend fun fetchGenres(): List<Genre>
-    suspend fun search(query: String?, filter: Filter): MutableList<Any>
-    suspend fun getPlaylistSongs(playlist: Playlist): List<Song>
-    suspend fun getGenre(genreId: Long): List<Song>
-    suspend fun artistById(artistId: Long): Artist
-    suspend fun albumArtistByName(name: String): Artist
-    suspend fun recentArtists(): List<Artist>
-    suspend fun topArtists(): List<Artist>
-    suspend fun topAlbums(): List<Album>
-    suspend fun recentAlbums(): List<Album>
-    suspend fun recentArtistsHome(): Home
-    suspend fun topArtistsHome(): Home
-    suspend fun topAlbumsHome(): Home
-    suspend fun recentAlbumsHome(): Home
-    suspend fun favoritePlaylistHome(): Home
-    suspend fun suggestions(): List<Song>
-    suspend fun genresHome(): Home
-    suspend fun playlists(): Home
-    suspend fun homeSections(): List<Home>
-
-    suspend fun playlist(playlistId: Long): Playlist
-    suspend fun fetchPlaylistWithSongs(): List<PlaylistWithSongs>
-    suspend fun playlistSongs(playlistWithSongs: PlaylistWithSongs): List<Song>
-    suspend fun insertSongs(songs: List<SongEntity>)
-    suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity>
-    suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
-    suspend fun fetchPlaylists(): List<PlaylistEntity>
-    suspend fun deleteRoomPlaylist(playlists: List<PlaylistEntity>)
-    suspend fun renameRoomPlaylist(playlistId: Long, name: String)
-    suspend fun deleteSongsInPlaylist(songs: List<SongEntity>)
-    suspend fun removeSongFromPlaylist(songEntity: SongEntity)
-    suspend fun deletePlaylistSongs(playlists: List<PlaylistEntity>)
-    suspend fun favoritePlaylist(): PlaylistEntity
-    suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity>
-    suspend fun upsertSongInHistory(currentSong: Song)
-    suspend fun favoritePlaylistSongs(): List<SongEntity>
-    suspend fun recentSongs(): List<Song>
-    suspend fun topPlayedSongs(): List<Song>
-    suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
-    suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
-    suspend fun deleteSongInHistory(songId: Long)
-    suspend fun clearSongHistory()
-    suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
-    suspend fun playCountSongs(): List<PlayCountEntity>
-    suspend fun deleteSongs(songs: List<Song>)
-    suspend fun searchArtists(query: String): List<Artist>
-    suspend fun searchSongs(query: String): List<Song>
-    suspend fun searchAlbums(query: String): List<Album>
-    suspend fun isSongFavorite(songId: Long): Boolean
-    fun getSongByGenre(genreId: Long): Song
-    fun checkPlaylistExists(playListId: Long): LiveData<Boolean>
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
-}
-
-class RealRepository(
-    private val context: Context,
-    private val songRepository: SongRepository,
-    private val albumRepository: AlbumRepository,
-    private val artistRepository: ArtistRepository,
-    private val genreRepository: GenreRepository,
-    private val lastAddedRepository: LastAddedRepository,
-    private val playlistRepository: PlaylistRepository,
-    private val searchRepository: RealSearchRepository,
-    private val topPlayedRepository: TopPlayedRepository,
-    private val roomRepository: RoomRepository,
-) : Repository {
-
-    override suspend fun deleteSongs(songs: List<Song>) = roomRepository.deleteSongs(songs)
-
-    override suspend fun searchSongs(query: String): List<Song> = songRepository.songs(query)
-
-    override suspend fun searchAlbums(query: String): List<Album> = albumRepository.albums(query)
-
-    override suspend fun isSongFavorite(songId: Long): Boolean =
-        roomRepository.isSongFavorite(context, songId)
-
-    override fun getSongByGenre(genreId: Long): Song = genreRepository.song(genreId)
-
-    override suspend fun searchArtists(query: String): List<Artist> =
-        artistRepository.artists(query)
-
-    override suspend fun fetchAlbums(): List<Album> = albumRepository.albums()
-
-    override suspend fun albumByIdAsync(albumId: Long): Album = albumRepository.album(albumId)
-
-    override fun albumById(albumId: Long): Album = albumRepository.album(albumId)
-
-    override suspend fun fetchArtists(): List<Artist> = artistRepository.artists()
-
-    override suspend fun albumArtists(): List<Artist> = artistRepository.albumArtists()
-
-    override suspend fun artistById(artistId: Long): Artist = artistRepository.artist(artistId)
-
-    override suspend fun albumArtistByName(name: String): Artist =
-        artistRepository.albumArtist(name)
-
-    override suspend fun recentArtists(): List<Artist> = lastAddedRepository.recentArtists()
-
-    override suspend fun recentAlbums(): List<Album> = lastAddedRepository.recentAlbums()
-
-    override suspend fun topArtists(): List<Artist> = topPlayedRepository.topArtists()
-
-    override suspend fun topAlbums(): List<Album> = topPlayedRepository.topAlbums()
-
-    override suspend fun fetchLegacyPlaylist(): List<Playlist> = playlistRepository.playlists()
-
-    override suspend fun fetchGenres(): List<Genre> = genreRepository.genres()
-
-    override suspend fun allSongs(): List<Song> = songRepository.songs()
-
-    override suspend fun search(query: String?, filter: Filter): MutableList<Any> =
-        searchRepository.searchAll(context, query, filter)
-
-    override suspend fun getPlaylistSongs(playlist: Playlist): List<Song> =
-        if (playlist is AbsCustomPlaylist) {
-            playlist.songs()
-        } else {
-            PlaylistSongsLoader.getPlaylistSongList(context, playlist.id)
-        }
-
-    override suspend fun getGenre(genreId: Long): List<Song> = genreRepository.songs(genreId)
-
-    override suspend fun homeSections(): List<Home> {
-        val homeSections = mutableListOf<Home>()
-        val sections: List<Home> = listOf(
-            topArtistsHome(),
-            topAlbumsHome(),
-            recentArtistsHome(),
-            recentAlbumsHome(),
-            favoritePlaylistHome()
-        )
-        for (section in sections) {
-            if (section.arrayList.isNotEmpty()) {
-                homeSections.add(section)
-            }
-        }
-        return homeSections
-    }
-
-
-    override suspend fun playlist(playlistId: Long) =
-        playlistRepository.playlist(playlistId)
-
-    override suspend fun fetchPlaylistWithSongs(): List<PlaylistWithSongs> =
-        roomRepository.playlistWithSongs()
-
-    override fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs> = roomRepository.getPlaylist(playlistId)
-
-    override suspend fun playlistSongs(playlistWithSongs: PlaylistWithSongs): List<Song> =
-        playlistWithSongs.songs.map {
-            it.toSong()
-        }
-
-    override fun playlistSongs(playListId: Long): LiveData<List<SongEntity>> =
-        roomRepository.getSongs(playListId)
-
-    override suspend fun insertSongs(songs: List<SongEntity>) =
-        roomRepository.insertSongs(songs)
-
-    override suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity> =
-        roomRepository.checkPlaylistExists(playlistName)
-
-    override fun checkPlaylistExists(playListId: Long): LiveData<Boolean> =
-        roomRepository.checkPlaylistExists(playListId)
-
-    override suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long =
-        roomRepository.createPlaylist(playlistEntity)
-
-    override suspend fun fetchPlaylists(): List<PlaylistEntity> = roomRepository.playlists()
-
-    override suspend fun deleteRoomPlaylist(playlists: List<PlaylistEntity>) =
-        roomRepository.deletePlaylistEntities(playlists)
-
-    override suspend fun renameRoomPlaylist(playlistId: Long, name: String) =
-        roomRepository.renamePlaylistEntity(playlistId, name)
-
-    override suspend fun deleteSongsInPlaylist(songs: List<SongEntity>) =
-        roomRepository.deleteSongsInPlaylist(songs)
-
-    override suspend fun removeSongFromPlaylist(songEntity: SongEntity) =
-        roomRepository.removeSongFromPlaylist(songEntity)
-
-    override suspend fun deletePlaylistSongs(playlists: List<PlaylistEntity>) =
-        roomRepository.deletePlaylistSongs(playlists)
-
-    override suspend fun favoritePlaylist(): PlaylistEntity =
-        roomRepository.favoritePlaylist(context.getString(R.string.favorites))
-
-    override suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity> =
-        roomRepository.isFavoriteSong(songEntity)
-
-    override suspend fun upsertSongInHistory(currentSong: Song) =
-        roomRepository.upsertSongInHistory(currentSong)
-
-    override suspend fun favoritePlaylistSongs(): List<SongEntity> =
-        roomRepository.favoritePlaylistSongs(context.getString(R.string.favorites))
-
-    override suspend fun recentSongs(): List<Song> = lastAddedRepository.recentSongs()
-
-    override suspend fun topPlayedSongs(): List<Song> = topPlayedRepository.topTracks()
-
-    override suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity) =
-        roomRepository.upsertSongInPlayCount(playCountEntity)
-
-    override suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity) =
-        roomRepository.deleteSongInPlayCount(playCountEntity)
-
-    override suspend fun deleteSongInHistory(songId: Long) =
-        roomRepository.deleteSongInHistory(songId)
-
-    override suspend fun clearSongHistory() {
-        roomRepository.clearSongHistory()
-    }
-
-    override suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity? =
-        roomRepository.findSongExistInPlayCount(songId)
-
-    override suspend fun playCountSongs(): List<PlayCountEntity> =
-        roomRepository.playCountSongs()
-
-    override fun observableHistorySongs(): LiveData<List<Song>> =
-        roomRepository.observableHistorySongs().map {
-            it.fromHistoryToSongs()
-        }
-
-    override fun historySong(): List<HistoryEntity> =
-        roomRepository.historySongs()
-
-    override fun favorites(): LiveData<List<SongEntity>> =
-        roomRepository.favoritePlaylistLiveData(context.getString(R.string.favorites))
-
-    override suspend fun suggestions(): List<Song> {
-        return NotPlayedPlaylist().songs().shuffled().takeIf {
-            it.size > 9
-        } ?: emptyList()
-    }
-
-    override suspend fun genresHome(): Home {
-        val genres = genreRepository.genres().shuffled()
-        return Home(genres, GENRES, R.string.genres)
-    }
-
-    override suspend fun playlists(): Home {
-        val playlist = playlistRepository.playlists()
-        return Home(playlist, PLAYLISTS, R.string.playlists)
-    }
-
-    override suspend fun recentArtistsHome(): Home {
-        val artists = lastAddedRepository.recentArtists().take(5)
-        return Home(artists, RECENT_ARTISTS, R.string.recent_artists)
-    }
-
-    override suspend fun recentAlbumsHome(): Home {
-        val albums = lastAddedRepository.recentAlbums().take(5)
-        return Home(albums, RECENT_ALBUMS, R.string.recent_albums)
-    }
-
-    override suspend fun topAlbumsHome(): Home {
-        val albums = topPlayedRepository.topAlbums().take(5)
-        return Home(albums, TOP_ALBUMS, R.string.top_albums)
-    }
-
-    override suspend fun topArtistsHome(): Home {
-        val artists = topPlayedRepository.topArtists().take(5)
-        return Home(artists, TOP_ARTISTS, R.string.top_artists)
-    }
-
-    override suspend fun favoritePlaylistHome(): Home {
-        val songs = favoritePlaylistSongs().map {
-            it.toSong()
-        }
-        return Home(songs, FAVOURITES, R.string.favorites)
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
deleted file mode 100644
index a38fc39f5..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/RoomRepository.kt
+++ /dev/null
@@ -1,180 +0,0 @@
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import androidx.annotation.WorkerThread
-import androidx.lifecycle.LiveData
-import code.name.monkey.retromusic.db.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_A_Z
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_SONG_COUNT_DESC
-import code.name.monkey.retromusic.helper.SortOrder.PlaylistSortOrder.Companion.PLAYLIST_Z_A
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-
-interface RoomRepository {
-    fun historySongs(): List<HistoryEntity>
-    fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>>
-    fun observableHistorySongs(): LiveData<List<HistoryEntity>>
-    fun getSongs(playListId: Long): LiveData<List<SongEntity>>
-    suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long
-    suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity>
-    suspend fun playlists(): List<PlaylistEntity>
-    suspend fun playlistWithSongs(): List<PlaylistWithSongs>
-    suspend fun insertSongs(songs: List<SongEntity>)
-    suspend fun deletePlaylistEntities(playlistEntities: List<PlaylistEntity>)
-    suspend fun renamePlaylistEntity(playlistId: Long, name: String)
-    suspend fun deleteSongsInPlaylist(songs: List<SongEntity>)
-    suspend fun deletePlaylistSongs(playlists: List<PlaylistEntity>)
-    suspend fun favoritePlaylist(favorite: String): PlaylistEntity
-    suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity>
-    suspend fun removeSongFromPlaylist(songEntity: SongEntity)
-    suspend fun upsertSongInHistory(currentSong: Song)
-    suspend fun favoritePlaylistSongs(favorite: String): List<SongEntity>
-    suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity)
-    suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity)
-    suspend fun deleteSongInHistory(songId: Long)
-    suspend fun clearSongHistory()
-    suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity?
-    suspend fun playCountSongs(): List<PlayCountEntity>
-    suspend fun deleteSongs(songs: List<Song>)
-    suspend fun isSongFavorite(context: Context, songId: Long): Boolean
-    fun checkPlaylistExists(playListId: Long): LiveData<Boolean>
-    fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs>
-}
-
-class RealRoomRepository(
-    private val playlistDao: PlaylistDao,
-    private val playCountDao: PlayCountDao,
-    private val historyDao: HistoryDao
-) : RoomRepository {
-    @WorkerThread
-    override suspend fun createPlaylist(playlistEntity: PlaylistEntity): Long =
-        playlistDao.createPlaylist(playlistEntity)
-
-    @WorkerThread
-    override suspend fun checkPlaylistExists(playlistName: String): List<PlaylistEntity> =
-        playlistDao.playlist(playlistName)
-
-    @WorkerThread
-    override suspend fun playlists(): List<PlaylistEntity> = playlistDao.playlists()
-
-    @WorkerThread
-    override suspend fun playlistWithSongs(): List<PlaylistWithSongs> =
-        when (PreferenceUtil.playlistSortOrder) {
-            PLAYLIST_A_Z ->
-                playlistDao.playlistsWithSongs().sortedBy {
-                    it.playlistEntity.playlistName
-                }
-            PLAYLIST_Z_A -> playlistDao.playlistsWithSongs()
-                .sortedByDescending {
-                    it.playlistEntity.playlistName
-                }
-            PLAYLIST_SONG_COUNT -> playlistDao.playlistsWithSongs().sortedBy { it.songs.size }
-            PLAYLIST_SONG_COUNT_DESC -> playlistDao.playlistsWithSongs()
-                .sortedByDescending { it.songs.size }
-            else -> playlistDao.playlistsWithSongs().sortedBy {
-                it.playlistEntity.playlistName
-            }
-        }
-
-    @WorkerThread
-    override fun getPlaylist(playlistId: Long): LiveData<PlaylistWithSongs> = playlistDao.getPlaylist(playlistId)
-
-    @WorkerThread
-    override suspend fun insertSongs(songs: List<SongEntity>) {
-
-        playlistDao.insertSongsToPlaylist(songs)
-    }
-
-    override fun getSongs(playListId: Long): LiveData<List<SongEntity>> =
-        playlistDao.songsFromPlaylist(playListId)
-
-    override fun checkPlaylistExists(playListId: Long): LiveData<Boolean> =
-        playlistDao.checkPlaylistExists(playListId)
-
-    override suspend fun deletePlaylistEntities(playlistEntities: List<PlaylistEntity>) =
-        playlistDao.deletePlaylists(playlistEntities)
-
-    override suspend fun renamePlaylistEntity(playlistId: Long, name: String) =
-        playlistDao.renamePlaylist(playlistId, name)
-
-    override suspend fun deleteSongsInPlaylist(songs: List<SongEntity>) {
-        songs.forEach {
-            playlistDao.deleteSongFromPlaylist(it.playlistCreatorId, it.id)
-        }
-    }
-
-    override suspend fun deletePlaylistSongs(playlists: List<PlaylistEntity>) =
-        playlists.forEach {
-            playlistDao.deletePlaylistSongs(it.playListId)
-        }
-
-    override suspend fun favoritePlaylist(favorite: String): PlaylistEntity {
-        val playlist: PlaylistEntity? = playlistDao.playlist(favorite).firstOrNull()
-        return if (playlist != null) {
-            playlist
-        } else {
-            createPlaylist(PlaylistEntity(playlistName = favorite))
-            playlistDao.playlist(favorite).first()
-        }
-    }
-
-    override suspend fun isFavoriteSong(songEntity: SongEntity): List<SongEntity> =
-        playlistDao.isSongExistsInPlaylist(
-            songEntity.playlistCreatorId,
-            songEntity.id
-        )
-
-    override suspend fun removeSongFromPlaylist(songEntity: SongEntity) =
-        playlistDao.deleteSongFromPlaylist(songEntity.playlistCreatorId, songEntity.id)
-
-    override suspend fun upsertSongInHistory(currentSong: Song) =
-        historyDao.upsertSongInHistory(currentSong.toHistoryEntity(System.currentTimeMillis()))
-
-    override fun observableHistorySongs(): LiveData<List<HistoryEntity>> =
-        historyDao.observableHistorySongs()
-
-    override fun historySongs(): List<HistoryEntity> = historyDao.historySongs()
-
-    override fun favoritePlaylistLiveData(favorite: String): LiveData<List<SongEntity>> =
-        playlistDao.favoritesSongsLiveData(favorite)
-
-    override suspend fun favoritePlaylistSongs(favorite: String): List<SongEntity> =
-        if (playlistDao.playlist(favorite).isNotEmpty()) playlistDao.favoritesSongs(
-            playlistDao.playlist(favorite).first().playListId
-        ) else emptyList()
-
-    override suspend fun upsertSongInPlayCount(playCountEntity: PlayCountEntity) =
-        playCountDao.upsertSongInPlayCount(playCountEntity)
-
-    override suspend fun deleteSongInPlayCount(playCountEntity: PlayCountEntity) =
-        playCountDao.deleteSongInPlayCount(playCountEntity)
-
-    override suspend fun deleteSongInHistory(songId: Long) {
-        historyDao.deleteSongInHistory(songId)
-    }
-
-    override suspend fun clearSongHistory() {
-        historyDao.clearHistory()
-    }
-
-    override suspend fun findSongExistInPlayCount(songId: Long): PlayCountEntity? =
-        playCountDao.findSongExistInPlayCount(songId)
-
-    override suspend fun playCountSongs(): List<PlayCountEntity> =
-        playCountDao.playCountSongs()
-
-    override suspend fun deleteSongs(songs: List<Song>) = songs.forEach {
-        playCountDao.deleteSong(it.id)
-    }
-
-    override suspend fun isSongFavorite(context: Context, songId: Long): Boolean {
-        return playlistDao.isSongExistsInPlaylist(
-            playlistDao.playlist(context.getString(R.string.favorites)).firstOrNull()?.playListId
-                ?: -1,
-            songId
-        ).isNotEmpty()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
deleted file mode 100644
index 17b555ecd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SearchRepository.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistWithSongs
-import code.name.monkey.retromusic.fragments.search.Filter
-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.Song
-
-class RealSearchRepository(
-    private val songRepository: SongRepository,
-    private val albumRepository: AlbumRepository,
-    private val artistRepository: ArtistRepository,
-    private val roomRepository: RoomRepository,
-    private val genreRepository: GenreRepository,
-) {
-    suspend fun searchAll(context: Context, query: String?, filter: Filter): MutableList<Any> {
-        val results = mutableListOf<Any>()
-        if (query.isNullOrEmpty()) return results
-        query.let { searchString ->
-
-            /** Songs **/
-            val songs: List<Song> = if (filter == Filter.SONGS || filter == Filter.NO_FILTER) {
-                songRepository.songs(searchString)
-            } else {
-                emptyList()
-            }
-            if (songs.isNotEmpty()) {
-                results.add(context.resources.getString(R.string.songs))
-                results.addAll(songs)
-            }
-
-            /** Artists **/
-            val artists: List<Artist> =
-                if (filter == Filter.ARTISTS || filter == Filter.NO_FILTER) {
-                    artistRepository.artists(searchString)
-                } else {
-                    emptyList()
-                }
-            if (artists.isNotEmpty()) {
-                results.add(context.resources.getString(R.string.artists))
-                results.addAll(artists)
-            }
-
-            /** Albums **/
-            val albums: List<Album> = if (filter == Filter.ALBUMS || filter == Filter.NO_FILTER) {
-                albumRepository.albums(searchString)
-            } else {
-                emptyList()
-            }
-            if (albums.isNotEmpty()) {
-                results.add(context.resources.getString(R.string.albums))
-                results.addAll(albums)
-            }
-
-            /** Album-Artists **/
-            val albumArtists: List<Artist> =
-                if (filter == Filter.ALBUM_ARTISTS || filter == Filter.NO_FILTER) {
-                    artistRepository.albumArtists(searchString)
-                } else {
-                    emptyList()
-                }
-            if (albumArtists.isNotEmpty()) {
-                results.add(context.resources.getString(R.string.album_artist))
-                results.addAll(albumArtists)
-            }
-
-            /** Genres **/
-            val genres: List<Genre> = if (filter == Filter.GENRES || filter == Filter.NO_FILTER) {
-                genreRepository.genres(query)
-            } else {
-                emptyList()
-            }
-            if (genres.isNotEmpty()) {
-                results.add(context.resources.getString(R.string.genres))
-                results.addAll(genres)
-            }
-
-            /** Playlists **/
-            val playlist: List<PlaylistWithSongs> =
-                if (filter == Filter.PLAYLISTS || filter == Filter.NO_FILTER) {
-                    roomRepository.playlistWithSongs().filter { playlist ->
-                        playlist.playlistEntity.playlistName.lowercase().contains(searchString.lowercase())
-                    }
-                } else {
-                    emptyList()
-                }
-
-            if (playlist.isNotEmpty()) {
-                results.add(context.getString(R.string.playlists))
-                results.addAll(playlist)
-            }
-        }
-        return results
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
deleted file mode 100644
index b6ddb4a69..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SongRepository.kt
+++ /dev/null
@@ -1,247 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import android.database.Cursor
-import android.os.Environment
-import android.provider.MediaStore
-import android.provider.MediaStore.Audio.AudioColumns
-import android.provider.MediaStore.Audio.Media
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.Constants.IS_MUSIC
-import code.name.monkey.retromusic.Constants.baseProjection
-import code.name.monkey.retromusic.extensions.getInt
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.getString
-import code.name.monkey.retromusic.extensions.getStringOrNull
-import code.name.monkey.retromusic.helper.SortOrder
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.BlacklistStore
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.getExternalStoragePublicDirectory
-import java.text.Collator
-
-/**
- * Created by hemanths on 10/08/17.
- */
-interface SongRepository {
-
-    fun songs(): List<Song>
-
-    fun songs(cursor: Cursor?): List<Song>
-
-    fun sortedSongs(cursor: Cursor?): List<Song>
-
-    fun songs(query: String): List<Song>
-
-    fun songsByFilePath(filePath: String, ignoreBlacklist: Boolean = false): List<Song>
-
-    fun song(cursor: Cursor?): Song
-
-    fun song(songId: Long): Song
-}
-
-class RealSongRepository(private val context: Context) : SongRepository {
-
-    override fun songs(): List<Song> {
-        return sortedSongs(makeSongCursor(null, null))
-    }
-
-    override fun songs(cursor: Cursor?): List<Song> {
-        val songs = arrayListOf<Song>()
-        if (cursor != null && cursor.moveToFirst()) {
-            do {
-                songs.add(getSongFromCursorImpl(cursor))
-            } while (cursor.moveToNext())
-        }
-        cursor?.close()
-        return songs
-    }
-
-    override fun sortedSongs(cursor: Cursor?): List<Song> {
-        val collator = Collator.getInstance()
-        val songs = songs(cursor)
-        return when (PreferenceUtil.songSortOrder) {
-            SortOrder.SongSortOrder.SONG_A_Z -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s1.title, s2.title) }
-            }
-            SortOrder.SongSortOrder.SONG_Z_A -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s2.title, s1.title) }
-            }
-            SortOrder.SongSortOrder.SONG_ALBUM -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s1.albumName, s2.albumName) }
-            }
-            SortOrder.SongSortOrder.SONG_ALBUM_ARTIST -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s1.albumArtist, s2.albumArtist) }
-            }
-            SortOrder.SongSortOrder.SONG_ARTIST -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s1.artistName, s2.artistName) }
-            }
-            SortOrder.SongSortOrder.COMPOSER -> {
-                songs.sortedWith{ s1, s2 -> collator.compare(s1.composer, s2.composer) }
-            }
-            else -> songs
-        }
-    }
-
-    override fun song(cursor: Cursor?): Song {
-        val song: Song = if (cursor != null && cursor.moveToFirst()) {
-            getSongFromCursorImpl(cursor)
-        } else {
-            Song.emptySong
-        }
-        cursor?.close()
-        return song
-    }
-
-    override fun songs(query: String): List<Song> {
-        return songs(makeSongCursor(AudioColumns.TITLE + " LIKE ?", arrayOf("%$query%")))
-    }
-
-    override fun song(songId: Long): Song {
-        return song(makeSongCursor(AudioColumns._ID + "=?", arrayOf(songId.toString())))
-    }
-
-    override fun songsByFilePath(filePath: String, ignoreBlacklist: Boolean): List<Song> {
-        return songs(
-            makeSongCursor(
-                Constants.DATA + "=?",
-                arrayOf(filePath),
-                ignoreBlacklist = ignoreBlacklist
-            )
-        )
-    }
-
-    private fun getSongFromCursorImpl(
-        cursor: Cursor
-    ): Song {
-        val id = cursor.getLong(AudioColumns._ID)
-        val title = cursor.getString(AudioColumns.TITLE)
-        val trackNumber = cursor.getInt(AudioColumns.TRACK)
-        val year = cursor.getInt(AudioColumns.YEAR)
-        val duration = cursor.getLong(AudioColumns.DURATION)
-        val data = cursor.getString(Constants.DATA)
-        val dateModified = cursor.getLong(AudioColumns.DATE_MODIFIED)
-        val albumId = cursor.getLong(AudioColumns.ALBUM_ID)
-        val albumName = cursor.getStringOrNull(AudioColumns.ALBUM)
-        val artistId = cursor.getLong(AudioColumns.ARTIST_ID)
-        val artistName = cursor.getStringOrNull(AudioColumns.ARTIST)
-        val composer = cursor.getStringOrNull(AudioColumns.COMPOSER)
-        val albumArtist = cursor.getStringOrNull("album_artist")
-        return Song(
-            id,
-            title,
-            trackNumber,
-            year,
-            duration,
-            data,
-            dateModified,
-            albumId,
-            albumName ?: "",
-            artistId,
-            artistName ?: "",
-            composer ?: "",
-            albumArtist ?: ""
-        )
-    }
-
-    @JvmOverloads
-    fun makeSongCursor(
-        selection: String?,
-        selectionValues: Array<String>?,
-        sortOrder: String = PreferenceUtil.songSortOrder,
-        ignoreBlacklist: Boolean = false
-    ): Cursor? {
-        var selectionFinal = selection
-        var selectionValuesFinal = selectionValues
-        if (!ignoreBlacklist) {
-            selectionFinal = if (selection != null && selection.trim { it <= ' ' } != "") {
-                "$IS_MUSIC AND $selectionFinal"
-            } else {
-                IS_MUSIC
-            }
-
-            // Whitelist
-            if (PreferenceUtil.isWhiteList) {
-                selectionFinal =
-                    selectionFinal + " AND " + Constants.DATA + " LIKE ?"
-                selectionValuesFinal = addSelectionValues(
-                    selectionValuesFinal, arrayListOf(
-                        getExternalStoragePublicDirectory(Environment.DIRECTORY_MUSIC).canonicalPath
-                    )
-                )
-            } else {
-                // Blacklist
-                val paths = BlacklistStore.getInstance(context).paths
-                if (paths.isNotEmpty()) {
-                    selectionFinal = generateBlacklistSelection(selectionFinal, paths.size)
-                    selectionValuesFinal = addSelectionValues(selectionValuesFinal, paths)
-                }
-            }
-
-            selectionFinal =
-                selectionFinal + " AND " + Media.DURATION + ">= " + (PreferenceUtil.filterLength * 1000)
-        }
-        val uri = if (VersionUtils.hasQ()) {
-            Media.getContentUri(MediaStore.VOLUME_EXTERNAL)
-        } else {
-            Media.EXTERNAL_CONTENT_URI
-        }
-        return try {
-            context.contentResolver.query(
-                uri,
-                baseProjection,
-                selectionFinal,
-                selectionValuesFinal,
-                sortOrder
-            )
-        } catch (ex: SecurityException) {
-            return null
-        }
-    }
-
-    private fun generateBlacklistSelection(
-        selection: String?,
-        pathCount: Int
-    ): String {
-        val newSelection = StringBuilder(
-            if (selection != null && selection.trim { it <= ' ' } != "") "$selection AND " else "")
-        newSelection.append(Constants.DATA + " NOT LIKE ?")
-        for (i in 0 until pathCount - 1) {
-            newSelection.append(" AND " + Constants.DATA + " NOT LIKE ?")
-        }
-        return newSelection.toString()
-    }
-
-    private fun addSelectionValues(
-        selectionValues: Array<String>?,
-        paths: ArrayList<String>
-    ): Array<String> {
-        var selectionValuesFinal = selectionValues
-        if (selectionValuesFinal == null) {
-            selectionValuesFinal = emptyArray()
-        }
-        val newSelectionValues = Array(selectionValuesFinal.size + paths.size) {
-            "n = $it"
-        }
-        System.arraycopy(selectionValuesFinal, 0, newSelectionValues, 0, selectionValuesFinal.size)
-        for (i in selectionValuesFinal.size until newSelectionValues.size) {
-            newSelectionValues[i] = paths[i - selectionValuesFinal.size] + "%"
-        }
-        return newSelectionValues
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java b/app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java
deleted file mode 100644
index 531af65da..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SortedCursor.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.repository;
-
-import android.database.AbstractCursor;
-import android.database.Cursor;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-/**
- * This cursor basically wraps a song cursor and is given a list of the order of the ids of the
- * contents of the cursor. It wraps the Cursor and simulates the internal cursor being sorted by
- * moving the point to the appropriate spot
- */
-public class SortedCursor extends AbstractCursor {
-  // cursor to wrap
-  private final Cursor mCursor;
-  // the map of external indices to internal indices
-  private ArrayList<Integer> mOrderedPositions;
-  // this contains the ids that weren't found in the underlying cursor
-  private final ArrayList<String> mMissingValues;
-  // this contains the mapped cursor positions and afterwards the extra ids that weren't found
-  private HashMap<String, Integer> mMapCursorPositions;
-
-  /**
-   * @param cursor to wrap
-   * @param order the list of unique ids in sorted order to display
-   * @param columnName the column name of the id to look up in the internal cursor
-   */
-  public SortedCursor(
-      @NonNull final Cursor cursor, @Nullable final String[] order, final String columnName) {
-    mCursor = cursor;
-    mMissingValues = buildCursorPositionMapping(order, columnName);
-  }
-
-  /**
-   * This function populates mOrderedPositions with the cursor positions in the order based on the
-   * order passed in
-   *
-   * @param order the target order of the internal cursor
-   * @return returns the ids that aren't found in the underlying cursor
-   */
-  @NonNull
-  private ArrayList<String> buildCursorPositionMapping(
-      @Nullable final String[] order, final String columnName) {
-    ArrayList<String> missingValues = new ArrayList<>();
-
-    mOrderedPositions = new ArrayList<>(mCursor.getCount());
-
-    mMapCursorPositions = new HashMap<>(mCursor.getCount());
-    final int valueColumnIndex = mCursor.getColumnIndex(columnName);
-
-    if (mCursor.moveToFirst()) {
-      // first figure out where each of the ids are in the cursor
-      do {
-        mMapCursorPositions.put(mCursor.getString(valueColumnIndex), mCursor.getPosition());
-      } while (mCursor.moveToNext());
-
-      if (order != null) {
-        // now create the ordered positions to map to the internal cursor given the
-        // external sort order
-        for (final String value : order) {
-          if (mMapCursorPositions.containsKey(value)) {
-            mOrderedPositions.add(mMapCursorPositions.get(value));
-            mMapCursorPositions.remove(value);
-          } else {
-            missingValues.add(value);
-          }
-        }
-      }
-
-      mCursor.moveToFirst();
-    }
-
-    return missingValues;
-  }
-
-  /** @return the list of ids that weren't found in the underlying cursor */
-  public ArrayList<String> getMissingValues() {
-    return mMissingValues;
-  }
-
-  /** @return the list of ids that were in the underlying cursor but not part of the ordered list */
-  @NonNull
-  public Collection<String> getExtraValues() {
-    return mMapCursorPositions.keySet();
-  }
-
-  @Override
-  public void close() {
-    mCursor.close();
-
-    super.close();
-  }
-
-  @Override
-  public int getCount() {
-    return mOrderedPositions.size();
-  }
-
-  @Override
-  public String[] getColumnNames() {
-    return mCursor.getColumnNames();
-  }
-
-  @Override
-  public String getString(int column) {
-    return mCursor.getString(column);
-  }
-
-  @Override
-  public short getShort(int column) {
-    return mCursor.getShort(column);
-  }
-
-  @Override
-  public int getInt(int column) {
-    return mCursor.getInt(column);
-  }
-
-  @Override
-  public long getLong(int column) {
-    return mCursor.getLong(column);
-  }
-
-  @Override
-  public float getFloat(int column) {
-    return mCursor.getFloat(column);
-  }
-
-  @Override
-  public double getDouble(int column) {
-    return mCursor.getDouble(column);
-  }
-
-  @Override
-  public boolean isNull(int column) {
-    return mCursor.isNull(column);
-  }
-
-  @Override
-  public boolean onMove(int oldPosition, int newPosition) {
-    if (newPosition >= 0 && newPosition < getCount()) {
-      mCursor.moveToPosition(mOrderedPositions.get(newPosition));
-      return true;
-    }
-
-    return false;
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java b/app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java
deleted file mode 100644
index 75996d4ab..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/SortedLongCursor.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.repository;
-
-import android.database.AbstractCursor;
-import android.database.Cursor;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-
-/**
- * This cursor basically wraps a song cursor and is given a list of the order of the ids of the
- * contents of the cursor. It wraps the Cursor and simulates the internal cursor being sorted by
- * moving the point to the appropriate spot
- */
-public class SortedLongCursor extends AbstractCursor {
-  // cursor to wrap
-  private final Cursor mCursor;
-  // the map of external indices to internal indices
-  private ArrayList<Integer> mOrderedPositions;
-  // this contains the ids that weren't found in the underlying cursor
-  private final ArrayList<Long> mMissingIds;
-  // this contains the mapped cursor positions and afterwards the extra ids that weren't found
-  private HashMap<Long, Integer> mMapCursorPositions;
-
-  /**
-   * @param cursor to wrap
-   * @param order the list of unique ids in sorted order to display
-   * @param columnName the column name of the id to look up in the internal cursor
-   */
-  public SortedLongCursor(final Cursor cursor, final long[] order, final String columnName) {
-
-    mCursor = cursor;
-    mMissingIds = buildCursorPositionMapping(order, columnName);
-  }
-
-  /**
-   * This function populates mOrderedPositions with the cursor positions in the order based on the
-   * order passed in
-   *
-   * @param order the target order of the internal cursor
-   * @return returns the ids that aren't found in the underlying cursor
-   */
-  @NonNull
-  private ArrayList<Long> buildCursorPositionMapping(
-      @Nullable final long[] order, final String columnName) {
-    ArrayList<Long> missingIds = new ArrayList<>();
-
-    mOrderedPositions = new ArrayList<>(mCursor.getCount());
-
-    mMapCursorPositions = new HashMap<>(mCursor.getCount());
-    final int idPosition = mCursor.getColumnIndex(columnName);
-
-    if (mCursor.moveToFirst()) {
-      // first figure out where each of the ids are in the cursor
-      do {
-        mMapCursorPositions.put(mCursor.getLong(idPosition), mCursor.getPosition());
-      } while (mCursor.moveToNext());
-
-      // now create the ordered positions to map to the internal cursor given the
-      // external sort order
-      for (int i = 0; order != null && i < order.length; i++) {
-        final long id = order[i];
-        if (mMapCursorPositions.containsKey(id)) {
-          mOrderedPositions.add(mMapCursorPositions.get(id));
-          mMapCursorPositions.remove(id);
-        } else {
-          missingIds.add(id);
-        }
-      }
-
-      mCursor.moveToFirst();
-    }
-
-    return missingIds;
-  }
-
-  /** @return the list of ids that weren't found in the underlying cursor */
-  public ArrayList<Long> getMissingIds() {
-    return mMissingIds;
-  }
-
-  /** @return the list of ids that were in the underlying cursor but not part of the ordered list */
-  @NonNull
-  public Collection<Long> getExtraIds() {
-    return mMapCursorPositions.keySet();
-  }
-
-  @Override
-  public void close() {
-    mCursor.close();
-
-    super.close();
-  }
-
-  @Override
-  public int getCount() {
-    return mOrderedPositions.size();
-  }
-
-  @Override
-  public String[] getColumnNames() {
-    return mCursor.getColumnNames();
-  }
-
-  @Override
-  public String getString(int column) {
-    return mCursor.getString(column);
-  }
-
-  @Override
-  public short getShort(int column) {
-    return mCursor.getShort(column);
-  }
-
-  @Override
-  public int getInt(int column) {
-    return mCursor.getInt(column);
-  }
-
-  @Override
-  public long getLong(int column) {
-    return mCursor.getLong(column);
-  }
-
-  @Override
-  public float getFloat(int column) {
-    return mCursor.getFloat(column);
-  }
-
-  @Override
-  public double getDouble(int column) {
-    return mCursor.getDouble(column);
-  }
-
-  @Override
-  public boolean isNull(int column) {
-    return mCursor.isNull(column);
-  }
-
-  @Override
-  public boolean onMove(int oldPosition, int newPosition) {
-    if (newPosition >= 0 && newPosition < getCount()) {
-      mCursor.moveToPosition(mOrderedPositions.get(newPosition));
-      return true;
-    }
-
-    return false;
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt b/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt
deleted file mode 100644
index 1470f7fc3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/repository/TopPlayedRepository.kt
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.repository
-
-import android.content.Context
-import android.database.Cursor
-import android.provider.BaseColumns
-import android.provider.MediaStore
-import code.name.monkey.retromusic.Constants.NUMBER_OF_TOP_TRACKS
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.providers.HistoryStore
-import code.name.monkey.retromusic.providers.SongPlayCountStore
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-
-/**
- * Created by hemanths on 16/08/17.
- */
-
-interface TopPlayedRepository {
-    fun recentlyPlayedTracks(): List<Song>
-
-    fun topTracks(): List<Song>
-
-    fun notRecentlyPlayedTracks(): List<Song>
-
-    fun topAlbums(): List<Album>
-
-    fun topArtists(): List<Artist>
-}
-
-class RealTopPlayedRepository(
-    private val context: Context,
-    private val songRepository: RealSongRepository,
-    private val albumRepository: RealAlbumRepository,
-    private val artistRepository: RealArtistRepository
-) : TopPlayedRepository {
-
-    override fun recentlyPlayedTracks(): List<Song> {
-        return songRepository.songs(makeRecentTracksCursorAndClearUpDatabase())
-    }
-
-    override fun topTracks(): List<Song> {
-        return songRepository.songs(makeTopTracksCursorAndClearUpDatabase())
-    }
-
-    override fun notRecentlyPlayedTracks(): List<Song> {
-        val allSongs = mutableListOf<Song>().apply {
-            addAll(
-                songRepository.songs(
-                    songRepository.makeSongCursor(
-                        null, null,
-                        MediaStore.Audio.Media.DATE_ADDED + " ASC"
-                    )
-                )
-            )
-        }
-        val playedSongs = songRepository.songs(
-            makePlayedTracksCursorAndClearUpDatabase()
-        )
-        val notRecentlyPlayedSongs = songRepository.songs(
-            makeNotRecentTracksCursorAndClearUpDatabase()
-        )
-        allSongs.removeAll(playedSongs.toSet())
-        allSongs.addAll(notRecentlyPlayedSongs)
-        return allSongs
-    }
-
-    override fun topAlbums(): List<Album> {
-        return albumRepository.splitIntoAlbums(topTracks(), sorted = false)
-    }
-
-    override fun topArtists(): List<Artist> {
-        return artistRepository.splitIntoArtists(topAlbums())
-    }
-
-
-    private fun makeTopTracksCursorAndClearUpDatabase(): Cursor? {
-        val retCursor = makeTopTracksCursorImpl()
-        // clean up the databases with any ids not found
-        if (retCursor != null) {
-            val missingIds = retCursor.missingIds
-            if (missingIds != null && missingIds.size > 0) {
-                for (id in missingIds) {
-                    SongPlayCountStore.getInstance(context).removeItem(id)
-                }
-            }
-        }
-        return retCursor
-    }
-
-    private fun makeRecentTracksCursorImpl(): SortedLongCursor? {
-        // first get the top results ids from the internal database
-        val songs = HistoryStore.getInstance(context).queryRecentIds()
-        songs.use {
-            return makeSortedCursor(
-                it,
-                it.getColumnIndex(HistoryStore.RecentStoreColumns.ID)
-            )
-        }
-    }
-
-    private fun makeTopTracksCursorImpl(): SortedLongCursor? {
-        // first get the top results ids from the internal database
-        val cursor =
-            SongPlayCountStore.getInstance(context).getTopPlayedResults(NUMBER_OF_TOP_TRACKS)
-
-        cursor.use { songs ->
-            return makeSortedCursor(
-                songs,
-                songs.getColumnIndex(SongPlayCountStore.SongPlayCountColumns.ID)
-            )
-        }
-    }
-
-    private fun makeSortedCursor(
-        cursor: Cursor?, idColumn: Int
-    ): SortedLongCursor? {
-
-        if (cursor != null && cursor.moveToFirst()) {
-            // create the list of ids to select against
-            val selection = StringBuilder()
-            selection.append(BaseColumns._ID)
-            selection.append(" IN (")
-
-            // this tracks the order of the ids
-            val order = LongArray(cursor.count)
-
-            var id = cursor.getLong(idColumn)
-            selection.append(id)
-            order[cursor.position] = id
-
-            while (cursor.moveToNext()) {
-                selection.append(",")
-
-                id = cursor.getLong(idColumn)
-                order[cursor.position] = id
-                selection.append(id.toString())
-            }
-
-            selection.append(")")
-
-            // get a list of songs with the data given the selection statement
-            val songCursor = songRepository.makeSongCursor(selection.toString(), null)
-            if (songCursor != null) {
-                // now return the wrapped TopTracksCursor to handle sorting given order
-                return SortedLongCursor(
-                    songCursor,
-                    order,
-                    BaseColumns._ID
-                )
-            }
-        }
-
-        return null
-    }
-
-    private fun makeRecentTracksCursorAndClearUpDatabase(): Cursor? {
-        return makeRecentTracksCursorAndClearUpDatabaseImpl(
-            ignoreCutoffTime = false,
-            reverseOrder = false
-        )
-    }
-
-    private fun makePlayedTracksCursorAndClearUpDatabase(): Cursor? {
-        return makeRecentTracksCursorAndClearUpDatabaseImpl(
-            ignoreCutoffTime = true,
-            reverseOrder = false
-        )
-    }
-
-    private fun makeNotRecentTracksCursorAndClearUpDatabase(): Cursor? {
-        return makeRecentTracksCursorAndClearUpDatabaseImpl(
-            ignoreCutoffTime = false,
-            reverseOrder = true
-        )
-    }
-
-    private fun makeRecentTracksCursorAndClearUpDatabaseImpl(
-        ignoreCutoffTime: Boolean,
-        reverseOrder: Boolean
-    ): SortedLongCursor? {
-        val retCursor = makeRecentTracksCursorImpl(ignoreCutoffTime, reverseOrder)
-        // clean up the databases with any ids not found
-        // clean up the databases with any ids not found
-        if (retCursor != null) {
-            val missingIds = retCursor.missingIds
-            if (missingIds != null && missingIds.size > 0) {
-                for (id in missingIds) {
-                    HistoryStore.getInstance(context).removeSongId(id)
-                }
-            }
-        }
-        return retCursor
-    }
-
-    private fun makeRecentTracksCursorImpl(
-        ignoreCutoffTime: Boolean,
-        reverseOrder: Boolean
-    ): SortedLongCursor? {
-        val cutoff =
-            (if (ignoreCutoffTime) 0 else PreferenceUtil.getRecentlyPlayedCutoffTimeMillis()).toLong()
-        val songs =
-            HistoryStore.getInstance(context).queryRecentIds(cutoff * if (reverseOrder) -1 else 1)
-        return songs.use {
-            makeSortedCursor(
-                it,
-                it.getColumnIndex(HistoryStore.RecentStoreColumns.ID)
-            )
-        }
-    }
-}
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
new file mode 100644
index 000000000..77d0cb955
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/LastFMRestClient.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.rest;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.File;
+import java.util.concurrent.TimeUnit;
+
+import code.name.monkey.retromusic.rest.service.LastFMService;
+import okhttp3.Cache;
+import okhttp3.Call;
+import okhttp3.ConnectionPool;
+import okhttp3.Interceptor;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import retrofit2.Retrofit;
+import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory;
+import retrofit2.converter.gson.GsonConverterFactory;
+
+
+public class LastFMRestClient {
+
+    private static final String BASE_URL = "https://ws.audioscrobbler.com/2.0/";
+
+    private LastFMService apiService;
+
+    public LastFMRestClient(@NonNull Context context) {
+        this(createDefaultOkHttpClientBuilder(context).build());
+    }
+
+    private LastFMRestClient(@NonNull Call.Factory client) {
+        Retrofit restAdapter = new Retrofit.Builder()
+                .baseUrl(BASE_URL)
+                .callFactory(client)
+                .addConverterFactory(GsonConverterFactory.create())
+                .addCallAdapterFactory(RxJava2CallAdapterFactory.create())
+                .build();
+
+        apiService = restAdapter.create(LastFMService.class);
+    }
+
+    @Nullable
+    private static Cache createDefaultCache(Context context) {
+        File cacheDir = new File(context.getCacheDir().getAbsolutePath(), "/okhttp-lastfm/");
+        if (cacheDir.mkdirs() || cacheDir.isDirectory()) {
+            return new Cache(cacheDir, 1024 * 1024 * 10);
+        }
+        return null;
+    }
+
+    private static Interceptor createCacheControlInterceptor() {
+        return chain -> {
+            Request modifiedRequest = chain.request().newBuilder()
+                    .addHeader("Cache-Control", "max-age=31536000, max-stale=31536000")
+                    .build();
+            return chain.proceed(modifiedRequest);
+        };
+    }
+
+    @NonNull
+    private static OkHttpClient.Builder createDefaultOkHttpClientBuilder(@NonNull Context context) {
+        return new OkHttpClient.Builder()
+                .connectionPool(new ConnectionPool(0, 1, TimeUnit.NANOSECONDS))
+                .retryOnConnectionFailure(true)
+                .connectTimeout(1, TimeUnit.MINUTES) // connect timeout
+                .writeTimeout(1, TimeUnit.MINUTES) // write timeout
+                .readTimeout(1, TimeUnit.MINUTES) // read timeout
+                .cache(createDefaultCache(context))
+                .addInterceptor(createCacheControlInterceptor());
+    }
+
+    @NonNull
+    public LastFMService getApiService() {
+        return apiService;
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmAlbum.java b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmAlbum.java
new file mode 100644
index 000000000..1bad869b8
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmAlbum.java
@@ -0,0 +1,125 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.rest.model;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LastFmAlbum {
+    @Expose
+    private Album album;
+
+    public Album getAlbum() {
+        return album;
+    }
+
+    public void setAlbum(Album album) {
+        this.album = album;
+    }
+
+    public static class Album {
+        @Expose
+        private Tags tags;
+        @Expose
+        private List<Image> image = new ArrayList<>();
+        @Expose
+        private Wiki wiki;
+
+        public List<Image> getImage() {
+            return image;
+        }
+
+        public void setImage(List<Image> image) {
+            this.image = image;
+        }
+
+        public Wiki getWiki() {
+            return wiki;
+        }
+
+        public void setWiki(Wiki wiki) {
+            this.wiki = wiki;
+        }
+
+        public Tags getTags() {
+            return tags;
+        }
+
+        public static class Image {
+            @SerializedName("#text")
+            @Expose
+            private String Text;
+            @Expose
+            private String size;
+
+            public String getText() {
+                return Text;
+            }
+
+            public void setText(String Text) {
+                this.Text = Text;
+            }
+
+            public String getSize() {
+                return size;
+            }
+
+            public void setSize(String size) {
+                this.size = size;
+            }
+        }
+
+        public class Tags {
+            @Expose
+            private List<Tag> tag = null;
+
+            public List<Tag> getTag() {
+                return tag;
+            }
+        }
+
+        public class Tag {
+            @Expose
+            private String name;
+
+            @Expose
+            private String url;
+
+            public String getName() {
+                return name;
+            }
+
+            public String getUrl() {
+                return url;
+            }
+        }
+
+        public class Wiki {
+            @Expose
+            private String content;
+
+            public String getContent() {
+                return content;
+            }
+
+            public void setContent(String content) {
+                this.content = content;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmArtist.java b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmArtist.java
new file mode 100644
index 000000000..6a72aa5a3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmArtist.java
@@ -0,0 +1,94 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.rest.model;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LastFmArtist {
+    @Expose
+    private Artist artist;
+
+    public Artist getArtist() {
+        return artist;
+    }
+
+    public void setArtist(Artist artist) {
+        this.artist = artist;
+    }
+
+    public static class Artist {
+        @Expose
+        private List<Image> image = new ArrayList<>();
+        @Expose
+        private Bio bio;
+
+        public List<Image> getImage() {
+            return image;
+        }
+
+        public void setImage(List<Image> image) {
+            this.image = image;
+        }
+
+        public Bio getBio() {
+            return bio;
+        }
+
+        public void setBio(Bio bio) {
+            this.bio = bio;
+        }
+
+        public class Bio {
+            @Expose
+            private String content;
+
+            public String getContent() {
+                return content;
+            }
+
+            public void setContent(String content) {
+                this.content = content;
+            }
+        }
+
+        public static class Image {
+            @SerializedName("#text")
+            @Expose
+            private String Text;
+            @Expose
+            private String size;
+
+            public String getText() {
+                return Text;
+            }
+
+            public void setText(String Text) {
+                this.Text = Text;
+            }
+
+            public String getSize() {
+                return size;
+            }
+
+            public void setSize(String size) {
+                this.size = size;
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmTrack.java b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmTrack.java
new file mode 100644
index 000000000..45b52a68c
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/model/LastFmTrack.java
@@ -0,0 +1,188 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.rest.model;
+
+import com.google.gson.annotations.Expose;
+import com.google.gson.annotations.SerializedName;
+
+import java.util.List;
+
+/**
+ * Created by hemanths on 15/06/17.
+ */
+
+public class LastFmTrack {
+
+    @Expose
+    private Track track;
+
+    public Track getTrack() {
+        return track;
+    }
+
+    public void setTrack(Track track) {
+        this.track = track;
+    }
+
+    public static class Track {
+        @SerializedName("name")
+        @Expose
+        private String name;
+        @Expose
+        private Album album;
+        @Expose
+        private Wiki wiki;
+        @Expose
+        private Toptags toptags;
+        @Expose
+        private Artist artist;
+
+        public Album getAlbum() {
+            return album;
+        }
+
+        public Wiki getWiki() {
+            return wiki;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public Toptags getToptags() {
+            return toptags;
+        }
+
+        public static class Artist {
+
+            @Expose
+            private String name;
+
+            public String getName() {
+                return name;
+            }
+
+            public void setName(String name) {
+                this.name = name;
+            }
+        }
+
+        public static class Wiki {
+            @Expose
+            private String published;
+
+            public String getPublished() {
+                return published;
+            }
+
+            public void setPublished(String published) {
+                this.published = published;
+            }
+        }
+
+        public static class Toptags {
+            @Expose
+            private List<Tag> tag = null;
+
+
+            public List<Tag> getTag() {
+                return tag;
+            }
+
+            public static class Tag {
+                @Expose
+                private String name;
+
+                public String getName() {
+                    return name;
+                }
+            }
+        }
+
+        public static class Album {
+            @Expose
+            private String artist;
+            @Expose
+            private List<Image> image = null;
+            @Expose
+            private String title;
+            @SerializedName("@attr")
+            @Expose
+            private Attr attr;
+
+            public Attr getAttr() {
+                return attr;
+            }
+
+            public void setAttr(Attr attr) {
+                this.attr = attr;
+            }
+
+            public String getArtist() {
+                return artist;
+            }
+
+            public void setArtist(String artist) {
+                this.artist = artist;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public List<Image> getImage() {
+                return image;
+            }
+
+            public void setImage(List<Image> image) {
+                this.image = image;
+            }
+
+            public static class Attr {
+                @Expose
+                private String position;
+
+                public String getPosition() {
+                    return position;
+                }
+
+                public void setPosition(String position) {
+                    this.position = position;
+                }
+            }
+
+            public class Image {
+
+                @SerializedName("#text")
+                @Expose
+                private String text;
+                @Expose
+                private String size;
+
+                public String getSize() {
+                    return size;
+                }
+
+                public String getText() {
+                    return text;
+                }
+            }
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.kt b/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.kt
new file mode 100644
index 000000000..6dcd5c765
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/rest/service/LastFMService.kt
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.rest.service
+
+import code.name.monkey.retromusic.rest.model.LastFmArtist
+import retrofit2.http.GET
+import retrofit2.http.Header
+import retrofit2.http.Query
+
+/**
+ * Created by hemanths on 2019-11-26.
+ */
+
+interface LastFMService {
+    companion object {
+        const val API_KEY = "c679c8d3efa84613dc7dcb2e8d42da4c"
+        const val BASE_QUERY_PARAMETERS = "?format=json&autocorrect=1&api_key=$API_KEY"
+    }
+
+    @GET("$BASE_QUERY_PARAMETERS&method=artist.getinfo")
+    suspend fun artistInfo(@Query("artist") artistName: String,
+                           @Query("lang") language: String?,
+                           @Header("Cache-Control") cacheControl: String?
+    ): LastFmArtist
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt b/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
deleted file mode 100644
index 69ec73746..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/AudioFader.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.animation.Animator
-import android.animation.ValueAnimator
-import android.content.Context
-import android.media.MediaPlayer
-import android.provider.Settings
-import androidx.core.animation.doOnEnd
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-class AudioFader {
-    companion object {
-        fun createFadeAnimator(
-            context: Context,
-            fadeInMp: MediaPlayer,
-            fadeOutMp: MediaPlayer,
-            endAction: (animator: Animator) -> Unit, /* Code to run when Animator Ends*/
-        ): Animator? {
-            // Get Global animator scale
-            val animScale = Settings.Global.getFloat(context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE, 1f)
-
-            // Set duration according to the global animation scale, so cross-fade actually lasts for the duration set by the user
-            val duration = (PreferenceUtil.crossFadeDuration * 1000 ) / animScale
-            if (duration == 0F) {
-                return null
-            }
-            return ValueAnimator.ofFloat(0f, 1f).apply {
-                this.duration = duration.toLong()
-                addUpdateListener { animation: ValueAnimator ->
-                    fadeInMp.setVolume(
-                        animation.animatedValue as Float, animation.animatedValue as Float
-                    )
-                    fadeOutMp.setVolume(1 - animation.animatedValue as Float,
-                        1 - animation.animatedValue as Float)
-                }
-                doOnEnd {
-                    endAction(it)
-                }
-            }
-        }
-
-        fun startFadeAnimator(
-            playback: Playback,
-            fadeIn: Boolean, /* fadeIn -> true  fadeOut -> false*/
-            callback: Runnable? = null, /* Code to run when Animator Ends*/
-        ) {
-            val duration = PreferenceUtil.audioFadeDuration.toLong()
-            if (duration == 0L) {
-                callback?.run()
-                return
-            }
-            val startValue = if (fadeIn) 0f else 1.0f
-            val endValue = if (fadeIn) 1.0f else 0f
-            val animator = ValueAnimator.ofFloat(startValue, endValue)
-            animator.duration = duration
-            animator.addUpdateListener { animation: ValueAnimator ->
-                playback.setVolume(animation.animatedValue as Float)
-            }
-            animator.doOnEnd {
-                callback?.run()
-            }
-            animator.start()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt b/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
deleted file mode 100644
index 06590c269..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/CrossFadePlayer.kt
+++ /dev/null
@@ -1,367 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.animation.Animator
-import android.content.Context
-import android.media.MediaPlayer
-import android.media.PlaybackParams
-import android.os.PowerManager
-import code.name.monkey.appthemehelper.util.VersionUtils.hasMarshmallow
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.helper.MusicPlayerRemote
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.AudioFader.Companion.createFadeAnimator
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.logE
-import kotlinx.coroutines.*
-
-/** @author Prathamesh M */
-
-/*
-* To make Crossfade work we need two MediaPlayer's
-* Basically, we switch back and forth between those two mp's
-* e.g. When song is about to end (Reaches Crossfade duration) we let current mediaplayer
-* play but with decreasing volume and start the player with the next song with increasing volume
-* and vice versa for upcoming song and so on.
-*/
-class CrossFadePlayer(context: Context) : LocalPlayback(context) {
-
-    private var currentPlayer: CurrentPlayer = CurrentPlayer.NOT_SET
-    private var player1 = MediaPlayer()
-    private var player2 = MediaPlayer()
-    private var durationListener = DurationListener()
-    private var mIsInitialized = false
-    private var hasDataSource: Boolean = false /* Whether first player has DataSource */
-    private var nextDataSource:String? = null
-    private var crossFadeAnimator: Animator? = null
-    override var callbacks: PlaybackCallbacks? = null
-    private var crossFadeDuration = PreferenceUtil.crossFadeDuration
-    var isCrossFading = false
-
-    init {
-        player1.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        player2.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        currentPlayer = CurrentPlayer.PLAYER_ONE
-    }
-
-    override fun start(): Boolean {
-        super.start()
-        durationListener.start()
-        resumeFade()
-        return try {
-            getCurrentPlayer()?.start()
-            if (isCrossFading) {
-                getNextPlayer()?.start()
-            }
-            true
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-            false
-        }
-    }
-
-    override fun release() {
-        stop()
-        cancelFade()
-        getCurrentPlayer()?.release()
-        getNextPlayer()?.release()
-        durationListener.cancel()
-    }
-
-    override fun stop() {
-        super.stop()
-        getCurrentPlayer()?.reset()
-        mIsInitialized = false
-    }
-
-    override fun pause(): Boolean {
-        super.pause()
-        durationListener.stop()
-        pauseFade()
-        getCurrentPlayer()?.let {
-            if (it.isPlaying) {
-                it.pause()
-            }
-        }
-        getNextPlayer()?.let {
-            if (it.isPlaying) {
-                it.pause()
-            }
-        }
-        return true
-    }
-
-    override fun seek(whereto: Int, force: Boolean): Int {
-        if (force) {
-            endFade()
-        }
-        getNextPlayer()?.stop()
-        return try {
-            getCurrentPlayer()?.seekTo(whereto)
-            whereto
-        } catch (e: java.lang.IllegalStateException) {
-            e.printStackTrace()
-            -1
-        }
-    }
-
-    override fun setVolume(vol: Float): Boolean {
-        cancelFade()
-        return try {
-            getCurrentPlayer()?.setVolume(vol, vol)
-            true
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-            false
-        }
-    }
-
-    override val isInitialized: Boolean
-        get() = mIsInitialized
-
-    override val isPlaying: Boolean
-        get() = mIsInitialized && getCurrentPlayer()?.isPlaying == true
-
-    override fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        if (force) hasDataSource = false
-        mIsInitialized = false
-        /* We've already set DataSource if initialized is true in setNextDataSource */
-        if (!hasDataSource) {
-            getCurrentPlayer()?.let {
-                setDataSourceImpl(it, song.uri.toString()) { success ->
-                    mIsInitialized = success
-                    completion(success)
-                }
-            }
-            hasDataSource = true
-        } else {
-            completion(true)
-            mIsInitialized = true
-        }
-    }
-
-    override fun setNextDataSource(path: String?) {
-        // Store the next song path in nextDataSource, we'll need this just in case
-        // if the user closes the app, then we can't get the nextSong from musicService
-        // As MusicPlayerRemote won't have access to the musicService
-        nextDataSource = path
-    }
-
-    override fun setAudioSessionId(sessionId: Int): Boolean {
-        return try {
-            getCurrentPlayer()?.audioSessionId = sessionId
-            true
-        } catch (e: IllegalArgumentException) {
-            e.printStackTrace()
-            false
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-            false
-        }
-    }
-
-    override val audioSessionId: Int
-        get() = getCurrentPlayer()?.audioSessionId!!
-
-    /**
-     * Gets the duration of the file.
-     *
-     * @return The duration in milliseconds
-     */
-    override fun duration(): Int {
-        return if (!mIsInitialized) {
-            -1
-        } else try {
-            getCurrentPlayer()?.duration!!
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-            -1
-        }
-    }
-
-    /**
-     * Gets the current position in audio.
-     * @return The position in milliseconds
-     */
-    override fun position(): Int {
-        return if (!mIsInitialized) {
-            -1
-        } else try {
-            getCurrentPlayer()?.currentPosition!!
-        } catch (e: IllegalStateException) {
-            e.printStackTrace()
-            -1
-        }
-    }
-
-    override fun onCompletion(mp: MediaPlayer?) {
-        if (mp == getCurrentPlayer()) {
-            callbacks?.onTrackEnded()
-        }
-    }
-
-    private fun getCurrentPlayer(): MediaPlayer? {
-        return when (currentPlayer) {
-            CurrentPlayer.PLAYER_ONE -> {
-                player1
-            }
-            CurrentPlayer.PLAYER_TWO -> {
-                player2
-            }
-            CurrentPlayer.NOT_SET -> {
-                null
-            }
-        }
-    }
-
-    private fun getNextPlayer(): MediaPlayer? {
-        return when (currentPlayer) {
-            CurrentPlayer.PLAYER_ONE -> {
-                player2
-            }
-            CurrentPlayer.PLAYER_TWO -> {
-                player1
-            }
-            CurrentPlayer.NOT_SET -> {
-                null
-            }
-        }
-    }
-
-    private fun crossFade(fadeInMp: MediaPlayer, fadeOutMp: MediaPlayer) {
-        isCrossFading = true
-        crossFadeAnimator = createFadeAnimator(context, fadeInMp, fadeOutMp) {
-            crossFadeAnimator = null
-            durationListener.start()
-            isCrossFading = false
-        }
-        crossFadeAnimator?.start()
-    }
-
-    private fun endFade() {
-        crossFadeAnimator?.end()
-        crossFadeAnimator = null
-    }
-
-    private fun cancelFade() {
-        crossFadeAnimator?.cancel()
-        crossFadeAnimator = null
-    }
-
-    private fun pauseFade() {
-        crossFadeAnimator?.pause()
-    }
-
-    private fun resumeFade() {
-        if (crossFadeAnimator?.isPaused == true) {
-            crossFadeAnimator?.resume()
-        }
-    }
-
-    override fun onError(mp: MediaPlayer?, what: Int, extra: Int): Boolean {
-        mIsInitialized = false
-        mp?.release()
-        player1 = MediaPlayer()
-        player2 = MediaPlayer()
-        mIsInitialized = true
-        mp?.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        context.showToast(R.string.unplayable_file)
-        logE(what.toString() + extra)
-        return false
-    }
-
-    enum class CurrentPlayer {
-        PLAYER_ONE,
-        PLAYER_TWO,
-        NOT_SET
-    }
-
-    inner class DurationListener : CoroutineScope by crossFadeScope() {
-
-        private var job: Job? = null
-
-        fun start() {
-            job?.cancel()
-            job = launch {
-                while (isActive) {
-                    delay(250)
-                    onDurationUpdated(position(), duration())
-                }
-            }
-        }
-
-        fun stop() {
-            job?.cancel()
-        }
-    }
-
-    fun onDurationUpdated(progress: Int, total: Int) {
-        if (total > 0 && (total - progress).div(1000) == crossFadeDuration) {
-            getNextPlayer()?.let { player ->
-                val nextSong = MusicPlayerRemote.nextSong
-                // Switch to other player (Crossfade) only if next song exists
-                // If we get an empty song it's can be because the app was cleared from background
-                // And MusicPlayerRemote don't have access to MusicService
-                if (nextSong != null && nextSong != Song.emptySong) {
-                    nextDataSource = null
-                    setDataSourceImpl(player, nextSong.uri.toString()) { success ->
-                        if (success) switchPlayer()
-                    }
-
-                }
-                // So we have to use the previously stored nextDataSource value
-                else if (!nextDataSource.isNullOrEmpty()) {
-                    setDataSourceImpl(player, nextDataSource!!) { success ->
-                        if (success) switchPlayer()
-                        nextDataSource = null
-                    }
-                }
-            }
-        }
-    }
-
-    private fun switchPlayer() {
-        getNextPlayer()?.start()
-        crossFade(getNextPlayer()!!, getCurrentPlayer()!!)
-        currentPlayer =
-            if (currentPlayer == CurrentPlayer.PLAYER_ONE || currentPlayer == CurrentPlayer.NOT_SET) {
-                CurrentPlayer.PLAYER_TWO
-            } else {
-                CurrentPlayer.PLAYER_ONE
-            }
-        callbacks?.onTrackEndedWithCrossfade()
-    }
-
-    override fun setCrossFadeDuration(duration: Int) {
-        crossFadeDuration = duration
-    }
-
-    override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {
-        getCurrentPlayer()?.setPlaybackSpeedPitch(speed, pitch)
-        if (getNextPlayer()?.isPlaying == true) {
-            getNextPlayer()?.setPlaybackSpeedPitch(speed, pitch)
-        }
-    }
-
-    companion object {
-        val TAG: String = CrossFadePlayer::class.java.simpleName
-    }
-}
-
-internal fun crossFadeScope(): CoroutineScope = CoroutineScope(Job() + Dispatchers.Default)
-
-fun MediaPlayer.setPlaybackSpeedPitch(speed: Float, pitch: Float) {
-    if (hasMarshmallow()) {
-        val wasPlaying = isPlaying
-        playbackParams = PlaybackParams().setSpeed(speed).setPitch(pitch)
-        if (!wasPlaying) {
-            pause()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt b/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt
deleted file mode 100644
index 429867051..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/LocalPlayback.kt
+++ /dev/null
@@ -1,189 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.media.AudioAttributes
-import android.media.AudioManager
-import android.media.MediaPlayer
-import android.media.PlaybackParams
-import androidx.annotation.CallSuper
-import androidx.core.content.getSystemService
-import androidx.core.net.toUri
-import androidx.media.AudioAttributesCompat
-import androidx.media.AudioFocusRequestCompat
-import androidx.media.AudioManagerCompat
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil.isAudioFocusEnabled
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
-
-abstract class LocalPlayback(val context: Context) : Playback, MediaPlayer.OnErrorListener,
-    MediaPlayer.OnCompletionListener {
-
-    private val becomingNoisyReceiverIntentFilter =
-        IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY)
-
-    private val audioManager: AudioManager? = context.getSystemService()
-
-    private var becomingNoisyReceiverRegistered = false
-    private val becomingNoisyReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (intent.action != null
-                && intent.action == AudioManager.ACTION_AUDIO_BECOMING_NOISY
-            ) {
-                val serviceIntent = Intent(context, MusicService::class.java)
-                serviceIntent.action = MusicService.ACTION_PAUSE
-                context.startService(serviceIntent)
-            }
-        }
-    }
-
-    private var isPausedByTransientLossOfFocus = false
-
-    private val audioFocusListener = AudioManager.OnAudioFocusChangeListener { focusChange ->
-        when (focusChange) {
-            AudioManager.AUDIOFOCUS_GAIN -> {
-                if (!isPlaying && isPausedByTransientLossOfFocus) {
-                    start()
-                    callbacks?.onPlayStateChanged()
-                    isPausedByTransientLossOfFocus = false
-                }
-                setVolume(Volume.NORMAL)
-            }
-            AudioManager.AUDIOFOCUS_LOSS -> {
-                // Lost focus for an unbounded amount of time: stop playback and release media playback
-                if (!isAudioFocusEnabled) {
-                    pause()
-                    callbacks?.onPlayStateChanged()
-                }
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT -> {
-                // Lost focus for a short time, but we have to stop
-                // playback. We don't release the media playback because playback
-                // is likely to resume
-                val wasPlaying = isPlaying
-                pause()
-                callbacks?.onPlayStateChanged()
-                isPausedByTransientLossOfFocus = wasPlaying
-            }
-            AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK -> {
-                // Lost focus for a short time, but it's ok to keep playing
-                // at an attenuated level
-                setVolume(Volume.DUCK)
-            }
-        }
-    }
-
-    private val audioFocusRequest: AudioFocusRequestCompat =
-        AudioFocusRequestCompat.Builder(AudioManagerCompat.AUDIOFOCUS_GAIN)
-            .setOnAudioFocusChangeListener(audioFocusListener)
-            .setAudioAttributes(
-                AudioAttributesCompat.Builder()
-                    .setContentType(AudioAttributesCompat.CONTENT_TYPE_MUSIC).build()
-            ).build()
-
-    @CallSuper
-    override fun start(): Boolean {
-        if (!requestFocus()) {
-            context.showToast(R.string.audio_focus_denied)
-        }
-        registerBecomingNoisyReceiver()
-        return true
-    }
-
-    @CallSuper
-    override fun stop() {
-        abandonFocus()
-        unregisterBecomingNoisyReceiver()
-    }
-
-    @CallSuper
-    override fun pause(): Boolean {
-        unregisterBecomingNoisyReceiver()
-        return true
-    }
-
-    /**
-     * @param player The [MediaPlayer] to use
-     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
-     * @return True if the <code>player</code> has been prepared and is ready to play, false otherwise
-     */
-    fun setDataSourceImpl(
-        player: MediaPlayer,
-        path: String,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        player.reset()
-        try {
-            if (path.startsWith("content://")) {
-                player.setDataSource(context, path.toUri())
-            } else {
-                player.setDataSource(path)
-            }
-            player.setAudioAttributes(
-                AudioAttributes.Builder()
-                    .setUsage(AudioAttributes.USAGE_MEDIA)
-                    .setContentType(AudioAttributes.CONTENT_TYPE_MUSIC)
-                    .build()
-            )
-            if (VersionUtils.hasMarshmallow())
-                player.playbackParams =
-                    PlaybackParams().setSpeed(playbackSpeed).setPitch(playbackPitch)
-
-            player.setOnPreparedListener {
-                player.setOnPreparedListener(null)
-                completion(true)
-            }
-            player.prepareAsync()
-        } catch (e: Exception) {
-            completion(false)
-            e.printStackTrace()
-        }
-        player.setOnCompletionListener(this)
-        player.setOnErrorListener(this)
-    }
-
-    private fun unregisterBecomingNoisyReceiver() {
-        if (becomingNoisyReceiverRegistered) {
-            context.unregisterReceiver(becomingNoisyReceiver)
-            becomingNoisyReceiverRegistered = false
-        }
-    }
-
-    private fun registerBecomingNoisyReceiver() {
-        if (!becomingNoisyReceiverRegistered) {
-            context.registerReceiver(
-                becomingNoisyReceiver,
-                becomingNoisyReceiverIntentFilter
-            )
-            becomingNoisyReceiverRegistered = true
-        }
-    }
-
-    private fun requestFocus(): Boolean {
-        return AudioManagerCompat.requestAudioFocus(
-            audioManager!!,
-            audioFocusRequest
-        ) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED
-    }
-
-    private fun abandonFocus() {
-        AudioManagerCompat.abandonAudioFocusRequest(audioManager!!, audioFocusRequest)
-    }
-
-    object Volume {
-        /**
-         * The volume we set the media player to when we lose audio focus, but are
-         * allowed to reduce the volume instead of stopping playback.
-         */
-        const val DUCK = 0.2f
-
-        /** The volume we set the media player when we have audio focus.  */
-        const val NORMAL = 1.0f
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
index 72f9550ff..09c282a73 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaButtonIntentReceiver.kt
@@ -15,26 +15,19 @@
 
 package code.name.monkey.retromusic.service
 
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.os.Handler
-import android.os.Looper
 import android.os.Message
 import android.os.PowerManager
 import android.os.PowerManager.WakeLock
 import android.util.Log
 import android.view.KeyEvent
 import androidx.core.content.ContextCompat
-import androidx.core.content.getSystemService
-import androidx.core.os.BundleCompat
-import androidx.media.session.MediaButtonReceiver
 import code.name.monkey.retromusic.BuildConfig
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_PLAY
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_STOP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
+import code.name.monkey.retromusic.service.MusicService.*
 
 
 /**
@@ -43,7 +36,7 @@ import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_
  * Double press: actionNext track
  * Triple press: previous track
  */
-class MediaButtonIntentReceiver : MediaButtonReceiver() {
+class MediaButtonIntentReceiver : BroadcastReceiver() {
 
     override fun onReceive(context: Context, intent: Intent) {
         if (DEBUG) Log.v(TAG, "Received intent: $intent")
@@ -63,19 +56,21 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
         private var mClickCounter = 0
         private var mLastClickTime: Long = 0
 
-        private val mHandler = object : Handler(Looper.getMainLooper()) {
+        @SuppressLint("HandlerLeak") // false alarm, handler is already static
+        private val mHandler = object : Handler() {
 
             override fun handleMessage(msg: Message) {
                 when (msg.what) {
                     MSG_HEADSET_DOUBLE_CLICK_TIMEOUT -> {
                         val clickCount = msg.arg1
+                        val command: String?
 
                         if (DEBUG) Log.v(TAG, "Handling headset click, count = $clickCount")
-                        val command = when (clickCount) {
-                            1 -> ACTION_TOGGLE_PAUSE
-                            2 -> ACTION_SKIP
-                            3 -> ACTION_REWIND
-                            else -> null
+                        when (clickCount) {
+                            1 -> command = ACTION_TOGGLE_PAUSE
+                            2 -> command = ACTION_SKIP
+                            3 -> command = ACTION_REWIND
+                            else -> command = null
                         }
 
                         if (command != null) {
@@ -89,11 +84,10 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
         }
 
         fun handleIntent(context: Context, intent: Intent): Boolean {
-            println("Intent Action: ${intent.action}")
             val intentAction = intent.action
             if (Intent.ACTION_MEDIA_BUTTON == intentAction) {
-                val event = intent.extras?.let { BundleCompat.getParcelable(it, Intent.EXTRA_KEY_EVENT, KeyEvent::class.java) }
-                    ?: return false
+                val event = intent.getParcelableExtra<KeyEvent>(Intent.EXTRA_KEY_EVENT)
+                        ?: return false
 
                 val keycode = event.keyCode
                 val action = event.action
@@ -105,9 +99,7 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
                 var command: String? = null
                 when (keycode) {
                     KeyEvent.KEYCODE_MEDIA_STOP -> command = ACTION_STOP
-                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> command =
-                        ACTION_TOGGLE_PAUSE
-
+                    KeyEvent.KEYCODE_HEADSETHOOK, KeyEvent.KEYCODE_MEDIA_PLAY_PAUSE -> command = ACTION_TOGGLE_PAUSE
                     KeyEvent.KEYCODE_MEDIA_NEXT -> command = ACTION_SKIP
                     KeyEvent.KEYCODE_MEDIA_PREVIOUS -> command = ACTION_REWIND
                     KeyEvent.KEYCODE_MEDIA_PAUSE -> command = ACTION_PAUSE
@@ -133,8 +125,7 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
                                 mHandler.removeMessages(MSG_HEADSET_DOUBLE_CLICK_TIMEOUT)
 
                                 val msg = mHandler.obtainMessage(
-                                    MSG_HEADSET_DOUBLE_CLICK_TIMEOUT, mClickCounter, 0, context
-                                )
+                                        MSG_HEADSET_DOUBLE_CLICK_TIMEOUT, mClickCounter, 0, context)
 
                                 val delay = (if (mClickCounter < 3) DOUBLE_CLICK else 0).toLong()
                                 if (mClickCounter >= 3) {
@@ -157,8 +148,14 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
             val intent = Intent(context, MusicService::class.java)
             intent.action = command
             try {
+                // IMPORTANT NOTE: (kind of a hack)
+                // on Android O and above the following crashes when the app is not running
+                // there is no good way to check whether the app is running so we catch the exception
+                // we do not always want to use startForegroundService() because then one gets an ANR
+                // if no notification is displayed via startForeground()
+                // according to Play analytics this happens a lot, I suppose for example if command = PAUSE
                 context.startService(intent)
-            } catch (e: Exception) {
+            } catch (ignored: IllegalStateException) {
                 ContextCompat.startForegroundService(context, intent)
             }
         }
@@ -166,11 +163,8 @@ class MediaButtonIntentReceiver : MediaButtonReceiver() {
         private fun acquireWakeLockAndSendMessage(context: Context, msg: Message, delay: Long) {
             if (wakeLock == null) {
                 val appContext = context.applicationContext
-                val pm = appContext.getSystemService<PowerManager>()
-                wakeLock = pm?.newWakeLock(
-                    PowerManager.PARTIAL_WAKE_LOCK,
-                    "RetroMusicApp:Wakelock headset button"
-                )
+                val pm = appContext.getSystemService(Context.POWER_SERVICE) as PowerManager
+                wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, "RetroMusicApp:Wakelock headset button")
                 wakeLock!!.setReferenceCounted(false)
             }
             if (DEBUG) Log.v(TAG, "Acquiring wake lock and sending " + msg.what)
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
index de1b54bf7..ce823ffe1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaSessionCallback.kt
@@ -14,148 +14,29 @@
 
 package code.name.monkey.retromusic.service
 
+import android.content.Context
+import android.content.Intent
 import android.os.Bundle
-import android.provider.MediaStore
 import android.support.v4.media.session.MediaSessionCompat
-import code.name.monkey.retromusic.auto.AutoMediaIDHelper
 import code.name.monkey.retromusic.helper.MusicPlayerRemote
 import code.name.monkey.retromusic.helper.MusicPlayerRemote.cycleRepeatMode
-import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
-import code.name.monkey.retromusic.model.Album
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Playlist
 import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.repository.*
-import code.name.monkey.retromusic.service.MusicService.Companion.CYCLE_REPEAT
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_SHUFFLE
+import code.name.monkey.retromusic.service.MusicService.*
 import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.logD
-import code.name.monkey.retromusic.util.logE
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.inject
+import java.util.*
+
 
 /**
  * Created by hemanths on 2019-08-01.
  */
 
-class MediaSessionCallback(
-    private val musicService: MusicService,
-) : MediaSessionCompat.Callback(), KoinComponent {
-
-    private val songRepository by inject<SongRepository>()
-    private val albumRepository by inject<AlbumRepository>()
-    private val artistRepository by inject<ArtistRepository>()
-    private val genreRepository by inject<GenreRepository>()
-    private val playlistRepository by inject<PlaylistRepository>()
-    private val topPlayedRepository by inject<TopPlayedRepository>()
-
-    override fun onPlayFromMediaId(mediaId: String?, extras: Bundle?) {
-        super.onPlayFromMediaId(mediaId, extras)
-        val musicId = AutoMediaIDHelper.extractMusicID(mediaId!!)
-        logD("Music Id $musicId")
-        val itemId = musicId?.toLong() ?: -1
-        val songs: ArrayList<Song> = ArrayList()
-        when (val category = AutoMediaIDHelper.extractCategory(mediaId)) {
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM -> {
-                val album: Album = albumRepository.album(itemId)
-                songs.addAll(album.songs)
-                musicService.openQueue(songs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ARTIST -> {
-                val artist: Artist = artistRepository.artist(itemId)
-                songs.addAll(artist.songs)
-                musicService.openQueue(songs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_ALBUM_ARTIST -> {
-                val artist: Artist =
-                    artistRepository.albumArtist(albumRepository.album(itemId).albumArtist!!)
-                songs.addAll(artist.songs)
-                musicService.openQueue(songs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_PLAYLIST -> {
-                val playlist: Playlist = playlistRepository.playlist(itemId)
-                songs.addAll(playlist.getSongs())
-                musicService.openQueue(songs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_GENRE -> {
-                songs.addAll(genreRepository.songs(itemId))
-                musicService.openQueue(songs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SHUFFLE -> {
-                val allSongs: ArrayList<Song> = songRepository.songs() as ArrayList<Song>
-                makeShuffleList(allSongs, -1)
-                musicService.openQueue(allSongs, 0, true)
-            }
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY,
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS,
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_TOP_TRACKS,
-            AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_QUEUE,
-            -> {
-                val tracks: List<Song> = when (category) {
-                    AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_HISTORY -> topPlayedRepository.recentlyPlayedTracks()
-                    AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_SUGGESTIONS -> topPlayedRepository.recentlyPlayedTracks()
-                    AutoMediaIDHelper.MEDIA_ID_MUSICS_BY_TOP_TRACKS -> topPlayedRepository.recentlyPlayedTracks()
-                    else -> musicService.playingQueue
-                }
-                songs.addAll(tracks)
-                var songIndex = MusicUtil.indexOfSongInList(tracks, itemId)
-                if (songIndex == -1) {
-                    songIndex = 0
-                }
-                musicService.openQueue(songs, songIndex, true)
-            }
-        }
-        musicService.play()
-    }
-
-    override fun onPlayFromSearch(query: String?, extras: Bundle?) {
-        val songs = ArrayList<Song>()
-        if (query.isNullOrEmpty()) {
-            // The user provided generic string e.g. 'Play music'
-            // Build appropriate playlist queue
-            songs.addAll(songRepository.songs())
-        } else {
-            // Build a queue based on songs that match "query" or "extras" param
-            val mediaFocus: String? = extras?.getString(MediaStore.EXTRA_MEDIA_FOCUS)
-            if (mediaFocus == MediaStore.Audio.Artists.ENTRY_CONTENT_TYPE) {
-                val artistQuery = extras.getString(MediaStore.EXTRA_MEDIA_ARTIST)
-                if (artistQuery != null) {
-                    artistRepository.artists(artistQuery).forEach {
-                        songs.addAll(it.songs)
-                    }
-                }
-            } else if (mediaFocus == MediaStore.Audio.Albums.ENTRY_CONTENT_TYPE) {
-                val albumQuery = extras.getString(MediaStore.EXTRA_MEDIA_ALBUM)
-                if (albumQuery != null) {
-                    albumRepository.albums(albumQuery).forEach {
-                        songs.addAll(it.songs)
-                    }
-                }
-            }
-        }
-
-        if (songs.isEmpty()) {
-            // No focus found, search by query for song title
-            query?.also {
-                songs.addAll(songRepository.songs(it))
-            }
-        }
-
-        musicService.openQueue(songs, 0, true)
-
-        musicService.play()
-    }
-
-    override fun onPrepare() {
-        super.onPrepare()
-        if (musicService.currentSong != Song.emptySong)
-            musicService.restoreState(::onPlay)
-    }
+class MediaSessionCallback(private val context: Context,
+                           private val musicService: MusicService
+) : MediaSessionCompat.Callback() {
 
     override fun onPlay() {
         super.onPlay()
-        if (musicService.currentSong != Song.emptySong) musicService.play()
+        musicService.play()
     }
 
     override fun onPause() {
@@ -170,7 +51,7 @@ class MediaSessionCallback(
 
     override fun onSkipToPrevious() {
         super.onSkipToPrevious()
-        musicService.playPreviousSong(true)
+        musicService.back(true)
     }
 
     override fun onStop() {
@@ -183,6 +64,10 @@ class MediaSessionCallback(
         musicService.seek(pos.toInt())
     }
 
+    override fun onMediaButtonEvent(mediaButtonIntent: Intent): Boolean {
+        return MediaButtonIntentReceiver.handleIntent(context, mediaButtonIntent)
+    }
+
     override fun onCustomAction(action: String, extras: Bundle?) {
         when (action) {
             CYCLE_REPEAT -> {
@@ -195,15 +80,16 @@ class MediaSessionCallback(
                 musicService.updateMediaSessionPlaybackState()
             }
             TOGGLE_FAVORITE -> {
-                musicService.toggleFavorite()
+                MusicUtil.toggleFavorite(context, MusicPlayerRemote.currentSong)
+                musicService.updateMediaSessionPlaybackState()
             }
             else -> {
-                logE("Unsupported action: $action")
+                println("Unsupported action: $action")
             }
         }
     }
 
-    private fun checkAndStartPlaying(songs: ArrayList<Song>, itemId: Long) {
+    private fun checkAndStartPlaying(songs: ArrayList<Song>, itemId: Int) {
         var songIndex = MusicUtil.indexOfSongInList(songs, itemId)
         if (songIndex == -1) {
             songIndex = 0
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt b/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt
index 27a6c3ccf..131154ef6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MediaStoreObserver.kt
@@ -18,8 +18,8 @@ import android.database.ContentObserver
 import android.os.Handler
 
 class MediaStoreObserver(
-    private val musicService: MusicService,
-    private val mHandler: Handler
+        private val musicService: MusicService,
+        private val mHandler: Handler
 ) : ContentObserver(mHandler), Runnable {
 
     override fun onChange(selfChange: Boolean) {
@@ -38,6 +38,6 @@ class MediaStoreObserver(
 
     companion object {
         // milliseconds to delay before calling refresh to aggregate events
-        private const val REFRESH_DELAY: Long = 500
+        private val REFRESH_DELAY: Long = 500
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
new file mode 100644
index 000000000..d8ecf5743
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.java
@@ -0,0 +1,348 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service;
+
+import android.content.Context;
+import android.content.Intent;
+import android.media.AudioManager;
+import android.media.MediaPlayer;
+import android.media.audiofx.AudioEffect;
+import android.net.Uri;
+import android.os.PowerManager;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import android.util.Log;
+import android.widget.Toast;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.service.playback.Playback;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+/**
+ * @author Andrew Neal, Karim Abou Zeid (kabouzeid)
+ */
+public class MultiPlayer implements Playback, MediaPlayer.OnErrorListener, MediaPlayer.OnCompletionListener {
+    public static final String TAG = MultiPlayer.class.getSimpleName();
+
+    private MediaPlayer mCurrentMediaPlayer = new MediaPlayer();
+    private MediaPlayer mNextMediaPlayer;
+
+    private Context context;
+    @Nullable
+    private Playback.PlaybackCallbacks callbacks;
+
+    private boolean mIsInitialized = false;
+
+    /**
+     * Constructor of <code>MultiPlayer</code>
+     */
+    MultiPlayer(final Context context) {
+        this.context = context;
+        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+    }
+
+    /**
+     * @param path The path of the file, or the http/rtsp URL of the stream
+     *             you want to play
+     * @return True if the <code>player</code> has been prepared and is
+     * ready to play, false otherwise
+     */
+    @Override
+    public boolean setDataSource(@NonNull final String path) {
+        mIsInitialized = false;
+        mIsInitialized = setDataSourceImpl(mCurrentMediaPlayer, path);
+        if (mIsInitialized) {
+            setNextDataSource(null);
+        }
+        return mIsInitialized;
+    }
+
+    /**
+     * @param player The {@link MediaPlayer} to use
+     * @param path   The path of the file, or the http/rtsp URL of the stream
+     *               you want to play
+     * @return True if the <code>player</code> has been prepared and is
+     * ready to play, false otherwise
+     */
+    private boolean setDataSourceImpl(@NonNull final MediaPlayer player, @NonNull final String path) {
+        if (context == null) {
+            return false;
+        }
+        try {
+            player.reset();
+            player.setOnPreparedListener(null);
+            if (path.startsWith("content://")) {
+                player.setDataSource(context, Uri.parse(path));
+            } else {
+                player.setDataSource(path);
+            }
+            player.setAudioStreamType(AudioManager.STREAM_MUSIC);
+            player.prepare();
+        } catch (Exception e) {
+            return false;
+        }
+        player.setOnCompletionListener(this);
+        player.setOnErrorListener(this);
+        final Intent intent = new Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION);
+        intent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, getAudioSessionId());
+        intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.getPackageName());
+        intent.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC);
+        context.sendBroadcast(intent);
+        return true;
+    }
+
+    /**
+     * Set the MediaPlayer to start when this MediaPlayer finishes playback.
+     *
+     * @param path The path of the file, or the http/rtsp URL of the stream
+     *             you want to play
+     */
+    @Override
+    public void setNextDataSource(@Nullable final String path) {
+        if (context == null) {
+            return;
+        }
+        try {
+            mCurrentMediaPlayer.setNextMediaPlayer(null);
+        } catch (IllegalArgumentException e) {
+            Log.i(TAG, "Next media player is current one, continuing");
+        } catch (IllegalStateException e) {
+            Log.e(TAG, "Media player not initialized!");
+            return;
+        }
+        if (mNextMediaPlayer != null) {
+            mNextMediaPlayer.release();
+            mNextMediaPlayer = null;
+        }
+        if (path == null) {
+            return;
+        }
+        if (PreferenceUtil.getInstance(context).gaplessPlayback()) {
+            mNextMediaPlayer = new MediaPlayer();
+            mNextMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+            mNextMediaPlayer.setAudioSessionId(getAudioSessionId());
+            if (setDataSourceImpl(mNextMediaPlayer, path)) {
+                try {
+                    mCurrentMediaPlayer.setNextMediaPlayer(mNextMediaPlayer);
+                } catch (@NonNull IllegalArgumentException | IllegalStateException e) {
+                    Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e);
+                    if (mNextMediaPlayer != null) {
+                        mNextMediaPlayer.release();
+                        mNextMediaPlayer = null;
+                    }
+                }
+            } else {
+                if (mNextMediaPlayer != null) {
+                    mNextMediaPlayer.release();
+                    mNextMediaPlayer = null;
+                }
+            }
+        }
+    }
+
+    /**
+     * Sets the callbacks
+     *
+     * @param callbacks The callbacks to use
+     */
+    @Override
+    public void setCallbacks(@Nullable final Playback.PlaybackCallbacks callbacks) {
+        this.callbacks = callbacks;
+    }
+
+    /**
+     * @return True if the player is ready to go, false otherwise
+     */
+    @Override
+    public boolean isInitialized() {
+        return mIsInitialized;
+    }
+
+    /**
+     * Starts or resumes playback.
+     */
+    @Override
+    public boolean start() {
+        try {
+            mCurrentMediaPlayer.start();
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Resets the MediaPlayer to its uninitialized state.
+     */
+    @Override
+    public void stop() {
+        mCurrentMediaPlayer.reset();
+        mIsInitialized = false;
+    }
+
+    /**
+     * Releases resources associated with this MediaPlayer object.
+     */
+    @Override
+    public void release() {
+        stop();
+        mCurrentMediaPlayer.release();
+        if (mNextMediaPlayer != null) {
+            mNextMediaPlayer.release();
+        }
+    }
+
+    /**
+     * Pauses playback. Call start() to resume.
+     */
+    @Override
+    public boolean pause() {
+        try {
+            mCurrentMediaPlayer.pause();
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Checks whether the MultiPlayer is playing.
+     */
+    @Override
+    public boolean isPlaying() {
+        return mIsInitialized && mCurrentMediaPlayer.isPlaying();
+    }
+
+    /**
+     * Gets the duration of the file.
+     *
+     * @return The duration in milliseconds
+     */
+    @Override
+    public int duration() {
+        if (!mIsInitialized) {
+            return -1;
+        }
+        try {
+            return mCurrentMediaPlayer.getDuration();
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Gets the current playback position.
+     *
+     * @return The current position in milliseconds
+     */
+    @Override
+    public int position() {
+        if (!mIsInitialized) {
+            return -1;
+        }
+        try {
+            return mCurrentMediaPlayer.getCurrentPosition();
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    /**
+     * Gets the current playback position.
+     *
+     * @param whereto The offset in milliseconds from the start to seek to
+     * @return The offset in milliseconds from the start to seek to
+     */
+    @Override
+    public int seek(final int whereto) {
+        try {
+            mCurrentMediaPlayer.seekTo(whereto);
+            return whereto;
+        } catch (IllegalStateException e) {
+            return -1;
+        }
+    }
+
+    @Override
+    public boolean setVolume(final float vol) {
+        try {
+            mCurrentMediaPlayer.setVolume(vol, vol);
+            return true;
+        } catch (IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Sets the audio session ID.
+     *
+     * @param sessionId The audio session ID
+     */
+    @Override
+    public boolean setAudioSessionId(final int sessionId) {
+        try {
+            mCurrentMediaPlayer.setAudioSessionId(sessionId);
+            return true;
+        } catch (@NonNull IllegalArgumentException | IllegalStateException e) {
+            return false;
+        }
+    }
+
+    /**
+     * Returns the audio session ID.
+     *
+     * @return The current audio session ID.
+     */
+    @Override
+    public int getAudioSessionId() {
+        return mCurrentMediaPlayer.getAudioSessionId();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean onError(final MediaPlayer mp, final int what, final int extra) {
+        mIsInitialized = false;
+        mCurrentMediaPlayer.release();
+        mCurrentMediaPlayer = new MediaPlayer();
+        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK);
+        if (context != null) {
+            Toast.makeText(context, context.getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
+        }
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void onCompletion(final MediaPlayer mp) {
+        if (mp == mCurrentMediaPlayer && mNextMediaPlayer != null) {
+            mIsInitialized = false;
+            mCurrentMediaPlayer.release();
+            mCurrentMediaPlayer = mNextMediaPlayer;
+            mIsInitialized = true;
+            mNextMediaPlayer = null;
+            if (callbacks != null)
+                callbacks.onTrackWentToNext();
+        } else {
+            if (callbacks != null)
+                callbacks.onTrackEnded();
+        }
+    }
+
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt b/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
deleted file mode 100644
index a29122a68..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/MultiPlayer.kt
+++ /dev/null
@@ -1,278 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.media.MediaPlayer
-import android.os.PowerManager
-import android.util.Log
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.PreferenceUtil.isGapLessPlayback
-import code.name.monkey.retromusic.util.logE
-
-/**
- * @author Andrew Neal, Karim Abou Zeid (kabouzeid)
- */
-class MultiPlayer(context: Context) : LocalPlayback(context) {
-    private var mCurrentMediaPlayer = MediaPlayer()
-    private var mNextMediaPlayer: MediaPlayer? = null
-    override var callbacks: PlaybackCallbacks? = null
-
-    /**
-     * @return True if the player is ready to go, false otherwise
-     */
-    override var isInitialized = false
-        private set
-
-    init {
-        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-    }
-
-    /**
-     * @param song The song object you want to play
-     * @return True if the `player` has been prepared and is ready to play, false otherwise
-     */
-    override fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        isInitialized = false
-        setDataSourceImpl(mCurrentMediaPlayer, song.uri.toString()) { success ->
-            isInitialized = success
-            if (isInitialized) {
-                setNextDataSource(null)
-            }
-            completion(isInitialized)
-        }
-    }
-
-    /**
-     * Set the MediaPlayer to start when this MediaPlayer finishes playback.
-     *
-     * @param path The path of the file, or the http/rtsp URL of the stream you want to play
-     */
-    override fun setNextDataSource(path: String?) {
-        try {
-            mCurrentMediaPlayer.setNextMediaPlayer(null)
-        } catch (e: IllegalArgumentException) {
-            Log.i(TAG, "Next media player is current one, continuing")
-        } catch (e: IllegalStateException) {
-            Log.e(TAG, "Media player not initialized!")
-            return
-        }
-        if (mNextMediaPlayer != null) {
-            mNextMediaPlayer?.release()
-            mNextMediaPlayer = null
-        }
-        if (path == null) {
-            return
-        }
-        if (isGapLessPlayback) {
-            mNextMediaPlayer = MediaPlayer()
-            mNextMediaPlayer?.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-            mNextMediaPlayer?.audioSessionId = audioSessionId
-            setDataSourceImpl(mNextMediaPlayer!!, path) { success ->
-                if (success) {
-                    try {
-                        mCurrentMediaPlayer.setNextMediaPlayer(mNextMediaPlayer)
-                    } catch (e: IllegalArgumentException) {
-                        Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e)
-                        if (mNextMediaPlayer != null) {
-                            mNextMediaPlayer?.release()
-                            mNextMediaPlayer = null
-                        }
-                    } catch (e: IllegalStateException) {
-                        Log.e(TAG, "setNextDataSource: setNextMediaPlayer()", e)
-                        if (mNextMediaPlayer != null) {
-                            mNextMediaPlayer?.release()
-                            mNextMediaPlayer = null
-                        }
-                    }
-                } else {
-                    if (mNextMediaPlayer != null) {
-                        mNextMediaPlayer?.release()
-                        mNextMediaPlayer = null
-                    }
-                }
-            }
-        }
-    }
-
-    /**
-     * Starts or resumes playback.
-     */
-    override fun start(): Boolean {
-        super.start()
-        return try {
-            mCurrentMediaPlayer.start()
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Resets the MediaPlayer to its uninitialized state.
-     */
-    override fun stop() {
-        super.stop()
-        mCurrentMediaPlayer.reset()
-        isInitialized = false
-    }
-
-    /**
-     * Releases resources associated with this MediaPlayer object.
-     */
-    override fun release() {
-        stop()
-        mCurrentMediaPlayer.release()
-        mNextMediaPlayer?.release()
-    }
-
-    /**
-     * Pauses playback. Call start() to resume.
-     */
-    override fun pause(): Boolean {
-        super.pause()
-        return try {
-            mCurrentMediaPlayer.pause()
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Checks whether the MultiPlayer is playing.
-     */
-    override val isPlaying: Boolean
-        get() = isInitialized && mCurrentMediaPlayer.isPlaying
-
-    /**
-     * Gets the duration of the file.
-     *
-     * @return The duration in milliseconds
-     */
-    override fun duration(): Int {
-        return if (!this.isInitialized) {
-            -1
-        } else try {
-            mCurrentMediaPlayer.duration
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    /**
-     * Gets the current playback position.
-     *
-     * @return The current position in milliseconds
-     */
-    override fun position(): Int {
-        return if (!this.isInitialized) {
-            -1
-        } else try {
-            mCurrentMediaPlayer.currentPosition
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    /**
-     * Gets the current playback position.
-     *
-     * @param whereto The offset in milliseconds from the start to seek to
-     * @return The offset in milliseconds from the start to seek to
-     */
-    override fun seek(whereto: Int, force: Boolean): Int {
-        return try {
-            mCurrentMediaPlayer.seekTo(whereto)
-            whereto
-        } catch (e: IllegalStateException) {
-            -1
-        }
-    }
-
-    override fun setVolume(vol: Float): Boolean {
-        return try {
-            mCurrentMediaPlayer.setVolume(vol, vol)
-            true
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Sets the audio session ID.
-     *
-     * @param sessionId The audio session ID
-     */
-    override fun setAudioSessionId(sessionId: Int): Boolean {
-        return try {
-            mCurrentMediaPlayer.audioSessionId = sessionId
-            true
-        } catch (e: IllegalArgumentException) {
-            false
-        } catch (e: IllegalStateException) {
-            false
-        }
-    }
-
-    /**
-     * Returns the audio session ID.
-     *
-     * @return The current audio session ID.
-     */
-    override val audioSessionId: Int
-        get() = mCurrentMediaPlayer.audioSessionId
-
-    override fun onError(mp: MediaPlayer, what: Int, extra: Int): Boolean {
-        isInitialized = false
-        mCurrentMediaPlayer.release()
-        mCurrentMediaPlayer = MediaPlayer()
-        mCurrentMediaPlayer.setWakeMode(context, PowerManager.PARTIAL_WAKE_LOCK)
-        context.showToast(R.string.unplayable_file)
-        logE(what.toString() + extra)
-        return false
-    }
-
-    override fun onCompletion(mp: MediaPlayer) {
-        if (mp == mCurrentMediaPlayer && mNextMediaPlayer != null) {
-            isInitialized = false
-            mCurrentMediaPlayer.release()
-            mCurrentMediaPlayer = mNextMediaPlayer!!
-            isInitialized = true
-            mNextMediaPlayer = null
-            callbacks?.onTrackWentToNext()
-        } else {
-            callbacks?.onTrackEnded()
-        }
-    }
-
-    override fun setCrossFadeDuration(duration: Int) {}
-
-    override fun setPlaybackSpeedPitch(speed: Float, pitch: Float) {
-        mCurrentMediaPlayer.setPlaybackSpeedPitch(speed, pitch)
-        mNextMediaPlayer?.setPlaybackSpeedPitch(speed, pitch)
-    }
-
-    companion object {
-        val TAG: String = MultiPlayer::class.java.simpleName
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
new file mode 100644
index 000000000..b7737f59e
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
@@ -0,0 +1,1264 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.appwidget.AppWidgetManager;
+import android.content.BroadcastReceiver;
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.content.SharedPreferences;
+import android.database.ContentObserver;
+import android.graphics.Bitmap;
+import android.graphics.Point;
+import android.graphics.drawable.Drawable;
+import android.media.AudioManager;
+import android.media.audiofx.AudioEffect;
+import android.os.Binder;
+import android.os.Build;
+import android.os.Handler;
+import android.os.HandlerThread;
+import android.os.IBinder;
+import android.os.PowerManager;
+import android.os.Process;
+import android.preference.PreferenceManager;
+import android.provider.MediaStore;
+import android.support.v4.media.MediaMetadataCompat;
+import android.support.v4.media.session.MediaSessionCompat;
+import android.support.v4.media.session.PlaybackStateCompat;
+import android.telephony.PhoneStateListener;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.BitmapRequestBuilder;
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.animation.GlideAnimation;
+import com.bumptech.glide.request.target.SimpleTarget;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Random;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.appwidgets.AppWidgetBig;
+import code.name.monkey.retromusic.appwidgets.AppWidgetCard;
+import code.name.monkey.retromusic.appwidgets.AppWidgetClassic;
+import code.name.monkey.retromusic.appwidgets.AppWidgetSmall;
+import code.name.monkey.retromusic.appwidgets.AppWidgetText;
+import code.name.monkey.retromusic.glide.BlurTransformation;
+import code.name.monkey.retromusic.glide.SongGlideRequest;
+import code.name.monkey.retromusic.helper.ShuffleHelper;
+import code.name.monkey.retromusic.model.Playlist;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.providers.HistoryStore;
+import code.name.monkey.retromusic.providers.MusicPlaybackQueueStore;
+import code.name.monkey.retromusic.providers.SongPlayCountStore;
+import code.name.monkey.retromusic.service.notification.PlayingNotification;
+import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl;
+import code.name.monkey.retromusic.service.notification.PlayingNotificationOreo;
+import code.name.monkey.retromusic.service.playback.Playback;
+import code.name.monkey.retromusic.util.MusicUtil;
+import code.name.monkey.retromusic.util.PreferenceUtil;
+import code.name.monkey.retromusic.util.RetroUtil;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid), Andrew Neal
+ */
+public class MusicService extends Service implements
+        SharedPreferences.OnSharedPreferenceChangeListener, Playback.PlaybackCallbacks {
+    public static final String TAG = MusicService.class.getSimpleName();
+
+    public static final String RETRO_MUSIC_PACKAGE_NAME = "code.name.monkey.retromusic";
+    public static final String MUSIC_PACKAGE_NAME = "com.android.music";
+
+    public static final String ACTION_TOGGLE_PAUSE = RETRO_MUSIC_PACKAGE_NAME + ".togglepause";
+    public static final String ACTION_PLAY = RETRO_MUSIC_PACKAGE_NAME + ".play";
+    public static final String ACTION_PLAY_PLAYLIST = RETRO_MUSIC_PACKAGE_NAME + ".play.playlist";
+    public static final String ACTION_PAUSE = RETRO_MUSIC_PACKAGE_NAME + ".pause";
+    public static final String ACTION_STOP = RETRO_MUSIC_PACKAGE_NAME + ".stop";
+    public static final String ACTION_SKIP = RETRO_MUSIC_PACKAGE_NAME + ".skip";
+    public static final String ACTION_REWIND = RETRO_MUSIC_PACKAGE_NAME + ".rewind";
+    public static final String ACTION_QUIT = RETRO_MUSIC_PACKAGE_NAME + ".quitservice";
+    public static final String ACTION_PENDING_QUIT = RETRO_MUSIC_PACKAGE_NAME + ".pendingquitservice";
+    public static final String INTENT_EXTRA_PLAYLIST = RETRO_MUSIC_PACKAGE_NAME + "intentextra.playlist";
+    public static final String INTENT_EXTRA_SHUFFLE_MODE = RETRO_MUSIC_PACKAGE_NAME + ".intentextra.shufflemode";
+
+    public static final String APP_WIDGET_UPDATE = RETRO_MUSIC_PACKAGE_NAME + ".appwidgetupdate";
+    public static final String EXTRA_APP_WIDGET_NAME = RETRO_MUSIC_PACKAGE_NAME + "app_widget_name";
+
+    // Do not change these three strings as it will break support with other apps (e.g. last.fm scrobbling)
+    public static final String META_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".metachanged";
+    public static final String QUEUE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".queuechanged";
+    public static final String PLAY_STATE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".playstatechanged";
+
+    public static final String FAVORITE_STATE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + "favoritestatechanged";
+
+    public static final String REPEAT_MODE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".repeatmodechanged";
+    public static final String SHUFFLE_MODE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".shufflemodechanged";
+    public static final String MEDIA_STORE_CHANGED = RETRO_MUSIC_PACKAGE_NAME + ".mediastorechanged";
+
+    public static final String CYCLE_REPEAT = RETRO_MUSIC_PACKAGE_NAME + ".cyclerepeat";
+    public static final String TOGGLE_SHUFFLE = RETRO_MUSIC_PACKAGE_NAME + ".toggleshuffle";
+    public static final String TOGGLE_FAVORITE = RETRO_MUSIC_PACKAGE_NAME + ".togglefavorite";
+
+    public static final String SAVED_POSITION = "POSITION";
+    public static final String SAVED_POSITION_IN_TRACK = "POSITION_IN_TRACK";
+    public static final String SAVED_SHUFFLE_MODE = "SHUFFLE_MODE";
+    public static final String SAVED_REPEAT_MODE = "REPEAT_MODE";
+
+    public static final int RELEASE_WAKELOCK = 0;
+    public static final int TRACK_ENDED = 1;
+    public static final int TRACK_WENT_TO_NEXT = 2;
+    public static final int PLAY_SONG = 3;
+    public static final int PREPARE_NEXT = 4;
+    public static final int SET_POSITION = 5;
+    public static final int FOCUS_CHANGE = 6;
+    public static final int DUCK = 7;
+    public static final int UNDUCK = 8;
+    public static final int RESTORE_QUEUES = 9;
+
+    public static final int SHUFFLE_MODE_NONE = 0;
+    public static final int SHUFFLE_MODE_SHUFFLE = 1;
+
+    public static final int REPEAT_MODE_NONE = 0;
+    public static final int REPEAT_MODE_ALL = 1;
+    public static final int REPEAT_MODE_THIS = 2;
+
+    public static final int SAVE_QUEUES = 0;
+    private static final long MEDIA_SESSION_ACTIONS = PlaybackStateCompat.ACTION_PLAY
+            | PlaybackStateCompat.ACTION_PAUSE
+            | PlaybackStateCompat.ACTION_PLAY_PAUSE
+            | PlaybackStateCompat.ACTION_SKIP_TO_NEXT
+            | PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
+            | PlaybackStateCompat.ACTION_STOP
+            | PlaybackStateCompat.ACTION_SEEK_TO;
+    private final IBinder musicBind = new MusicBinder();
+    public boolean pendingQuit = false;
+    public Playback playback;
+    public int position = -1;
+    public int nextPosition = -1;
+    private AppWidgetBig appWidgetBig = AppWidgetBig.Companion.getInstance();
+    private AppWidgetClassic appWidgetClassic = AppWidgetClassic.Companion.getInstance();
+    private AppWidgetSmall appWidgetSmall = AppWidgetSmall.Companion.getInstance();
+    private AppWidgetCard appWidgetCard = AppWidgetCard.Companion.getInstance();
+    private AppWidgetText appWidgetText = AppWidgetText.Companion.getInstance();
+    private final BroadcastReceiver widgetIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(final Context context, final Intent intent) {
+            final String command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME);
+
+            final int[] ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS);
+            switch (command) {
+                case AppWidgetClassic.NAME: {
+                    appWidgetClassic.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetSmall.NAME: {
+                    appWidgetSmall.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetBig.NAME: {
+                    appWidgetBig.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetCard.NAME: {
+                    appWidgetCard.performUpdate(MusicService.this, ids);
+                    break;
+                }
+                case AppWidgetText.NAME: {
+                    appWidgetText.performUpdate(MusicService.this, ids);
+                    break;
+                }
+            }
+
+        }
+    };
+    private ArrayList<Song> playingQueue = new ArrayList<>();
+    private ArrayList<Song> originalPlayingQueue = new ArrayList<>();
+    private int shuffleMode;
+    private int repeatMode;
+    private boolean queuesRestored;
+    private boolean pausedByTransientLossOfFocus;
+    private final BroadcastReceiver becomingNoisyReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, @NonNull Intent intent) {
+            if (intent.getAction() != null && intent.getAction().equals(AudioManager.ACTION_AUDIO_BECOMING_NOISY)) {
+                pause();
+            }
+        }
+    };
+    private PlayingNotification playingNotification;
+    private final BroadcastReceiver updateFavoriteReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(final Context context, final Intent intent) {
+            updateNotification();
+        }
+    };
+    private AudioManager audioManager;
+    private MediaSessionCompat mediaSession;
+    private PowerManager.WakeLock wakeLock;
+    private PlaybackHandler playerHandler;
+    private final AudioManager.OnAudioFocusChangeListener audioFocusListener = new AudioManager.OnAudioFocusChangeListener() {
+        @Override
+        public void onAudioFocusChange(final int focusChange) {
+            playerHandler.obtainMessage(FOCUS_CHANGE, focusChange, 0).sendToTarget();
+        }
+    };
+    private QueueSaveHandler queueSaveHandler;
+    private HandlerThread musicPlayerHandlerThread;
+    private HandlerThread queueSaveHandlerThread;
+    private SongPlayCountHelper songPlayCountHelper = new SongPlayCountHelper();
+    private ThrottledSeekHandler throttledSeekHandler;
+    private boolean becomingNoisyReceiverRegistered;
+    private IntentFilter becomingNoisyReceiverIntentFilter = new IntentFilter(AudioManager.ACTION_AUDIO_BECOMING_NOISY);
+    private ContentObserver mediaStoreObserver;
+    private boolean notHandledMetaChangedForCurrentTrack;
+    private PhoneStateListener phoneStateListener = new PhoneStateListener() {
+        @Override
+        public void onCallStateChanged(int state, String incomingNumber) {
+            switch (state) {
+                case TelephonyManager.CALL_STATE_IDLE:
+                    //Not in call: Play music
+                    play();
+                    break;
+                case TelephonyManager.CALL_STATE_RINGING:
+                case TelephonyManager.CALL_STATE_OFFHOOK:
+                    //A call is dialing, active or on hold
+                    pause();
+                    break;
+                default:
+            }
+            super.onCallStateChanged(state, incomingNumber);
+        }
+    };
+    private Handler uiThreadHandler;
+    private IntentFilter headsetReceiverIntentFilter = new IntentFilter(Intent.ACTION_HEADSET_PLUG);
+    private boolean headsetReceiverRegistered = false;
+    private BroadcastReceiver headsetReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action != null) {
+                if (Intent.ACTION_HEADSET_PLUG.equals(action)) {
+                    int state = intent.getIntExtra("state", -1);
+                    switch (state) {
+                        case 0:
+                            Log.d(TAG, "Headset unplugged");
+                            pause();
+                            break;
+                        case 1:
+                            Log.d(TAG, "Headset plugged");
+                            play();
+                            break;
+                    }
+                }
+            }
+        }
+    };
+
+    private static String getTrackUri(@NonNull Song song) {
+        return MusicUtil.getSongFileUri(song.getId()).toString();
+    }
+
+    private static Bitmap copy(Bitmap bitmap) {
+        Bitmap.Config config = bitmap.getConfig();
+        if (config == null) {
+            config = Bitmap.Config.RGB_565;
+        }
+        try {
+            return bitmap.copy(config, false);
+        } catch (OutOfMemoryError e) {
+            e.printStackTrace();
+            return null;
+        }
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        final TelephonyManager telephonyManager = (TelephonyManager) getSystemService(TELEPHONY_SERVICE);
+        if (telephonyManager != null) {
+            telephonyManager.listen(phoneStateListener, PhoneStateListener.LISTEN_NONE);
+        }
+
+        final PowerManager powerManager = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        if (powerManager != null) {
+            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, getClass().getName());
+        }
+        wakeLock.setReferenceCounted(false);
+
+        musicPlayerHandlerThread = new HandlerThread("PlaybackHandler");
+        musicPlayerHandlerThread.start();
+        playerHandler = new PlaybackHandler(this, musicPlayerHandlerThread.getLooper());
+
+        playback = new MultiPlayer(this);
+        playback.setCallbacks(this);
+
+        setupMediaSession();
+
+        // queue saving needs to run on a separate thread so that it doesn't block the playback handler events
+        queueSaveHandlerThread = new HandlerThread("QueueSaveHandler", Process.THREAD_PRIORITY_BACKGROUND);
+        queueSaveHandlerThread.start();
+        queueSaveHandler = new QueueSaveHandler(this, queueSaveHandlerThread.getLooper());
+
+        uiThreadHandler = new Handler();
+
+        registerReceiver(widgetIntentReceiver, new IntentFilter(APP_WIDGET_UPDATE));
+        registerReceiver(updateFavoriteReceiver, new IntentFilter(FAVORITE_STATE_CHANGED));
+
+        initNotification();
+
+        mediaStoreObserver = new MediaStoreObserver(this, playerHandler);
+        throttledSeekHandler = new ThrottledSeekHandler(this, playerHandler);
+        getContentResolver().registerContentObserver(
+                MediaStore.Audio.Media.INTERNAL_CONTENT_URI, true, mediaStoreObserver);
+        getContentResolver().registerContentObserver(
+                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, true, mediaStoreObserver);
+
+        PreferenceUtil.getInstance(this).registerOnSharedPreferenceChangedListener(this);
+
+        restoreState();
+
+        sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_CREATED"));
+
+        registerHeadsetEvents();
+    }
+
+    private AudioManager getAudioManager() {
+        if (audioManager == null) {
+            audioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
+        }
+        return audioManager;
+    }
+
+    private void setupMediaSession() {
+        ComponentName mediaButtonReceiverComponentName = new ComponentName(
+                getApplicationContext(),
+                MediaButtonIntentReceiver.class);
+
+        Intent mediaButtonIntent = new Intent(Intent.ACTION_MEDIA_BUTTON);
+        mediaButtonIntent.setComponent(mediaButtonReceiverComponentName);
+
+
+        PendingIntent mediaButtonReceiverPendingIntent = PendingIntent.getBroadcast(
+                getApplicationContext(),
+                0,
+                mediaButtonIntent,
+                0);
+
+        mediaSession = new MediaSessionCompat(this,
+                "RetroMusicPlayer",
+                mediaButtonReceiverComponentName,
+                mediaButtonReceiverPendingIntent);
+        MediaSessionCallback mediasessionCallback = new MediaSessionCallback(
+                getApplicationContext(), this);
+        mediaSession.setFlags(MediaSessionCompat.FLAG_HANDLES_MEDIA_BUTTONS
+                | MediaSessionCompat.FLAG_HANDLES_TRANSPORT_CONTROLS
+        );
+        mediaSession.setCallback(mediasessionCallback);
+        mediaSession.setActive(true);
+        mediaSession.setMediaButtonReceiver(mediaButtonReceiverPendingIntent);
+
+    }
+
+    @Override
+    public int onStartCommand(@Nullable Intent intent, int flags, int startId) {
+        if (intent != null) {
+            if (intent.getAction() != null) {
+                restoreQueuesAndPositionIfNecessary();
+                String action = intent.getAction();
+                switch (action) {
+                    case ACTION_TOGGLE_PAUSE:
+                        if (isPlaying()) {
+                            pause();
+                        } else {
+                            play();
+                        }
+                        break;
+                    case ACTION_PAUSE:
+                        pause();
+                        break;
+                    case ACTION_PLAY:
+                        play();
+                        break;
+                    case ACTION_PLAY_PLAYLIST:
+                        playFromPlaylist(intent);
+                        break;
+                    case ACTION_REWIND:
+                        back(true);
+                        break;
+                    case ACTION_SKIP:
+                        playNextSong(true);
+                        break;
+                    case ACTION_STOP:
+                    case ACTION_QUIT:
+                        pendingQuit = false;
+                        quit();
+                        break;
+                    case ACTION_PENDING_QUIT:
+                        pendingQuit = true;
+                        break;
+                    case TOGGLE_FAVORITE:
+                        MusicUtil.toggleFavorite(getApplicationContext(), getCurrentSong());
+                        break;
+                }
+            }
+        }
+
+        return START_NOT_STICKY;
+    }
+
+    private void playFromPlaylist(Intent intent) {
+        Playlist playlist = intent.getParcelableExtra(INTENT_EXTRA_PLAYLIST);
+        int shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, getShuffleMode());
+        if (playlist != null) {
+            ArrayList<Song> playlistSongs = playlist.getSongs(getApplicationContext());
+            if (!playlistSongs.isEmpty()) {
+                if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
+                    int startPosition = 0;
+                    if (!playlistSongs.isEmpty()) {
+                        startPosition = new Random().nextInt(playlistSongs.size());
+                    }
+                    openQueue(playlistSongs, startPosition, true);
+                    setShuffleMode(shuffleMode);
+                } else {
+                    openQueue(playlistSongs, 0, true);
+                }
+            } else {
+                Toast.makeText(getApplicationContext(), R.string.playlist_is_empty, Toast.LENGTH_LONG).show();
+            }
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.playlist_is_empty, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    @Override
+    public void onDestroy() {
+        unregisterReceiver(widgetIntentReceiver);
+        unregisterReceiver(updateFavoriteReceiver);
+        if (becomingNoisyReceiverRegistered) {
+            unregisterReceiver(becomingNoisyReceiver);
+            becomingNoisyReceiverRegistered = false;
+        }
+        if (headsetReceiverRegistered) {
+            unregisterReceiver(headsetReceiver);
+            headsetReceiverRegistered = false;
+        }
+        mediaSession.setActive(false);
+        quit();
+        releaseResources();
+        getContentResolver().unregisterContentObserver(mediaStoreObserver);
+        PreferenceUtil.getInstance(this).unregisterOnSharedPreferenceChangedListener(this);
+        wakeLock.release();
+
+        sendBroadcast(new Intent("code.name.monkey.retromusic.RETRO_MUSIC_SERVICE_DESTROYED"));
+    }
+
+    @Override
+    public IBinder onBind(Intent intent) {
+        return musicBind;
+    }
+
+
+    @Override
+    public void onRebind(Intent intent) {
+    }
+
+    @Override
+    public boolean onUnbind(Intent intent) {
+        if (!isPlaying()) {
+            stopSelf();
+        }
+        return true;
+    }
+
+    public void saveQueuesImpl() {
+        MusicPlaybackQueueStore.getInstance(this).saveQueues(playingQueue, originalPlayingQueue);
+    }
+
+    private void savePosition() {
+        PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(SAVED_POSITION, getPosition()).apply();
+    }
+
+    public void savePositionInTrack() {
+        PreferenceManager.getDefaultSharedPreferences(this).edit().putInt(SAVED_POSITION_IN_TRACK, getSongProgressMillis()).apply();
+    }
+
+    public void saveState() {
+        saveQueues();
+        savePosition();
+        savePositionInTrack();
+    }
+
+    private void saveQueues() {
+        queueSaveHandler.removeMessages(SAVE_QUEUES);
+        queueSaveHandler.sendEmptyMessage(SAVE_QUEUES);
+    }
+
+    private void restoreState() {
+        shuffleMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_SHUFFLE_MODE, 0);
+        repeatMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_REPEAT_MODE, 0);
+        handleAndSendChangeInternal(SHUFFLE_MODE_CHANGED);
+        handleAndSendChangeInternal(REPEAT_MODE_CHANGED);
+
+        playerHandler.removeMessages(RESTORE_QUEUES);
+        playerHandler.sendEmptyMessage(RESTORE_QUEUES);
+    }
+
+    public synchronized void restoreQueuesAndPositionIfNecessary() {
+        if (!queuesRestored && playingQueue.isEmpty()) {
+            ArrayList<Song> restoredQueue = MusicPlaybackQueueStore.getInstance(this).getSavedPlayingQueue();
+            ArrayList<Song> restoredOriginalQueue = MusicPlaybackQueueStore.getInstance(this).getSavedOriginalPlayingQueue();
+            int restoredPosition = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION, -1);
+            int restoredPositionInTrack = PreferenceManager.getDefaultSharedPreferences(this).getInt(SAVED_POSITION_IN_TRACK, -1);
+
+            if (restoredQueue.size() > 0 && restoredQueue.size() == restoredOriginalQueue.size() && restoredPosition != -1) {
+                this.originalPlayingQueue = restoredOriginalQueue;
+                this.playingQueue = restoredQueue;
+
+                position = restoredPosition;
+                openCurrent();
+                prepareNext();
+
+                if (restoredPositionInTrack > 0) seek(restoredPositionInTrack);
+
+                notHandledMetaChangedForCurrentTrack = true;
+                sendChangeInternal(META_CHANGED);
+                sendChangeInternal(QUEUE_CHANGED);
+            }
+        }
+        queuesRestored = true;
+    }
+
+    public void quit() {
+        pause();
+        playingNotification.stop();
+
+        closeAudioEffectSession();
+        getAudioManager().abandonAudioFocus(audioFocusListener);
+        stopSelf();
+    }
+
+
+    private void releaseResources() {
+        playerHandler.removeCallbacksAndMessages(null);
+        musicPlayerHandlerThread.quitSafely();
+        queueSaveHandler.removeCallbacksAndMessages(null);
+        queueSaveHandlerThread.quitSafely();
+        playback.release();
+        playback = null;
+        mediaSession.release();
+    }
+
+    public boolean isPlaying() {
+        return playback != null && playback.isPlaying();
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(final int position) {
+        // handle this on the handlers thread to avoid blocking the ui thread
+        playerHandler.removeMessages(SET_POSITION);
+        playerHandler.obtainMessage(SET_POSITION, position, 0).sendToTarget();
+    }
+
+    public void playNextSong(boolean force) {
+        playSongAt(getNextPosition(force));
+    }
+
+    public boolean openTrackAndPrepareNextAt(int position) {
+        synchronized (this) {
+            this.position = position;
+            boolean prepared = openCurrent();
+            if (prepared) prepareNextImpl();
+            notifyChange(META_CHANGED);
+            notHandledMetaChangedForCurrentTrack = false;
+            return prepared;
+        }
+    }
+
+    private boolean openCurrent() {
+        synchronized (this) {
+            try {
+                return playback.setDataSource(getTrackUri(getCurrentSong()));
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    private void prepareNext() {
+        playerHandler.removeMessages(PREPARE_NEXT);
+        playerHandler.obtainMessage(PREPARE_NEXT).sendToTarget();
+    }
+
+    public boolean prepareNextImpl() {
+        synchronized (this) {
+            try {
+                int nextPosition = getNextPosition(false);
+                playback.setNextDataSource(getTrackUri(getSongAt(nextPosition)));
+                this.nextPosition = nextPosition;
+                return true;
+            } catch (Exception e) {
+                return false;
+            }
+        }
+    }
+
+    private void closeAudioEffectSession() {
+        final Intent audioEffectsIntent = new Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION);
+        audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, playback.getAudioSessionId());
+        audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, getPackageName());
+        sendBroadcast(audioEffectsIntent);
+    }
+
+    private boolean requestFocus() {
+        return (getAudioManager().requestAudioFocus(audioFocusListener, AudioManager.STREAM_MUSIC, AudioManager.AUDIOFOCUS_GAIN) == AudioManager.AUDIOFOCUS_REQUEST_GRANTED);
+    }
+
+    public void initNotification() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && !PreferenceUtil.getInstance(this).classicNotification()) {
+            playingNotification = new PlayingNotificationImpl();
+        } else {
+            playingNotification = new PlayingNotificationOreo();
+        }
+        playingNotification.init(this);
+    }
+
+    public void updateNotification() {
+        if (playingNotification != null && getCurrentSong().getId() != -1) {
+            playingNotification.update();
+        }
+    }
+
+    public void updateMediaSessionPlaybackState() {
+        PlaybackStateCompat.Builder stateBuilder = new PlaybackStateCompat.Builder()
+                .setActions(MEDIA_SESSION_ACTIONS)
+                .setState(isPlaying() ? PlaybackStateCompat.STATE_PLAYING : PlaybackStateCompat.STATE_PAUSED,
+                        getSongProgressMillis(), 1);
+
+        setCustomAction(stateBuilder);
+
+        mediaSession.setPlaybackState(stateBuilder.build());
+    }
+
+    private void setCustomAction(PlaybackStateCompat.Builder stateBuilder) {
+        int repeatIcon = R.drawable.ic_repeat_white_24dp;  // REPEAT_MODE_NONE
+        if (getRepeatMode() == REPEAT_MODE_THIS) {
+            repeatIcon = R.drawable.ic_repeat_one_white_24dp;
+        } else if (getRepeatMode() == REPEAT_MODE_ALL) {
+            repeatIcon = R.drawable.ic_repeat_white_circle_24dp;
+        }
+        stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder(
+                CYCLE_REPEAT, getString(R.string.action_cycle_repeat), repeatIcon)
+                .build());
+
+        final int shuffleIcon = getShuffleMode() == SHUFFLE_MODE_NONE ? R.drawable.ic_shuffle_off_circled : R.drawable.ic_shuffle_on_circled;
+        stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder(
+                TOGGLE_SHUFFLE, getString(R.string.action_toggle_shuffle), shuffleIcon)
+                .build());
+
+        final int favoriteIcon = MusicUtil.isFavorite(getApplicationContext(), getCurrentSong()) ? R.drawable.ic_favorite_white_24dp : R.drawable.ic_favorite_border_white_24dp;
+        stateBuilder.addCustomAction(new PlaybackStateCompat.CustomAction.Builder(
+                TOGGLE_FAVORITE, getString(R.string.action_toggle_favorite), favoriteIcon)
+                .build());
+    }
+
+    private void updateMediaSessionMetaData() {
+        final Song song = getCurrentSong();
+
+        if (song.getId() == -1) {
+            mediaSession.setMetadata(null);
+            return;
+        }
+
+        final MediaMetadataCompat.Builder metaData = new MediaMetadataCompat.Builder()
+                .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, song.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ARTIST, song.getArtistName())
+                .putString(MediaMetadataCompat.METADATA_KEY_ALBUM, song.getAlbumName())
+                .putString(MediaMetadataCompat.METADATA_KEY_TITLE, song.getTitle())
+                .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, song.getDuration())
+                .putLong(MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER, getPosition() + 1)
+                .putLong(MediaMetadataCompat.METADATA_KEY_YEAR, song.getYear())
+                .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
+                .putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, getPlayingQueue().size());
+
+
+        if (PreferenceUtil.getInstance(this).albumArtOnLockscreen()) {
+            final Point screenSize = RetroUtil.getScreenSize(MusicService.this);
+            final BitmapRequestBuilder<?, Bitmap> request = SongGlideRequest.Builder.from(Glide.with(MusicService.this), song)
+                    .checkIgnoreMediaStore(MusicService.this)
+                    .asBitmap().build();
+            if (PreferenceUtil.getInstance(this).blurredAlbumArt()) {
+                request.transform(new BlurTransformation.Builder(MusicService.this).build());
+            }
+            runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    request.into(new SimpleTarget<Bitmap>(screenSize.x, screenSize.y) {
+                        @Override
+                        public void onResourceReady(Bitmap resource, GlideAnimation<? super Bitmap> glideAnimation) {
+                            metaData.putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, copy(resource));
+                            mediaSession.setMetadata(metaData.build());
+                        }
+
+                        @Override
+                        public void onLoadFailed(Exception e, Drawable errorDrawable) {
+                            super.onLoadFailed(e, errorDrawable);
+                            mediaSession.setMetadata(metaData.build());
+                        }
+                    });
+                }
+            });
+        } else {
+            mediaSession.setMetadata(metaData.build());
+        }
+    }
+
+    public void runOnUiThread(Runnable runnable) {
+        uiThreadHandler.post(runnable);
+    }
+
+    public Song getCurrentSong() {
+        return getSongAt(getPosition());
+    }
+
+    public Song getSongAt(int position) {
+        if (position >= 0 && position < getPlayingQueue().size()) {
+            return getPlayingQueue().get(position);
+        } else {
+            return Song.Companion.getEmptySong();
+        }
+    }
+
+    public int getNextPosition(boolean force) {
+        int position = getPosition() + 1;
+        switch (getRepeatMode()) {
+            case REPEAT_MODE_ALL:
+                if (isLastTrack()) {
+                    position = 0;
+                }
+                break;
+            case REPEAT_MODE_THIS:
+                if (force) {
+                    if (isLastTrack()) {
+                        position = 0;
+                    }
+                } else {
+                    position -= 1;
+                }
+                break;
+            default:
+            case REPEAT_MODE_NONE:
+                if (isLastTrack()) {
+                    position -= 1;
+                }
+                break;
+        }
+        return position;
+    }
+
+    public boolean isLastTrack() {
+        return getPosition() == getPlayingQueue().size() - 1;
+    }
+
+    public ArrayList<Song> getPlayingQueue() {
+        return playingQueue;
+    }
+
+    public int getRepeatMode() {
+        return repeatMode;
+    }
+
+    public void setRepeatMode(final int repeatMode) {
+        switch (repeatMode) {
+            case REPEAT_MODE_NONE:
+            case REPEAT_MODE_ALL:
+            case REPEAT_MODE_THIS:
+                this.repeatMode = repeatMode;
+                PreferenceManager.getDefaultSharedPreferences(this).edit()
+                        .putInt(SAVED_REPEAT_MODE, repeatMode)
+                        .apply();
+                prepareNext();
+                handleAndSendChangeInternal(REPEAT_MODE_CHANGED);
+                break;
+        }
+    }
+
+    public void openQueue(@Nullable final ArrayList<Song> playingQueue, final int startPosition, final boolean startPlaying) {
+        if (playingQueue != null && !playingQueue.isEmpty() && startPosition >= 0 && startPosition < playingQueue.size()) {
+            // it is important to copy the playing queue here first as we might add/remove songs later
+            originalPlayingQueue = new ArrayList<>(playingQueue);
+            this.playingQueue = new ArrayList<>(originalPlayingQueue);
+
+            int position = startPosition;
+            if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
+                ShuffleHelper.INSTANCE.makeShuffleList(this.playingQueue, startPosition);
+                position = 0;
+            }
+            if (startPlaying) {
+                playSongAt(position);
+            } else {
+                setPosition(position);
+            }
+            notifyChange(QUEUE_CHANGED);
+        }
+    }
+
+    public void addSong(int position, Song song) {
+        playingQueue.add(position, song);
+        originalPlayingQueue.add(position, song);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void addSong(Song song) {
+        playingQueue.add(song);
+        originalPlayingQueue.add(song);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void addSongs(int position, List<Song> songs) {
+        playingQueue.addAll(position, songs);
+        originalPlayingQueue.addAll(position, songs);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void addSongs(List<Song> songs) {
+        playingQueue.addAll(songs);
+        originalPlayingQueue.addAll(songs);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void removeSong(int position) {
+        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
+            playingQueue.remove(position);
+            originalPlayingQueue.remove(position);
+        } else {
+            originalPlayingQueue.remove(playingQueue.remove(position));
+        }
+
+        rePosition(position);
+
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void removeSong(@NonNull Song song) {
+        for (int i = 0; i < playingQueue.size(); i++) {
+            if (playingQueue.get(i).getId() == song.getId()) {
+                playingQueue.remove(i);
+                rePosition(i);
+            }
+        }
+        for (int i = 0; i < originalPlayingQueue.size(); i++) {
+            if (originalPlayingQueue.get(i).getId() == song.getId()) {
+                originalPlayingQueue.remove(i);
+            }
+        }
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    private void rePosition(int deletedPosition) {
+        int currentPosition = getPosition();
+        if (deletedPosition < currentPosition) {
+            position = currentPosition - 1;
+        } else if (deletedPosition == currentPosition) {
+            if (playingQueue.size() > deletedPosition) {
+                setPosition(position);
+            } else {
+                setPosition(position - 1);
+            }
+        }
+    }
+
+    public void moveSong(int from, int to) {
+        if (from == to) return;
+        final int currentPosition = getPosition();
+        Song songToMove = playingQueue.remove(from);
+        playingQueue.add(to, songToMove);
+        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
+            Song tmpSong = originalPlayingQueue.remove(from);
+            originalPlayingQueue.add(to, tmpSong);
+        }
+        if (from > currentPosition && to <= currentPosition) {
+            position = currentPosition + 1;
+        } else if (from < currentPosition && to >= currentPosition) {
+            position = currentPosition - 1;
+        } else if (from == currentPosition) {
+            position = to;
+        }
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void clearQueue() {
+        playingQueue.clear();
+        originalPlayingQueue.clear();
+
+        setPosition(-1);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void playSongAt(final int position) {
+        // handle this on the handlers thread to avoid blocking the ui thread
+        playerHandler.removeMessages(PLAY_SONG);
+        playerHandler.obtainMessage(PLAY_SONG, position, 0).sendToTarget();
+    }
+
+    public void playSongAtImpl(int position) {
+        if (openTrackAndPrepareNextAt(position)) {
+            play();
+        } else {
+            Toast.makeText(this, getResources().getString(R.string.unplayable_file), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    public void pause() {
+        pausedByTransientLossOfFocus = false;
+        if (playback.isPlaying()) {
+            playback.pause();
+            notifyChange(PLAY_STATE_CHANGED);
+        }
+    }
+
+    public void play() {
+        synchronized (this) {
+            if (requestFocus()) {
+                if (!playback.isPlaying()) {
+                    if (!playback.isInitialized()) {
+                        playSongAt(getPosition());
+                    } else {
+                        playback.start();
+                        if (!becomingNoisyReceiverRegistered) {
+                            registerReceiver(becomingNoisyReceiver, becomingNoisyReceiverIntentFilter);
+                            becomingNoisyReceiverRegistered = true;
+                        }
+                        if (notHandledMetaChangedForCurrentTrack) {
+                            handleChangeInternal(META_CHANGED);
+                            notHandledMetaChangedForCurrentTrack = false;
+                        }
+                        notifyChange(PLAY_STATE_CHANGED);
+
+                        // fixes a bug where the volume would stay ducked because the AudioManager.AUDIOFOCUS_GAIN event is not sent
+                        playerHandler.removeMessages(DUCK);
+                        playerHandler.sendEmptyMessage(UNDUCK);
+                    }
+                }
+            } else {
+                Toast.makeText(this, getResources().getString(R.string.audio_focus_denied), Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public void playSongs(ArrayList<Song> songs, int shuffleMode) {
+        if (songs != null && !songs.isEmpty()) {
+            if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
+                int startPosition = 0;
+                if (!songs.isEmpty()) {
+                    startPosition = new Random().nextInt(songs.size());
+                }
+                openQueue(songs, startPosition, false);
+                setShuffleMode(shuffleMode);
+            } else {
+                openQueue(songs, 0, false);
+            }
+            play();
+        } else {
+            Toast.makeText(getApplicationContext(), R.string.playlist_is_empty, Toast.LENGTH_LONG).show();
+        }
+    }
+
+    public void playPreviousSong(boolean force) {
+        playSongAt(getPreviousPosition(force));
+    }
+
+    public void back(boolean force) {
+        if (getSongProgressMillis() > 2000) {
+            seek(0);
+        } else {
+            playPreviousSong(force);
+        }
+    }
+
+    public int getPreviousPosition(boolean force) {
+        int newPosition = getPosition() - 1;
+        switch (repeatMode) {
+            case REPEAT_MODE_ALL:
+                if (newPosition < 0) {
+                    newPosition = getPlayingQueue().size() - 1;
+                }
+                break;
+            case REPEAT_MODE_THIS:
+                if (force) {
+                    if (newPosition < 0) {
+                        newPosition = getPlayingQueue().size() - 1;
+                    }
+                } else {
+                    newPosition = getPosition();
+                }
+                break;
+            default:
+            case REPEAT_MODE_NONE:
+                if (newPosition < 0) {
+                    newPosition = 0;
+                }
+                break;
+        }
+        return newPosition;
+    }
+
+    public int getSongProgressMillis() {
+        return playback.position();
+    }
+
+    public int getSongDurationMillis() {
+        return playback.duration();
+    }
+
+    public long getQueueDurationMillis(int position) {
+        long duration = 0;
+        for (int i = position + 1; i < playingQueue.size(); i++)
+            duration += playingQueue.get(i).getDuration();
+        return duration;
+    }
+
+    public int seek(int millis) {
+        synchronized (this) {
+            try {
+                int newPosition = playback.seek(millis);
+                throttledSeekHandler.notifySeek();
+                updateMediaSessionPlaybackState();
+                return newPosition;
+            } catch (Exception e) {
+                return -1;
+            }
+        }
+    }
+
+    public void cycleRepeatMode() {
+        switch (getRepeatMode()) {
+            case REPEAT_MODE_NONE:
+                setRepeatMode(REPEAT_MODE_ALL);
+                break;
+            case REPEAT_MODE_ALL:
+                setRepeatMode(REPEAT_MODE_THIS);
+                break;
+            default:
+                setRepeatMode(REPEAT_MODE_NONE);
+                break;
+        }
+    }
+
+    public void toggleShuffle() {
+        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
+            setShuffleMode(SHUFFLE_MODE_SHUFFLE);
+        } else {
+            setShuffleMode(SHUFFLE_MODE_NONE);
+        }
+    }
+
+    public int getShuffleMode() {
+        return shuffleMode;
+    }
+
+    public void setShuffleMode(final int shuffleMode) {
+        PreferenceManager.getDefaultSharedPreferences(this).edit()
+                .putInt(SAVED_SHUFFLE_MODE, shuffleMode)
+                .apply();
+        switch (shuffleMode) {
+            case SHUFFLE_MODE_SHUFFLE:
+                this.shuffleMode = shuffleMode;
+                ShuffleHelper.INSTANCE.makeShuffleList(this.getPlayingQueue(), getPosition());
+                position = 0;
+                break;
+            case SHUFFLE_MODE_NONE:
+                this.shuffleMode = shuffleMode;
+                int currentSongId = getCurrentSong().getId();
+                playingQueue = new ArrayList<>(originalPlayingQueue);
+                int newPosition = 0;
+                for (Song song : getPlayingQueue()) {
+                    if (song.getId() == currentSongId) {
+                        newPosition = getPlayingQueue().indexOf(song);
+                    }
+                }
+                position = newPosition;
+                break;
+        }
+        handleAndSendChangeInternal(SHUFFLE_MODE_CHANGED);
+        notifyChange(QUEUE_CHANGED);
+    }
+
+    public void notifyChange(@NonNull final String what) {
+        handleAndSendChangeInternal(what);
+        sendPublicIntent(what);
+    }
+
+    public void handleAndSendChangeInternal(@NonNull final String what) {
+        handleChangeInternal(what);
+        sendChangeInternal(what);
+    }
+
+    // to let other apps know whats playing. i.E. last.fm (scrobbling) or musixmatch
+    public void sendPublicIntent(@NonNull final String what) {
+        final Intent intent = new Intent(what.replace(RETRO_MUSIC_PACKAGE_NAME, MUSIC_PACKAGE_NAME));
+
+        final Song song = getCurrentSong();
+
+        intent.putExtra("id", song.getId());
+        intent.putExtra("artist", song.getArtistName());
+        intent.putExtra("album", song.getAlbumName());
+        intent.putExtra("track", song.getTitle());
+        intent.putExtra("duration", song.getDuration());
+        intent.putExtra("position", (long) getSongProgressMillis());
+        intent.putExtra("playing", isPlaying());
+        intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME);
+
+        sendStickyBroadcast(intent);
+
+    }
+
+    private void sendChangeInternal(final String what) {
+        sendBroadcast(new Intent(what));
+        appWidgetBig.notifyChange(this, what);
+        appWidgetClassic.notifyChange(this, what);
+        appWidgetSmall.notifyChange(this, what);
+        appWidgetCard.notifyChange(this, what);
+        appWidgetText.notifyChange(this, what);
+    }
+
+    private void handleChangeInternal(@NonNull final String what) {
+        switch (what) {
+            case PLAY_STATE_CHANGED:
+                updateNotification();
+                updateMediaSessionPlaybackState();
+                final boolean isPlaying = isPlaying();
+                if (!isPlaying && getSongProgressMillis() > 0) {
+                    savePositionInTrack();
+                }
+                songPlayCountHelper.notifyPlayStateChanged(isPlaying);
+                break;
+            case FAVORITE_STATE_CHANGED:
+            case META_CHANGED:
+                updateNotification();
+                updateMediaSessionMetaData();
+                savePosition();
+                savePositionInTrack();
+                final Song currentSong = getCurrentSong();
+                HistoryStore.getInstance(this).addSongId(currentSong.getId());
+                if (songPlayCountHelper.shouldBumpPlayCount()) {
+                    SongPlayCountStore.getInstance(this).bumpPlayCount(songPlayCountHelper.getSong().getId());
+                }
+                songPlayCountHelper.notifySongChanged(currentSong);
+                break;
+            case QUEUE_CHANGED:
+                updateMediaSessionMetaData(); // because playing queue size might have changed
+                saveState();
+                if (playingQueue.size() > 0) {
+                    prepareNext();
+                } else {
+                    playingNotification.stop();
+                }
+                break;
+        }
+    }
+
+    public int getAudioSessionId() {
+        return playback.getAudioSessionId();
+    }
+
+    @NonNull
+    public MediaSessionCompat getMediaSession() {
+        return mediaSession;
+    }
+
+    public void releaseWakeLock() {
+        if (wakeLock.isHeld()) {
+            wakeLock.release();
+        }
+    }
+
+    public void acquireWakeLock(long milli) {
+        wakeLock.acquire(milli);
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(@NonNull SharedPreferences sharedPreferences, @NonNull String key) {
+        switch (key) {
+            case PreferenceUtil.GAPLESS_PLAYBACK:
+                if (sharedPreferences.getBoolean(key, false)) {
+                    prepareNext();
+                } else {
+                    playback.setNextDataSource(null);
+                }
+                break;
+            case PreferenceUtil.ALBUM_ART_ON_LOCKSCREEN:
+            case PreferenceUtil.BLURRED_ALBUM_ART:
+                updateMediaSessionMetaData();
+                break;
+            case PreferenceUtil.COLORED_NOTIFICATION:
+            case PreferenceUtil.DOMINANT_COLOR:
+                updateNotification();
+                break;
+            case PreferenceUtil.CLASSIC_NOTIFICATION:
+                initNotification();
+                updateNotification();
+                break;
+            case PreferenceUtil.TOGGLE_HEADSET:
+                registerHeadsetEvents();
+                break;
+        }
+    }
+
+    private void registerHeadsetEvents() {
+        if (!headsetReceiverRegistered && PreferenceUtil.getInstance(this).getHeadsetPlugged()) {
+            registerReceiver(headsetReceiver, headsetReceiverIntentFilter);
+            headsetReceiverRegistered = true;
+        }
+    }
+
+    @Override
+    public void onTrackWentToNext() {
+        playerHandler.sendEmptyMessage(TRACK_WENT_TO_NEXT);
+    }
+
+    @Override
+    public void onTrackEnded() {
+        acquireWakeLock(30000);
+        playerHandler.sendEmptyMessage(TRACK_ENDED);
+    }
+
+    public boolean isPausedByTransientLossOfFocus() {
+        return pausedByTransientLossOfFocus;
+    }
+
+    public void setPausedByTransientLossOfFocus(boolean pausedByTransientLossOfFocus) {
+        this.pausedByTransientLossOfFocus = pausedByTransientLossOfFocus;
+    }
+
+    public class MusicBinder extends Binder {
+        @NonNull
+        public MusicService getService() {
+            return MusicService.this;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
deleted file mode 100644
index f33d8341f..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.kt
+++ /dev/null
@@ -1,1424 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.service
-
-import android.annotation.SuppressLint
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.appwidget.AppWidgetManager
-import android.bluetooth.BluetoothDevice
-import android.content.*
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
-import android.content.pm.ServiceInfo
-import android.database.ContentObserver
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.drawable.Drawable
-import android.media.AudioManager
-import android.os.*
-import android.os.Build.VERSION
-import android.os.Build.VERSION_CODES
-import android.os.PowerManager.WakeLock
-import android.provider.MediaStore
-import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaMetadataCompat
-import android.support.v4.media.session.MediaSessionCompat
-import android.support.v4.media.session.PlaybackStateCompat
-import android.util.Log
-import android.widget.Toast
-import androidx.core.app.ServiceCompat
-import androidx.core.content.ContextCompat
-import androidx.core.content.edit
-import androidx.core.content.getSystemService
-import androidx.core.os.BundleCompat
-import androidx.media.MediaBrowserServiceCompat
-import androidx.preference.PreferenceManager
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.appwidgets.*
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.LockScreenActivity
-import code.name.monkey.retromusic.appwidgets.*
-import code.name.monkey.retromusic.auto.AutoMediaIDHelper
-import code.name.monkey.retromusic.auto.AutoMusicProvider
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.extensions.toMediaSessionQueue
-import code.name.monkey.retromusic.extensions.uri
-import code.name.monkey.retromusic.glide.BlurTransformation
-import code.name.monkey.retromusic.glide.RetroGlideExtension.getSongModel
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.helper.ShuffleHelper.makeShuffleList
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.Song.Companion.emptySong
-import code.name.monkey.retromusic.model.smartplaylist.AbsSmartPlaylist
-import code.name.monkey.retromusic.providers.HistoryStore
-import code.name.monkey.retromusic.providers.MusicPlaybackQueueStore
-import code.name.monkey.retromusic.providers.SongPlayCountStore
-import code.name.monkey.retromusic.service.notification.PlayingNotification
-import code.name.monkey.retromusic.service.notification.PlayingNotificationClassic
-import code.name.monkey.retromusic.service.notification.PlayingNotificationImpl24
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.service.playback.Playback.PlaybackCallbacks
-import code.name.monkey.retromusic.util.MusicUtil
-import code.name.monkey.retromusic.util.MusicUtil.toggleFavorite
-import code.name.monkey.retromusic.util.PackageValidator
-import code.name.monkey.retromusic.util.PreferenceUtil.crossFadeDuration
-import code.name.monkey.retromusic.util.PreferenceUtil.isAlbumArtOnLockScreen
-import code.name.monkey.retromusic.util.PreferenceUtil.isBluetoothSpeaker
-import code.name.monkey.retromusic.util.PreferenceUtil.isBlurredAlbumArt
-import code.name.monkey.retromusic.util.PreferenceUtil.isClassicNotification
-import code.name.monkey.retromusic.util.PreferenceUtil.isHeadsetPlugged
-import code.name.monkey.retromusic.util.PreferenceUtil.isLockScreen
-import code.name.monkey.retromusic.util.PreferenceUtil.isPauseOnZeroVolume
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackPitch
-import code.name.monkey.retromusic.util.PreferenceUtil.playbackSpeed
-import code.name.monkey.retromusic.util.PreferenceUtil.registerOnSharedPreferenceChangedListener
-import code.name.monkey.retromusic.util.PreferenceUtil.unregisterOnSharedPreferenceChangedListener
-import code.name.monkey.retromusic.volume.AudioVolumeObserver
-import code.name.monkey.retromusic.volume.OnAudioVolumeChangedListener
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.target.Target
-import com.bumptech.glide.request.transition.Transition
-import kotlinx.coroutines.*
-import kotlinx.coroutines.Dispatchers.Default
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.Dispatchers.Main
-import org.koin.java.KoinJavaComponent.get
-import java.util.*
-
-
-/**
- * @author Karim Abou Zeid (kabouzeid), Andrew Neal. Modified by Prathamesh More
- */
-class MusicService : MediaBrowserServiceCompat(),
-    OnSharedPreferenceChangeListener, PlaybackCallbacks, OnAudioVolumeChangedListener {
-    private val musicBind: IBinder = MusicBinder()
-
-    @JvmField
-    var nextPosition = -1
-
-    @JvmField
-    var pendingQuit = false
-
-    private lateinit var playbackManager: PlaybackManager
-
-    val playback: Playback? get() = playbackManager.playback
-
-    private var mPackageValidator: PackageValidator? = null
-    private val mMusicProvider = get<AutoMusicProvider>(AutoMusicProvider::class.java)
-    private lateinit var storage: PersistentStorage
-    private var trackEndedByCrossfade = false
-    private val serviceScope = CoroutineScope(Job() + Main)
-
-    @JvmField
-    var position = -1
-    private val appWidgetBig = AppWidgetBig.instance
-    private val appWidgetCard = AppWidgetCard.instance
-    private val appWidgetClassic = AppWidgetClassic.instance
-    private val appWidgetSmall = AppWidgetSmall.instance
-    private val appWidgetText = AppWidgetText.instance
-    private val appWidgetMd3 = AppWidgetMD3.instance
-    private val appWidgetCircle = AppWidgetCircle.instance
-    private val widgetIntentReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val command = intent.getStringExtra(EXTRA_APP_WIDGET_NAME)
-            val ids = intent.getIntArrayExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS)
-            if (command != null) {
-                when (command) {
-                    AppWidgetClassic.NAME -> {
-                        appWidgetClassic.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetSmall.NAME -> {
-                        appWidgetSmall.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetBig.NAME -> {
-                        appWidgetBig.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetCard.NAME -> {
-                        appWidgetCard.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetText.NAME -> {
-                        appWidgetText.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetMD3.NAME -> {
-                        appWidgetMd3.performUpdate(this@MusicService, ids)
-                    }
-
-                    AppWidgetCircle.NAME -> {
-                        appWidgetCircle.performUpdate(this@MusicService, ids)
-                    }
-                }
-            }
-        }
-    }
-
-    private val bluetoothConnectedIntentFilter = IntentFilter(BluetoothDevice.ACTION_ACL_CONNECTED)
-    private var bluetoothConnectedRegistered = false
-    private val headsetReceiverIntentFilter = IntentFilter(Intent.ACTION_HEADSET_PLUG)
-    private var headsetReceiverRegistered = false
-    private var mediaSession: MediaSessionCompat? = null
-    private lateinit var mediaStoreObserver: ContentObserver
-    private var musicPlayerHandlerThread: HandlerThread? = null
-    private var notHandledMetaChangedForCurrentTrack = false
-    private var originalPlayingQueue = ArrayList<Song>()
-
-    @JvmField
-    var playingQueue = ArrayList<Song>()
-
-    private var playerHandler: Handler? = null
-
-    private var playingNotification: PlayingNotification? = null
-
-    private val updateFavoriteReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            isCurrentFavorite { isFavorite ->
-                if (!isForeground) {
-                    playingNotification?.updateMetadata(currentSong) {
-                        playingNotification?.setPlaying(isPlaying)
-                        playingNotification?.updateFavorite(isFavorite)
-                        startForegroundOrNotify()
-                    }
-                } else {
-                    playingNotification?.updateFavorite(isFavorite)
-                    startForegroundOrNotify()
-                }
-
-                appWidgetCircle.notifyChange(this@MusicService, FAVORITE_STATE_CHANGED)
-            }
-        }
-    }
-
-    private val lockScreenReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            if (isLockScreen && isPlaying) {
-                val lockIntent = Intent(context, LockScreenActivity::class.java)
-                lockIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
-                startActivity(lockIntent)
-            }
-        }
-    }
-
-    private var queuesRestored = false
-
-    var repeatMode = 0
-        private set(value) {
-            when (value) {
-                REPEAT_MODE_NONE, REPEAT_MODE_ALL, REPEAT_MODE_THIS -> {
-                    field = value
-                    PreferenceManager.getDefaultSharedPreferences(this).edit {
-                        putInt(SAVED_REPEAT_MODE, value)
-                    }
-                    prepareNext()
-                    handleAndSendChangeInternal(REPEAT_MODE_CHANGED)
-                }
-            }
-        }
-
-    @JvmField
-    var shuffleMode = 0
-    private val songPlayCountHelper = SongPlayCountHelper()
-
-    private val bluetoothReceiver: BroadcastReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val action = intent.action
-            if (action != null) {
-                if (BluetoothDevice.ACTION_ACL_CONNECTED == action && isBluetoothSpeaker) {
-                    @Suppress("Deprecation")
-                    if (getSystemService<AudioManager>()!!.isBluetoothA2dpOn) {
-                        play()
-                    }
-                }
-            }
-        }
-    }
-
-    private var receivedHeadsetConnected = false
-    private val headsetReceiver = object : BroadcastReceiver() {
-        override fun onReceive(context: Context, intent: Intent) {
-            val action = intent.action
-            if (action != null) {
-                if (Intent.ACTION_HEADSET_PLUG == action) {
-                    when (intent.getIntExtra("state", -1)) {
-                        0 -> pause()
-                        // Check whether the current song is empty which means the playing queue hasn't restored yet
-                        1 -> if (currentSong != emptySong) {
-                            play()
-                        } else {
-                            receivedHeadsetConnected = true
-                        }
-                    }
-                }
-            }
-        }
-    }
-    private var throttledSeekHandler: ThrottledSeekHandler? = null
-    private var uiThreadHandler: Handler? = null
-    private var wakeLock: WakeLock? = null
-    private var notificationManager: NotificationManager? = null
-    private var isForeground = false
-    override fun onCreate() {
-        super.onCreate()
-        val powerManager = getSystemService<PowerManager>()
-        if (powerManager != null) {
-            wakeLock = powerManager.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, javaClass.name)
-        }
-        wakeLock?.setReferenceCounted(false)
-        musicPlayerHandlerThread = HandlerThread("PlaybackHandler")
-        musicPlayerHandlerThread?.start()
-        playerHandler = Handler(musicPlayerHandlerThread!!.looper)
-
-        playbackManager = PlaybackManager(this)
-        playbackManager.setCallbacks(this)
-        setupMediaSession()
-
-        uiThreadHandler = Handler(Looper.getMainLooper())
-        ContextCompat.registerReceiver(this, widgetIntentReceiver, IntentFilter(APP_WIDGET_UPDATE), ContextCompat.RECEIVER_NOT_EXPORTED)
-        ContextCompat.registerReceiver(this, updateFavoriteReceiver, IntentFilter(FAVORITE_STATE_CHANGED), ContextCompat.RECEIVER_NOT_EXPORTED)
-        registerReceiver(lockScreenReceiver, IntentFilter(Intent.ACTION_SCREEN_ON))
-        sessionToken = mediaSession?.sessionToken
-        notificationManager = getSystemService()
-        initNotification()
-        mediaStoreObserver = MediaStoreObserver(this, playerHandler!!)
-        throttledSeekHandler = ThrottledSeekHandler(this, Handler(mainLooper))
-        contentResolver.registerContentObserver(
-            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-            true,
-            mediaStoreObserver
-        )
-        contentResolver.registerContentObserver(
-            MediaStore.Audio.Media.INTERNAL_CONTENT_URI,
-            true,
-            mediaStoreObserver
-        )
-        val audioVolumeObserver = AudioVolumeObserver(this)
-        audioVolumeObserver.register(AudioManager.STREAM_MUSIC, this)
-        registerOnSharedPreferenceChangedListener(this)
-        restoreState()
-        sendBroadcast(Intent("$RETRO_MUSIC_PACKAGE_NAME.RETRO_MUSIC_SERVICE_CREATED"))
-        registerHeadsetEvents()
-        registerBluetoothConnected()
-        mPackageValidator = PackageValidator(this, R.xml.allowed_media_browser_callers)
-        mMusicProvider.setMusicService(this)
-        storage = PersistentStorage.getInstance(this)
-    }
-
-    override fun onDestroy() {
-        unregisterReceiver(widgetIntentReceiver)
-        unregisterReceiver(updateFavoriteReceiver)
-        unregisterReceiver(lockScreenReceiver)
-        if (headsetReceiverRegistered) {
-            unregisterReceiver(headsetReceiver)
-            headsetReceiverRegistered = false
-        }
-        if (bluetoothConnectedRegistered) {
-            unregisterReceiver(bluetoothReceiver)
-            bluetoothConnectedRegistered = false
-        }
-        mediaSession?.isActive = false
-        quit()
-        releaseResources()
-        serviceScope.cancel()
-        contentResolver.unregisterContentObserver(mediaStoreObserver)
-        unregisterOnSharedPreferenceChangedListener(this)
-        wakeLock?.release()
-        sendBroadcast(Intent("$RETRO_MUSIC_PACKAGE_NAME.RETRO_MUSIC_SERVICE_DESTROYED"))
-    }
-
-    private fun acquireWakeLock() {
-        wakeLock?.acquire(30000)
-    }
-
-    private var pausedByZeroVolume = false
-    override fun onAudioVolumeChanged(currentVolume: Int, maxVolume: Int) {
-        if (isPauseOnZeroVolume) {
-            if (isPlaying && currentVolume < 1) {
-                pause()
-                pausedByZeroVolume = true
-            } else if (pausedByZeroVolume && currentVolume >= 1) {
-                play()
-                pausedByZeroVolume = false
-            }
-        }
-    }
-
-    fun addSong(position: Int, song: Song) {
-        playingQueue.add(position, song)
-        originalPlayingQueue.add(position, song)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun addSong(song: Song) {
-        playingQueue.add(song)
-        originalPlayingQueue.add(song)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun addSongs(position: Int, songs: List<Song>?) {
-        playingQueue.addAll(position, songs!!)
-        originalPlayingQueue.addAll(position, songs)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun addSongs(songs: List<Song>?) {
-        playingQueue.addAll(songs!!)
-        originalPlayingQueue.addAll(songs)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun back(force: Boolean) {
-        if (songProgressMillis > 2000) {
-            seek(0)
-        } else {
-            playPreviousSong(force)
-        }
-    }
-
-    fun clearQueue() {
-        playingQueue.clear()
-        originalPlayingQueue.clear()
-        setPosition(-1)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun cycleRepeatMode() {
-        repeatMode = when (repeatMode) {
-            REPEAT_MODE_NONE -> REPEAT_MODE_ALL
-            REPEAT_MODE_ALL -> REPEAT_MODE_THIS
-            else -> REPEAT_MODE_NONE
-        }
-    }
-
-    val audioSessionId: Int
-        get() = playbackManager.audioSessionId
-
-    val currentSong: Song
-        get() = getSongAt(getPosition())
-
-    val nextSong: Song?
-        get() = if (isLastTrack && repeatMode == REPEAT_MODE_NONE) {
-            null
-        } else {
-            getSongAt(getNextPosition(false))
-        }
-
-    private fun getNextPosition(force: Boolean): Int {
-        var position = getPosition() + 1
-        when (repeatMode) {
-            REPEAT_MODE_ALL -> if (isLastTrack) {
-                position = 0
-            }
-
-            REPEAT_MODE_THIS -> if (force) {
-                if (isLastTrack) {
-                    position = 0
-                }
-            } else {
-                position -= 1
-            }
-
-            REPEAT_MODE_NONE -> if (isLastTrack) {
-                position -= 1
-            }
-
-            else -> if (isLastTrack) {
-                position -= 1
-            }
-        }
-        return position
-    }
-
-    private fun getPosition(): Int {
-        return position
-    }
-
-    private fun setPosition(position: Int) {
-        openTrackAndPrepareNextAt(position) { success ->
-            if (success) {
-                notifyChange(PLAY_STATE_CHANGED)
-            }
-        }
-    }
-
-    private fun getPreviousPosition(force: Boolean): Int {
-        var newPosition = getPosition() - 1
-        when (repeatMode) {
-            REPEAT_MODE_ALL -> if (newPosition < 0) {
-                newPosition = playingQueue.size - 1
-            }
-
-            REPEAT_MODE_THIS -> if (force) {
-                if (newPosition < 0) {
-                    newPosition = playingQueue.size - 1
-                }
-            } else {
-                newPosition = getPosition()
-            }
-
-            REPEAT_MODE_NONE -> if (newPosition < 0) {
-                newPosition = 0
-            }
-
-            else -> if (newPosition < 0) {
-                newPosition = 0
-            }
-        }
-        return newPosition
-    }
-
-    fun getQueueDurationMillis(position: Int): Long {
-        var duration: Long = 0
-        for (i in position + 1 until playingQueue.size) {
-            duration += playingQueue[i].duration
-        }
-        return duration
-    }
-
-    private fun getShuffleMode(): Int {
-        return shuffleMode
-    }
-
-    fun setShuffleMode(shuffleMode: Int) {
-        PreferenceManager.getDefaultSharedPreferences(this).edit {
-            putInt(SAVED_SHUFFLE_MODE, shuffleMode)
-        }
-        when (shuffleMode) {
-            SHUFFLE_MODE_SHUFFLE -> {
-                this.shuffleMode = shuffleMode
-                makeShuffleList(playingQueue, getPosition())
-                position = 0
-            }
-
-            SHUFFLE_MODE_NONE -> {
-                this.shuffleMode = shuffleMode
-                val currentSongId = Objects.requireNonNull(currentSong).id
-                playingQueue = ArrayList(originalPlayingQueue)
-                var newPosition = 0
-                for (song in playingQueue) {
-                    if (song.id == currentSongId) {
-                        newPosition = playingQueue.indexOf(song)
-                    }
-                }
-                position = newPosition
-            }
-        }
-        handleAndSendChangeInternal(SHUFFLE_MODE_CHANGED)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    private fun getSongAt(position: Int): Song {
-        return if ((position >= 0) && (position < playingQueue.size)) {
-            playingQueue[position]
-        } else {
-            emptySong
-        }
-    }
-
-    val songDurationMillis: Int
-        get() = playbackManager.songDurationMillis
-
-    val songProgressMillis: Int
-        get() = playbackManager.songProgressMillis
-
-    fun handleAndSendChangeInternal(what: String) {
-        handleChangeInternal(what)
-        sendChangeInternal(what)
-    }
-
-    private fun initNotification() {
-        playingNotification = if (VERSION.SDK_INT >= VERSION_CODES.N
-            && !isClassicNotification
-        ) {
-            PlayingNotificationImpl24.from(this, notificationManager!!, mediaSession!!)
-        } else {
-            PlayingNotificationClassic.from(this, notificationManager!!)
-        }
-    }
-
-    private val isLastTrack: Boolean
-        get() = getPosition() == playingQueue.size - 1
-
-    val isPlaying: Boolean
-        get() = playbackManager.isPlaying
-
-    fun moveSong(from: Int, to: Int) {
-        if (from == to) {
-            return
-        }
-        val currentPosition = getPosition()
-        val songToMove = playingQueue.removeAt(from)
-        playingQueue.add(to, songToMove)
-        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
-            val tmpSong = originalPlayingQueue.removeAt(from)
-            originalPlayingQueue.add(to, tmpSong)
-        }
-        when {
-            currentPosition in to until from -> {
-                position = currentPosition + 1
-            }
-
-            currentPosition in (from + 1)..to -> {
-                position = currentPosition - 1
-            }
-
-            from == currentPosition -> {
-                position = to
-            }
-        }
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    private fun notifyChange(what: String) {
-        handleAndSendChangeInternal(what)
-        sendPublicIntent(what)
-    }
-
-    override fun onBind(intent: Intent): IBinder {
-        // For Android auto, need to call super, or onGetRoot won't be called.
-        return if ("android.media.browse.MediaBrowserService" == intent.action) {
-            super.onBind(intent)!!
-        } else musicBind
-    }
-
-    override fun onGetRoot(
-        clientPackageName: String,
-        clientUid: Int,
-        rootHints: Bundle?,
-    ): BrowserRoot {
-
-
-        // Check origin to ensure we're not allowing any arbitrary app to browse app contents
-        return if (!mPackageValidator!!.isKnownCaller(clientPackageName, clientUid)) {
-            // Request from an untrusted package: return an empty browser root
-            BrowserRoot(AutoMediaIDHelper.MEDIA_ID_EMPTY_ROOT, null)
-        } else {
-            /**
-             * By default return the browsable root. Treat the EXTRA_RECENT flag as a special case
-             * and return the recent root instead.
-             */
-            val isRecentRequest = rootHints?.getBoolean(BrowserRoot.EXTRA_RECENT) ?: false
-            val browserRootPath =
-                if (isRecentRequest) AutoMediaIDHelper.RECENT_ROOT else AutoMediaIDHelper.MEDIA_ID_ROOT
-            BrowserRoot(browserRootPath, null)
-        }
-    }
-
-    override fun onLoadChildren(
-        parentId: String,
-        result: Result<List<MediaBrowserCompat.MediaItem>>,
-    ) {
-        if (parentId == AutoMediaIDHelper.RECENT_ROOT) {
-            result.sendResult(listOf(storage.recentSong()))
-        } else {
-            result.sendResult(mMusicProvider.getChildren(parentId, resources))
-        }
-    }
-
-    override fun onSharedPreferenceChanged(
-        sharedPreferences: SharedPreferences, key: String,
-    ) {
-        when (key) {
-            PLAYBACK_SPEED, PLAYBACK_PITCH -> {
-                updateMediaSessionPlaybackState()
-                playbackManager.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
-            }
-
-            CROSS_FADE_DURATION -> {
-                val progress = songProgressMillis
-                val wasPlaying = isPlaying
-
-                if (playbackManager.maybeSwitchToCrossFade(crossFadeDuration)) {
-                    restorePlaybackState(wasPlaying, progress)
-                } else {
-                    playbackManager.setCrossFadeDuration(crossFadeDuration)
-                }
-            }
-
-            ALBUM_ART_ON_LOCK_SCREEN, BLURRED_ALBUM_ART -> updateMediaSessionMetaData(::updateMediaSessionPlaybackState)
-            COLORED_NOTIFICATION -> {
-                playingNotification?.updateMetadata(currentSong) {
-                    playingNotification?.setPlaying(isPlaying)
-                    startForegroundOrNotify()
-                }
-            }
-
-            CLASSIC_NOTIFICATION -> {
-                updateNotification()
-                playingNotification?.updateMetadata(currentSong) {
-                    playingNotification?.setPlaying(isPlaying)
-                    startForegroundOrNotify()
-                }
-            }
-
-            TOGGLE_HEADSET -> registerHeadsetEvents()
-        }
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        if (intent != null && intent.action != null) {
-            serviceScope.launch {
-                restoreQueuesAndPositionIfNecessary()
-                when (intent.action) {
-                    ACTION_TOGGLE_PAUSE -> if (isPlaying) {
-                        pause()
-                    } else {
-                        play()
-                    }
-
-                    ACTION_PAUSE -> pause()
-                    ACTION_PLAY -> play()
-                    ACTION_PLAY_PLAYLIST -> playFromPlaylist(intent)
-                    ACTION_REWIND -> back(true)
-                    ACTION_SKIP -> playNextSong(true)
-                    ACTION_STOP, ACTION_QUIT -> {
-                        pendingQuit = false
-                        quit()
-                    }
-
-                    ACTION_PENDING_QUIT -> pendingQuit = true
-                    TOGGLE_FAVORITE -> toggleFavorite()
-                }
-            }
-        }
-        return START_NOT_STICKY
-    }
-
-    override fun onTrackEnded() {
-        acquireWakeLock()
-        // if there is a timer finished, don't continue
-        if (pendingQuit
-            || repeatMode == REPEAT_MODE_NONE && isLastTrack
-        ) {
-            notifyChange(PLAY_STATE_CHANGED)
-            seek(0, false)
-            if (pendingQuit) {
-                pendingQuit = false
-                quit()
-            }
-        } else {
-            playNextSong(false)
-        }
-        releaseWakeLock()
-    }
-
-    override fun onTrackEndedWithCrossfade() {
-        trackEndedByCrossfade = true
-        onTrackEnded()
-    }
-
-    override fun onTrackWentToNext() {
-        if (pendingQuit || repeatMode == REPEAT_MODE_NONE && isLastTrack) {
-            playbackManager.setNextDataSource(null)
-            pause(false)
-            seek(0, false)
-            if (pendingQuit) {
-                pendingQuit = false
-                quit()
-            }
-        } else {
-            position = nextPosition
-            prepareNextImpl()
-            notifyChange(META_CHANGED)
-        }
-    }
-
-    override fun onPlayStateChanged() {
-        notifyChange(PLAY_STATE_CHANGED)
-    }
-
-    override fun onUnbind(intent: Intent): Boolean {
-        if (!isPlaying) {
-            stopSelf()
-        }
-        return true
-    }
-
-    fun openQueue(
-        playingQueue: List<Song>?,
-        startPosition: Int,
-        startPlaying: Boolean,
-    ) {
-        if (!playingQueue.isNullOrEmpty()
-            && startPosition >= 0 && startPosition < playingQueue.size
-        ) {
-            // it is important to copy the playing queue here first as we might add/remove songs later
-            originalPlayingQueue = ArrayList(playingQueue)
-            this.playingQueue = ArrayList(originalPlayingQueue)
-            var position = startPosition
-            if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
-                makeShuffleList(this.playingQueue, startPosition)
-                position = 0
-            }
-            if (startPlaying) {
-                playSongAt(position)
-            } else {
-                setPosition(position)
-            }
-            notifyChange(QUEUE_CHANGED)
-        }
-    }
-
-    @Synchronized
-    fun openTrackAndPrepareNextAt(position: Int, completion: (success: Boolean) -> Unit) {
-        this.position = position
-        openCurrent { success ->
-            completion(success)
-            if (success) {
-                prepareNextImpl()
-            }
-            notifyChange(META_CHANGED)
-            notHandledMetaChangedForCurrentTrack = false
-        }
-    }
-
-    fun pause(force: Boolean = false) {
-        playbackManager.pause(force) {
-            notifyChange(PLAY_STATE_CHANGED)
-        }
-    }
-
-    @Synchronized
-    fun play() {
-        playbackManager.play { playSongAt(getPosition()) }
-        if (notHandledMetaChangedForCurrentTrack) {
-            handleChangeInternal(META_CHANGED)
-            notHandledMetaChangedForCurrentTrack = false
-        }
-        notifyChange(PLAY_STATE_CHANGED)
-    }
-
-    fun playNextSong(force: Boolean) {
-        playSongAt(getNextPosition(force))
-    }
-
-    fun playPreviousSong(force: Boolean) {
-        playSongAt(getPreviousPosition(force))
-    }
-
-    fun playSongAt(position: Int) {
-        // Every chromecast method needs to run on main thread or you are greeted with IllegalStateException
-        // So it will use Main dispatcher
-        // And by using Default dispatcher for local playback we are reduce the burden of main thread
-        serviceScope.launch(if (playbackManager.isLocalPlayback) Default else Main) {
-            openTrackAndPrepareNextAt(position) { success ->
-                if (success) {
-                    play()
-                } else {
-                    runOnUiThread {
-                        showToast(R.string.unplayable_file)
-                    }
-                }
-            }
-        }
-    }
-
-    @Synchronized
-    fun prepareNextImpl() {
-        try {
-            val nextPosition = getNextPosition(false)
-            playbackManager.setNextDataSource(getSongAt(nextPosition).uri.toString())
-            this.nextPosition = nextPosition
-        } catch (ignored: Exception) {
-        }
-    }
-
-    fun toggleFavorite() {
-        serviceScope.launch {
-            toggleFavorite(currentSong)
-            sendBroadcast(Intent(FAVORITE_STATE_CHANGED))
-        }
-    }
-
-    fun isCurrentFavorite(completion: (isFavorite: Boolean) -> Unit) {
-        serviceScope.launch(IO) {
-            val isFavorite = MusicUtil.isFavorite(currentSong)
-            withContext(Main) {
-                completion(isFavorite)
-            }
-        }
-    }
-
-    fun quit() {
-        pause()
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        isForeground = false
-        notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID)
-
-        stopSelf()
-    }
-
-    private fun releaseWakeLock() {
-        if (wakeLock!!.isHeld) {
-            wakeLock?.release()
-        }
-    }
-
-    fun removeSong(position: Int) {
-        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
-            playingQueue.removeAt(position)
-            originalPlayingQueue.removeAt(position)
-        } else {
-            originalPlayingQueue.remove(playingQueue.removeAt(position))
-        }
-        rePosition(position)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    private fun removeSongImpl(song: Song) {
-        val deletePosition = playingQueue.indexOf(song)
-        if (deletePosition != -1) {
-            playingQueue.removeAt(deletePosition)
-            rePosition(deletePosition)
-        }
-
-        val originalDeletePosition = originalPlayingQueue.indexOf(song)
-        if (originalDeletePosition != -1) {
-            originalPlayingQueue.removeAt(originalDeletePosition)
-            rePosition(originalDeletePosition)
-        }
-    }
-
-    fun removeSong(song: Song) {
-        removeSongImpl(song)
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    fun removeSongs(songs: List<Song>) {
-        for (song in songs) {
-            removeSongImpl(song)
-        }
-        notifyChange(QUEUE_CHANGED)
-    }
-
-    private fun rePosition(deletedPosition: Int) {
-        val currentPosition = getPosition()
-        if (deletedPosition < currentPosition) {
-            position = currentPosition - 1
-        } else if (deletedPosition == currentPosition) {
-            if (playingQueue.size > deletedPosition) {
-                setPosition(position)
-            } else {
-                setPosition(position - 1)
-            }
-        }
-    }
-
-    private suspend fun restoreQueuesAndPositionIfNecessary() {
-        if (!queuesRestored && playingQueue.isEmpty()) {
-            withContext(IO) {
-                val restoredQueue =
-                    MusicPlaybackQueueStore.getInstance(this@MusicService).savedPlayingQueue
-                val restoredOriginalQueue =
-                    MusicPlaybackQueueStore.getInstance(this@MusicService).savedOriginalPlayingQueue
-                val restoredPosition =
-                    PreferenceManager.getDefaultSharedPreferences(this@MusicService).getInt(
-                        SAVED_POSITION, -1
-                    )
-                val restoredPositionInTrack =
-                    PreferenceManager.getDefaultSharedPreferences(this@MusicService).getInt(
-                        SAVED_POSITION_IN_TRACK, -1
-                    )
-                if (restoredQueue.size > 0 && restoredQueue.size == restoredOriginalQueue.size && restoredPosition != -1) {
-                    originalPlayingQueue = ArrayList(restoredOriginalQueue)
-                    playingQueue = ArrayList(restoredQueue)
-                    position = restoredPosition
-                    withContext(Main) {
-                        openCurrent {
-                            prepareNext()
-                            if (restoredPositionInTrack > 0) {
-                                seek(restoredPositionInTrack)
-                            }
-                            notHandledMetaChangedForCurrentTrack = true
-                            sendChangeInternal(META_CHANGED)
-                        }
-                        if (receivedHeadsetConnected) {
-                            play()
-                            receivedHeadsetConnected = false
-                        }
-                    }
-
-                    sendChangeInternal(QUEUE_CHANGED)
-                    mediaSession?.setQueueTitle(getString(R.string.now_playing_queue))
-                    mediaSession?.setQueue(playingQueue.toMediaSessionQueue())
-                }
-            }
-            queuesRestored = true
-        }
-    }
-
-    fun runOnUiThread(runnable: Runnable?) {
-        uiThreadHandler?.post(runnable!!)
-    }
-
-    fun savePositionInTrack() {
-        PreferenceManager.getDefaultSharedPreferences(this).edit {
-            putInt(SAVED_POSITION_IN_TRACK, songProgressMillis)
-        }
-    }
-
-    @Synchronized
-    fun seek(millis: Int, force: Boolean = true): Int {
-        return try {
-            val newPosition = playbackManager.seek(millis, force)
-            throttledSeekHandler?.notifySeek()
-            newPosition
-        } catch (e: Exception) {
-            -1
-        }
-    }
-
-    // to let other apps know whats playing. i.e. last.fm (scrobbling) or musixmatch
-    fun sendPublicIntent(what: String) {
-        val intent = Intent(what.replace(RETRO_MUSIC_PACKAGE_NAME, MUSIC_PACKAGE_NAME))
-        val song = currentSong
-        intent.putExtra("id", song.id)
-        intent.putExtra("artist", song.artistName)
-        intent.putExtra("album", song.albumName)
-        intent.putExtra("track", song.title)
-        intent.putExtra("duration", song.duration)
-        intent.putExtra("position", songProgressMillis.toLong())
-        intent.putExtra("playing", isPlaying)
-        intent.putExtra("scrobbling_source", RETRO_MUSIC_PACKAGE_NAME)
-        @Suppress("Deprecation")
-        sendStickyBroadcast(intent)
-    }
-
-    fun toggleShuffle() {
-        if (getShuffleMode() == SHUFFLE_MODE_NONE) {
-            setShuffleMode(SHUFFLE_MODE_SHUFFLE)
-        } else {
-            setShuffleMode(SHUFFLE_MODE_NONE)
-        }
-    }
-
-    fun updateMediaSessionPlaybackState() {
-        val stateBuilder = PlaybackStateCompat.Builder()
-            .setActions(MEDIA_SESSION_ACTIONS)
-            .setState(
-                if (isPlaying) PlaybackStateCompat.STATE_PLAYING else PlaybackStateCompat.STATE_PAUSED,
-                songProgressMillis.toLong(),
-                playbackSpeed
-            )
-        setCustomAction(stateBuilder)
-        mediaSession?.setPlaybackState(stateBuilder.build())
-    }
-
-    private fun updateNotification() {
-        if (playingNotification != null && currentSong.id != -1L) {
-            stopForegroundAndNotification()
-            initNotification()
-        }
-    }
-
-    @SuppressLint("CheckResult")
-    fun updateMediaSessionMetaData(onCompletion: () -> Unit) {
-        Log.i(TAG, "onResourceReady: ")
-        val song = currentSong
-        if (song.id == -1L) {
-            mediaSession?.setMetadata(null)
-            return
-        }
-        val metaData = MediaMetadataCompat.Builder()
-            .putString(MediaMetadataCompat.METADATA_KEY_ARTIST, song.artistName)
-            .putString(MediaMetadataCompat.METADATA_KEY_ALBUM_ARTIST, song.albumArtist)
-            .putString(MediaMetadataCompat.METADATA_KEY_ALBUM, song.albumName)
-            .putString(MediaMetadataCompat.METADATA_KEY_TITLE, song.title)
-            .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, song.duration)
-            .putLong(
-                MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER,
-                (getPosition() + 1).toLong()
-            )
-            .putLong(MediaMetadataCompat.METADATA_KEY_YEAR, song.year.toLong())
-            .putBitmap(MediaMetadataCompat.METADATA_KEY_ALBUM_ART, null)
-            .putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, playingQueue.size.toLong())
-
-        // We must send the album art in METADATA_KEY_ALBUM_ART key on A13+ or
-        // else album art is blurry in notification
-        if (isAlbumArtOnLockScreen || VersionUtils.hasT()) {
-            // val screenSize: Point = RetroUtil.getScreenSize(this)
-            val request = Glide.with(this)
-                .asBitmap()
-                .songCoverOptions(song)
-                .load(getSongModel(song))
-
-            if (isBlurredAlbumArt) {
-                request.transform(BlurTransformation.Builder(this@MusicService).build())
-            }
-            request.into(object :
-                CustomTarget<Bitmap?>(Target.SIZE_ORIGINAL, Target.SIZE_ORIGINAL) {
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    metaData.putBitmap(
-                        MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
-                        BitmapFactory.decodeResource(
-                            resources,
-                            R.drawable.default_audio_art
-                        )
-                    )
-                    mediaSession?.setMetadata(metaData.build())
-                    onCompletion()
-                }
-
-                override fun onResourceReady(
-                    resource: Bitmap,
-                    transition: Transition<in Bitmap?>?,
-                ) {
-                    metaData.putBitmap(
-                        MediaMetadataCompat.METADATA_KEY_ALBUM_ART,
-                        resource
-                    )
-                    mediaSession?.setMetadata(metaData.build())
-                    onCompletion()
-                }
-
-                override fun onLoadCleared(placeholder: Drawable?) {}
-            })
-        } else {
-            mediaSession?.setMetadata(metaData.build())
-            onCompletion()
-        }
-    }
-
-    private fun handleChangeInternal(what: String) {
-        when (what) {
-            PLAY_STATE_CHANGED -> {
-                updateMediaSessionPlaybackState()
-                val isPlaying = isPlaying
-                if (!isPlaying && songProgressMillis > 0) {
-                    savePositionInTrack()
-                }
-                songPlayCountHelper.notifyPlayStateChanged(isPlaying)
-                playingNotification?.setPlaying(isPlaying)
-                startForegroundOrNotify()
-            }
-
-            FAVORITE_STATE_CHANGED -> {
-                isCurrentFavorite { isFavorite ->
-                    playingNotification?.updateFavorite(isFavorite)
-                    startForegroundOrNotify()
-                }
-            }
-
-            META_CHANGED -> {
-                playingNotification?.updateMetadata(currentSong) { startForegroundOrNotify() }
-                isCurrentFavorite { isFavorite ->
-                    playingNotification?.updateFavorite(isFavorite)
-                    startForegroundOrNotify()
-                }
-
-                // We must call updateMediaSessionPlaybackState after the load of album art is completed
-                // if we are loading it or it won't be updated in the notification
-                updateMediaSessionMetaData(::updateMediaSessionPlaybackState)
-                savePosition()
-                savePositionInTrack()
-                serviceScope.launch(IO) {
-                    val currentSong = currentSong
-                    HistoryStore.getInstance(this@MusicService).addSongId(currentSong.id)
-                    if (songPlayCountHelper.shouldBumpPlayCount()) {
-                        SongPlayCountStore.getInstance(this@MusicService)
-                            .bumpPlayCount(songPlayCountHelper.song.id)
-                    }
-                    songPlayCountHelper.notifySongChanged(currentSong)
-                    storage.saveSong(currentSong)
-                }
-            }
-
-            QUEUE_CHANGED -> {
-                mediaSession?.setQueueTitle(getString(R.string.now_playing_queue))
-                mediaSession?.setQueue(playingQueue.toMediaSessionQueue())
-                updateMediaSessionMetaData(::updateMediaSessionPlaybackState) // because playing queue size might have changed
-                saveQueues()
-                if (playingQueue.size > 0) {
-                    prepareNext()
-                } else {
-                    stopForegroundAndNotification()
-                }
-            }
-        }
-    }
-
-    private fun startForegroundOrNotify() {
-        if (playingNotification != null && currentSong.id != -1L) {
-            if (isForeground && !isPlaying) {
-                // This makes the notification dismissible
-                // We can't call stopForeground(false) on A12 though, which may result in crashes
-                // when we call startForeground after that e.g. when Alarm goes off,
-                if (!VersionUtils.hasS()) {
-                    ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_DETACH)
-                    isForeground = false
-                }
-            }
-            if (!isForeground && isPlaying) {
-                // Specify that this is a media service, if supported.
-                if (VersionUtils.hasQ()) {
-                    startForeground(
-                        PlayingNotification.NOTIFICATION_ID, playingNotification!!.build(),
-                        ServiceInfo.FOREGROUND_SERVICE_TYPE_MEDIA_PLAYBACK
-                    )
-                } else {
-                    startForeground(
-                        PlayingNotification.NOTIFICATION_ID,
-                        playingNotification!!.build()
-                    )
-                }
-                isForeground = true
-            } else {
-                // If we are already in foreground just update the notification
-                notificationManager?.notify(
-                    PlayingNotification.NOTIFICATION_ID, playingNotification!!.build()
-                )
-            }
-        }
-    }
-
-    private fun stopForegroundAndNotification() {
-        ServiceCompat.stopForeground(this, ServiceCompat.STOP_FOREGROUND_REMOVE)
-        notificationManager?.cancel(PlayingNotification.NOTIFICATION_ID)
-        isForeground = false
-    }
-
-    @Synchronized
-    private fun openCurrent(completion: (success: Boolean) -> Unit) {
-        val force = if (!trackEndedByCrossfade) {
-            true
-        } else {
-            trackEndedByCrossfade = false
-            false
-        }
-        playbackManager.setDataSource(currentSong, force) { success ->
-            completion(success)
-        }
-    }
-
-    fun switchToLocalPlayback() {
-        playbackManager.switchToLocalPlayback(this::restorePlaybackState)
-    }
-
-    private fun restorePlaybackState(wasPlaying: Boolean, progress: Int) {
-        playbackManager.setCallbacks(this)
-        openTrackAndPrepareNextAt(position) { success ->
-            if (success) {
-                seek(progress)
-                if (wasPlaying) {
-                    play()
-                } else {
-                    pause()
-                }
-            }
-        }
-        playbackManager.setCrossFadeDuration(crossFadeDuration)
-    }
-
-    private fun playFromPlaylist(intent: Intent) {
-        val playlist: AbsSmartPlaylist? = intent.extras?.let {
-            BundleCompat.getParcelable(
-                it,
-                INTENT_EXTRA_PLAYLIST,
-                AbsSmartPlaylist::class.java
-            )
-        }
-        val shuffleMode = intent.getIntExtra(INTENT_EXTRA_SHUFFLE_MODE, getShuffleMode())
-        if (playlist != null) {
-            val playlistSongs = playlist.songs()
-            if (playlistSongs.isNotEmpty()) {
-                if (shuffleMode == SHUFFLE_MODE_SHUFFLE) {
-                    val startPosition = Random().nextInt(playlistSongs.size)
-                    openQueue(playlistSongs, startPosition, true)
-                    setShuffleMode(shuffleMode)
-                } else {
-                    openQueue(playlistSongs, 0, true)
-                }
-            } else {
-                runOnUiThread {
-                    showToast(R.string.playlist_is_empty, Toast.LENGTH_LONG)
-                }
-            }
-        } else {
-            runOnUiThread {
-                showToast(R.string.playlist_is_empty, Toast.LENGTH_LONG)
-            }
-        }
-    }
-
-    private fun prepareNext() {
-        prepareNextImpl()
-    }
-
-    private fun registerBluetoothConnected() {
-        Log.i(TAG, "registerBluetoothConnected: ")
-        if (!bluetoothConnectedRegistered) {
-            registerReceiver(bluetoothReceiver, bluetoothConnectedIntentFilter)
-            bluetoothConnectedRegistered = true
-        }
-    }
-
-    private fun registerHeadsetEvents() {
-        if (!headsetReceiverRegistered && isHeadsetPlugged) {
-            registerReceiver(headsetReceiver, headsetReceiverIntentFilter)
-            headsetReceiverRegistered = true
-        }
-    }
-
-    private fun releaseResources() {
-        playerHandler?.removeCallbacksAndMessages(null)
-        musicPlayerHandlerThread?.quitSafely()
-        playbackManager.release()
-        mediaSession?.release()
-    }
-
-    fun restoreState(completion: () -> Unit = {}) {
-        shuffleMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(
-            SAVED_SHUFFLE_MODE, 0
-        )
-        repeatMode = PreferenceManager.getDefaultSharedPreferences(this).getInt(
-            SAVED_REPEAT_MODE, 0
-        )
-        handleAndSendChangeInternal(SHUFFLE_MODE_CHANGED)
-        handleAndSendChangeInternal(REPEAT_MODE_CHANGED)
-        serviceScope.launch {
-            restoreQueuesAndPositionIfNecessary()
-            completion()
-        }
-    }
-
-    private fun savePosition() {
-        PreferenceManager.getDefaultSharedPreferences(this).edit {
-            putInt(SAVED_POSITION, getPosition())
-        }
-    }
-
-    private fun saveQueues() {
-        serviceScope.launch(IO) {
-            MusicPlaybackQueueStore.getInstance(this@MusicService)
-                .saveQueues(playingQueue, originalPlayingQueue)
-        }
-    }
-
-    private fun sendChangeInternal(what: String) {
-        sendBroadcast(Intent(what))
-        appWidgetBig.notifyChange(this, what)
-        appWidgetClassic.notifyChange(this, what)
-        appWidgetSmall.notifyChange(this, what)
-        appWidgetCard.notifyChange(this, what)
-        appWidgetText.notifyChange(this, what)
-        appWidgetMd3.notifyChange(this, what)
-        appWidgetCircle.notifyChange(this, what)
-    }
-
-    private fun setCustomAction(stateBuilder: PlaybackStateCompat.Builder) {
-        var repeatIcon = R.drawable.ic_repeat // REPEAT_MODE_NONE
-        if (repeatMode == REPEAT_MODE_THIS) {
-            repeatIcon = R.drawable.ic_repeat_one
-        } else if (repeatMode == REPEAT_MODE_ALL) {
-            repeatIcon = R.drawable.ic_repeat_white_circle
-        }
-        stateBuilder.addCustomAction(
-            PlaybackStateCompat.CustomAction.Builder(
-                CYCLE_REPEAT, getString(R.string.action_cycle_repeat), repeatIcon
-            )
-                .build()
-        )
-        val shuffleIcon =
-            if (getShuffleMode() == SHUFFLE_MODE_NONE) R.drawable.ic_shuffle_off_circled else R.drawable.ic_shuffle_on_circled
-        stateBuilder.addCustomAction(
-            PlaybackStateCompat.CustomAction.Builder(
-                TOGGLE_SHUFFLE, getString(R.string.action_toggle_shuffle), shuffleIcon
-            )
-                .build()
-        )
-    }
-
-    private fun setupMediaSession() {
-        val mediaButtonReceiverComponentName = ComponentName(
-            applicationContext,
-            MediaButtonIntentReceiver::class.java
-        )
-
-        val mediaButtonIntent = Intent(Intent.ACTION_MEDIA_BUTTON)
-        mediaButtonIntent.component = mediaButtonReceiverComponentName
-        val mediaButtonReceiverPendingIntent = PendingIntent.getBroadcast(
-            applicationContext, 0, mediaButtonIntent,
-            if (VersionUtils.hasMarshmallow()) PendingIntent.FLAG_IMMUTABLE else 0
-        )
-        mediaSession = MediaSessionCompat(
-            this,
-            BuildConfig.APPLICATION_ID,
-            mediaButtonReceiverComponentName,
-            mediaButtonReceiverPendingIntent
-        )
-        val mediaSessionCallback = MediaSessionCallback(this)
-        mediaSession?.setCallback(mediaSessionCallback)
-        mediaSession?.isActive = true
-        mediaSession?.setMediaButtonReceiver(mediaButtonReceiverPendingIntent)
-    }
-
-    inner class MusicBinder : Binder() {
-        val service: MusicService
-            get() = this@MusicService
-    }
-
-    companion object {
-        val TAG: String = MusicService::class.java.simpleName
-        const val RETRO_MUSIC_PACKAGE_NAME = "code.name.monkey.retromusic"
-        const val MUSIC_PACKAGE_NAME = "com.android.music"
-        const val ACTION_TOGGLE_PAUSE = "$RETRO_MUSIC_PACKAGE_NAME.togglepause"
-        const val ACTION_PLAY = "$RETRO_MUSIC_PACKAGE_NAME.play"
-        const val ACTION_PLAY_PLAYLIST = "$RETRO_MUSIC_PACKAGE_NAME.play.playlist"
-        const val ACTION_PAUSE = "$RETRO_MUSIC_PACKAGE_NAME.pause"
-        const val ACTION_STOP = "$RETRO_MUSIC_PACKAGE_NAME.stop"
-        const val ACTION_SKIP = "$RETRO_MUSIC_PACKAGE_NAME.skip"
-        const val ACTION_REWIND = "$RETRO_MUSIC_PACKAGE_NAME.rewind"
-        const val ACTION_QUIT = "$RETRO_MUSIC_PACKAGE_NAME.quitservice"
-        const val ACTION_PENDING_QUIT = "$RETRO_MUSIC_PACKAGE_NAME.pendingquitservice"
-        const val INTENT_EXTRA_PLAYLIST = RETRO_MUSIC_PACKAGE_NAME + "intentextra.playlist"
-        const val INTENT_EXTRA_SHUFFLE_MODE =
-            "$RETRO_MUSIC_PACKAGE_NAME.intentextra.shufflemode"
-        const val APP_WIDGET_UPDATE = "$RETRO_MUSIC_PACKAGE_NAME.appwidgetupdate"
-        const val EXTRA_APP_WIDGET_NAME = RETRO_MUSIC_PACKAGE_NAME + "app_widget_name"
-
-        // Do not change these three strings as it will break support with other apps (e.g. last.fm
-        // scrobbling)
-        const val META_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.metachanged"
-        const val QUEUE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.queuechanged"
-        const val PLAY_STATE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.playstatechanged"
-        const val FAVORITE_STATE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.favoritestatechanged"
-        const val REPEAT_MODE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.repeatmodechanged"
-        const val SHUFFLE_MODE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.shufflemodechanged"
-        const val MEDIA_STORE_CHANGED = "$RETRO_MUSIC_PACKAGE_NAME.mediastorechanged"
-        const val CYCLE_REPEAT = "$RETRO_MUSIC_PACKAGE_NAME.cyclerepeat"
-        const val TOGGLE_SHUFFLE = "$RETRO_MUSIC_PACKAGE_NAME.toggleshuffle"
-        const val TOGGLE_FAVORITE = "$RETRO_MUSIC_PACKAGE_NAME.togglefavorite"
-        const val SAVED_POSITION = "POSITION"
-        const val SAVED_POSITION_IN_TRACK = "POSITION_IN_TRACK"
-        const val SAVED_SHUFFLE_MODE = "SHUFFLE_MODE"
-        const val SAVED_REPEAT_MODE = "REPEAT_MODE"
-        const val SHUFFLE_MODE_NONE = 0
-        const val SHUFFLE_MODE_SHUFFLE = 1
-        const val REPEAT_MODE_NONE = 0
-        const val REPEAT_MODE_ALL = 1
-        const val REPEAT_MODE_THIS = 2
-        private const val MEDIA_SESSION_ACTIONS = (PlaybackStateCompat.ACTION_PLAY
-                or PlaybackStateCompat.ACTION_PAUSE
-                or PlaybackStateCompat.ACTION_PLAY_PAUSE
-                or PlaybackStateCompat.ACTION_SKIP_TO_NEXT
-                or PlaybackStateCompat.ACTION_SKIP_TO_PREVIOUS
-                or PlaybackStateCompat.ACTION_STOP
-                or PlaybackStateCompat.ACTION_SEEK_TO)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt b/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt
deleted file mode 100644
index 1d8d2351b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/PersistentStorage.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.support.v4.media.MediaBrowserCompat
-import android.support.v4.media.MediaDescriptionCompat
-import androidx.core.content.edit
-import androidx.core.net.toUri
-import code.name.monkey.retromusic.extensions.albumArtUri
-import code.name.monkey.retromusic.model.Song
-
-class PersistentStorage(context: Context) {
-
-    private val prefs = context.getSharedPreferences(PREFERENCES_NAME, Context.MODE_PRIVATE)
-
-    fun saveSong(song: Song) {
-        prefs.edit {
-            putLong("song_id", song.id)
-            putString("song_title", song.title)
-            putString("song_artist", song.artistName)
-            putString("song_cover", song.albumArtUri.toString())
-        }
-    }
-
-    fun recentSong(): MediaBrowserCompat.MediaItem {
-        return MediaBrowserCompat.MediaItem(
-            MediaDescriptionCompat.Builder()
-                .setMediaId(prefs.getLong("song_id", 0L).toString())
-                .setTitle(prefs.getString("song_title", ""))
-                .setSubtitle(prefs.getString("song_artist", ""))
-                .setIconUri(prefs.getString("song_cover", "")?.toUri())
-                .build(), MediaBrowserCompat.MediaItem.FLAG_PLAYABLE
-        )
-    }
-
-    companion object {
-        const val PREFERENCES_NAME = "retro_recent"
-
-        @Volatile
-        private var instance: PersistentStorage? = null
-
-        fun getInstance(context: Context) =
-            instance ?: synchronized(this) {
-                instance ?: PersistentStorage(context).also { instance = it }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackHandler.java b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackHandler.java
new file mode 100644
index 000000000..243965dc9
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackHandler.java
@@ -0,0 +1,165 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service;
+
+import android.media.AudioManager;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
+
+import androidx.annotation.NonNull;
+
+import java.lang.ref.WeakReference;
+
+import code.name.monkey.retromusic.util.PreferenceUtil;
+
+import static code.name.monkey.retromusic.service.MusicService.DUCK;
+import static code.name.monkey.retromusic.service.MusicService.META_CHANGED;
+import static code.name.monkey.retromusic.service.MusicService.PLAY_STATE_CHANGED;
+import static code.name.monkey.retromusic.service.MusicService.REPEAT_MODE_NONE;
+import static code.name.monkey.retromusic.service.MusicService.TRACK_ENDED;
+import static code.name.monkey.retromusic.service.MusicService.TRACK_WENT_TO_NEXT;
+
+class PlaybackHandler extends Handler {
+    @NonNull
+    private final WeakReference<MusicService> mService;
+    private float currentDuckVolume = 1.0f;
+
+    PlaybackHandler(final MusicService service, @NonNull final Looper looper) {
+        super(looper);
+        mService = new WeakReference<>(service);
+    }
+
+    @Override
+    public void handleMessage(@NonNull final Message msg) {
+        final MusicService service = mService.get();
+        if (service == null) {
+            return;
+        }
+
+        switch (msg.what) {
+            case MusicService.DUCK:
+                if (PreferenceUtil.getInstance(service).audioDucking()) {
+                    currentDuckVolume -= .05f;
+                    if (currentDuckVolume > .2f) {
+                        sendEmptyMessageDelayed(DUCK, 10);
+                    } else {
+                        currentDuckVolume = .2f;
+                    }
+                } else {
+                    currentDuckVolume = 1f;
+                }
+                service.playback.setVolume(currentDuckVolume);
+                break;
+
+            case MusicService.UNDUCK:
+                if (PreferenceUtil.getInstance(service).audioDucking()) {
+                    currentDuckVolume += .03f;
+                    if (currentDuckVolume < 1f) {
+                        sendEmptyMessageDelayed(MusicService.UNDUCK, 10);
+                    } else {
+                        currentDuckVolume = 1f;
+                    }
+                } else {
+                    currentDuckVolume = 1f;
+                }
+                service.playback.setVolume(currentDuckVolume);
+                break;
+
+            case TRACK_WENT_TO_NEXT:
+                if (service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
+                    service.pause();
+                    service.seek(0);
+                } else {
+                    service.position = service.nextPosition;
+                    service.prepareNextImpl();
+                    service.notifyChange(META_CHANGED);
+                }
+                break;
+
+            case TRACK_ENDED:
+                // if there is a timer finished, don't continue
+                if (service.pendingQuit ||
+                        service.getRepeatMode() == REPEAT_MODE_NONE && service.isLastTrack()) {
+                    service.notifyChange(PLAY_STATE_CHANGED);
+                    service.seek(0);
+                    if (service.pendingQuit) {
+                        service.pendingQuit = false;
+                        service.quit();
+                        break;
+                    }
+                } else {
+                    service.playNextSong(false);
+                }
+                sendEmptyMessage(MusicService.RELEASE_WAKELOCK);
+                break;
+
+            case MusicService.RELEASE_WAKELOCK:
+                service.releaseWakeLock();
+                break;
+
+            case MusicService.PLAY_SONG:
+                service.playSongAtImpl(msg.arg1);
+                break;
+
+            case MusicService.SET_POSITION:
+                service.openTrackAndPrepareNextAt(msg.arg1);
+                service.notifyChange(PLAY_STATE_CHANGED);
+                break;
+
+            case MusicService.PREPARE_NEXT:
+                service.prepareNextImpl();
+                break;
+
+            case MusicService.RESTORE_QUEUES:
+                service.restoreQueuesAndPositionIfNecessary();
+                break;
+
+            case MusicService.FOCUS_CHANGE:
+                switch (msg.arg1) {
+                    case AudioManager.AUDIOFOCUS_GAIN:
+                        if (!service.isPlaying() && service.isPausedByTransientLossOfFocus()) {
+                            service.play();
+                            service.setPausedByTransientLossOfFocus(false);
+                        }
+                        removeMessages(DUCK);
+                        sendEmptyMessage(MusicService.UNDUCK);
+                        break;
+
+                    case AudioManager.AUDIOFOCUS_LOSS:
+                        // Lost focus for an unbounded amount of time: stop playback and release media playback
+                        service.pause();
+                        break;
+
+                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT:
+                        // Lost focus for a short time, but we have to stop
+                        // playback. We don't release the media playback because playback
+                        // is likely to resume
+                        boolean wasPlaying = service.isPlaying();
+                        service.pause();
+                        service.setPausedByTransientLossOfFocus(wasPlaying);
+                        break;
+
+                    case AudioManager.AUDIOFOCUS_LOSS_TRANSIENT_CAN_DUCK:
+                        // Lost focus for a short time, but it's ok to keep playing
+                        // at an attenuated level
+                        removeMessages(MusicService.UNDUCK);
+                        sendEmptyMessage(DUCK);
+                        break;
+                }
+                break;
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt b/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
deleted file mode 100644
index 59137fa64..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/PlaybackManager.kt
+++ /dev/null
@@ -1,181 +0,0 @@
-package code.name.monkey.retromusic.service
-
-import android.content.Context
-import android.content.Intent
-import android.media.audiofx.AudioEffect
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.playback.Playback
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-
-class PlaybackManager(val context: Context) {
-
-    var playback: Playback? = null
-    private var playbackLocation = PlaybackLocation.LOCAL
-
-    val isLocalPlayback get() = playbackLocation == PlaybackLocation.LOCAL
-
-    val audioSessionId: Int
-        get() = if (playback != null) {
-            playback!!.audioSessionId
-        } else 0
-
-    val songDurationMillis: Int
-        get() = if (playback != null) {
-            playback!!.duration()
-        } else -1
-
-    val songProgressMillis: Int
-        get() = if (playback != null) {
-            playback!!.position()
-        } else -1
-
-    val isPlaying: Boolean
-        get() = playback != null && playback!!.isPlaying
-
-    init {
-        playback = createLocalPlayback()
-    }
-
-    fun setCallbacks(callbacks: Playback.PlaybackCallbacks) {
-        playback?.callbacks = callbacks
-    }
-
-    fun play(onNotInitialized: () -> Unit) {
-        if (playback != null && !playback!!.isPlaying) {
-            if (!playback!!.isInitialized) {
-                onNotInitialized()
-            } else {
-                openAudioEffectSession()
-                if (playbackLocation == PlaybackLocation.LOCAL) {
-                    if (playback is CrossFadePlayer) {
-                        if (!(playback as CrossFadePlayer).isCrossFading) {
-                            AudioFader.startFadeAnimator(playback!!, true)
-                        }
-                    } else {
-                        AudioFader.startFadeAnimator(playback!!, true)
-                    }
-                }
-                playback?.start()
-            }
-        }
-    }
-
-    fun pause(force: Boolean, onPause: () -> Unit) {
-        if (playback != null && playback!!.isPlaying) {
-            if (force) {
-                playback?.pause()
-                closeAudioEffectSession()
-                onPause()
-            } else {
-                AudioFader.startFadeAnimator(playback!!, false) {
-                    //Code to run when Animator Ends
-                    playback?.pause()
-                    closeAudioEffectSession()
-                    onPause()
-                }
-            }
-        }
-    }
-
-    fun seek(millis: Int, force: Boolean): Int = playback!!.seek(millis, force)
-
-    fun setDataSource(
-        song: Song,
-        force: Boolean,
-        completion: (success: Boolean) -> Unit,
-    ) {
-        playback?.setDataSource(song, force, completion)
-    }
-
-    fun setNextDataSource(trackUri: String?) {
-        playback?.setNextDataSource(trackUri)
-    }
-
-    fun setCrossFadeDuration(duration: Int) {
-        playback?.setCrossFadeDuration(duration)
-    }
-
-    /**
-     * @param crossFadeDuration CrossFade duration
-     * @return Whether switched playback
-     */
-    fun maybeSwitchToCrossFade(crossFadeDuration: Int): Boolean {
-        /* Switch to MultiPlayer if CrossFade duration is 0 and
-                Playback is not an instance of MultiPlayer */
-        if (playback !is MultiPlayer && crossFadeDuration == 0) {
-            if (playback != null) {
-                playback?.release()
-            }
-            playback = null
-            playback = MultiPlayer(context)
-            return true
-        } else if (playback !is CrossFadePlayer && crossFadeDuration > 0) {
-            if (playback != null) {
-                playback?.release()
-            }
-            playback = null
-            playback = CrossFadePlayer(context)
-            return true
-        }
-        return false
-    }
-
-    fun release() {
-        playback?.release()
-        playback = null
-        closeAudioEffectSession()
-    }
-
-    private fun openAudioEffectSession() {
-        val intent = Intent(AudioEffect.ACTION_OPEN_AUDIO_EFFECT_CONTROL_SESSION)
-        intent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, audioSessionId)
-        intent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
-        intent.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC)
-        context.sendBroadcast(intent)
-    }
-
-    private fun closeAudioEffectSession() {
-        val audioEffectsIntent = Intent(AudioEffect.ACTION_CLOSE_AUDIO_EFFECT_CONTROL_SESSION)
-        if (playback != null) {
-            audioEffectsIntent.putExtra(AudioEffect.EXTRA_AUDIO_SESSION,
-                playback!!.audioSessionId)
-        }
-        audioEffectsIntent.putExtra(AudioEffect.EXTRA_PACKAGE_NAME, context.packageName)
-        context.sendBroadcast(audioEffectsIntent)
-    }
-
-    fun switchToLocalPlayback(onChange: (wasPlaying: Boolean, progress: Int) -> Unit) {
-        playbackLocation = PlaybackLocation.LOCAL
-        switchToPlayback(createLocalPlayback(), onChange)
-    }
-
-    private fun switchToPlayback(
-        playback: Playback,
-        onChange: (wasPlaying: Boolean, progress: Int) -> Unit,
-    ) {
-        val oldPlayback = this.playback
-        val wasPlaying: Boolean = oldPlayback?.isPlaying == true
-        val progress: Int = oldPlayback?.position() ?: 0
-        this.playback = playback
-        oldPlayback?.stop()
-        onChange(wasPlaying, progress)
-    }
-
-    private fun createLocalPlayback(): Playback {
-        // Set MultiPlayer when crossfade duration is 0 i.e. off
-        return if (PreferenceUtil.crossFadeDuration == 0) {
-            MultiPlayer(context)
-        } else {
-            CrossFadePlayer(context)
-        }
-    }
-
-    fun setPlaybackSpeedPitch(playbackSpeed: Float, playbackPitch: Float) {
-        playback?.setPlaybackSpeedPitch(playbackSpeed, playbackPitch)
-    }
-}
-
-enum class PlaybackLocation {
-    LOCAL,
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/QueueSaveHandler.kt b/app/src/main/java/code/name/monkey/retromusic/service/QueueSaveHandler.kt
new file mode 100644
index 000000000..44f3eb84c
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/QueueSaveHandler.kt
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service
+
+import android.os.Handler
+import android.os.Looper
+import android.os.Message
+import code.name.monkey.retromusic.service.MusicService.SAVE_QUEUES
+import java.lang.ref.WeakReference
+
+internal class QueueSaveHandler(
+        musicService: MusicService,
+        looper: Looper
+) : Handler(looper) {
+    private val service: WeakReference<MusicService> = WeakReference(musicService)
+
+    override fun handleMessage(msg: Message) {
+        val service: MusicService? = service.get()
+        if (msg.what == SAVE_QUEUES) {
+            service?.saveQueuesImpl()
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt b/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
index 9fcda73cb..1d971104c 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/ThrottledSeekHandler.kt
@@ -16,15 +16,15 @@ package code.name.monkey.retromusic.service
 
 
 import android.os.Handler
-import code.name.monkey.retromusic.service.MusicService.Companion.PLAY_STATE_CHANGED
+
+import code.name.monkey.retromusic.service.MusicService.PLAY_STATE_CHANGED
 
 class ThrottledSeekHandler(
-    private val musicService: MusicService,
-    private val handler: Handler
+        private val musicService: MusicService,
+        private val handler: Handler
 ) : Runnable {
 
     fun notifySeek() {
-        musicService.updateMediaSessionPlaybackState()
         handler.removeCallbacks(this)
         handler.postDelayed(this, THROTTLE)
     }
@@ -36,6 +36,6 @@ class ThrottledSeekHandler(
 
     companion object {
         // milliseconds to throttle before calling run() to aggregate events
-        private const val THROTTLE: Long = 500
+        private val THROTTLE: Long = 500
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
new file mode 100644
index 000000000..56c476408
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/WearBrowserService.java
@@ -0,0 +1,369 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+package code.name.monkey.retromusic.service;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.Intent;
+import android.media.MediaDescription;
+import android.media.browse.MediaBrowser;
+import android.media.session.MediaSession;
+import android.net.Uri;
+import android.os.AsyncTask;
+import android.os.Bundle;
+import android.service.media.MediaBrowserService;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.helper.MusicPlayerRemote;
+import code.name.monkey.retromusic.loaders.AlbumLoader;
+import code.name.monkey.retromusic.loaders.ArtistLoader;
+import code.name.monkey.retromusic.loaders.PlaylistLoader;
+import code.name.monkey.retromusic.loaders.PlaylistSongsLoader;
+import code.name.monkey.retromusic.loaders.SongLoader;
+import code.name.monkey.retromusic.model.Album;
+import code.name.monkey.retromusic.model.Artist;
+import code.name.monkey.retromusic.model.Playlist;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.util.RetroUtil;
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+@TargetApi(21)
+public class WearBrowserService extends MediaBrowserService {
+
+    public static final String MEDIA_ID_ROOT = "__ROOT__";
+    public static final int TYPE_ARTIST = 0;
+    public static final int TYPE_ALBUM = 1;
+    public static final int TYPE_SONG = 2;
+    public static final int TYPE_PLAYLIST = 3;
+    public static final int TYPE_ARTIST_SONG_ALBUMS = 4;
+    public static final int TYPE_ALBUM_SONGS = 5;
+    public static final int TYPE_ARTIST_ALL_SONGS = 6;
+    public static final int TYPE_PLAYLIST_ALL_SONGS = 7;
+
+    public static WearBrowserService sInstance;
+    private MediaSession mSession;
+    private Context mContext;
+    private boolean mServiceStarted;
+
+    public static WearBrowserService getInstance() {
+        return sInstance;
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+        sInstance = this;
+        mContext = this;
+        mSession = new MediaSession(this, "WearBrowserService");
+        setSessionToken(mSession.getSessionToken());
+        mSession.setCallback(new MediaSessionCallback());
+        mSession.setFlags(MediaSession.FLAG_HANDLES_MEDIA_BUTTONS | MediaSession.FLAG_HANDLES_TRANSPORT_CONTROLS);
+    }
+
+    @Override
+    public int onStartCommand(Intent startIntent, int flags, int startId) {
+        return START_STICKY;
+    }
+
+    @Override
+    public void onDestroy() {
+        mServiceStarted = false;
+        mSession.release();
+    }
+
+    @Nullable
+    @Override
+    public BrowserRoot onGetRoot(@NonNull String s, int i, @Nullable Bundle bundle) {
+        return new BrowserRoot(MEDIA_ID_ROOT, null);
+    }
+
+    @Override
+    public void onLoadChildren(@NonNull String parentId, @NonNull Result<List<MediaBrowser.MediaItem>> result) {
+        result.detach();
+        loadChildren(parentId, result);
+    }
+
+    private void setSessionActive() {
+        if (!mServiceStarted) {
+            startService(new Intent(getApplicationContext(), WearBrowserService.class));
+            mServiceStarted = true;
+        }
+
+        if (!mSession.isActive()) {
+            mSession.setActive(true);
+        }
+    }
+
+    private void setSessionInactive() {
+        if (mServiceStarted) {
+            stopSelf();
+            mServiceStarted = false;
+        }
+
+        if (mSession.isActive()) {
+            mSession.setActive(false);
+        }
+    }
+
+    private void fillMediaItems(List<MediaBrowser.MediaItem> mediaItems,
+                                String mediaId,
+                                String title,
+                                String subTitle,
+                                Uri icon,
+                                int playableOrBrowsable) {
+        mediaItems.add(new MediaBrowser.MediaItem(
+                new MediaDescription.Builder()
+                        .setMediaId(mediaId)
+                        .setTitle(title)
+                        .setIconUri(icon)
+                        .setSubtitle(subTitle)
+                        .build(), playableOrBrowsable
+        ));
+    }
+
+    private void addMediaRoots(List<MediaBrowser.MediaItem> mMediaRoot) {
+        mMediaRoot.add(new MediaBrowser.MediaItem(
+                new MediaDescription.Builder()
+                        .setMediaId(Integer.toString(TYPE_ARTIST))
+                        .setTitle(getString(R.string.artists))
+                        .setIconBitmap(RetroUtil.createBitmap(ContextCompat.getDrawable(getApplicationContext(), R.drawable.default_artist_art), 1f))
+                        .setSubtitle(getString(R.string.artists))
+                        .build(), MediaBrowser.MediaItem.FLAG_BROWSABLE
+        ));
+
+        mMediaRoot.add(new MediaBrowser.MediaItem(
+                new MediaDescription.Builder()
+                        .setMediaId(Integer.toString(TYPE_ALBUM))
+                        .setTitle(getString(R.string.albums))
+                        .setIconBitmap(RetroUtil.createBitmap(ContextCompat.getDrawable(getApplicationContext(), R.drawable.default_album_art), 1f))
+                        .setSubtitle(getString(R.string.albums))
+                        .build(), MediaBrowser.MediaItem.FLAG_BROWSABLE
+        ));
+
+        mMediaRoot.add(new MediaBrowser.MediaItem(
+                new MediaDescription.Builder()
+                        .setMediaId(Integer.toString(TYPE_SONG))
+                        .setTitle(getString(R.string.songs))
+                        .setIconBitmap(RetroUtil.createBitmap(ContextCompat.getDrawable(getApplicationContext(), R.drawable.default_album_art), 1f))
+                        .setSubtitle(getString(R.string.songs))
+                        .build(), MediaBrowser.MediaItem.FLAG_BROWSABLE
+        ));
+
+
+        mMediaRoot.add(new MediaBrowser.MediaItem(
+                new MediaDescription.Builder()
+                        .setMediaId(Integer.toString(TYPE_PLAYLIST))
+                        .setTitle(getString(R.string.playlists))
+                        .setIconUri(Uri.parse("android.resource://code.name.monkey.retromusic/drawable/ic_queue_music_white_24dp"))
+                        .setSubtitle(getString(R.string.playlists))
+                        .build(), MediaBrowser.MediaItem.FLAG_BROWSABLE
+        ));
+
+    }
+
+    private void loadChildren(final String parentId, final Result<List<MediaBrowser.MediaItem>> result) {
+
+        final List<MediaBrowser.MediaItem> mediaItems = new ArrayList<>();
+
+
+        new AsyncTask<Void, Void, Void>() {
+            @Override
+            protected Void doInBackground(final Void... unused) {
+
+                if (parentId.equals(MEDIA_ID_ROOT)) {
+                    addMediaRoots(mediaItems);
+                } else {
+                    switch (Integer.parseInt(Character.toString(parentId.charAt(0)))) {
+                        case TYPE_ARTIST:
+                            List<Artist> artistList = ArtistLoader.INSTANCE.getAllArtists(mContext) ;
+                            for (Artist artist : artistList) {
+                                String albumNmber = String.format("%d %s", artist.getAlbums().size(), artist.getAlbums().size() > 1 ? "Albums" : "Album");
+                                String songCount = String.format("%d %s", artist.getSongs().size(), artist.getSongs().size() > 1 ? "Songs" : "Song");
+                                fillMediaItems(mediaItems,
+                                        Integer.toString(TYPE_ARTIST_SONG_ALBUMS) + Long.toString(artist.getId()),
+                                        artist.getName(),
+                                        albumNmber + " • " + songCount,
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_artist_art"),
+                                        MediaBrowser.MediaItem.FLAG_BROWSABLE);
+                            }
+                            break;
+
+                        case TYPE_ARTIST_SONG_ALBUMS:
+                            fillMediaItems(mediaItems,
+                                    Integer.toString(TYPE_ARTIST_ALL_SONGS) + Long.parseLong(parentId.substring(1)),
+                                    "All songs",
+                                    "All songs by artist",
+                                    Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_artist_art"),
+                                    MediaBrowser.MediaItem.FLAG_BROWSABLE);
+
+                            List<Album> artistAlbums = ArtistLoader.INSTANCE.getArtist(mContext, Integer.parseInt(parentId.substring(1))).getAlbums(); //ArtistAlbumLoader.getAlbumsForArtist(mContext, Long.parseLong(parentId.substring(1)));
+                            for (Album album : artistAlbums) {
+                                String songCount = String.format("%d %s", album.getSongs().size(), album.getSongs().size() > 1 ? "Songs" : "Song");
+                                fillMediaItems(mediaItems,
+                                        Integer.toString(TYPE_ALBUM_SONGS) + Long.toString(album.getId()),
+                                        album.getTitle(),
+                                        songCount,
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_artist_art"),
+                                        MediaBrowser.MediaItem.FLAG_BROWSABLE);
+                            }
+                            break;
+                        case TYPE_ALBUM:
+                            List<Album> albumList = AlbumLoader.INSTANCE.getAllAlbums(mContext);
+                            for (Album album : albumList) {
+                                fillMediaItems(mediaItems,
+                                        Integer.toString(TYPE_ALBUM_SONGS) + Long.toString(album.getId()),
+                                        album.getTitle(),
+                                        album.getArtistName(),
+                                        RetroUtil.getAlbumArtUri(album.getId()),
+                                        MediaBrowser.MediaItem.FLAG_BROWSABLE);
+                            }
+                            break;
+                        case TYPE_SONG:
+                            List<Song> songList = SongLoader.INSTANCE.getAllSongs(mContext);
+                            for (Song song : songList) {
+                                fillMediaItems(mediaItems,
+                                        String.valueOf(song.getId()),
+                                        song.getTitle(),
+                                        song.getAlbumName(),
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_album_art"),
+                                        MediaBrowser.MediaItem.FLAG_PLAYABLE);
+                            }
+                            break;
+
+                        case TYPE_ALBUM_SONGS:
+                            List<Song> albumSongList = AlbumLoader.INSTANCE.getAlbum(mContext, Integer.parseInt(parentId.substring(1))).getSongs();
+                            for (Song song : albumSongList) {
+                                fillMediaItems(mediaItems,
+                                        String.valueOf(song.getId()),
+                                        song.getTitle(),
+                                        song.getAlbumName(),
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_album_art"),
+                                        MediaBrowser.MediaItem.FLAG_PLAYABLE);
+                            }
+                            break;
+                        case TYPE_ARTIST_ALL_SONGS:
+                            List<Song> artistSongs = ArtistLoader.INSTANCE.getArtist(mContext, Integer.parseInt(parentId.substring(1))).getSongs();
+                            for (Song song : artistSongs) {
+                                fillMediaItems(mediaItems,
+                                        String.valueOf(song.getId()),
+                                        song.getTitle(),
+                                        song.getAlbumName(),
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_album_art"),
+                                        MediaBrowser.MediaItem.FLAG_PLAYABLE);
+                            }
+                            break;
+                        case TYPE_PLAYLIST:
+                            List<Playlist> playlistList = PlaylistLoader.INSTANCE.getAllPlaylists(mContext);
+                            for (Playlist playlist : playlistList) {
+                                int size = PlaylistSongsLoader.INSTANCE.getPlaylistSongList(mContext, playlist).size();
+                                String songCount = String.format("%d %s", size, size > 1 ? "Songs" : "Song");
+                                fillMediaItems(mediaItems,
+                                        Integer.toString(TYPE_PLAYLIST_ALL_SONGS) + Long.toString(playlist.id),
+                                        playlist.name,
+                                        songCount,
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/ic_queue_music_white_24dp"),
+                                        MediaBrowser.MediaItem.FLAG_BROWSABLE);
+                            }
+                            break;
+                        case TYPE_PLAYLIST_ALL_SONGS:
+                            List<Song> playlistSongs = PlaylistSongsLoader.INSTANCE.getPlaylistSongList(mContext, Integer.parseInt(parentId.substring(1)));
+                            for (Song song : playlistSongs) {
+                                fillMediaItems(mediaItems,
+                                        String.valueOf(song.getId()),
+                                        song.getTitle(),
+                                        song.getAlbumName(),
+                                        Uri.parse("android.resource://code.name.monkey.retromusic/drawable/default_album_art"),
+                                        MediaBrowser.MediaItem.FLAG_PLAYABLE);
+                            }
+                            break;
+
+                    }
+                }
+                return null;
+            }
+
+            @Override
+            protected void onPostExecute(Void aVoid) {
+                result.sendResult(mediaItems);
+            }
+        }.execute();
+
+    }
+
+    private final class MediaSessionCallback extends MediaSession.Callback {
+
+        @Override
+        public void onPlay() {
+            setSessionActive();
+        }
+
+        @Override
+        public void onSeekTo(long position) {
+
+        }
+
+        @Override
+        public void onPlayFromMediaId(final String mediaId, Bundle extras) {
+            long songId = Long.parseLong(mediaId);
+            setSessionActive();
+            ArrayList<Song> songs = new ArrayList<>();
+            songs.add(SongLoader.INSTANCE.getSong(mContext, Integer.parseInt(mediaId)));
+            MusicPlayerRemote.INSTANCE.openQueue(songs, 0, true);
+        }
+
+        @Override
+        public void onPause() {
+
+        }
+
+        @Override
+        public void onStop() {
+            setSessionInactive();
+        }
+
+        @Override
+        public void onSkipToNext() {
+
+        }
+
+        @Override
+        public void onSkipToPrevious() {
+
+        }
+
+        @Override
+        public void onFastForward() {
+
+        }
+
+        @Override
+        public void onRewind() {
+
+        }
+
+        @Override
+        public void onCustomAction(@NonNull String action, Bundle extras) {
+
+        }
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt
index 110677115..5bb8d56c0 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotification.kt
@@ -15,51 +15,83 @@
 package code.name.monkey.retromusic.service.notification
 
 
+import android.app.Notification
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.Context
+import android.content.Context.NOTIFICATION_SERVICE
+import android.os.Build
 import androidx.annotation.RequiresApi
-import androidx.core.app.NotificationCompat
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.service.MusicService
 
 
-abstract class PlayingNotification(context: Context) :
-    NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ID) {
+abstract class PlayingNotification {
+    protected lateinit var service: MusicService
+    protected var stopped: Boolean = false
+    private var notifyMode = NOTIFY_MODE_BACKGROUND
+    private var notificationManager: NotificationManager? = null
 
-    abstract fun updateMetadata(song: Song, onUpdate: () -> Unit)
 
-    abstract fun setPlaying(isPlaying: Boolean)
+    @Synchronized
+    fun init(service: MusicService) {
+        this.service = service
+        notificationManager = service.getSystemService(NOTIFICATION_SERVICE) as NotificationManager
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            createNotificationChannel()
+        }
+    }
 
-    abstract fun updateFavorite(isFavorite: Boolean)
+    abstract fun update()
+
+    @Synchronized
+    fun stop() {
+        stopped = true
+        service.stopForeground(true)
+        notificationManager!!.cancel(NOTIFICATION_ID)
+    }
+
+    internal fun updateNotifyModeAndPostNotification(notification: Notification) {
+        val newNotifyMode: Int = if (service.isPlaying) {
+            NOTIFY_MODE_FOREGROUND
+        } else {
+            NOTIFY_MODE_BACKGROUND
+        }
+
+        if (notifyMode != newNotifyMode && newNotifyMode == NOTIFY_MODE_BACKGROUND) {
+            service.stopForeground(false)
+        }
+
+        if (newNotifyMode == NOTIFY_MODE_FOREGROUND) {
+            service.startForeground(NOTIFICATION_ID, notification)
+        } else if (newNotifyMode == NOTIFY_MODE_BACKGROUND) {
+            notificationManager!!.notify(NOTIFICATION_ID, notification)
+        }
+
+        notifyMode = newNotifyMode
+    }
+
+    @RequiresApi(26)
+    private fun createNotificationChannel() {
+        var notificationChannel: NotificationChannel? = notificationManager!!
+                .getNotificationChannel(NOTIFICATION_CHANNEL_ID)
+        if (notificationChannel == null) {
+            notificationChannel = NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                    service.getString(R.string.playing_notification_name),
+                    NotificationManager.IMPORTANCE_LOW)
+            notificationChannel.description = service.getString(R.string.playing_notification_description)
+            notificationChannel.enableLights(false)
+            notificationChannel.enableVibration(false)
+            notificationChannel.setShowBadge(false)
+
+            notificationManager!!.createNotificationChannel(notificationChannel)
+        }
+    }
 
     companion object {
         const val NOTIFICATION_CONTROLS_SIZE_MULTIPLIER = 1.0f
         internal const val NOTIFICATION_CHANNEL_ID = "playing_notification"
-        const val NOTIFICATION_ID = 1
-
-
-        @RequiresApi(26)
-        fun createNotificationChannel(
-            context: Context,
-            notificationManager: NotificationManager
-        ) {
-            var notificationChannel: NotificationChannel? = notificationManager
-                .getNotificationChannel(NOTIFICATION_CHANNEL_ID)
-            if (notificationChannel == null) {
-                notificationChannel = NotificationChannel(
-                    NOTIFICATION_CHANNEL_ID,
-                    context.getString(R.string.playing_notification_name),
-                    NotificationManager.IMPORTANCE_LOW
-                )
-                notificationChannel.description =
-                    context.getString(R.string.playing_notification_description)
-                notificationChannel.enableLights(false)
-                notificationChannel.enableVibration(false)
-                notificationChannel.setShowBadge(false)
-
-                notificationManager.createNotificationChannel(notificationChannel)
-            }
-        }
+        private const val NOTIFICATION_ID = 1
+        private const val NOTIFY_MODE_FOREGROUND = 1
+        private const val NOTIFY_MODE_BACKGROUND = 0
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt
deleted file mode 100644
index 9da412d9b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationClassic.kt
+++ /dev/null
@@ -1,318 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.service.notification
-
-import android.annotation.SuppressLint
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.Color
-import android.graphics.drawable.Drawable
-import android.widget.RemoteViews
-import androidx.core.app.NotificationCompat
-import androidx.core.graphics.drawable.toBitmap
-import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.MaterialValueHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.extensions.getTintedDrawable
-import code.name.monkey.retromusic.extensions.isColorLight
-import code.name.monkey.retromusic.extensions.isSystemDarkModeEnabled
-import code.name.monkey.retromusic.extensions.toBitmap
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.asBitmapPalette
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.transition.Transition
-
-/**
- * @author Hemanth S (h4h13).
- */
-@SuppressLint("RestrictedApi")
-class PlayingNotificationClassic(
-    val context: Context,
-) : PlayingNotification(context) {
-    private var primaryColor: Int = 0
-
-    private fun getCombinedRemoteViews(collapsed: Boolean, song: Song): RemoteViews {
-        val remoteViews = RemoteViews(
-            context.packageName,
-            if (collapsed) R.layout.layout_notification_collapsed else R.layout.layout_notification_expanded
-        )
-        remoteViews.setTextViewText(
-            R.id.appName,
-            context.getString(R.string.app_name) + " • " + song.albumName
-        )
-        remoteViews.setTextViewText(R.id.title, song.title)
-        remoteViews.setTextViewText(R.id.subtitle, song.artistName)
-        linkButtons(remoteViews)
-        return remoteViews
-    }
-
-    override fun updateMetadata(song: Song, onUpdate: () -> Unit) {
-        if (song == Song.emptySong) return
-        val notificationLayout = getCombinedRemoteViews(true, song)
-        val notificationLayoutBig = getCombinedRemoteViews(false, song)
-
-        val action = Intent(context, MainActivity::class.java)
-        action.putExtra(MainActivity.EXPAND_PANEL, PreferenceUtil.isExpandPanel)
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-
-        val clickIntent = PendingIntent
-            .getActivity(
-                context,
-                0,
-                action,
-                PendingIntent.FLAG_UPDATE_CURRENT or if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-        val deleteIntent = buildPendingIntent(context, ACTION_QUIT, null)
-
-        setSmallIcon(R.drawable.ic_notification)
-        setContentIntent(clickIntent)
-        setDeleteIntent(deleteIntent)
-        setCategory(NotificationCompat.CATEGORY_SERVICE)
-        priority = NotificationCompat.PRIORITY_MAX
-        setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        setCustomContentView(notificationLayout)
-        setCustomBigContentView(notificationLayoutBig)
-        setOngoing(true)
-        val bigNotificationImageSize = context.resources
-            .getDimensionPixelSize(R.dimen.notification_big_image_size)
-        Glide.with(context)
-            .asBitmapPalette()
-            .songCoverOptions(song)
-            .load(RetroGlideExtension.getSongModel(song))
-            .centerCrop()
-            .into(object : CustomTarget<BitmapPaletteWrapper>(
-                bigNotificationImageSize,
-                bigNotificationImageSize
-            ) {
-                override fun onResourceReady(
-                    resource: BitmapPaletteWrapper,
-                    transition: Transition<in BitmapPaletteWrapper>?,
-                ) {
-                    val colors = MediaNotificationProcessor(context, resource.bitmap)
-                    update(resource.bitmap, colors.backgroundColor)
-                }
-
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    update(
-                        null,
-                        resolveColor(
-                            context,
-                            com.google.android.material.R.attr.colorSurface,
-                            Color.WHITE
-                        )
-                    )
-                }
-
-                override fun onLoadCleared(placeholder: Drawable?) {
-                    update(
-                        null,
-                        resolveColor(
-                            context,
-                            com.google.android.material.R.attr.colorSurface,
-                            Color.WHITE
-                        )
-                    )
-                }
-
-                private fun update(bitmap: Bitmap?, bgColor: Int) {
-                    var bgColorFinal = bgColor
-                    if (bitmap != null) {
-                        contentView.setImageViewBitmap(R.id.largeIcon, bitmap)
-                        bigContentView.setImageViewBitmap(R.id.largeIcon, bitmap)
-                    } else {
-                        contentView.setImageViewResource(
-                            R.id.largeIcon,
-                            R.drawable.default_audio_art
-                        )
-                        bigContentView.setImageViewResource(
-                            R.id.largeIcon,
-                            R.drawable.default_audio_art
-                        )
-                    }
-
-                    // Android 12 applies a standard Notification template to every notification
-                    // which will in turn have a default background so setting a different background
-                    // than that, looks weird
-                    if (!VersionUtils.hasS()) {
-                        if (!PreferenceUtil.isColoredNotification) {
-                            bgColorFinal =
-                                resolveColor(
-                                    context,
-                                    com.google.android.material.R.attr.colorSurface,
-                                    Color.WHITE
-                                )
-                        }
-                        setBackgroundColor(bgColorFinal)
-                        setNotificationContent(ColorUtil.isColorLight(bgColorFinal))
-                    } else {
-                        if (PreferenceUtil.isColoredNotification) {
-                            setColorized(true)
-                            color = bgColor
-                            setNotificationContent(color.isColorLight)
-                        } else {
-                            setNotificationContent(!context.isSystemDarkModeEnabled())
-                        }
-                    }
-                    onUpdate()
-                }
-
-                private fun setBackgroundColor(color: Int) {
-                    contentView.setInt(R.id.image, "setBackgroundColor", color)
-                    bigContentView.setInt(R.id.image, "setBackgroundColor", color)
-                }
-
-                private fun setNotificationContent(dark: Boolean) {
-                    val primary = MaterialValueHelper.getPrimaryTextColor(context, dark)
-                    val secondary = MaterialValueHelper.getSecondaryTextColor(context, dark)
-                    primaryColor = primary
-
-                    val close = context.getTintedDrawable(
-                        R.drawable.ic_close,
-                        primary
-                    ).toBitmap()
-                    val prev =
-                        context.getTintedDrawable(
-                            R.drawable.ic_skip_previous,
-                            primary
-                        ).toBitmap()
-                    val next =
-                        context.getTintedDrawable(
-                            R.drawable.ic_skip_next,
-                            primary
-                        ).toBitmap()
-                    val playPause = getPlayPauseBitmap(true)
-
-                    contentView.setTextColor(R.id.title, primary)
-                    contentView.setTextColor(R.id.subtitle, secondary)
-                    contentView.setTextColor(R.id.appName, secondary)
-
-                    contentView.setImageViewBitmap(R.id.action_prev, prev)
-                    contentView.setImageViewBitmap(R.id.action_next, next)
-                    contentView.setImageViewBitmap(R.id.action_play_pause, playPause)
-
-                    bigContentView.setTextColor(R.id.title, primary)
-                    bigContentView.setTextColor(R.id.subtitle, secondary)
-                    bigContentView.setTextColor(R.id.appName, secondary)
-
-                    bigContentView.setImageViewBitmap(R.id.action_quit, close)
-                    bigContentView.setImageViewBitmap(R.id.action_prev, prev)
-                    bigContentView.setImageViewBitmap(R.id.action_next, next)
-                    bigContentView.setImageViewBitmap(R.id.action_play_pause, playPause)
-
-                    contentView.setImageViewBitmap(
-                        R.id.smallIcon,
-                        context.getTintedDrawable(
-                            R.drawable.ic_notification,
-                            secondary
-                        ).toBitmap(0.6f)
-                    )
-                    bigContentView.setImageViewBitmap(
-                        R.id.smallIcon,
-                        context.getTintedDrawable(
-                            R.drawable.ic_notification,
-                            secondary
-                        ).toBitmap(0.6f)
-                    )
-                }
-            })
-    }
-
-    private fun getPlayPauseBitmap(isPlaying: Boolean): Bitmap {
-        return context.getTintedDrawable(
-            if (isPlaying)
-                R.drawable.ic_pause_white_48dp
-            else
-                R.drawable.ic_play_arrow_white_48dp, primaryColor
-        ).toBitmap()
-    }
-
-    override fun setPlaying(isPlaying: Boolean) {
-        getPlayPauseBitmap(isPlaying).also {
-            contentView?.setImageViewBitmap(R.id.action_play_pause, it)
-            bigContentView?.setImageViewBitmap(R.id.action_play_pause, it)
-        }
-    }
-
-    override fun updateFavorite(isFavorite: Boolean) {}
-
-    private fun buildPendingIntent(
-        context: Context, action: String,
-        serviceName: ComponentName?,
-    ): PendingIntent {
-        val intent = Intent(action)
-        intent.component = serviceName
-        return PendingIntent.getService(
-            context, 0, intent, if (VersionUtils.hasMarshmallow())
-                PendingIntent.FLAG_IMMUTABLE
-            else 0
-        )
-    }
-
-
-    private fun linkButtons(notificationLayout: RemoteViews) {
-        var pendingIntent: PendingIntent
-
-        val serviceName = ComponentName(context, MusicService::class.java)
-
-        // Previous track
-        pendingIntent = buildPendingIntent(context, ACTION_REWIND, serviceName)
-        notificationLayout.setOnClickPendingIntent(R.id.action_prev, pendingIntent)
-
-        // Play and pause
-        pendingIntent = buildPendingIntent(context, ACTION_TOGGLE_PAUSE, serviceName)
-        notificationLayout.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent)
-
-        // Next track
-        pendingIntent = buildPendingIntent(context, ACTION_SKIP, serviceName)
-        notificationLayout.setOnClickPendingIntent(R.id.action_next, pendingIntent)
-
-        // Close
-        pendingIntent = buildPendingIntent(context, ACTION_QUIT, serviceName)
-        notificationLayout.setOnClickPendingIntent(R.id.action_quit, pendingIntent)
-    }
-
-    companion object {
-        fun from(
-            context: Context,
-            notificationManager: NotificationManager,
-        ): PlayingNotification {
-            if (VersionUtils.hasOreo()) {
-                createNotificationChannel(context, notificationManager)
-            }
-            return PlayingNotificationClassic(context)
-        }
-    }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
new file mode 100644
index 000000000..c4890a692
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl.kt
@@ -0,0 +1,139 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service.notification
+
+import android.app.PendingIntent
+import android.content.ComponentName
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.os.Build
+import android.text.Html
+import androidx.core.app.NotificationCompat
+import androidx.media.app.NotificationCompat.MediaStyle
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.activities.MainActivity
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.MusicUtil
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroColorUtil
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.target.Target
+
+class PlayingNotificationImpl : PlayingNotification() {
+    private var target: Target<BitmapPaletteWrapper>? = null
+    @Synchronized
+    override fun update() {
+        stopped = false
+
+        val song = service.currentSong
+        val isPlaying = service.isPlaying
+        val isFavorite = MusicUtil.isFavorite(service, song)
+        val playButtonResId = if (isPlaying) R.drawable.ic_pause_white_48dp else R.drawable.ic_play_arrow_white_48dp
+        val favoriteResId = if (isFavorite) R.drawable.ic_favorite_white_24dp else R.drawable.ic_favorite_border_white_24dp
+
+        val action = Intent(service, MainActivity::class.java)
+        action.putExtra("expand", true)
+        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        val clickIntent = PendingIntent.getActivity(service, 0, action, PendingIntent.FLAG_UPDATE_CURRENT)
+
+        val serviceName = ComponentName(service, MusicService::class.java)
+        val intent = Intent(ACTION_QUIT)
+        intent.component = serviceName
+        val deleteIntent = PendingIntent.getService(service, 0, intent, 0)
+
+        val bigNotificationImageSize = service.resources
+                .getDimensionPixelSize(R.dimen.notification_big_image_size)
+        service.runOnUiThread {
+            if (target != null) {
+                Glide.clear(target)
+            }
+            target = SongGlideRequest.Builder.from(Glide.with(service), song)
+                    .checkIgnoreMediaStore(service)
+                    .generatePalette(service).build()
+                    .centerCrop()
+                    .into(object : SimpleTarget<BitmapPaletteWrapper>(bigNotificationImageSize, bigNotificationImageSize) {
+                        override fun onResourceReady(resource: BitmapPaletteWrapper, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>) {
+                            update(resource.bitmap, when {
+                                PreferenceUtil.getInstance(service).isDominantColor -> RetroColorUtil.getDominantColor(resource.bitmap, Color.TRANSPARENT)
+                                else -> RetroColorUtil.getColor(resource.palette, Color.TRANSPARENT)
+                            })
+                        }
+
+                        override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+                            super.onLoadFailed(e, errorDrawable)
+                            update(null, Color.TRANSPARENT)
+                        }
+
+                        fun update(bitmap: Bitmap?, color: Int) {
+                            var bitmapFinal = bitmap
+                            if (bitmapFinal == null) {
+                                bitmapFinal = BitmapFactory.decodeResource(service.resources, R.drawable.default_album_art)
+                            }
+
+                            val toggleFavorite = NotificationCompat.Action(favoriteResId, service.getString(R.string.action_toggle_favorite), retrievePlaybackAction(TOGGLE_FAVORITE))
+                            val playPauseAction = NotificationCompat.Action(playButtonResId, service.getString(R.string.action_play_pause), retrievePlaybackAction(ACTION_TOGGLE_PAUSE))
+                            val previousAction = NotificationCompat.Action(R.drawable.ic_skip_previous_round_white_32dp, service.getString(R.string.action_previous), retrievePlaybackAction(ACTION_REWIND))
+                            val nextAction = NotificationCompat.Action(R.drawable.ic_skip_next_round_white_32dp, service.getString(R.string.action_next), retrievePlaybackAction(ACTION_SKIP))
+
+                            val builder = NotificationCompat.Builder(service,
+                                    NOTIFICATION_CHANNEL_ID)
+                                    .setSmallIcon(R.drawable.ic_notification)
+                                    .setLargeIcon(bitmapFinal)
+                                    .setContentIntent(clickIntent)
+                                    .setDeleteIntent(deleteIntent)
+                                    .setContentTitle(Html.fromHtml("<b>" + song.title + "</b>"))
+                                    .setContentText(song.artistName)
+                                    .setSubText(Html.fromHtml("<b>" + song.albumName + "</b>"))
+                                    .setOngoing(isPlaying)
+                                    .setShowWhen(false)
+                                    .addAction(toggleFavorite)
+                                    .addAction(previousAction)
+                                    .addAction(playPauseAction)
+                                    .addAction(nextAction)
+
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                builder.setStyle(MediaStyle()
+                                        .setMediaSession(service.mediaSession.sessionToken)
+                                        .setShowActionsInCompactView(1, 2, 3))
+                                        .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                                if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O && PreferenceUtil.getInstance(service).coloredNotification()) {
+                                    builder.color = color
+                                }
+                            }
+
+                            if (stopped) {
+                                return  // notification has been stopped before loading was finished
+                            }
+                            updateNotifyModeAndPostNotification(builder.build())
+                        }
+                    })
+        }
+    }
+
+    private fun retrievePlaybackAction(action: String): PendingIntent {
+        val serviceName = ComponentName(service, MusicService::class.java)
+        val intent = Intent(action)
+        intent.component = serviceName
+        return PendingIntent.getService(service, 0, intent, 0)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
deleted file mode 100644
index 55dbb9ade..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationImpl24.kt
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.service.notification
-
-import android.annotation.SuppressLint
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.ComponentName
-import android.content.Intent
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.drawable.Drawable
-import android.support.v4.media.session.MediaSessionCompat
-import androidx.core.app.NotificationCompat
-import androidx.media.app.NotificationCompat.MediaStyle
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.MainActivity
-import code.name.monkey.retromusic.glide.RetroGlideExtension
-import code.name.monkey.retromusic.glide.RetroGlideExtension.songCoverOptions
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_QUIT
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_REWIND
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_SKIP
-import code.name.monkey.retromusic.service.MusicService.Companion.ACTION_TOGGLE_PAUSE
-import code.name.monkey.retromusic.service.MusicService.Companion.TOGGLE_FAVORITE
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.bumptech.glide.Glide
-import com.bumptech.glide.request.target.CustomTarget
-import com.bumptech.glide.request.transition.Transition
-
-@SuppressLint("RestrictedApi")
-class PlayingNotificationImpl24(
-    val context: MusicService,
-    mediaSessionToken: MediaSessionCompat.Token,
-) : PlayingNotification(context) {
-
-    init {
-        val action = Intent(context, MainActivity::class.java)
-        action.putExtra(MainActivity.EXPAND_PANEL, PreferenceUtil.isExpandPanel)
-        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
-        val clickIntent =
-            PendingIntent.getActivity(
-                context,
-                0,
-                action,
-                PendingIntent.FLAG_UPDATE_CURRENT or if (VersionUtils.hasMarshmallow())
-                    PendingIntent.FLAG_IMMUTABLE
-                else 0
-            )
-
-        val serviceName = ComponentName(context, MusicService::class.java)
-        val intent = Intent(ACTION_QUIT)
-        intent.component = serviceName
-        val deleteIntent = PendingIntent.getService(
-            context,
-            0,
-            intent,
-            PendingIntent.FLAG_UPDATE_CURRENT or (if (VersionUtils.hasMarshmallow())
-                PendingIntent.FLAG_IMMUTABLE
-            else 0)
-        )
-        val toggleFavorite = buildFavoriteAction(false)
-        val playPauseAction = buildPlayAction(true)
-        val previousAction = NotificationCompat.Action(
-            R.drawable.ic_skip_previous,
-            context.getString(R.string.action_previous),
-            retrievePlaybackAction(ACTION_REWIND)
-        )
-        val nextAction = NotificationCompat.Action(
-            R.drawable.ic_skip_next,
-            context.getString(R.string.action_next),
-            retrievePlaybackAction(ACTION_SKIP)
-        )
-        val dismissAction = NotificationCompat.Action(
-            R.drawable.ic_close,
-            context.getString(R.string.action_cancel),
-            retrievePlaybackAction(ACTION_QUIT)
-        )
-        setSmallIcon(R.drawable.ic_notification)
-        setContentIntent(clickIntent)
-        setDeleteIntent(deleteIntent)
-        setShowWhen(false)
-        addAction(toggleFavorite)
-        addAction(previousAction)
-        addAction(playPauseAction)
-        addAction(nextAction)
-        if (VersionUtils.hasS()) {
-            addAction(dismissAction)
-        }
-
-        setStyle(
-            MediaStyle()
-                .setMediaSession(mediaSessionToken)
-                .setShowActionsInCompactView(1, 2, 3)
-        )
-        setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-    }
-
-    override fun updateMetadata(song: Song, onUpdate: () -> Unit) {
-        if (song == Song.emptySong) return
-        setContentTitle(song.title)
-        setContentText(song.artistName)
-        setSubText(song.albumName)
-        val bigNotificationImageSize = context.resources
-            .getDimensionPixelSize(R.dimen.notification_big_image_size)
-        Glide.with(context)
-            .asBitmap()
-            .songCoverOptions(song)
-            .load(RetroGlideExtension.getSongModel(song))
-            //.checkIgnoreMediaStore()
-            .centerCrop()
-            .into(object : CustomTarget<Bitmap>(
-                bigNotificationImageSize,
-                bigNotificationImageSize
-            ) {
-                override fun onResourceReady(resource: Bitmap, transition: Transition<in Bitmap>?) {
-                    setLargeIcon(resource)
-                    onUpdate()
-                }
-
-                override fun onLoadFailed(errorDrawable: Drawable?) {
-                    super.onLoadFailed(errorDrawable)
-                    setLargeIcon(
-                        BitmapFactory.decodeResource(
-                            context.resources,
-                            R.drawable.default_audio_art
-                        )
-                    )
-                    onUpdate()
-                }
-
-                override fun onLoadCleared(placeholder: Drawable?) {
-                    setLargeIcon(
-                        BitmapFactory.decodeResource(
-                            context.resources,
-                            R.drawable.default_audio_art
-                        )
-                    )
-                    onUpdate()
-                }
-            })
-    }
-
-    private fun buildPlayAction(isPlaying: Boolean): NotificationCompat.Action {
-        val playButtonResId =
-            if (isPlaying) R.drawable.ic_pause_white_48dp else R.drawable.ic_play_arrow_white_48dp
-        return NotificationCompat.Action.Builder(
-            playButtonResId,
-            context.getString(R.string.action_play_pause),
-            retrievePlaybackAction(ACTION_TOGGLE_PAUSE)
-        ).build()
-    }
-
-    private fun buildFavoriteAction(isFavorite: Boolean): NotificationCompat.Action {
-        val favoriteResId =
-            if (isFavorite) R.drawable.ic_favorite else R.drawable.ic_favorite_border
-        return NotificationCompat.Action.Builder(
-            favoriteResId,
-            context.getString(R.string.action_toggle_favorite),
-            retrievePlaybackAction(TOGGLE_FAVORITE)
-        ).build()
-    }
-
-    override fun setPlaying(isPlaying: Boolean) {
-        mActions[2] = buildPlayAction(isPlaying)
-    }
-
-    override fun updateFavorite(isFavorite: Boolean) {
-        mActions[0] = buildFavoriteAction(isFavorite)
-    }
-
-    private fun retrievePlaybackAction(action: String): PendingIntent {
-        val serviceName = ComponentName(context, MusicService::class.java)
-        val intent = Intent(action)
-        intent.component = serviceName
-        return PendingIntent.getService(
-            context, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT or
-                    if (VersionUtils.hasMarshmallow()) PendingIntent.FLAG_IMMUTABLE
-                    else 0
-        )
-    }
-
-    companion object {
-
-        fun from(
-            context: MusicService,
-            notificationManager: NotificationManager,
-            mediaSession: MediaSessionCompat,
-        ): PlayingNotification {
-            if (VersionUtils.hasOreo()) {
-                createNotificationChannel(context, notificationManager)
-            }
-            return PlayingNotificationImpl24(context, mediaSession.sessionToken)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
new file mode 100644
index 000000000..0d2f1ccf0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/service/notification/PlayingNotificationOreo.kt
@@ -0,0 +1,210 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.service.notification
+
+import android.app.PendingIntent
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.graphics.Bitmap
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.widget.RemoteViews
+import androidx.core.app.NotificationCompat
+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.retromusic.R
+import code.name.monkey.retromusic.activities.MainActivity
+import code.name.monkey.retromusic.glide.SongGlideRequest
+import code.name.monkey.retromusic.glide.palette.BitmapPaletteWrapper
+import code.name.monkey.retromusic.model.Song
+import code.name.monkey.retromusic.service.MusicService
+import code.name.monkey.retromusic.service.MusicService.*
+import code.name.monkey.retromusic.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RetroUtil
+import code.name.monkey.retromusic.util.RetroUtil.createBitmap
+import code.name.monkey.retromusic.util.color.MediaNotificationProcessor
+import com.bumptech.glide.Glide
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.SimpleTarget
+import com.bumptech.glide.request.target.Target
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+class PlayingNotificationOreo : PlayingNotification() {
+
+    private var target: Target<BitmapPaletteWrapper>? = null
+
+    private fun getCombinedRemoteViews(collapsed: Boolean, song: Song): RemoteViews {
+        val remoteViews = RemoteViews(service.packageName, if (collapsed) R.layout.layout_notification_collapsed else R.layout.layout_notification_expanded)
+        remoteViews.setTextViewText(R.id.appName, service.getString(R.string.app_name) + " • " + song.albumName)
+        remoteViews.setTextViewText(R.id.title, song.title)
+        remoteViews.setTextViewText(R.id.subtitle, song.artistName)
+        linkButtons(remoteViews)
+        return remoteViews
+    }
+
+    override fun update() {
+        stopped = false
+        val song = service.currentSong
+        val isPlaying = service.isPlaying
+
+        val notificationLayout = getCombinedRemoteViews(true, song)
+        val notificationLayoutBig = getCombinedRemoteViews(false, song)
+
+        val action = Intent(service, MainActivity::class.java)
+        action.putExtra("expand", true)
+        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+
+        val clickIntent = PendingIntent
+                .getActivity(service, 0, action, PendingIntent.FLAG_UPDATE_CURRENT)
+        val deleteIntent = buildPendingIntent(service, ACTION_QUIT, null)
+
+        val builder = NotificationCompat.Builder(service, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.ic_notification)
+                .setContentIntent(clickIntent)
+                .setDeleteIntent(deleteIntent)
+                .setCategory(NotificationCompat.CATEGORY_SERVICE)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setCustomContentView(notificationLayout)
+                .setCustomBigContentView(notificationLayoutBig)
+                .setOngoing(isPlaying)
+
+        val bigNotificationImageSize = service.resources
+                .getDimensionPixelSize(R.dimen.notification_big_image_size)
+        service.runOnUiThread {
+            if (target != null) {
+                Glide.clear(target)
+            }
+            target = SongGlideRequest.Builder.from(Glide.with(service), song)
+                    .checkIgnoreMediaStore(service)
+                    .generatePalette(service).build()
+                    .centerCrop()
+                    .into(object : SimpleTarget<BitmapPaletteWrapper>(bigNotificationImageSize, bigNotificationImageSize) {
+                        override fun onResourceReady(resource: BitmapPaletteWrapper, glideAnimation: GlideAnimation<in BitmapPaletteWrapper>) {
+                            val mediaNotificationProcessor = MediaNotificationProcessor(service, service) { i, _ -> update(resource.bitmap, i) }
+                            mediaNotificationProcessor.processNotification(resource.bitmap)
+                        }
+
+                        override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+                            super.onLoadFailed(e, errorDrawable)
+                            update(null, ATHUtil.resolveColor(service, R.attr.colorSurface, Color.WHITE))
+                        }
+
+                        private fun update(bitmap: Bitmap?, bgColor: Int) {
+                            var bgColorFinal = bgColor
+                            if (bitmap != null) {
+                                notificationLayout.setImageViewBitmap(R.id.largeIcon, bitmap)
+                                notificationLayoutBig.setImageViewBitmap(R.id.largeIcon, bitmap)
+                            } else {
+                                notificationLayout.setImageViewResource(R.id.largeIcon, R.drawable.default_album_art)
+                                notificationLayoutBig.setImageViewResource(R.id.largeIcon, R.drawable.default_album_art)
+                            }
+
+                            if (!PreferenceUtil.getInstance(service).coloredNotification()) {
+                                bgColorFinal = ATHUtil.resolveColor(service, R.attr.colorPrimary, Color.WHITE)
+                            }
+                            setBackgroundColor(bgColorFinal)
+                            setNotificationContent(ColorUtil.isColorLight(bgColorFinal))
+
+                            if (stopped) {
+                                return  // notification has been stopped before loading was finished
+                            }
+                            updateNotifyModeAndPostNotification(builder.build())
+                        }
+
+                        private fun setBackgroundColor(color: Int) {
+                            notificationLayout.setInt(R.id.image, "setBackgroundColor", color)
+                            notificationLayoutBig.setInt(R.id.image, "setBackgroundColor", color)
+                        }
+
+                        private fun setNotificationContent(dark: Boolean) {
+                            val primary = MaterialValueHelper.getPrimaryTextColor(service, dark)
+                            val secondary = MaterialValueHelper.getSecondaryTextColor(service, dark)
+
+                            val close = createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_close_white_24dp, primary)!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER)
+                            val prev = createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_previous_round_white_32dp, primary)!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER)
+                            val next = createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_skip_next_round_white_32dp, primary)!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER)
+                            val playPause = createBitmap(RetroUtil.getTintedVectorDrawable(service,
+                                    if (isPlaying)
+                                        R.drawable.ic_pause_white_48dp
+                                    else
+                                        R.drawable.ic_play_arrow_white_48dp, primary)!!, NOTIFICATION_CONTROLS_SIZE_MULTIPLIER)
+
+                            notificationLayout.setTextColor(R.id.title, primary)
+                            notificationLayout.setTextColor(R.id.subtitle, secondary)
+                            notificationLayout.setTextColor(R.id.appName, secondary)
+
+                            notificationLayout.setImageViewBitmap(R.id.action_prev, prev)
+                            notificationLayout.setImageViewBitmap(R.id.action_next, next)
+                            notificationLayout.setImageViewBitmap(R.id.action_play_pause, playPause)
+
+                            notificationLayoutBig.setTextColor(R.id.title, primary)
+                            notificationLayoutBig.setTextColor(R.id.subtitle, secondary)
+                            notificationLayoutBig.setTextColor(R.id.appName, secondary)
+
+                            notificationLayoutBig.setImageViewBitmap(R.id.action_quit, close)
+                            notificationLayoutBig.setImageViewBitmap(R.id.action_prev, prev)
+                            notificationLayoutBig.setImageViewBitmap(R.id.action_next, next)
+                            notificationLayoutBig.setImageViewBitmap(R.id.action_play_pause, playPause)
+
+                            notificationLayout.setImageViewBitmap(R.id.smallIcon, createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_notification, secondary)!!, 0.6f))
+                            notificationLayoutBig.setImageViewBitmap(R.id.smallIcon, createBitmap(RetroUtil.getTintedVectorDrawable(service, R.drawable.ic_notification, secondary)!!, 0.6f))
+
+                        }
+                    })
+        }
+
+        if (stopped) {
+            return  // notification has been stopped before loading was finished
+        }
+        updateNotifyModeAndPostNotification(builder.build())
+    }
+
+
+    private fun buildPendingIntent(context: Context, action: String,
+                                   serviceName: ComponentName?): PendingIntent {
+        val intent = Intent(action)
+        intent.component = serviceName
+        return PendingIntent.getService(context, 0, intent, 0)
+    }
+
+
+    private fun linkButtons(notificationLayout: RemoteViews) {
+        var pendingIntent: PendingIntent
+
+        val serviceName = ComponentName(service, MusicService::class.java)
+
+        // Previous track
+        pendingIntent = buildPendingIntent(service, ACTION_REWIND, serviceName)
+        notificationLayout.setOnClickPendingIntent(R.id.action_prev, pendingIntent)
+
+        // Play and pause
+        pendingIntent = buildPendingIntent(service, ACTION_TOGGLE_PAUSE, serviceName)
+        notificationLayout.setOnClickPendingIntent(R.id.action_play_pause, pendingIntent)
+
+        // Next track
+        pendingIntent = buildPendingIntent(service, ACTION_SKIP, serviceName)
+        notificationLayout.setOnClickPendingIntent(R.id.action_next, pendingIntent)
+
+        // Close
+        pendingIntent = buildPendingIntent(service, ACTION_QUIT, serviceName)
+        notificationLayout.setOnClickPendingIntent(R.id.action_quit, pendingIntent)
+    }
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
index fdcae6b55..7925bef99 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/service/playback/Playback.kt
@@ -14,8 +14,6 @@
 
 package code.name.monkey.retromusic.service.playback
 
-import code.name.monkey.retromusic.model.Song
-
 
 interface Playback {
 
@@ -25,13 +23,11 @@ interface Playback {
 
     val audioSessionId: Int
 
-    fun setDataSource(
-        song: Song, force: Boolean, completion: (success: Boolean) -> Unit,
-    )
+    fun setDataSource(path: String): Boolean
 
     fun setNextDataSource(path: String?)
 
-    var callbacks: PlaybackCallbacks?
+    fun setCallbacks(callbacks: PlaybackCallbacks)
 
     fun start(): Boolean
 
@@ -45,23 +41,15 @@ interface Playback {
 
     fun position(): Int
 
-    fun seek(whereto: Int, force: Boolean): Int
+    fun seek(whereto: Int): Int
 
     fun setVolume(vol: Float): Boolean
 
     fun setAudioSessionId(sessionId: Int): Boolean
 
-    fun setCrossFadeDuration(duration: Int)
-
-    fun setPlaybackSpeedPitch(speed: Float, pitch: Float)
-
     interface PlaybackCallbacks {
         fun onTrackWentToNext()
 
         fun onTrackEnded()
-
-        fun onTrackEndedWithCrossfade()
-
-        fun onPlayStateChanged()
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt
index 6ce985bb5..2c4e2b9b2 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/CarousalPagerTransformer.kt
@@ -49,4 +49,6 @@ class CarousalPagerTransformer(context: Context) : ViewPager.PageTransformer {
         val m = context.resources.displayMetrics.density
         return (dipValue * m + 0.5f).toInt()
     }
+
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt
index 2f256e9d0..6330f062b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/CascadingPageTransformer.kt
@@ -14,6 +14,7 @@
 
 package code.name.monkey.retromusic.transform
 
+import android.annotation.SuppressLint
 import android.view.View
 import androidx.viewpager.widget.ViewPager
 
@@ -21,29 +22,35 @@ class CascadingPageTransformer : ViewPager.PageTransformer {
 
     private var mScaleOffset = 40
 
+    fun setScaleOffset(mScaleOffset: Int) {
+        this.mScaleOffset = mScaleOffset
+    }
+
+    @SuppressLint("NewApi")
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            when {
-                position < -1 -> { // [-Infinity,-1)
-                    alpha = 0f
-                }
-                position <= 0 -> {
-                    alpha = 1f
-                    rotation = 45 * position
-                    translationX = width / 3 * position
-                }
-                else -> {
-                    alpha = 1f
-                    rotation = 0f
-                    val scale = (width - mScaleOffset * position) / width.toFloat()
+        if (position <= 0.0f) {//被滑动的那页  position 是-下标~ 0
+            page.translationX = 0f
+            //旋转角度  45° * -0.1 = -4.5°
+            page.rotation = 45 * position
+            //X轴偏移 li:  300/3 * -0.1 = -10
+            page.translationX = page.width / 3 * position
+        } else if (position <= 1f) {
+            val scale = (page.width - mScaleOffset * position) / page.width.toFloat()
 
-                    scaleX = scale
-                    scaleY = scale
+            page.scaleX = scale
+            page.scaleY = scale
 
-                    translationX = -width * position
-                    translationY = mScaleOffset * 0.8f * position
-                }
-            }
+            page.translationX = -page.width * position
+            page.translationY = mScaleOffset * 0.8f * position
+        } else {
+            //缩放比例
+            val scale = (page.width - mScaleOffset * position) / page.width.toFloat()
+
+            page.scaleX = scale
+            page.scaleY = scale
+
+            page.translationX = -page.width * position
+            page.translationY = mScaleOffset * 0.7f * position
         }
     }
-}
\ No newline at end of file
+} 
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt
deleted file mode 100644
index c16c2649c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/transform/DefaultTransformer.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package code.name.monkey.retromusic.transform
-
-import android.view.View
-import androidx.viewpager.widget.ViewPager
-
-class DefaultTransformer : ViewPager.PageTransformer {
-    override fun transformPage(page: View, position: Float) {}
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt b/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt
index 7abd4f15d..97126c46d 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/DepthTransformation.kt
@@ -16,44 +16,26 @@ package code.name.monkey.retromusic.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
-import kotlin.math.abs
 
 class DepthTransformation : ViewPager.PageTransformer {
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            when {
-                position < -1 -> { // [-Infinity,-1)
-                    // This page is way off-screen to the left.
-                    alpha = 0f
-                }
-                position <= 0 -> { // [-1,0]
-                    // Use the default slide transition when moving to the left page
-                    alpha = 1f
-                    translationX = 0f
-                    scaleX = 1f
-                    scaleY = 1f
-                }
-                position <= 1 -> { // (0,1]
-                    // Fade the page out.
-                    alpha = 1 - position
+        if (position < -1) {    // [-Infinity,-1)
+            // This page is way off-screen to the left.
+            page.alpha = 0f
+        } else if (position <= 0) {    // [-1,0]
+            page.alpha = 1f
+            page.translationX = 0f
+            page.scaleX = 1f
+            page.scaleY = 1f
+        } else if (position <= 1) {    // (0,1]
+            page.translationX = -position * page.width
+            page.alpha = 1 - Math.abs(position)
+            page.scaleX = 1 - Math.abs(position)
+            page.scaleY = 1 - Math.abs(position)
+        } else {    // (1,+Infinity]
+            // This page is way off-screen to the right.
+            page.alpha = 0f
 
-                    // Counteract the default slide transition
-                    translationX = width * -position
-
-                    // Scale the page down (between MIN_SCALE and 1)
-                    val scaleFactor = (MIN_SCALE + (1 - MIN_SCALE) * (1 - abs(position)))
-                    scaleX = scaleFactor
-                    scaleY = scaleFactor
-                }
-                else -> { // (1,+Infinity]
-                    // This page is way off-screen to the right.
-                    alpha = 0f
-                }
-            }
         }
     }
-
-    companion object {
-        private const val MIN_SCALE = 0.5f
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt b/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt
index f4a13ae5c..c3804623b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/HingeTransformation.kt
@@ -15,42 +15,32 @@
 package code.name.monkey.retromusic.transform
 
 import android.view.View
-import androidx.core.view.isVisible
 import androidx.viewpager.widget.ViewPager
-import kotlin.math.abs
 
 class HingeTransformation : ViewPager.PageTransformer {
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            translationX = -position * width
-            pivotX = 0f
-            pivotY = 0f
 
-            when {
-                position < -1 -> {    // [-Infinity,-1)
-                    // This page is way off-screen to the left.
-                    alpha = 0f
-                    // The Page is off-screen but it may still interfere with
-                    // click events of current page if
-                    // it's visibility is not set to Gone
-                    isVisible = false
-                }
-                position <= 0 -> {    // [-1,0]
-                    rotation = 90 * abs(position)
-                    alpha = 1 - abs(position)
-                    isVisible = true
-                }
-                position <= 1 -> {    // (0,1]
-                    rotation = 0f
-                    alpha = 1f
-                    isVisible = true
-                }
-                else -> {    // (1,+Infinity]
-                    // This page is way off-screen to the right.
-                    alpha = 0f
-                    isVisible = false
-                }
-            }
+        page.translationX = -position * page.width
+        page.pivotX = 0f
+        page.pivotY = 0f
+
+
+        if (position < -1) {    // [-Infinity,-1)
+            // This page is way off-screen to the left.
+            page.alpha = 0f
+
+        } else if (position <= 0) {    // [-1,0]
+            page.rotation = 90 * Math.abs(position)
+            page.alpha = 1 - Math.abs(position)
+
+        } else if (position <= 1) {    // (0,1]
+            page.rotation = 0f
+            page.alpha = 1f
+
+        } else {    // (1,+Infinity]
+            // This page is way off-screen to the right.
+            page.alpha = 0f
+
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt b/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt
index 1b0084162..409fb6e5b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/HorizontalFlipTransformation.kt
@@ -15,41 +15,36 @@
 package code.name.monkey.retromusic.transform
 
 import android.view.View
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
 import androidx.viewpager.widget.ViewPager
-import kotlin.math.abs
 
 class HorizontalFlipTransformation : ViewPager.PageTransformer {
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            page.translationX = -position * page.width
-            page.cameraDistance = 20000f
 
-            if (position < 0.5 && position > -0.5) {
-                page.isVisible = true
-            } else {
-                page.isInvisible = true
-            }
+        page.translationX = -position * page.width
+        page.cameraDistance = 20000f
 
-            when {
-                position < -1 -> {     // [-Infinity,-1)
-                    // This page is way off-screen to the left.
-                    page.alpha = 0f
-                }
-                position <= 0 -> {    // [-1,0]
-                    page.alpha = 1f
-                    page.rotationX = 180 * (1 - abs(position) + 1)
-                }
-                position <= 1 -> {    // (0,1]
-                    page.alpha = 1f
-                    page.rotationX = -180 * (1 - abs(position) + 1)
-                }
-                else -> {    // (1,+Infinity]
-                    // This page is way off-screen to the right.
-                    page.alpha = 0f
-                }
-            }
+        if (position < 0.5 && position > -0.5) {
+            page.visibility = View.VISIBLE
+        } else {
+            page.visibility = View.INVISIBLE
+        }
+
+
+        if (position < -1) {     // [-Infinity,-1)
+            // This page is way off-screen to the left.
+            page.alpha = 0f
+
+        } else if (position <= 0) {    // [-1,0]
+            page.alpha = 1f
+            page.rotationX = 180 * (1 - Math.abs(position) + 1)
+
+        } else if (position <= 1) {    // (0,1]
+            page.alpha = 1f
+            page.rotationX = -180 * (1 - Math.abs(position) + 1)
+
+        } else {    // (1,+Infinity]
+            // This page is way off-screen to the right.
+            page.alpha = 0f
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt
index d0049e5a6..f63e0cd7e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/NormalPageTransformer.kt
@@ -16,8 +16,6 @@ package code.name.monkey.retromusic.transform
 
 import android.view.View
 import androidx.viewpager.widget.ViewPager
-import kotlin.math.abs
-import kotlin.math.max
 
 /**
  * @author Hemanth S (h4h13).
@@ -25,47 +23,41 @@ import kotlin.math.max
 
 class NormalPageTransformer : ViewPager.PageTransformer {
 
-    override fun transformPage(page: View, position: Float) {
-        page.apply {
-            val pageWidth = width
-            val pageHeight = height
+    override fun transformPage(view: View, position: Float) {
+        val pageWidth = view.width
+        val pageHeight = view.height
 
-            when {
-                position < -1 -> { // [-Infinity,-1)
-                    // This page is way off-screen to the left.
-                    alpha = 1f
-                    scaleY = 0.7f
-                }
-                position <= 1 -> { // [-1,1]
-                    // Modify the default slide transition to shrink the page as well
-                    val scaleFactor = max(MIN_SCALE, 1 - abs(position))
-                    val vertMargin = pageHeight * (1 - scaleFactor) / 2
-                    val horzMargin = pageWidth * (1 - scaleFactor) / 2
-                    translationX = if (position < 0) {
-                        horzMargin - vertMargin / 2
-                    } else {
-                        -horzMargin + vertMargin / 2
-                    }
-
-                    // Scale the page down (between MIN_SCALE and 1)
-                    scaleX = scaleFactor
-                    scaleY = scaleFactor
-
-                    // Fade the page relative to its size.
-                    //setAlpha(MIN_ALPHA + (scaleFactor - MIN_SCALE) / (1 - MIN_SCALE) * (1 - MIN_ALPHA));
-
-                }
-                else -> { // (1,+Infinity]
-                    // This page is way off-screen to the right.
-                    alpha = 1f
-                    scaleY = 0.7f
-                }
+        if (position < -1) { // [-Infinity,-1)
+            // This page is way off-screen to the left.
+            view.alpha = 1f
+            view.scaleY = 0.7f
+        } else if (position <= 1) { // [-1,1]
+            // Modify the default slide transition to shrink the page as well
+            val scaleFactor = Math.max(MIN_SCALE, 1 - Math.abs(position))
+            val vertMargin = pageHeight * (1 - scaleFactor) / 2
+            val horzMargin = pageWidth * (1 - scaleFactor) / 2
+            if (position < 0) {
+                view.translationX = horzMargin - vertMargin / 2
+            } else {
+                view.translationX = -horzMargin + vertMargin / 2
             }
+
+            // Scale the page down (between MIN_SCALE and 1)
+            view.scaleX = scaleFactor
+            view.scaleY = scaleFactor
+
+            // Fade the page relative to its size.
+            //view.setAlpha(MIN_ALPHA + (scaleFactor - MIN_SCALE) / (1 - MIN_SCALE) * (1 - MIN_ALPHA));
+
+        } else { // (1,+Infinity]
+            // This page is way off-screen to the right.
+            view.alpha = 1f
+            view.scaleY = 0.7f
         }
     }
 
     companion object {
-        private const val MIN_SCALE = 0.85f
-        private const val MIN_ALPHA = 0.5f
+        private val MIN_SCALE = 0.85f
+        private val MIN_ALPHA = 0.5f
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt
index 0a7d40faf..9e5ec9df8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/ParallaxPagerTransformer.kt
@@ -14,6 +14,9 @@
 
 package code.name.monkey.retromusic.transform
 
+import android.annotation.TargetApi
+import android.os.Build
+import android.util.Log
 import android.view.View
 import androidx.viewpager.widget.ViewPager
 
@@ -22,22 +25,34 @@ import androidx.viewpager.widget.ViewPager
  */
 
 class ParallaxPagerTransformer(private val id: Int) : ViewPager.PageTransformer {
+    private var border = 0
     private var speed = 0.2f
 
-    override fun transformPage(page: View, position: Float) {
-        val parallaxView = page.findViewById<View>(id)
-        page.apply {
-            if (parallaxView != null) {
-                if (position > -1 && position < 1) {
-                    val width = parallaxView.width.toFloat()
-                    parallaxView.translationX = -(position * width * speed)
-                    scaleX = 1f
-                    scaleY = 1f
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+    override fun transformPage(view: View, position: Float) {
+
+        val parallaxView = view.findViewById<View>(id)
+
+        if (parallaxView != null) {
+            if (position > -1 && position < 1) {
+                val width = parallaxView.width.toFloat()
+                parallaxView.translationX = -(position * width * speed)
+                val sc = (view.width.toFloat() - border) / view.width
+                if (position == 0f) {
+                    view.scaleX = 1f
+                    view.scaleY = 1f
+                } else {
+                    view.scaleX = sc
+                    view.scaleY = sc
                 }
             }
         }
     }
 
+    fun setBorder(px: Int) {
+        border = px
+    }
+
     fun setSpeed(speed: Float) {
         this.speed = speed
     }
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt b/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt
index d73674820..4b06bd561 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/VerticalFlipTransformation.kt
@@ -15,42 +15,39 @@
 package code.name.monkey.retromusic.transform
 
 import android.view.View
-import androidx.core.view.isInvisible
-import androidx.core.view.isVisible
 import androidx.viewpager.widget.ViewPager
-import kotlin.math.abs
 
 class VerticalFlipTransformation : ViewPager.PageTransformer {
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            translationX = -position * width
-            cameraDistance = 100000f
 
-            if (position < 0.5 && position > -0.5) {
-                isVisible = true
-            } else {
-                isInvisible = true
-            }
+        page.translationX = -position * page.width
+        page.cameraDistance = 100000f
 
-            when {
-                position < -1 -> {     // [-Infinity,-1)
-                    // This page is way off-screen to the left.
-                    alpha = 0f
-                }
-                position <= 0 -> {    // [-1,0]
-                    alpha = 1f
-                    rotationY = 180 * (1 - abs(position) + 1)
-                }
-                position <= 1 -> {    // (0,1]
-                    alpha = 1f
-                    rotationY = -180 * (1 - abs(position) + 1)
-                }
-                else -> {    // (1,+Infinity]
-                    // This page is way off-screen to the right.
-                    alpha = 0f
-                }
-            }
+        if (position < 0.5 && position > -0.5) {
+            page.visibility = View.VISIBLE
+        } else {
+            page.visibility = View.INVISIBLE
         }
 
+
+        if (position < -1) {     // [-Infinity,-1)
+            // This page is way off-screen to the left.
+            page.alpha = 0f
+
+        } else if (position <= 0) {    // [-1,0]
+            page.alpha = 1f
+            page.rotationY = 180 * (1 - Math.abs(position) + 1)
+
+        } else if (position <= 1) {    // (0,1]
+            page.alpha = 1f
+            page.rotationY = -180 * (1 - Math.abs(position) + 1)
+
+        } else {    // (1,+Infinity]
+            // This page is way off-screen to the right.
+            page.alpha = 0f
+
+        }
+
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt b/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt
index bb1b95973..b4b09f5be 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/transform/VerticalStackTransformer.kt
@@ -19,14 +19,11 @@ import androidx.viewpager.widget.ViewPager
 
 class VerticalStackTransformer : ViewPager.PageTransformer {
     override fun transformPage(page: View, position: Float) {
-        page.apply {
-            if (position >= 0) {
-                scaleX = (0.9f - 0.05f * position)
-                scaleY = 0.9f
-                translationX = -width * position
-                translationY = -30 * position
-            }
+        if (position >= 0) {
+            page.scaleX = (0.9f - 0.05f * position)
+            page.scaleY = 0.9f
+            page.translationX = -page.width * position
+            page.translationY = -30 * position
         }
-
     }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt b/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
new file mode 100644
index 000000000..999038103
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util
+
+import android.content.Context
+import android.content.Intent
+import android.content.SharedPreferences
+import android.graphics.Color
+import android.net.Uri
+import code.name.monkey.retromusic.R
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.WhichButton
+import com.afollestad.materialdialogs.actions.getActionButton
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
+
+object AppRater {
+    private const val DO_NOT_SHOW_AGAIN = "do_not_show_again"// Package Name
+    private const val APP_RATING = "app_rating"// Package Name
+    private const val LAUNCH_COUNT = "launch_count"// Package Name
+    private const val DATE_FIRST_LAUNCH = "date_first_launch"// Package Name
+
+    private const val DAYS_UNTIL_PROMPT = 3//Min number of days
+    private const val LAUNCHES_UNTIL_PROMPT = 5//Min number of launches
+
+    fun appLaunched(context: Context) {
+        val prefs = context.getSharedPreferences(APP_RATING, 0)
+        if (prefs.getBoolean(DO_NOT_SHOW_AGAIN, false)) {
+            return
+        }
+
+        val editor = prefs.edit()
+
+        // Increment launch counter
+        val launchCount = prefs.getLong(LAUNCH_COUNT, 0) + 1
+        editor.putLong(LAUNCH_COUNT, launchCount)
+
+        // Get date of first launch
+        var dateFirstLaunch = prefs.getLong(DATE_FIRST_LAUNCH, 0)
+        if (dateFirstLaunch == 0L) {
+            dateFirstLaunch = System.currentTimeMillis()
+            editor.putLong(DATE_FIRST_LAUNCH, dateFirstLaunch)
+        }
+
+        // Wait at least n days before opening
+        if (launchCount >= LAUNCHES_UNTIL_PROMPT) {
+            if (System.currentTimeMillis() >= dateFirstLaunch + DAYS_UNTIL_PROMPT * 24 * 60 * 60 * 1000) {
+                showRateDialog(context, editor)
+            }
+        }
+
+        editor.commit()
+    }
+
+    private fun showRateDialog(context: Context, editor: SharedPreferences.Editor) {
+        MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT))
+                .show {
+
+                    cornerRadius(PreferenceUtil.getInstance(context).dialogCorner)
+                    title(text = "Rate this App")
+                    message(text = "If you enjoy using Retro Music, please take a moment to rate it. Thanks for your support!")
+                    positiveButton(R.string.app_name) {
+                        context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=${context.packageName}")))
+                        editor.putBoolean(DO_NOT_SHOW_AGAIN, true)
+                        editor.commit()
+                        dismiss()
+                    }
+                    negativeButton(text = "Later") {
+                        dismiss()
+                    }
+                    neutralButton(text = " No thanks") {
+                        editor.putBoolean(DO_NOT_SHOW_AGAIN, true)
+                        editor.commit()
+                        dismiss()
+                    }
+                    getActionButton(WhichButton.POSITIVE).updateTextColor(Color.RED)
+                }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java
new file mode 100644
index 000000000..6b7493456
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.java
@@ -0,0 +1,57 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import androidx.annotation.NonNull;
+
+import com.bumptech.glide.signature.StringSignature;
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+public class ArtistSignatureUtil {
+    private static final String ARTIST_SIGNATURE_PREFS = "artist_signatures";
+
+    private static ArtistSignatureUtil sInstance;
+
+    private final SharedPreferences mPreferences;
+
+    private ArtistSignatureUtil(@NonNull final Context context) {
+        mPreferences = context.getSharedPreferences(ARTIST_SIGNATURE_PREFS, Context.MODE_PRIVATE);
+    }
+
+    public static ArtistSignatureUtil getInstance(@NonNull final Context context) {
+        if (sInstance == null) {
+            sInstance = new ArtistSignatureUtil(context.getApplicationContext());
+        }
+        return sInstance;
+    }
+
+    @SuppressLint("CommitPrefEdits")
+    public void updateArtistSignature(String artistName) {
+        mPreferences.edit().putLong(artistName, System.currentTimeMillis()).commit();
+    }
+
+    public long getArtistSignatureRaw(String artistName) {
+        return mPreferences.getLong(artistName, 0);
+    }
+
+    public StringSignature getArtistSignature(String artistName) {
+        return new StringSignature(String.valueOf(getArtistSignatureRaw(artistName)));
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt
deleted file mode 100644
index 94a5b0b58..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/ArtistSignatureUtil.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.content.SharedPreferences
-import androidx.core.content.edit
-import com.bumptech.glide.signature.ObjectKey
-
-/** @author Karim Abou Zeid (kabouzeid)
- */
-class ArtistSignatureUtil private constructor(context: Context) {
-    private val mPreferences: SharedPreferences =
-        context.getSharedPreferences(ARTIST_SIGNATURE_PREFS, Context.MODE_PRIVATE)
-
-    fun updateArtistSignature(artistName: String?) {
-        mPreferences.edit { putLong(artistName, System.currentTimeMillis()) }
-    }
-
-    private fun getArtistSignatureRaw(artistName: String?): Long {
-        return mPreferences.getLong(artistName, 0)
-    }
-
-    fun getArtistSignature(artistName: String?): ObjectKey {
-        return ObjectKey(getArtistSignatureRaw(artistName).toString())
-    }
-
-    companion object {
-        private const val ARTIST_SIGNATURE_PREFS = "artist_signatures"
-        private var INSTANCE: ArtistSignatureUtil? = null
-        fun getInstance(context: Context): ArtistSignatureUtil {
-            if (INSTANCE == null) {
-                INSTANCE = ArtistSignatureUtil(context.applicationContext)
-            }
-            return INSTANCE!!
-        }
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt b/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt
deleted file mode 100644
index 8c5fa078c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/AutoGeneratedPlaylistBitmap.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.util.MergedImageUtils.joinImages
-import code.name.monkey.retromusic.util.MusicUtil.getMediaStoreAlbumCoverUri
-import com.bumptech.glide.Glide
-import com.bumptech.glide.load.resource.bitmap.RoundedCorners
-
-object AutoGeneratedPlaylistBitmap {
-    fun getBitmap(
-        context: Context, songPlaylist: List<Song>?
-    ): Bitmap? {
-        if (songPlaylist == null || songPlaylist.isEmpty()) return getDefaultBitmap(context)
-        if (songPlaylist.size == 1) return getBitmapWithAlbumId(context, songPlaylist[0].albumId)
-        val albumID: MutableList<Long> = ArrayList()
-        for (song in songPlaylist) {
-            if (!albumID.contains(song.albumId)) albumID.add(song.albumId)
-        }
-        val art: MutableList<Bitmap> = ArrayList()
-        for (id in albumID) {
-            val bitmap = getBitmapWithAlbumId(context, id)
-            if (bitmap != null) art.add(bitmap)
-            if (art.size == 9) break
-        }
-        return joinImages(art)
-    }
-
-    private fun getBitmapWithAlbumId(context: Context, id: Long): Bitmap? {
-        return try {
-            Glide.with(context)
-                .asBitmap()
-                .transform(RoundedCorners(20))
-                .load(getMediaStoreAlbumCoverUri(id))
-                .submit(200, 200)
-                .get()
-        } catch (e: Exception) {
-            null
-        }
-    }
-
-    private fun getDefaultBitmap(context: Context): Bitmap {
-        return BitmapFactory.decodeResource(context.resources, R.drawable.default_album_art)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.java
new file mode 100644
index 000000000..842871417
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.java
@@ -0,0 +1,131 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+
+/**
+ * @author Eugene Cheung (arkon)
+ */
+public class CalendarUtil {
+    private static final long MS_PER_MINUTE = 60 * 1000;
+    private static final long MS_PER_DAY = 24 * 60 * MS_PER_MINUTE;
+
+    private Calendar calendar;
+
+    public CalendarUtil() {
+        this.calendar = Calendar.getInstance();
+    }
+
+    /**
+     * Returns the time elapsed so far today in milliseconds.
+     *
+     * @return Time elapsed today in milliseconds.
+     */
+    public long getElapsedToday() {
+        // Time elapsed so far today
+        return (calendar.get(Calendar.HOUR_OF_DAY) * 60 + calendar.get(Calendar.MINUTE)) * MS_PER_MINUTE
+                + calendar.get(Calendar.SECOND) * 1000
+                + calendar.get(Calendar.MILLISECOND);
+    }
+
+    /**
+     * Returns the time elapsed so far this week in milliseconds.
+     *
+     * @return Time elapsed this week in milliseconds.
+     */
+    public long getElapsedWeek() {
+        // Today + days passed this week
+        long elapsed = getElapsedToday();
+
+        final int passedWeekdays = calendar.get(Calendar.DAY_OF_WEEK) - 1 - calendar.getFirstDayOfWeek();
+        if (passedWeekdays > 0) {
+            elapsed += passedWeekdays * MS_PER_DAY;
+        }
+
+        return elapsed;
+    }
+
+    /**
+     * Returns the time elapsed so far this month in milliseconds.
+     *
+     * @return Time elapsed this month in milliseconds.
+     */
+    public long getElapsedMonth() {
+        // Today + rest of this month
+        return getElapsedToday() +
+                ((calendar.get(Calendar.DAY_OF_MONTH) - 1) * MS_PER_DAY);
+    }
+
+    /**
+     * Returns the time elapsed so far this month and the last numMonths months in milliseconds.
+     *
+     * @param numMonths Additional number of months prior to the current month to calculate.
+     * @return Time elapsed this month and the last numMonths months in milliseconds.
+     */
+    public long getElapsedMonths(int numMonths) {
+        // Today + rest of this month
+        long elapsed = getElapsedMonth();
+
+        // Previous numMonths months
+        int month = calendar.get(Calendar.MONTH);
+        int year = calendar.get(Calendar.YEAR);
+        for (int i = 0; i < numMonths; i++) {
+            month--;
+
+            if (month < Calendar.JANUARY) {
+                month = Calendar.DECEMBER;
+                year--;
+            }
+
+            elapsed += getDaysInMonth(year, month) * MS_PER_DAY;
+        }
+
+        return elapsed;
+    }
+
+    /**
+     * Returns the time elapsed so far this year in milliseconds.
+     *
+     * @return Time elapsed this year in milliseconds.
+     */
+    public long getElapsedYear() {
+        // Today + rest of this month + previous months until January
+        long elapsed = getElapsedMonth();
+
+        int month = calendar.get(Calendar.MONTH) - 1;
+        int year = calendar.get(Calendar.YEAR);
+        while (month > Calendar.JANUARY) {
+            elapsed += getDaysInMonth(year, month) * MS_PER_DAY;
+
+            month--;
+        }
+
+        return elapsed;
+    }
+
+    /**
+     * Gets the number of days for the given month in the given year.
+     *
+     * @param year  The year.
+     * @param month The month (1 - 12).
+     * @return The days in that month/year.
+     */
+    private int getDaysInMonth(int year, int month) {
+        final Calendar monthCal = new GregorianCalendar(calendar.get(Calendar.YEAR), month, 1);
+        return monthCal.getActualMaximum(Calendar.DAY_OF_MONTH);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
deleted file mode 100644
index 777b63842..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/CalendarUtil.kt
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import java.util.*
-
-/** @author Eugene Cheung (arkon)
- */
-class CalendarUtil {
-    private val calendar = Calendar.getInstance()// Time elapsed so far today
-
-    /**
-     * Returns the time elapsed so far today in milliseconds.
-     *
-     * @return Time elapsed today in milliseconds.
-     */
-    val elapsedToday: Long
-        get() =// Time elapsed so far today
-            (calendar[Calendar.HOUR_OF_DAY] * 60 + calendar[Calendar.MINUTE]) * MS_PER_MINUTE + calendar[Calendar.SECOND] * 1000 + calendar[Calendar.MILLISECOND]// Today + days passed this week
-
-    /**
-     * Returns the time elapsed so far this week in milliseconds.
-     *
-     * @return Time elapsed this week in milliseconds.
-     */
-    val elapsedWeek: Long
-        get() {
-            // Today + days passed this week
-            var elapsed = elapsedToday
-            val passedWeekdays = calendar[Calendar.DAY_OF_WEEK] - 1 - calendar.firstDayOfWeek
-            if (passedWeekdays > 0) {
-                elapsed += passedWeekdays * MS_PER_DAY
-            }
-            return elapsed
-        }// Today + rest of this month
-
-    /**
-     * Returns the time elapsed so far this month in milliseconds.
-     *
-     * @return Time elapsed this month in milliseconds.
-     */
-    val elapsedMonth: Long
-        get() =// Today + rest of this month
-            elapsedToday + (calendar[Calendar.DAY_OF_MONTH] - 1) * MS_PER_DAY
-
-    /**
-     * Returns the time elapsed so far this month and the last numMonths months in milliseconds.
-     *
-     * @param numMonths Additional number of months prior to the current month to calculate.
-     * @return Time elapsed this month and the last numMonths months in milliseconds.
-     */
-    fun getElapsedMonths(numMonths: Int): Long {
-        // Today + rest of this month
-        var elapsed = elapsedMonth
-
-        // Previous numMonths months
-        var month = calendar[Calendar.MONTH]
-        var year = calendar[Calendar.YEAR]
-        for (i in 0 until numMonths) {
-            month--
-            if (month < Calendar.JANUARY) {
-                month = Calendar.DECEMBER
-                year--
-            }
-            elapsed += getDaysInMonth(month) * MS_PER_DAY
-        }
-        return elapsed
-    }// Today + rest of this month + previous months until January
-
-    /**
-     * Returns the time elapsed so far this year in milliseconds.
-     *
-     * @return Time elapsed this year in milliseconds.
-     */
-    val elapsedYear: Long
-        get() {
-            // Today + rest of this month + previous months until January
-            var elapsed = elapsedMonth
-            var month = calendar[Calendar.MONTH] - 1
-            while (month > Calendar.JANUARY) {
-                elapsed += getDaysInMonth(month) * MS_PER_DAY
-                month--
-            }
-            return elapsed
-        }
-
-    /**
-     * Gets the number of days for the given month in the given year.
-     *
-     * @param month The month (1 - 12).
-     * @return The days in that month/year.
-     */
-    private fun getDaysInMonth(month: Int): Int {
-        val monthCal: Calendar = GregorianCalendar(calendar[Calendar.YEAR], month, 1)
-        return monthCal.getActualMaximum(Calendar.DAY_OF_MONTH)
-    }
-
-    /**
-     * Returns the time elapsed so far last N days in milliseconds.
-     *
-     * @return Time elapsed since N days in milliseconds.
-     */
-    fun getElapsedDays(numDays: Int): Long {
-        var elapsed = elapsedToday
-        elapsed += numDays * MS_PER_DAY
-        return elapsed
-    }
-
-    companion object {
-        private const val MS_PER_MINUTE = (60 * 1000).toLong()
-        private const val MS_PER_DAY = 24 * 60 * MS_PER_MINUTE
-    }
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java
deleted file mode 100644
index e8f91f5dc..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/ColorUtil.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package code.name.monkey.retromusic.util;
-
-import android.graphics.Bitmap;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.Nullable;
-import androidx.palette.graphics.Palette;
-
-import java.util.Collections;
-import java.util.Comparator;
-
-public class ColorUtil {
-
-  @Nullable
-  public static Palette generatePalette(Bitmap bitmap) {
-    if (bitmap == null) return null;
-    return Palette.from(bitmap).generate();
-  }
-
-  @ColorInt
-  public static int getColor(@Nullable Palette palette, int fallback) {
-    if (palette != null) {
-      if (palette.getVibrantSwatch() != null) {
-        return palette.getVibrantSwatch().getRgb();
-      } else if (palette.getMutedSwatch() != null) {
-        return palette.getMutedSwatch().getRgb();
-      } else if (palette.getDarkVibrantSwatch() != null) {
-        return palette.getDarkVibrantSwatch().getRgb();
-      } else if (palette.getDarkMutedSwatch() != null) {
-        return palette.getDarkMutedSwatch().getRgb();
-      } else if (palette.getLightVibrantSwatch() != null) {
-        return palette.getLightVibrantSwatch().getRgb();
-      } else if (palette.getLightMutedSwatch() != null) {
-        return palette.getLightMutedSwatch().getRgb();
-      } else if (!palette.getSwatches().isEmpty()) {
-        return Collections.max(palette.getSwatches(), SwatchComparator.getInstance()).getRgb();
-      }
-    }
-    return fallback;
-  }
-
-  private static class SwatchComparator implements Comparator<Palette.Swatch> {
-    private static SwatchComparator sInstance;
-
-    static SwatchComparator getInstance() {
-      if (sInstance == null) {
-        sInstance = new SwatchComparator();
-      }
-      return sInstance;
-    }
-
-    @Override
-    public int compare(Palette.Swatch lhs, Palette.Swatch rhs) {
-      return lhs.getPopulation() - rhs.getPopulation();
-    }
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/Compressor.java b/app/src/main/java/code/name/monkey/retromusic/util/Compressor.java
new file mode 100644
index 000000000..a684fc8b3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/Compressor.java
@@ -0,0 +1,104 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+
+import java.io.File;
+import java.io.IOException;
+
+import io.reactivex.Flowable;
+
+/**
+ * Created on : June 18, 2016
+ * Author     : zetbaitsu
+ * Name       : Zetra
+ * GitHub     : https://github.com/zetbaitsu
+ */
+public class Compressor {
+    //max width and height values of the compressed image is taken as 612x816
+    private int maxWidth = 612;
+    private int maxHeight = 816;
+    private Bitmap.CompressFormat compressFormat = Bitmap.CompressFormat.JPEG;
+    private int quality = 80;
+    private String destinationDirectoryPath;
+
+    public Compressor(Context context) {
+        destinationDirectoryPath = context.getCacheDir().getPath() + File.separator + "images";
+    }
+
+    public Compressor setMaxWidth(int maxWidth) {
+        this.maxWidth = maxWidth;
+        return this;
+    }
+
+    public Compressor setMaxHeight(int maxHeight) {
+        this.maxHeight = maxHeight;
+        return this;
+    }
+
+    public Compressor setCompressFormat(Bitmap.CompressFormat compressFormat) {
+        this.compressFormat = compressFormat;
+        return this;
+    }
+
+    public Compressor setQuality(int quality) {
+        this.quality = quality;
+        return this;
+    }
+
+    public Compressor setDestinationDirectoryPath(String destinationDirectoryPath) {
+        this.destinationDirectoryPath = destinationDirectoryPath;
+        return this;
+    }
+
+    public File compressToFile(File imageFile) throws IOException {
+        return compressToFile(imageFile, imageFile.getName());
+    }
+
+    public File compressToFile(File imageFile, String compressedFileName) throws IOException {
+        return ImageUtil.compressImage(imageFile, maxWidth, maxHeight, compressFormat, quality,
+                destinationDirectoryPath + File.separator + compressedFileName);
+    }
+
+    public Bitmap compressToBitmap(File imageFile) throws IOException {
+        return ImageUtil.decodeSampledBitmapFromFile(imageFile, maxWidth, maxHeight);
+    }
+
+    public Flowable<File> compressToFileAsFlowable(final File imageFile) {
+        return compressToFileAsFlowable(imageFile, imageFile.getName());
+    }
+
+    public Flowable<File> compressToFileAsFlowable(final File imageFile, final String compressedFileName) {
+        return Flowable.defer(() -> {
+            try {
+                return Flowable.just(compressToFile(imageFile, compressedFileName));
+            } catch (IOException e) {
+                return Flowable.error(e);
+            }
+        });
+    }
+
+    public Flowable<Bitmap> compressToBitmapAsFlowable(final File imageFile) {
+        return Flowable.defer(() -> {
+            try {
+                return Flowable.just(compressToBitmap(imageFile));
+            } catch (IOException e) {
+                return Flowable.error(e);
+            }
+        });
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
index 3c0cb02d7..523639f1b 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/CustomArtistImageUtil.kt
@@ -14,98 +14,98 @@
 
 package code.name.monkey.retromusic.util
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Bitmap
+import android.graphics.drawable.Drawable
 import android.net.Uri
-import android.provider.MediaStore
+import android.os.AsyncTask
 import android.widget.Toast
-import androidx.core.content.edit
 import code.name.monkey.retromusic.App
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.model.Artist
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.withContext
+import com.bumptech.glide.request.animation.GlideAnimation
+import com.bumptech.glide.request.target.SimpleTarget
+import java.io.BufferedOutputStream
 import java.io.File
+import java.io.FileOutputStream
 import java.io.IOException
 import java.util.*
 
 
 class CustomArtistImageUtil private constructor(context: Context) {
 
-    private val mPreferences: SharedPreferences = context.applicationContext.getSharedPreferences(
-        CUSTOM_ARTIST_IMAGE_PREFS,
-        Context.MODE_PRIVATE
-    )
+    private val mPreferences: SharedPreferences
 
-    suspend fun setCustomArtistImage(artist: Artist, uri: Uri) {
-        val context = App.getContext()
-        withContext(IO) {
-            runCatching {
-                Glide.with(context)
-                    .asBitmap()
-                    .load(uri)
-                    .diskCacheStrategy(DiskCacheStrategy.NONE)
-                    .skipMemoryCache(true)
-                    .submit()
-                    .get()
-            }
-                .onSuccess {
-                    saveImage(context, artist, it)
-                }
-                .onFailure {
-                    context.showToast(R.string.error_load_failed)
-                }
-        }
+    init {
+        mPreferences = context.applicationContext.getSharedPreferences(CUSTOM_ARTIST_IMAGE_PREFS, Context.MODE_PRIVATE)
     }
 
-    private fun saveImage(context: Context, artist: Artist, bitmap: Bitmap) {
-        val dir = File(context.filesDir, FOLDER_NAME)
-        if (!dir.exists()) {
-            if (!dir.mkdirs()) { // create the folder
-                return
-            }
-        }
-        val file = File(dir, getFileName(artist))
+    fun setCustomArtistImage(artist: Artist, uri: Uri) {
+        Glide.with(App.getContext())
+                .load(uri)
+                .asBitmap()
+                .diskCacheStrategy(DiskCacheStrategy.NONE)
+                .skipMemoryCache(true)
+                .into(object : SimpleTarget<Bitmap>() {
+                    override fun onLoadFailed(e: Exception?, errorDrawable: Drawable?) {
+                        super.onLoadFailed(e, errorDrawable)
+                        e!!.printStackTrace()
+                        Toast.makeText(App.getContext(), e.toString(), Toast.LENGTH_LONG).show()
+                    }
 
-        var successful = false
-        try {
-            file.outputStream().buffered().use { bos ->
-                successful = ImageUtil.resizeBitmap(bitmap, 2048)
-                    .compress(Bitmap.CompressFormat.JPEG, 100, bos)
-            }
-        } catch (e: IOException) {
-            context.showToast(e.toString(), Toast.LENGTH_LONG)
-        }
+                    override fun onResourceReady(resource: Bitmap, glideAnimation: GlideAnimation<in Bitmap>) {
+                        object : AsyncTask<Void, Void, Void>() {
+                            @SuppressLint("ApplySharedPref")
+                            override fun doInBackground(vararg params: Void): Void? {
+                                val dir = File(App.getContext().filesDir, FOLDER_NAME)
+                                if (!dir.exists()) {
+                                    if (!dir.mkdirs()) { // create the folder
+                                        return null
+                                    }
+                                }
+                                val file = File(dir, getFileName(artist))
 
-        if (successful) {
-            mPreferences.edit { putBoolean(getFileName(artist), true) }
-            ArtistSignatureUtil.getInstance(context)
-                .updateArtistSignature(artist.name)
-            context.contentResolver.notifyChange(
-                MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI,
-                null
-            ) // trigger media store changed to force artist image reload
-        }
+                                var succesful = false
+                                try {
+                                    val os = BufferedOutputStream(FileOutputStream(file))
+                                    succesful = ImageUtil.resizeBitmap(resource, 2048).compress(Bitmap.CompressFormat.JPEG, 100, os)
+                                    os.close()
+                                } catch (e: IOException) {
+                                    Toast.makeText(App.getContext(), e.toString(), Toast.LENGTH_LONG).show()
+                                }
+
+                                if (succesful) {
+                                    mPreferences.edit().putBoolean(getFileName(artist), true).commit()
+                                    ArtistSignatureUtil.getInstance(App.getContext()).updateArtistSignature(artist.name)
+                                    App.getContext().getContentResolver().notifyChange(Uri.parse("content://media"), null) // trigger media store changed to force artist image reload
+                                }
+                                return null
+                            }
+                        }.execute()
+                    }
+                })
     }
 
-    suspend fun resetCustomArtistImage(artist: Artist) {
-        withContext(IO) {
-            mPreferences.edit { putBoolean(getFileName(artist), false) }
-            ArtistSignatureUtil.getInstance(App.getContext()).updateArtistSignature(artist.name)
-            App.getContext().contentResolver.notifyChange(
-                MediaStore.Audio.Artists.EXTERNAL_CONTENT_URI,
-                null
-            ) // trigger media store changed to force artist image reload
+    fun resetCustomArtistImage(artist: Artist) {
+        object : AsyncTask<Void, Void, Void>() {
+            @SuppressLint("ApplySharedPref")
+            override fun doInBackground(vararg params: Void): Void? {
+                mPreferences.edit().putBoolean(getFileName(artist), false).commit()
+                ArtistSignatureUtil.getInstance(App.getContext()).updateArtistSignature(artist.name)
+                App.getContext().contentResolver.notifyChange(Uri.parse("content://media"), null) // trigger media store changed to force artist image reload
 
-            val file = getFile(artist)
-            if (file.exists()) {
-                file.delete()
+                val file = getFile(artist)
+                if (!file.exists()) {
+                    return null
+                } else {
+                    file.delete()
+                }
+                return null
             }
-        }
+        }.execute()
     }
 
     // shared prefs saves us many IO operations
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java
new file mode 100644
index 000000000..6c5c650c2
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.java
@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.app.Activity;
+import android.content.Context;
+import android.util.DisplayMetrics;
+
+import androidx.annotation.NonNull;
+
+/**
+ * Created by hefuyi on 16/7/30.
+ */
+public class DensityUtil {
+
+    public static int getScreenHeight(@NonNull Context context) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        ((Activity) context).getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        return displayMetrics.heightPixels;
+    }
+
+    public static int dip2px(@NonNull Context context, float dpVale) {
+        final float scale = context.getResources().getDisplayMetrics().density;
+        return (int) (dpVale * scale + 0.5f);
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt
deleted file mode 100644
index 51a7cc420..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/DensityUtil.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.util.TypedValue
-
-/**
- * Created by hefuyi on 16/7/30.
- */
-object DensityUtil {
-    fun getScreenHeight(context: Context): Int {
-        val displayMetrics = context.resources.displayMetrics
-        return displayMetrics.heightPixels
-    }
-
-    fun getScreenWidth(context: Context): Int {
-        val displayMetrics = context.resources.displayMetrics
-        return displayMetrics.widthPixels
-    }
-
-    private fun toDP(context: Context, value: Int): Int {
-        return TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP,
-            value.toFloat(), context.resources.displayMetrics
-        ).toInt()
-    }
-
-    @JvmStatic
-    fun dip2px(context: Context, dpVale: Float): Int {
-        val scale = context.resources.displayMetrics.density
-        return (dpVale * scale + 0.5f).toInt()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt
deleted file mode 100644
index b0abc8af5..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/FilePathUtil.kt
+++ /dev/null
@@ -1,15 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.os.Environment
-
-object FilePathUtil {
-    fun blacklistFilePaths(): List<String> {
-        return listOf(
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_ALARMS),
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_RINGTONES),
-            getExternalStoragePublicDirectory(Environment.DIRECTORY_NOTIFICATIONS)
-        ).map {
-            FileUtil.safeGetCanonicalPath(it)
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
index 6fa658bb4..9476e86d1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/FileUtil.java
@@ -14,11 +14,10 @@
 
 package code.name.monkey.retromusic.util;
 
-import static code.name.monkey.retromusic.util.FileUtilsKt.getExternalStorageDirectory;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.os.Environment;
+import android.provider.MediaStore;
 import android.webkit.MimeTypeMap;
 
 import androidx.annotation.NonNull;
@@ -29,307 +28,241 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.FileInputStream;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Locale;
-import java.util.StringTokenizer;
 
-import code.name.monkey.retromusic.Constants;
-import code.name.monkey.retromusic.adapter.Storage;
+import code.name.monkey.retromusic.loaders.SongLoader;
+import code.name.monkey.retromusic.loaders.SortedCursor;
 import code.name.monkey.retromusic.model.Song;
-import code.name.monkey.retromusic.repository.RealSongRepository;
-import code.name.monkey.retromusic.repository.SortedCursor;
+
 
 public final class FileUtil {
 
-  private FileUtil() {}
-
-  public static byte[] readBytes(InputStream stream) throws IOException {
-    ByteArrayOutputStream baos = new ByteArrayOutputStream();
-    byte[] buffer = new byte[4096];
-    int count;
-    while ((count = stream.read(buffer)) != -1) {
-      baos.write(buffer, 0, count);
-    }
-    stream.close();
-    return baos.toByteArray();
-  }
-
-  @NonNull
-  public static List<Song> matchFilesWithMediaStore(
-      @NonNull Context context, @Nullable List<File> files) {
-    return new RealSongRepository(context).songs(makeSongCursor(context, files));
-  }
-
-  public static String safeGetCanonicalPath(File file) {
-    try {
-      return file.getCanonicalPath();
-    } catch (IOException e) {
-      e.printStackTrace();
-      return file.getAbsolutePath();
-    }
-  }
-
-  @Nullable
-  public static SortedCursor makeSongCursor(
-      @NonNull final Context context, @Nullable final List<File> files) {
-    String selection = null;
-    String[] paths = null;
-
-    if (files != null) {
-      paths = toPathArray(files);
-
-      if (files.size() > 0
-          && files.size() < 999) { // 999 is the max amount Androids SQL implementation can handle.
-        selection =
-            Constants.DATA + " IN (" + makePlaceholders(files.size()) + ")";
-      }
+    private FileUtil() {
     }
 
-    Cursor songCursor =
-        new RealSongRepository(context).makeSongCursor(selection, selection == null ? null : paths, PreferenceUtil.INSTANCE.getSongSortOrder(), true);
-
-    return songCursor == null
-        ? null
-        : new SortedCursor(songCursor, paths, Constants.DATA);
-  }
-
-  private static String makePlaceholders(int len) {
-    StringBuilder sb = new StringBuilder(len * 2 - 1);
-    sb.append("?");
-    for (int i = 1; i < len; i++) {
-      sb.append(",?");
-    }
-    return sb.toString();
-  }
-
-  @Nullable
-  private static String[] toPathArray(@Nullable List<File> files) {
-    if (files != null) {
-      String[] paths = new String[files.size()];
-      for (int i = 0; i < files.size(); i++) {
-        paths[i] = safeGetCanonicalPath(files.get(i));
-      }
-      return paths;
-    }
-    return null;
-  }
-
-  @NonNull
-  public static List<File> listFiles(@NonNull File directory, @Nullable FileFilter fileFilter) {
-    List<File> fileList = new LinkedList<>();
-    File[] found = directory.listFiles(fileFilter);
-    if (found != null) {
-      Collections.addAll(fileList, found);
-    }
-    return fileList;
-  }
-
-  @NonNull
-  public static List<File> listFilesDeep(@NonNull File directory, @Nullable FileFilter fileFilter) {
-    List<File> files = new LinkedList<>();
-    internalListFilesDeep(files, directory, fileFilter);
-    return files;
-  }
-
-  @NonNull
-  public static List<File> listFilesDeep(
-      @NonNull Collection<File> files, @Nullable FileFilter fileFilter) {
-    List<File> resFiles = new LinkedList<>();
-    for (File file : files) {
-      if (file.isDirectory()) {
-        internalListFilesDeep(resFiles, file, fileFilter);
-      } else if (fileFilter == null || fileFilter.accept(file)) {
-        resFiles.add(file);
-      }
-    }
-    return resFiles;
-  }
-
-  private static void internalListFilesDeep(
-      @NonNull Collection<File> files, @NonNull File directory, @Nullable FileFilter fileFilter) {
-    File[] found = directory.listFiles(fileFilter);
-
-    if (found != null) {
-      for (File file : found) {
-        if (file.isDirectory()) {
-          internalListFilesDeep(files, file, fileFilter);
-        } else {
-          files.add(file);
+    public static byte[] readBytes(InputStream stream) throws IOException {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream();
+        byte[] buffer = new byte[4096];
+        int count;
+        while ((count = stream.read(buffer)) != -1) {
+            baos.write(buffer, 0, count);
         }
-      }
-    }
-  }
-
-  public static boolean fileIsMimeType(File file, String mimeType, MimeTypeMap mimeTypeMap) {
-    if (mimeType == null || mimeType.equals("*/*")) {
-      return true;
-    } else {
-      // get the file mime type
-      String filename = file.toURI().toString();
-      int dotPos = filename.lastIndexOf('.');
-      if (dotPos == -1) {
-        return false;
-      }
-      String fileExtension = filename.substring(dotPos + 1).toLowerCase(Locale.ROOT);
-      String fileType = mimeTypeMap.getMimeTypeFromExtension(fileExtension);
-      if (fileType == null) {
-        return false;
-      }
-      // check the 'type/subtype' pattern
-      if (fileType.equals(mimeType)) {
-        return true;
-      }
-      // check the 'type/*' pattern
-      int mimeTypeDelimiter = mimeType.lastIndexOf('/');
-      if (mimeTypeDelimiter == -1) {
-        return false;
-      }
-      String mimeTypeMainType = mimeType.substring(0, mimeTypeDelimiter);
-      String mimeTypeSubtype = mimeType.substring(mimeTypeDelimiter + 1);
-      if (!mimeTypeSubtype.equals("*")) {
-        return false;
-      }
-      int fileTypeDelimiter = fileType.lastIndexOf('/');
-      if (fileTypeDelimiter == -1) {
-        return false;
-      }
-      String fileTypeMainType = fileType.substring(0, fileTypeDelimiter);
-      if (fileTypeMainType.equals(mimeTypeMainType)) {
-        return true;
-      }
-      return fileTypeMainType.equals(mimeTypeMainType);
-    }
-  }
-
-  public static String stripExtension(String str) {
-    if (str == null) {
-      return null;
-    }
-    int pos = str.lastIndexOf('.');
-    if (pos == -1) {
-      return str;
-    }
-    return str.substring(0, pos);
-  }
-
-  public static String readFromStream(InputStream is) throws Exception {
-    BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-    StringBuilder sb = new StringBuilder();
-    String line;
-    while ((line = reader.readLine()) != null) {
-      if (sb.length() > 0) {
-        sb.append("\n");
-      }
-      sb.append(line);
-    }
-    reader.close();
-    return sb.toString();
-  }
-
-  public static String read(File file) throws Exception {
-    FileInputStream fin = new FileInputStream(file);
-    String ret = readFromStream(fin);
-    fin.close();
-    return ret;
-  }
-
-  public static boolean isExternalMemoryAvailable() {
-    Boolean isSDPresent =
-        Environment.getExternalStorageState().equals(android.os.Environment.MEDIA_MOUNTED);
-    Boolean isSDSupportedDevice = Environment.isExternalStorageRemovable();
-
-    // yes SD-card is present
-    // Sorry
-    return isSDSupportedDevice && isSDPresent;
-  }
-
-  public static File safeGetCanonicalFile(File file) {
-    try {
-      return file.getCanonicalFile();
-    } catch (IOException e) {
-      e.printStackTrace();
-      return file.getAbsoluteFile();
-    }
-  }
-
-  // https://github.com/DrKLO/Telegram/blob/ab221dafadbc17459d78d9ea3e643ae18e934b16/TMessagesProj/src/main/java/org/telegram/ui/Components/ChatAttachAlertDocumentLayout.java#L939
-  public static ArrayList<Storage> listRoots() {
-    ArrayList<Storage> storageItems = new ArrayList<>();
-    HashSet<String> paths = new HashSet<>();
-    String defaultPath = getExternalStorageDirectory().getPath();
-    String defaultPathState = Environment.getExternalStorageState();
-    if (defaultPathState.equals(Environment.MEDIA_MOUNTED) || defaultPathState.equals(Environment.MEDIA_MOUNTED_READ_ONLY)) {
-      Storage ext = new Storage();
-      if (Environment.isExternalStorageRemovable()) {
-        ext.title = "SD Card";
-      } else {
-        ext.title = "Internal Storage";
-      }
-      ext.file = getExternalStorageDirectory();
-      storageItems.add(ext);
-      paths.add(defaultPath);
+        stream.close();
+        return baos.toByteArray();
     }
 
-    BufferedReader bufferedReader = null;
-    try {
-      bufferedReader = new BufferedReader(new FileReader("/proc/mounts"));
-      String line;
-      while ((line = bufferedReader.readLine()) != null) {
-        if (line.contains("vfat") || line.contains("/mnt")) {
-          StringTokenizer tokens = new StringTokenizer(line, " ");
-          tokens.nextToken();
-          String path = tokens.nextToken();
-          if (paths.contains(path)) {
-            continue;
-          }
-          if (line.contains("/dev/block/vold")) {
-            if (!line.contains("/mnt/secure") && !line.contains("/mnt/asec") && !line.contains("/mnt/obb") && !line.contains("/dev/mapper") && !line.contains("tmpfs")) {
-              if (!new File(path).isDirectory()) {
-                int index = path.lastIndexOf('/');
-                if (index != -1) {
-                  String newPath = "/storage/" + path.substring(index + 1);
-                  if (new File(newPath).isDirectory()) {
-                    path = newPath;
-                  }
-                }
-              }
-              paths.add(path);
-              try {
-                Storage item = new Storage();
-                if (path.toLowerCase(Locale.ROOT).contains("sd")) {
-                  item.title = "SD Card";
-                } else {
-                  item.title = "External Storage";
-                }
-                item.file = new File(path);
-                storageItems.add(item);
-              } catch (Exception e) {
-                e.printStackTrace();
-              }
-            }
-          }
-        }
-      }
-    } catch (Exception e) {
-      e.printStackTrace();
-    } finally {
-      if (bufferedReader != null) {
+    @NonNull
+    public static ArrayList<Song> matchFilesWithMediaStore(@NonNull Context context,
+                                                           @Nullable List<File> files) {
+        return SongLoader.INSTANCE.getSongs(makeSongCursor(context, files));
+    }
+
+    public static String safeGetCanonicalPath(File file) {
         try {
-          bufferedReader.close();
-        } catch (Exception e) {
-          e.printStackTrace();
+            return file.getCanonicalPath();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return file.getAbsolutePath();
         }
-      }
     }
-    return storageItems;
-  }
+
+    @Nullable
+    public static SortedCursor makeSongCursor(@NonNull final Context context,
+                                              @Nullable final List<File> files) {
+        String selection = null;
+        String[] paths = null;
+
+        if (files != null) {
+            paths = toPathArray(files);
+
+            if (files.size() > 0
+                    && files.size() < 999) { // 999 is the max amount Androids SQL implementation can handle.
+                selection =
+                        MediaStore.Audio.AudioColumns.DATA + " IN (" + makePlaceholders(files.size()) + ")";
+            }
+        }
+
+        Cursor songCursor = SongLoader.INSTANCE.makeSongCursor(context, selection, selection == null ? null : paths);
+
+        return songCursor == null ? null
+                : new SortedCursor(songCursor, paths, MediaStore.Audio.AudioColumns.DATA);
+    }
+
+    private static String makePlaceholders(int len) {
+        StringBuilder sb = new StringBuilder(len * 2 - 1);
+        sb.append("?");
+        for (int i = 1; i < len; i++) {
+            sb.append(",?");
+        }
+        return sb.toString();
+    }
+
+    @Nullable
+    private static String[] toPathArray(@Nullable List<File> files) {
+        if (files != null) {
+            String[] paths = new String[files.size()];
+            for (int i = 0; i < files.size(); i++) {
+                /*try {
+                    paths[i] = files.get(i).getCanonicalPath(); // canonical path is important here because we want to compare the path with the media store entry later
+                } catch (IOException e) {
+                    e.printStackTrace();
+                    paths[i] = files.get(i).getPath();
+                }*/
+                paths[i] = safeGetCanonicalPath(files.get(i));
+            }
+            return paths;
+        }
+        return null;
+    }
+
+    @NonNull
+    public static List<File> listFiles(@NonNull File directory, @Nullable FileFilter fileFilter) {
+        List<File> fileList = new LinkedList<>();
+        File[] found = directory.listFiles(fileFilter);
+        if (found != null) {
+            Collections.addAll(fileList, found);
+        }
+        return fileList;
+    }
+
+    @NonNull
+    public static List<File> listFilesDeep(@NonNull File directory, @Nullable FileFilter fileFilter) {
+        List<File> files = new LinkedList<>();
+        internalListFilesDeep(files, directory, fileFilter);
+        return files;
+    }
+
+    @NonNull
+    public static List<File> listFilesDeep(@NonNull Collection<File> files,
+                                           @Nullable FileFilter fileFilter) {
+        List<File> resFiles = new LinkedList<>();
+        for (File file : files) {
+            if (file.isDirectory()) {
+                internalListFilesDeep(resFiles, file, fileFilter);
+            } else if (fileFilter == null || fileFilter.accept(file)) {
+                resFiles.add(file);
+            }
+        }
+        return resFiles;
+    }
+
+    private static void internalListFilesDeep(@NonNull Collection<File> files,
+                                              @NonNull File directory, @Nullable FileFilter fileFilter) {
+        File[] found = directory.listFiles(fileFilter);
+
+        if (found != null) {
+            for (File file : found) {
+                if (file.isDirectory()) {
+                    internalListFilesDeep(files, file, fileFilter);
+                } else {
+                    files.add(file);
+                }
+            }
+        }
+    }
+
+    public static boolean fileIsMimeType(File file, String mimeType, MimeTypeMap mimeTypeMap) {
+        if (mimeType == null || mimeType.equals("*/*")) {
+            return true;
+        } else {
+            // get the file mime type
+            String filename = file.toURI().toString();
+            int dotPos = filename.lastIndexOf('.');
+            if (dotPos == -1) {
+                return false;
+            }
+            String fileExtension = filename.substring(dotPos + 1).toLowerCase();
+            String fileType = mimeTypeMap.getMimeTypeFromExtension(fileExtension);
+            if (fileType == null) {
+                return false;
+            }
+            // check the 'type/subtype' pattern
+            if (fileType.equals(mimeType)) {
+                return true;
+            }
+            // check the 'type/*' pattern
+            int mimeTypeDelimiter = mimeType.lastIndexOf('/');
+            if (mimeTypeDelimiter == -1) {
+                return false;
+            }
+            String mimeTypeMainType = mimeType.substring(0, mimeTypeDelimiter);
+            String mimeTypeSubtype = mimeType.substring(mimeTypeDelimiter + 1);
+            if (!mimeTypeSubtype.equals("*")) {
+                return false;
+            }
+            int fileTypeDelimiter = fileType.lastIndexOf('/');
+            if (fileTypeDelimiter == -1) {
+                return false;
+            }
+            String fileTypeMainType = fileType.substring(0, fileTypeDelimiter);
+            if (fileTypeMainType.equals(mimeTypeMainType)) {
+                return true;
+            }
+            return fileTypeMainType.equals(mimeTypeMainType);
+        }
+    }
+
+    public static String stripExtension(String str) {
+        if (str == null) {
+            return null;
+        }
+        int pos = str.lastIndexOf('.');
+        if (pos == -1) {
+            return str;
+        }
+        return str.substring(0, pos);
+    }
+
+    public static String readFromStream(InputStream is) throws Exception {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder sb = new StringBuilder();
+        String line;
+        while ((line = reader.readLine()) != null) {
+            if (sb.length() > 0) {
+                sb.append("\n");
+            }
+            sb.append(line);
+        }
+        reader.close();
+        return sb.toString();
+    }
+
+    public static String read(File file) throws Exception {
+        FileInputStream fin = new FileInputStream(file);
+        String ret = readFromStream(fin);
+        fin.close();
+        return ret;
+    }
+
+    public static boolean isExternalMemoryAvailable() {
+        Boolean isSDPresent = Environment.getExternalStorageState()
+                .equals(android.os.Environment.MEDIA_MOUNTED);
+        Boolean isSDSupportedDevice = Environment.isExternalStorageRemovable();
+
+        if (isSDSupportedDevice && isSDPresent) {
+            // yes SD-card is present
+            return true;
+        } else {
+            return false;
+            // Sorry
+        }
+    }
+
+    public static File safeGetCanonicalFile(File file) {
+        try {
+            return file.getCanonicalFile();
+        } catch (IOException e) {
+            e.printStackTrace();
+            return file.getAbsoluteFile();
+        }
+    }
+
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt b/app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt
deleted file mode 100644
index 8a06bf62b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/FileUtils.kt
+++ /dev/null
@@ -1,76 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.net.Uri
-import android.os.Environment
-import android.util.Log
-import java.io.File
-import java.io.IOException
-
-
-object FileUtils {
-    fun copyFileToUri(context: Context, fromFile: File, toUri: Uri) {
-        context.contentResolver.openOutputStream(toUri)
-            ?.use { output ->
-                fromFile.inputStream().use { input ->
-                    input.copyTo(output)
-                }
-            }
-    }
-
-    /**
-     * creates a new file in storage in app specific directory.
-     *
-     * @return the file
-     * @throws IOException
-     */
-    fun createFile(
-        context: Context,
-        directoryName: String,
-        fileName: String,
-        body: String,
-        fileType: String
-    ): File {
-        val root = createDirectory(context, directoryName)
-        val filePath = "$root/$fileName$fileType"
-        val file = File(filePath)
-
-        // create file if not exist
-        if (!file.exists()) {
-            try {
-                // create a new file and write text in it.
-                file.createNewFile()
-                file.writeText(body)
-                Log.d(FileUtils::class.java.name, "File has been created and saved")
-            } catch (e: IOException) {
-                Log.d(FileUtils::class.java.name, e.message.toString())
-            }
-        }
-        return file
-    }
-
-    /**
-     * creates a new directory in storage in app specific directory.
-     *
-     * @return the file
-     */
-    private fun createDirectory(context: Context, directoryName: String): File {
-        val file = File(
-            context.getExternalFilesDir(directoryName)
-                .toString()
-        )
-        if (!file.exists()) {
-            file.mkdir()
-        }
-        return file
-    }
-}
-@Suppress("Deprecation")
-fun getExternalStorageDirectory(): File {
-    return Environment.getExternalStorageDirectory()
-}
-
-@Suppress("Deprecation")
-fun getExternalStoragePublicDirectory(type: String): File {
-    return Environment.getExternalStoragePublicDirectory(type)
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ImageSaver.kt b/app/src/main/java/code/name/monkey/retromusic/util/ImageSaver.kt
new file mode 100644
index 000000000..265c057a6
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ImageSaver.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util
+
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.os.Environment
+import java.io.File
+import java.io.FileInputStream
+import java.io.FileOutputStream
+import java.io.IOException
+
+/**
+ * Created by hemanths on 2019-11-05.
+ */
+
+class ImageSaver(val context: Context) {
+    private var external: Boolean = false
+    private var directoryName: String = "RetroMusic"
+    private var fileName: String = "profile.png"
+
+    fun setFileName(fileName: String): ImageSaver {
+        this.fileName = fileName
+        return this
+    }
+
+    fun setDirectoryName(directoryName: String): ImageSaver {
+        this.directoryName = directoryName
+        return this
+    }
+
+    fun setStoreType(external: Boolean): ImageSaver {
+        this.external = external
+        return this
+    }
+
+    fun save(bitmap: Bitmap) {
+        var fileOutputStream: FileOutputStream? = null
+        try {
+            fileOutputStream = FileOutputStream(createFile())
+            bitmap.compress(Bitmap.CompressFormat.PNG, 100, fileOutputStream)
+        } catch (er: Exception) {
+            println(er)
+        } finally {
+            try {
+                fileOutputStream?.close()
+            } catch (er: IOException) {
+                println(er)
+            }
+        }
+    }
+
+    fun getFile(): File {
+        return createFile()
+    }
+
+    private fun createFile(): File {
+        val directory: File = if (external) {
+            getFileStorePlace(directoryName)
+        } else {
+            context.getDir(directoryName, Context.MODE_PRIVATE)
+        }
+        if (!directory.exists() && !directory.mkdirs()) {
+            println("Error in creating folders $directory")
+        }
+        println("Create file -> $directory/$fileName")
+        return File(directory, fileName)
+    }
+
+    private fun getFileStorePlace(directoryName: String): File {
+        return File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES), directoryName)
+    }
+
+    fun load(): Bitmap? {
+        var inputStream: FileInputStream? = null
+        return try {
+            inputStream = FileInputStream(createFile())
+            BitmapFactory.decodeStream(inputStream)
+        } catch (er: Exception) {
+            try {
+                inputStream?.close()
+            } catch (e: IOException) {
+                e.printStackTrace()
+            }
+            null
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
index b87eceab9..46b03a1bb 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ImageUtil.java
@@ -14,64 +14,274 @@
 
 package code.name.monkey.retromusic.util;
 
+import android.content.Context;
+import android.content.res.Resources;
 import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffColorFilter;
+import android.graphics.drawable.Drawable;
+import android.media.ExifInterface;
+import android.os.Build;
 
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+
+import code.name.monkey.appthemehelper.util.TintHelper;
 
 /**
- * Created on : June 18, 2016 Author : zetbaitsu Name : Zetra GitHub : https://github.com/zetbaitsu
+ * Created on : June 18, 2016 Author     : zetbaitsu Name       : Zetra GitHub     :
+ * https://github.com/zetbaitsu
  */
 public class ImageUtil {
 
-  private ImageUtil() {}
+    private static final int TOLERANCE = 20;
+    // Alpha amount for which values below are considered transparent.
+    private static final int ALPHA_TOLERANCE = 50;
+    private static int[] mTempBuffer;
 
-  public static Bitmap resizeBitmap(@NonNull Bitmap src, int maxForSmallerSize) {
-    int width = src.getWidth();
-    int height = src.getHeight();
+    private ImageUtil() {
 
-    final int dstWidth;
-    final int dstHeight;
-
-    if (width < height) {
-      if (maxForSmallerSize >= width) {
-        return src;
-      }
-      float ratio = (float) height / width;
-      dstWidth = maxForSmallerSize;
-      dstHeight = Math.round(maxForSmallerSize * ratio);
-    } else {
-      if (maxForSmallerSize >= height) {
-        return src;
-      }
-      float ratio = (float) width / height;
-      dstWidth = Math.round(maxForSmallerSize * ratio);
-      dstHeight = maxForSmallerSize;
     }
 
-    return Bitmap.createScaledBitmap(src, dstWidth, dstHeight, false);
-  }
-
-  public static int calculateInSampleSize(int width, int height, int reqWidth) {
-    // setting reqWidth matching to desired 1:1 ratio and screen-size
-    if (width < height) {
-      reqWidth = (height / width) * reqWidth;
-    } else {
-      reqWidth = (width / height) * reqWidth;
+    public static boolean isGrayscale(Bitmap bitmap) {
+        final int height = bitmap.getHeight();
+        final int width = bitmap.getWidth();
+        int size = height * width;
+        ensureBufferSize(size);
+        bitmap.getPixels(mTempBuffer, 0, width, 0, 0, width, height);
+        for (int i = 0; i < size; i++) {
+            if (!isGrayscale(mTempBuffer[i])) {
+                return false;
+            }
+        }
+        return true;
     }
 
-    int inSampleSize = 1;
-
-    if (height > reqWidth || width > reqWidth) {
-      final int halfHeight = height / 2;
-      final int halfWidth = width / 2;
-
-      // Calculate the largest inSampleSize value that is a power of 2 and keeps both
-      // height and width larger than the requested height and width.
-      while ((halfHeight / inSampleSize) > reqWidth && (halfWidth / inSampleSize) > reqWidth) {
-        inSampleSize *= 2;
-      }
+    public static Bitmap createBitmap(Drawable drawable) {
+        return createBitmap(drawable, 1f);
     }
 
-    return inSampleSize;
-  }
+    public static Bitmap createBitmap(Drawable drawable, float sizeMultiplier) {
+        Bitmap bitmap = Bitmap.createBitmap((int) (drawable.getIntrinsicWidth() * sizeMultiplier), (int) (drawable.getIntrinsicHeight() * sizeMultiplier), Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(bitmap);
+        drawable.setBounds(0, 0, c.getWidth(), c.getHeight());
+        drawable.draw(c);
+        return bitmap;
+    }
+
+    public static Drawable getTintedVectorDrawable(@NonNull Resources res, @DrawableRes int resId, @Nullable Resources.Theme theme, @ColorInt int color) {
+        return TintHelper.createTintedDrawable(getVectorDrawable(res, resId, theme), color);
+    }
+
+    public static Drawable getTintedVectorDrawable(@NonNull Context context, @DrawableRes int id, @ColorInt int color) {
+        return TintHelper.createTintedDrawable(getVectorDrawable(context.getResources(), id, context.getTheme()), color);
+    }
+
+    public static Drawable getVectorDrawable(@NonNull Context context, @DrawableRes int id) {
+        return getVectorDrawable(context.getResources(), id, context.getTheme());
+    }
+
+    public static Drawable getVectorDrawable(@NonNull Resources res, @DrawableRes int resId, @Nullable Resources.Theme theme) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return res.getDrawable(resId, theme);
+        }
+        return VectorDrawableCompat.create(res, resId, theme);
+    }
+
+    /**
+     * Makes sure that {@code mTempBuffer} has at least length {@code size}.
+     */
+    private static void ensureBufferSize(int size) {
+        if (mTempBuffer == null || mTempBuffer.length < size) {
+            mTempBuffer = new int[size];
+        }
+    }
+
+    public static Bitmap setBitmapColor(Bitmap bitmap, int color) {
+        Bitmap result = Bitmap
+                .createBitmap(bitmap, 0, 0, bitmap.getWidth() - 1, bitmap.getHeight() - 1);
+        Paint paint = new Paint();
+        paint.setColorFilter(new PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP));
+
+        Canvas canvas = new Canvas(result);
+        canvas.drawBitmap(result, 0, 0, paint);
+
+        return result;
+    }
+
+    public static boolean isGrayscale(int color) {
+        int alpha = 0xFF & (color >> 24);
+        if (alpha < ALPHA_TOLERANCE) {
+            return true;
+        }
+        int r = 0xFF & (color >> 16);
+        int g = 0xFF & (color >> 8);
+        int b = 0xFF & color;
+        return Math.abs(r - g) < TOLERANCE
+                && Math.abs(r - b) < TOLERANCE
+                && Math.abs(g - b) < TOLERANCE;
+    } // Amount (max is 255) that two channels can differ before the color is no longer "gray".
+
+    public static Bitmap resizeBitmap(@NonNull Bitmap src, int maxForSmallerSize) {
+        int width = src.getWidth();
+        int height = src.getHeight();
+
+        final int dstWidth;
+        final int dstHeight;
+
+        if (width < height) {
+            if (maxForSmallerSize >= width) {
+                return src;
+            }
+            float ratio = (float) height / width;
+            dstWidth = maxForSmallerSize;
+            dstHeight = Math.round(maxForSmallerSize * ratio);
+        } else {
+            if (maxForSmallerSize >= height) {
+                return src;
+            }
+            float ratio = (float) width / height;
+            dstWidth = Math.round(maxForSmallerSize * ratio);
+            dstHeight = maxForSmallerSize;
+        }
+
+        return Bitmap.createScaledBitmap(src, dstWidth, dstHeight, false);
+    }
+
+    public static int calculateInSampleSize(int width, int height, int reqWidth) {
+        // setting reqWidth matching to desired 1:1 ratio and screen-size
+        if (width < height) {
+            reqWidth = (height / width) * reqWidth;
+        } else {
+            reqWidth = (width / height) * reqWidth;
+        }
+
+        int inSampleSize = 1;
+
+        if (height > reqWidth || width > reqWidth) {
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) > reqWidth
+                    && (halfWidth / inSampleSize) > reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+
+    static File compressImage(File imageFile, int reqWidth, int reqHeight,
+                              Bitmap.CompressFormat compressFormat, int quality, String destinationPath)
+            throws IOException {
+        FileOutputStream fileOutputStream = null;
+        File file = new File(destinationPath).getParentFile();
+        if (!file.exists()) {
+            file.mkdirs();
+        }
+        try {
+            fileOutputStream = new FileOutputStream(destinationPath);
+            // write the compressed bitmap at the destination specified by destinationPath.
+            decodeSampledBitmapFromFile(imageFile, reqWidth, reqHeight)
+                    .compress(compressFormat, quality, fileOutputStream);
+        } finally {
+            if (fileOutputStream != null) {
+                fileOutputStream.flush();
+                fileOutputStream.close();
+            }
+        }
+
+        return new File(destinationPath);
+    }
+
+    static Bitmap decodeSampledBitmapFromFile(File imageFile, int reqWidth, int reqHeight)
+            throws IOException {
+        // First decode with inJustDecodeBounds=true to check dimensions
+        BitmapFactory.Options options = new BitmapFactory.Options();
+        options.inJustDecodeBounds = true;
+        BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+        // Calculate inSampleSize
+        options.inSampleSize = calculateInSampleSize(options, reqWidth, reqHeight);
+
+        // Decode bitmap with inSampleSize set
+        options.inJustDecodeBounds = false;
+
+        Bitmap scaledBitmap = BitmapFactory.decodeFile(imageFile.getAbsolutePath(), options);
+
+        //check the rotation of the image and display it properly
+        ExifInterface exif;
+        exif = new ExifInterface(imageFile.getAbsolutePath());
+        int orientation = exif.getAttributeInt(ExifInterface.TAG_ORIENTATION, 0);
+        Matrix matrix = new Matrix();
+        if (orientation == 6) {
+            matrix.postRotate(90);
+        } else if (orientation == 3) {
+            matrix.postRotate(180);
+        } else if (orientation == 8) {
+            matrix.postRotate(270);
+        }
+        scaledBitmap = Bitmap
+                .createBitmap(scaledBitmap, 0, 0, scaledBitmap.getWidth(), scaledBitmap.getHeight(), matrix,
+                        true);
+        return scaledBitmap;
+    }
+
+    private static int calculateInSampleSize(BitmapFactory.Options options, int reqWidth,
+                                             int reqHeight) {
+        // Raw height and width of image
+        final int height = options.outHeight;
+        final int width = options.outWidth;
+        int inSampleSize = 1;
+
+        if (height > reqHeight || width > reqWidth) {
+
+            final int halfHeight = height / 2;
+            final int halfWidth = width / 2;
+
+            // Calculate the largest inSampleSize value that is a power of 2 and keeps both
+            // height and width larger than the requested height and width.
+            while ((halfHeight / inSampleSize) >= reqHeight && (halfWidth / inSampleSize) >= reqWidth) {
+                inSampleSize *= 2;
+            }
+        }
+
+        return inSampleSize;
+    }
+
+    @NonNull
+    public static Bitmap getResizedBitmap(@NonNull Bitmap image, int maxSize) {
+        int width = image.getWidth();
+        int height = image.getHeight();
+
+        float bitmapRatio = (float) width / (float) height;
+        if (bitmapRatio > 1) {
+            width = maxSize;
+            height = (int) (width / bitmapRatio);
+        } else {
+            height = maxSize;
+            width = (int) (height * bitmapRatio);
+        }
+        return Bitmap.createScaledBitmap(image, width, height, true);
+    }
+
+    public static Bitmap resize(InputStream stream, int scaledWidth, int scaledHeight) {
+        final Bitmap bitmap = BitmapFactory.decodeStream(stream);
+        return Bitmap.createScaledBitmap(bitmap, scaledWidth, scaledHeight, true);
+
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LastFMUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/LastFMUtil.java
new file mode 100755
index 000000000..a8f47946a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/LastFMUtil.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+
+import code.name.monkey.retromusic.rest.model.LastFmAlbum.Album.Image;
+import code.name.monkey.retromusic.rest.model.LastFmArtist;
+
+public class LastFMUtil {
+
+    public static String getLargestAlbumImageUrl(List<Image> list) {
+        Map hashMap = new HashMap();
+        for (Image image : list) {
+            Object obj = null;
+            String size = image.getSize();
+            if (size == null) {
+                obj = ImageSize.UNKNOWN;
+            } else {
+                try {
+                    obj = ImageSize.valueOf(size.toUpperCase(Locale.ENGLISH));
+                } catch (IllegalArgumentException ignored) {
+                }
+            }
+            if (obj != null) {
+                hashMap.put(obj, image.getText());
+            }
+        }
+        return getLargestImageUrl(hashMap);
+    }
+
+    public static String getLargestArtistImageUrl(List<LastFmArtist.Artist.Image> list) {
+        Map hashMap = new HashMap();
+        for (LastFmArtist.Artist.Image image : list) {
+            Object obj = null;
+            String size = image.getSize();
+            if (size == null) {
+                obj = ImageSize.UNKNOWN;
+            } else {
+                try {
+                    obj = ImageSize.valueOf(size.toUpperCase(Locale.ENGLISH));
+                } catch (IllegalArgumentException ignored) {
+                }
+            }
+            if (obj != null) {
+                hashMap.put(obj, image.getText());
+            }
+        }
+        return getLargestImageUrl(hashMap);
+    }
+
+    private static String getLargestImageUrl(Map<ImageSize, String> map) {
+        return map.containsKey(ImageSize.MEGA) ? map.get(ImageSize.MEGA)
+                : map.containsKey(ImageSize.EXTRALARGE) ? map.get(ImageSize.EXTRALARGE)
+                : map.containsKey(ImageSize.LARGE) ? map.get(ImageSize.LARGE)
+                : map.containsKey(ImageSize.MEDIUM) ? map.get(ImageSize.MEDIUM)
+                : map.containsKey(ImageSize.SMALL) ? map.get(ImageSize.SMALL)
+                : map.containsKey(ImageSize.UNKNOWN) ? map.get(ImageSize.UNKNOWN) : null;
+    }
+
+    private enum ImageSize {
+        SMALL,
+        MEDIUM,
+        LARGE,
+        EXTRALARGE,
+        MEGA,
+        UNKNOWN
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
deleted file mode 100644
index e0def5424..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/LogUtil.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.util.Log
-import code.name.monkey.retromusic.BuildConfig
-
-fun Any.logD(message: Any?) {
-    logD(message.toString())
-}
-
-fun Any.logD(message: String) {
-    if (BuildConfig.DEBUG) {
-        Log.d(name, message)
-    }
-}
-
-fun Any.logE(message: String) {
-    Log.e(name, message)
-}
-
-fun Any.logE(e: Exception) {
-    Log.e(name, e.message ?: "Error")
-}
-
-private val Any.name: String get() = this::class.java.simpleName
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.java
new file mode 100644
index 000000000..0ce976601
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.java
@@ -0,0 +1,163 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.text.TextUtils;
+import android.util.Base64;
+
+import androidx.annotation.NonNull;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.UnsupportedEncodingException;
+
+/**
+ * Created by hefuyi on 2016/11/8.
+ */
+
+public class LyricUtil {
+
+    private static final String lrcRootPath = android.os.Environment
+            .getExternalStorageDirectory().toString() + "/RetroMusic/lyrics/";
+
+    @NonNull
+    public static File writeLrcToLoc(@NonNull String title, @NonNull String artist, @NonNull String lrcContext) {
+        FileWriter writer = null;
+        try {
+            File file = new File(getLrcPath2(title, artist));
+            if (!file.exists()) {
+                file.mkdirs();
+            }
+            writer = new FileWriter(getLrcPath2(title, artist));
+            writer.write(lrcContext);
+            return file;
+        } catch (IOException e) {
+            e.printStackTrace();
+            return null;
+        } finally {
+            try {
+                if (writer != null)
+                    writer.close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static boolean deleteLrcFile(@NonNull String title, @NonNull String artist) {
+        File file = new File(getLrcPath(title, artist));
+        return file.delete();
+    }
+
+    public static boolean isLrcFileExist(@NonNull String title, @NonNull String artist) {
+        File file = new File(getLrcPath(title, artist));
+        return file.exists();
+    }
+
+    public static boolean isLrcFile2Exist(@NonNull String title, @NonNull String artist) {
+        File file = new File(getLrcPath2(title, artist));
+
+        return file.exists();
+    }
+
+    @NonNull
+    public static File getLocalLyricFile(@NonNull String title, @NonNull String artist) {
+        try {
+            File file = new File(getLrcPath(title, artist));
+            File file2 = new File(getLrcPath2(title, artist));
+            if (file.exists()) {
+
+                return file;
+            } else if (file2.exists()) {
+
+                return file2;
+            } else {
+
+                return new File("lyric file not exist");
+            }
+        } catch (Exception dfs) {
+            dfs.printStackTrace();
+            return new File("lyric file not exist");
+
+        }
+    }
+
+    public static String getLrcPath2(String title, String artist) {
+        if (!TextUtils.isEmpty(title)) {
+            String x2;
+            if (title.endsWith(".flac") || title.endsWith(".mogg") || title.endsWith(".alac") || title.endsWith(".aiff") || title.endsWith(".webv")) {
+                x2 = title.substring(0, title.length() - 5) + ".lrc";
+            } else {
+                x2 = title.substring(0, title.length() - 4) + ".lrc";
+            }
+            return x2;
+        }
+        return "";
+    }
+
+    public static String getLrcPath(String title, String artist) {
+        return lrcRootPath + title + " - " + artist + ".lrc";
+    }
+
+    @NonNull
+    public static String decryptBASE64(@NonNull String str) {
+        if (str == null || str.length() == 0) {
+            return null;
+        }
+        try {
+            byte[] encode = str.getBytes("UTF-8");
+            // base64 解密
+            return new String(Base64.decode(encode, 0, encode.length, Base64.DEFAULT), "UTF-8");
+
+        } catch (UnsupportedEncodingException e) {
+            e.printStackTrace();
+        }
+
+        return null;
+    }
+
+    @NonNull
+    public static String getStringFromFile(@NonNull String title, @NonNull String artist) throws Exception {
+        File file;
+        File file2 = new File(getLrcPath(title, artist));
+        File file3 = new File(getLrcPath2(title, artist));
+        if (file2.exists()) {
+            file = file2;
+        } else {
+            file = file3;
+        }
+        FileInputStream fin = new FileInputStream(file);
+        String ret = convertStreamToString(fin);
+        fin.close();
+        //  Log.d("damn2",ret);
+        return ret;
+    }
+
+    private static String convertStreamToString(InputStream is) throws Exception {
+        BufferedReader reader = new BufferedReader(new InputStreamReader(is));
+        StringBuilder sb = new StringBuilder();
+        String line = null;
+        while ((line = reader.readLine()) != null) {
+            sb.append(line).append("\n");
+        }
+        reader.close();
+        return sb.toString();
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt
deleted file mode 100644
index 2f7aff94c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/LyricUtil.kt
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.util.Log
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import org.jaudiotagger.audio.AudioFileIO
-import org.jaudiotagger.tag.FieldKey
-import java.io.*
-
-/**
- * Created by hefuyi on 2016/11/8.
- */
-object LyricUtil {
-    private val lrcRootPath =
-        getExternalStorageDirectory().toString() + "/RetroMusic/lyrics/"
-    private const val TAG = "LyricUtil"
-    fun writeLrcToLoc(
-        title: String, artist: String, lrcContext: String
-    ): File? {
-        var writer: FileWriter? = null
-        return try {
-            val file = File(getLrcPath(title, artist))
-            if (file.parentFile?.exists() != true) {
-                file.parentFile?.mkdirs()
-            }
-            writer = FileWriter(getLrcPath(title, artist))
-            writer.write(lrcContext)
-            file
-        } catch (e: IOException) {
-            e.printStackTrace()
-            null
-        } finally {
-            try {
-                writer?.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    //So in Retro, Lrc file can be same folder as Music File or in RetroMusic Folder
-    // In this case we pass location of the file and Contents to write to file
-    fun writeLrc(song: Song, lrcContext: String) {
-        var writer: FileWriter? = null
-        val location: File?
-        try {
-            if (isLrcOriginalFileExist(song.data)) {
-                location = getLocalLyricOriginalFile(song.data)
-            } else if (isLrcFileExist(song.title, song.artistName)) {
-                location = getLocalLyricFile(song.title, song.artistName)
-            } else {
-                location = File(getLrcPath(song.title, song.artistName))
-                if (location.parentFile?.exists() != true) {
-                    location.parentFile?.mkdirs()
-                }
-            }
-            writer = FileWriter(location)
-            writer.write(lrcContext)
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            try {
-                writer?.close()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
-    }
-
-    fun deleteLrcFile(title: String, artist: String): Boolean {
-        val file = File(getLrcPath(title, artist))
-        return file.delete()
-    }
-
-    private fun isLrcFileExist(title: String, artist: String): Boolean {
-        val file = File(getLrcPath(title, artist))
-        return file.exists()
-    }
-
-    private fun isLrcOriginalFileExist(path: String): Boolean {
-        val file = File(getLrcOriginalPath(path))
-        return file.exists()
-    }
-
-    private fun getLocalLyricFile(title: String, artist: String): File? {
-        val file = File(getLrcPath(title, artist))
-        return if (file.exists()) {
-            file
-        } else {
-            null
-        }
-    }
-
-    private fun getLocalLyricOriginalFile(path: String): File? {
-        val file = File(getLrcOriginalPath(path))
-        return if (file.exists()) {
-            file
-        } else {
-            null
-        }
-    }
-
-    private fun getLrcPath(title: String, artist: String): String {
-        return "$lrcRootPath$title - $artist.lrc"
-    }
-
-    private fun getLrcOriginalPath(filePath: String): String {
-        return filePath.replace(filePath.substring(filePath.lastIndexOf(".") + 1), "lrc")
-    }
-
-    @Throws(Exception::class)
-    fun getStringFromFile(title: String, artist: String): String {
-        val file = File(getLrcPath(title, artist))
-        val fin = FileInputStream(file)
-        val ret = convertStreamToString(fin)
-        fin.close()
-        return ret
-    }
-
-    @Throws(Exception::class)
-    private fun convertStreamToString(inputStream: InputStream): String {
-        return inputStream.bufferedReader().readLines().joinToString(separator = "\n")
-    }
-
-    fun getStringFromLrc(file: File?): String {
-        try {
-            val reader = BufferedReader(FileReader(file))
-            return reader.readLines().joinToString(separator = "\n")
-        } catch (e: Exception) {
-            Log.i("Error", "Error Occurred")
-        }
-        return ""
-    }
-
-    fun getSyncedLyricsFile(song: Song): File? {
-        return when {
-            isLrcOriginalFileExist(song.data) -> {
-                getLocalLyricOriginalFile(song.data)
-            }
-            isLrcFileExist(song.title, song.artistName) -> {
-                getLocalLyricFile(song.title, song.artistName)
-            }
-            else -> {
-                null
-            }
-        }
-    }
-
-    fun getEmbeddedSyncedLyrics(data: String): String? {
-        val embeddedLyrics = try {
-            AudioFileIO.read(File(data)).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
-            return null
-        }
-        return if (AbsSynchronizedLyrics.isSynchronized(embeddedLyrics)) {
-            embeddedLyrics
-        } else {
-            null
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt b/app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt
deleted file mode 100644
index 8026c98f7..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/MergedImageUtils.kt
+++ /dev/null
@@ -1,112 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.graphics.Matrix
-import android.graphics.Paint
-import androidx.core.graphics.scale
-import com.bumptech.glide.util.Util.assertBackgroundThread
-
-
-internal object MergedImageUtils {
-
-    private const val IMAGE_SIZE = 1600
-    private const val PARTS = 3
-    private const val DEGREES = 9f
-
-    fun joinImages(list: List<Bitmap>): Bitmap {
-        assertBackgroundThread()
-
-        val arranged = arrangeBitmaps(list)
-
-        val mergedImage = create(
-            arranged,
-            IMAGE_SIZE,
-            PARTS
-        )
-        val finalImage = rotate(
-            mergedImage,
-            IMAGE_SIZE,
-            DEGREES
-        )
-        mergedImage.recycle()
-        return finalImage
-    }
-
-    private fun arrangeBitmaps(list: List<Bitmap>): List<Bitmap> {
-        return when {
-            list.size == 1 -> {
-                val item = list[0]
-                listOf(item, item, item, item, item, item, item, item, item)
-            }
-            list.size == 2 -> {
-                val item1 = list[0]
-                val item2 = list[1]
-                listOf(item1, item2, item1, item2, item1, item2, item1, item2, item1)
-            }
-            list.size == 3 -> {
-                val item1 = list[0]
-                val item2 = list[1]
-                val item3 = list[2]
-                listOf(item1, item2, item3, item3, item1, item2, item2, item3, item1)
-            }
-            list.size == 4 -> {
-                val item1 = list[0]
-                val item2 = list[1]
-                val item3 = list[2]
-                val item4 = list[3]
-                listOf(item1, item2, item3, item4, item1, item2, item3, item4, item1)
-            }
-            list.size < 9 -> { // 5 to 8
-                val item1 = list[0]
-                val item2 = list[1]
-                val item3 = list[2]
-                val item4 = list[3]
-                val item5 = list[4]
-                listOf(item1, item2, item3, item4, item5, item2, item3, item4, item1)
-            }
-            else -> list // case 9
-        }
-    }
-
-    private fun create(images: List<Bitmap>, imageSize: Int, parts: Int): Bitmap {
-        val result = Bitmap.createBitmap(imageSize, imageSize, Bitmap.Config.ARGB_8888)
-        val canvas = Canvas(result)
-        val paint = Paint(Paint.ANTI_ALIAS_FLAG)
-        val onePartSize = imageSize / parts
-
-        images.forEachIndexed { i, bitmap ->
-            val bit = bitmap.scale(onePartSize, onePartSize)
-            canvas.drawBitmap(
-                bit,
-                (onePartSize * (i % parts)).toFloat() + (i % 3) * 50,
-                (onePartSize * (i / parts)).toFloat() + (i / 3) * 50,
-                paint
-            )
-            bit.recycle()
-        }
-        return result
-    }
-
-    private fun rotate(bitmap: Bitmap, imageSize: Int, degrees: Float): Bitmap {
-        val matrix = Matrix()
-        matrix.postRotate(degrees)
-
-        val rotated = Bitmap.createBitmap(bitmap, 0, 0, imageSize, imageSize, matrix, true)
-        bitmap.recycle()
-        val cropStart = imageSize * 25 / 100
-        val cropEnd: Int = (cropStart * 1.5).toInt()
-        val cropped = Bitmap.createBitmap(
-            rotated,
-            cropStart,
-            cropStart,
-            imageSize - cropEnd,
-            imageSize - cropEnd
-        )
-        rotated.recycle()
-
-        return cropped
-    }
-
-
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
new file mode 100644
index 000000000..eca52b849
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.java
@@ -0,0 +1,425 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.app.Activity;
+import android.content.ContentResolver;
+import android.content.ContentUris;
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.BaseColumns;
+import android.provider.MediaStore;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.content.FileProvider;
+
+import org.jaudiotagger.audio.AudioFileIO;
+import org.jaudiotagger.tag.FieldKey;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.helper.MusicPlayerRemote;
+import code.name.monkey.retromusic.loaders.PlaylistLoader;
+import code.name.monkey.retromusic.loaders.SongLoader;
+import code.name.monkey.retromusic.model.Artist;
+import code.name.monkey.retromusic.model.Playlist;
+import code.name.monkey.retromusic.model.Song;
+import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics;
+import code.name.monkey.retromusic.service.MusicService;
+
+
+public class MusicUtil {
+
+    public static final String TAG = MusicUtil.class.getSimpleName();
+    private static Playlist playlist;
+
+    public static Uri getMediaStoreAlbumCoverUri(int albumId) {
+        final Uri sArtworkUri = Uri
+                .parse("content://media/external/audio/albumart");
+
+        return ContentUris.withAppendedId(sArtworkUri, albumId);
+    }
+
+    public static Uri getSongFileUri(int songId) {
+        return ContentUris.withAppendedId(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, songId);
+    }
+
+    @NonNull
+    public static Intent createShareSongFileIntent(@NonNull final Song song, @NonNull Context context) {
+        try {
+            return new Intent()
+                    .setAction(Intent.ACTION_SEND)
+                    .putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName(), new File(song.getData())))
+                    .addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+                    .setType("audio/*");
+        } catch (IllegalArgumentException e) {
+            // TODO the path is most likely not like /storage/emulated/0/... but something like /storage/28C7-75B0/...
+            e.printStackTrace();
+            Toast.makeText(context, "Could not share this file, I'm aware of the issue.", Toast.LENGTH_SHORT).show();
+            return new Intent();
+        }
+    }
+
+    @NonNull
+    public static String getSongCountString(@NonNull final Context context, int songCount) {
+        final String songString = songCount == 1 ? context.getResources().getString(R.string.song) : context.getResources().getString(R.string.songs);
+        return songCount + " " + songString;
+    }
+
+    @NonNull
+    public static String getSongInfoString(@NonNull Song song) {
+        return MusicUtil.buildInfoString(
+                song.getArtistName(),
+                song.getAlbumName()
+        );
+    }
+
+    @NonNull
+    public static String getArtistInfoString(@NonNull final Context context,
+                                             @NonNull final Artist artist) {
+        int albumCount = artist.getAlbumCount();
+        int songCount = artist.getSongCount();
+        String albumString = albumCount == 1 ? context.getResources().getString(R.string.album)
+                : context.getResources().getString(R.string.albums);
+        String songString = songCount == 1 ? context.getResources().getString(R.string.song)
+                : context.getResources().getString(R.string.songs);
+        return albumCount + " " + albumString + " • " + songCount + " " + songString;
+    }
+
+    @NonNull
+    public static String getPlaylistInfoString(@NonNull final Context context, @NonNull List<Song> songs) {
+        final long duration = getTotalDuration(context, songs);
+
+        return MusicUtil.buildInfoString(
+                MusicUtil.getSongCountString(context, songs.size()),
+                MusicUtil.getReadableDurationString(duration)
+        );
+    }
+
+
+    /**
+     * Build a concatenated string from the provided arguments
+     * The intended purpose is to show extra annotations
+     * to a music library item.
+     * Ex: for a given album --> buildInfoString(album.artist, album.songCount)
+     */
+    @NonNull
+    public static String buildInfoString(@Nullable final String string1, @Nullable final String string2) {
+        // Skip empty strings
+        if (TextUtils.isEmpty(string1)) {
+            //noinspection ConstantConditions
+            return TextUtils.isEmpty(string2) ? "" : string2;
+        }
+        if (TextUtils.isEmpty(string2)) {
+            //noinspection ConstantConditions
+            return TextUtils.isEmpty(string1) ? "" : string1;
+        }
+
+        return string1 + "  •  " + string2;
+    }
+
+    public static String getReadableDurationString(long songDurationMillis) {
+        long minutes = (songDurationMillis / 1000) / 60;
+        long seconds = (songDurationMillis / 1000) % 60;
+        if (minutes < 60) {
+            return String.format(Locale.getDefault(), "%01d:%02d", minutes, seconds);
+        } else {
+            long hours = minutes / 60;
+            minutes = minutes % 60;
+            return String.format(Locale.getDefault(), "%d:%02d:%02d", hours, minutes, seconds);
+        }
+    }
+
+    //iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
+    //this method converts those values to normal tracknumbers
+    public static int getFixedTrackNumber(int trackNumberToFix) {
+        return trackNumberToFix % 1000;
+    }
+
+    public static void insertAlbumArt(@NonNull Context context, int albumId, String path) {
+        ContentResolver contentResolver = context.getContentResolver();
+
+        Uri artworkUri = Uri.parse("content://media/external/audio/albumart");
+        contentResolver.delete(ContentUris.withAppendedId(artworkUri, albumId), null, null);
+
+        ContentValues values = new ContentValues();
+        values.put("album_id", albumId);
+        values.put("_data", path);
+
+        contentResolver.insert(artworkUri, values);
+    }
+
+    @NonNull
+    public static File createAlbumArtFile() {
+        return new File(createAlbumArtDir(), String.valueOf(System.currentTimeMillis()));
+    }
+
+    @NonNull
+    @SuppressWarnings("ResultOfMethodCallIgnored")
+    private static File createAlbumArtDir() {
+        File albumArtDir = new File(Environment.getExternalStorageDirectory(), "/albumthumbs/");
+        if (!albumArtDir.exists()) {
+            albumArtDir.mkdirs();
+            try {
+                new File(albumArtDir, ".nomedia").createNewFile();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+        return albumArtDir;
+    }
+
+    public static void deleteTracks(@NonNull final Activity activity,
+                                    @NonNull final List<Song> songs,
+                                    @Nullable final List<Uri> safUris,
+                                    @Nullable final Runnable callback) {
+        final String[] projection = new String[]{
+                BaseColumns._ID, MediaStore.MediaColumns.DATA
+        };
+
+        // Split the query into multiple batches, and merge the resulting cursors
+        int batchStart = 0;
+        int batchEnd = 0;
+        final int batchSize = 1000000 / 10; // 10^6 being the SQLite limite on the query lenth in bytes, 10 being the max number of digits in an int, used to store the track ID
+        final int songCount = songs.size();
+
+        while (batchEnd < songCount) {
+            batchStart = batchEnd;
+
+            final StringBuilder selection = new StringBuilder();
+            selection.append(BaseColumns._ID + " IN (");
+
+            for (int i = 0; (i < batchSize - 1) && (batchEnd < songCount - 1); i++, batchEnd++) {
+                selection.append(songs.get(batchEnd).getId());
+                selection.append(",");
+            }
+            // The last element of a batch
+            selection.append(songs.get(batchEnd).getId());
+            batchEnd++;
+            selection.append(")");
+
+            try {
+                final Cursor cursor = activity.getContentResolver().query(
+                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, projection, selection.toString(),
+                        null, null);
+                // TODO: At this point, there is no guarantee that the size of the cursor is the same as the size of the selection string.
+                // Despite that, the Step 3 assumes that the safUris elements are tracking closely the content of the cursor.
+
+                if (cursor != null) {
+                    // Step 1: Remove selected tracks from the current playlist, as well
+                    // as from the album art cache
+                    cursor.moveToFirst();
+                    while (!cursor.isAfterLast()) {
+                        final int id = cursor.getInt(0);
+                        final Song song = SongLoader.INSTANCE.getSong(activity, id);
+                        MusicPlayerRemote.INSTANCE.removeFromQueue(song);
+                        cursor.moveToNext();
+                    }
+
+                    // Step 2: Remove selected tracks from the database
+                    activity.getContentResolver().delete(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                            selection.toString(), null);
+
+                    // Step 3: Remove files from card
+                    cursor.moveToFirst();
+                    int i = batchStart;
+                    while (!cursor.isAfterLast()) {
+                        final String name = cursor.getString(1);
+                        final Uri safUri = safUris == null || safUris.size() <= i ? null : safUris.get(i);
+                        SAFUtil.delete(activity, name, safUri);
+                        i++;
+                        cursor.moveToNext();
+                    }
+                    cursor.close();
+                }
+            } catch (SecurityException ignored) {
+            }
+        }
+
+        activity.getContentResolver().notifyChange(Uri.parse("content://media"), null);
+
+        activity.runOnUiThread(() -> {
+            Toast.makeText(activity, activity.getString(R.string.deleted_x_songs, songCount), Toast.LENGTH_SHORT).show();
+            if (callback != null) {
+                callback.run();
+            }
+        });
+    }
+
+    public static void deleteAlbumArt(@NonNull Context context, int albumId) {
+        ContentResolver contentResolver = context.getContentResolver();
+        Uri localUri = Uri.parse("content://media/external/audio/albumart");
+        contentResolver.delete(ContentUris.withAppendedId(localUri, albumId), null, null);
+    }
+
+
+    @Nullable
+    public static String getLyrics(@NonNull Song song) {
+        String lyrics = null;
+
+        File file = new File(song.getData());
+
+        try {
+            lyrics = AudioFileIO.read(file).getTagOrCreateDefault().getFirst(FieldKey.LYRICS);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        if (lyrics == null || lyrics.trim().isEmpty() || !AbsSynchronizedLyrics
+                .isSynchronized(lyrics)) {
+            File dir = file.getAbsoluteFile().getParentFile();
+
+            if (dir != null && dir.exists() && dir.isDirectory()) {
+                String format = ".*%s.*\\.(lrc|txt)";
+                String filename = Pattern.quote(FileUtil.stripExtension(file.getName()));
+                String songtitle = Pattern.quote(song.getTitle());
+
+                final ArrayList<Pattern> patterns = new ArrayList<>();
+                patterns.add(Pattern.compile(String.format(format, filename),
+                        Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE));
+                patterns.add(Pattern.compile(String.format(format, songtitle),
+                        Pattern.CASE_INSENSITIVE | Pattern.UNICODE_CASE));
+
+                File[] files = dir.listFiles(f -> {
+                    for (Pattern pattern : patterns) {
+                        if (pattern.matcher(f.getName()).matches()) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
+
+                if (files != null && files.length > 0) {
+                    for (File f : files) {
+                        try {
+                            String newLyrics = FileUtil.read(f);
+                            if (newLyrics != null && !newLyrics.trim().isEmpty()) {
+                                if (AbsSynchronizedLyrics.isSynchronized(newLyrics)) {
+                                    return newLyrics;
+                                }
+                                lyrics = newLyrics;
+                            }
+                        } catch (Exception e) {
+                            e.printStackTrace();
+                        }
+                    }
+                }
+            }
+        }
+
+        return lyrics;
+    }
+
+    public static void toggleFavorite(@NonNull final Context context, @NonNull final Song song) {
+        if (isFavorite(context, song)) {
+            PlaylistsUtil.removeFromPlaylist(context, song, getFavoritesPlaylist(context).id);
+        } else {
+            PlaylistsUtil.addToPlaylist(context, song, getOrCreateFavoritesPlaylist(context).id,
+                    false);
+        }
+        context.sendBroadcast(new Intent(MusicService.FAVORITE_STATE_CHANGED));
+    }
+
+    public static boolean isFavoritePlaylist(@NonNull final Context context,
+                                             @NonNull final Playlist playlist) {
+        return playlist.name != null && playlist.name.equals(context.getString(R.string.favorites));
+    }
+
+    private static Playlist getFavoritesPlaylist(@NonNull final Context context) {
+        return PlaylistLoader.INSTANCE.getPlaylist(context, context.getString(R.string.favorites));
+    }
+
+    private static Playlist getOrCreateFavoritesPlaylist(@NonNull final Context context) {
+        return PlaylistLoader.INSTANCE.getPlaylist(context,
+                PlaylistsUtil.createPlaylist(context, context.getString(R.string.favorites)));
+    }
+
+    public static boolean isFavorite(@NonNull final Context context, @NonNull final Song song) {
+        return PlaylistsUtil
+                .doPlaylistContains(context, getFavoritesPlaylist(context).id, song.getId());
+    }
+
+    public static boolean isArtistNameUnknown(@Nullable String artistName) {
+        if (TextUtils.isEmpty(artistName)) {
+            return false;
+        }
+        if (artistName.equals(Artist.UNKNOWN_ARTIST_DISPLAY_NAME)) {
+            return true;
+        }
+        artistName = artistName.trim().toLowerCase();
+        return artistName.equals("unknown") || artistName.equals("<unknown>");
+    }
+
+    @NonNull
+    public static String getSectionName(@Nullable String musicMediaTitle) {
+        if (TextUtils.isEmpty(musicMediaTitle)) {
+            return "";
+        }
+        musicMediaTitle = musicMediaTitle.trim().toLowerCase();
+        if (musicMediaTitle.startsWith("the ")) {
+            musicMediaTitle = musicMediaTitle.substring(4);
+        } else if (musicMediaTitle.startsWith("a ")) {
+            musicMediaTitle = musicMediaTitle.substring(2);
+        }
+        if (musicMediaTitle.isEmpty()) {
+            return "";
+        }
+        return String.valueOf(musicMediaTitle.charAt(0)).toUpperCase();
+    }
+
+    @NonNull
+    public static Playlist getPlaylist() {
+        return playlist;
+    }
+
+    public static void setPlaylist(@NonNull Playlist playlist) {
+        MusicUtil.playlist = playlist;
+    }
+
+    public static long getTotalDuration(@NonNull final Context context, @NonNull List<Song> songs) {
+        long duration = 0;
+        for (int i = 0; i < songs.size(); i++) {
+            duration += songs.get(i).getDuration();
+        }
+        return duration;
+    }
+
+    public static int indexOfSongInList(List<Song> songs, int songId) {
+        for (int i = 0; i < songs.size(); i++) {
+            if (songs.get(i).getId() == songId) {
+                return i;
+            }
+        }
+        return -1;
+    }
+
+    @NonNull
+    public static String getYearString(int year) {
+        return year > 0 ? String.valueOf(year) : "-";
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
deleted file mode 100644
index ae3af5939..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/MusicUtil.kt
+++ /dev/null
@@ -1,517 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.ContentUris
-import android.content.Context
-import android.content.Intent
-import android.database.Cursor
-import android.net.Uri
-import android.provider.BaseColumns
-import android.provider.MediaStore
-import android.util.Log
-import androidx.core.content.FileProvider
-import androidx.core.content.contentValuesOf
-import androidx.core.net.toUri
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.Constants
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.db.PlaylistEntity
-import code.name.monkey.retromusic.db.SongEntity
-import code.name.monkey.retromusic.db.toSongEntity
-import code.name.monkey.retromusic.extensions.getLong
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.removeFromQueue
-import code.name.monkey.retromusic.model.Artist
-import code.name.monkey.retromusic.model.Song
-import code.name.monkey.retromusic.model.lyrics.AbsSynchronizedLyrics
-import code.name.monkey.retromusic.repository.Repository
-import code.name.monkey.retromusic.repository.SongRepository
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.Dispatchers.IO
-import kotlinx.coroutines.withContext
-import org.jaudiotagger.audio.AudioFileIO
-import org.jaudiotagger.tag.FieldKey
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
-import java.io.File
-import java.io.IOException
-import java.text.SimpleDateFormat
-import java.util.*
-import java.util.regex.Pattern
-
-
-object MusicUtil : KoinComponent {
-    fun createShareSongFileIntent(context: Context, song: Song): Intent {
-        return Intent().apply {
-            action = Intent.ACTION_SEND
-            putExtra(
-                Intent.EXTRA_STREAM, try {
-                    FileProvider.getUriForFile(
-                        context,
-                        context.applicationContext.packageName,
-                        File(song.data)
-                    )
-                } catch (e: IllegalArgumentException) {
-                    getSongFileUri(song.id)
-                }
-            )
-            addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-            type = "audio/*"
-        }
-    }
-
-    fun createShareMultipleSongIntent(context: Context, songs: List<Song>): Intent {
-        return Intent().apply {
-            action = Intent.ACTION_SEND_MULTIPLE
-            type = "audio/*"
-
-            val files = ArrayList<Uri>()
-
-            for (song in songs) {
-                files.add(
-                    try {
-                        FileProvider.getUriForFile(
-                            context,
-                            context.applicationContext.packageName,
-                            File(song.data)
-                        )
-                    } catch (e: IllegalArgumentException) {
-                        getSongFileUri(song.id)
-                    }
-                )
-            }
-            putParcelableArrayListExtra(Intent.EXTRA_STREAM, files)
-        }
-    }
-
-    fun buildInfoString(string1: String?, string2: String?): String {
-        if (string1.isNullOrEmpty()) {
-            return if (string2.isNullOrEmpty()) "" else string2
-        }
-        return if (string2.isNullOrEmpty()) if (string1.isNullOrEmpty()) "" else string1 else "$string1  •  $string2"
-    }
-
-    fun createAlbumArtFile(context: Context): File {
-        return File(
-            createAlbumArtDir(context),
-            System.currentTimeMillis().toString()
-        )
-    }
-
-    private fun createAlbumArtDir(context: Context): File {
-        val albumArtDir = File(
-            if (VersionUtils.hasR()) context.cacheDir else getExternalStorageDirectory(),
-            "/albumthumbs/"
-        )
-        if (!albumArtDir.exists()) {
-            albumArtDir.mkdirs()
-            try {
-                File(albumArtDir, ".nomedia").createNewFile()
-            } catch (e: IOException) {
-                e.printStackTrace()
-            }
-        }
-        return albumArtDir
-    }
-
-    fun deleteAlbumArt(context: Context, albumId: Long) {
-        val contentResolver = context.contentResolver
-        val localUri = "content://media/external/audio/albumart".toUri()
-        contentResolver.delete(ContentUris.withAppendedId(localUri, albumId), null, null)
-        contentResolver.notifyChange(localUri, null)
-    }
-
-    fun getArtistInfoString(
-        context: Context,
-        artist: Artist,
-    ): String {
-        val albumCount = artist.albumCount
-        val songCount = artist.songCount
-        val albumString =
-            if (albumCount == 1) context.resources.getString(R.string.album)
-            else context.resources.getString(R.string.albums)
-        val songString =
-            if (songCount == 1) context.resources.getString(R.string.song)
-            else context.resources.getString(R.string.songs)
-        return "$albumCount $albumString • $songCount $songString"
-    }
-
-    //iTunes uses for example 1002 for track 2 CD1 or 3011 for track 11 CD3.
-    //this method converts those values to normal tracknumbers
-    fun getFixedTrackNumber(trackNumberToFix: Int): Int {
-        return trackNumberToFix % 1000
-    }
-
-    fun getLyrics(song: Song): String? {
-        var lyrics: String? = "No lyrics found"
-        val file = File(song.data)
-        try {
-            lyrics = AudioFileIO.read(file).tagOrCreateDefault.getFirst(FieldKey.LYRICS)
-        } catch (e: Exception) {
-            e.printStackTrace()
-        }
-        if (lyrics == null || lyrics.trim { it <= ' ' }.isEmpty() || AbsSynchronizedLyrics
-                .isSynchronized(lyrics)
-        ) {
-            val dir = file.absoluteFile.parentFile
-            if (dir != null && dir.exists() && dir.isDirectory) {
-                val format = ".*%s.*\\.(lrc|txt)"
-                val filename = Pattern.quote(
-                    FileUtil.stripExtension(file.name)
-                )
-                val songtitle = Pattern.quote(song.title)
-                val patterns =
-                    ArrayList<Pattern>()
-                patterns.add(
-                    Pattern.compile(
-                        String.format(format, filename),
-                        Pattern.CASE_INSENSITIVE or Pattern.UNICODE_CASE
-                    )
-                )
-                patterns.add(
-                    Pattern.compile(
-                        String.format(format, songtitle),
-                        Pattern.CASE_INSENSITIVE or Pattern.UNICODE_CASE
-                    )
-                )
-                val files =
-                    dir.listFiles { f: File ->
-                        for (pattern in patterns) {
-                            if (pattern.matcher(f.name).matches()) {
-                                return@listFiles true
-                            }
-                        }
-                        false
-                    }
-                if (files != null && files.isNotEmpty()) {
-                    for (f in files) {
-                        try {
-                            val newLyrics =
-                                FileUtil.read(f)
-                            if (newLyrics != null && newLyrics.trim { it <= ' ' }.isNotEmpty()) {
-                                if (AbsSynchronizedLyrics.isSynchronized(newLyrics)) {
-                                    return newLyrics
-                                }
-                                lyrics = newLyrics
-                            }
-                        } catch (e: Exception) {
-                            e.printStackTrace()
-                        }
-                    }
-                }
-            }
-        }
-        return lyrics
-    }
-
-    @JvmStatic
-    fun getMediaStoreAlbumCoverUri(albumId: Long): Uri {
-        val sArtworkUri = "content://media/external/audio/albumart".toUri()
-        return ContentUris.withAppendedId(sArtworkUri, albumId)
-    }
-
-
-    fun getPlaylistInfoString(
-        context: Context,
-        songs: List<Song>,
-    ): String {
-        val duration = getTotalDuration(songs)
-        return buildInfoString(
-            getSongCountString(context, songs.size),
-            getReadableDurationString(duration)
-        )
-    }
-
-    fun playlistInfoString(
-        context: Context,
-        songs: List<SongEntity>,
-    ): String {
-        return getSongCountString(context, songs.size)
-    }
-
-    fun getReadableDurationString(songDurationMillis: Long): String {
-        var minutes = songDurationMillis / 1000 / 60
-        val seconds = songDurationMillis / 1000 % 60
-        return if (minutes < 60) {
-            String.format(
-                Locale.getDefault(),
-                "%02d:%02d",
-                minutes,
-                seconds
-            )
-        } else {
-            val hours = minutes / 60
-            minutes %= 60
-            String.format(
-                Locale.getDefault(),
-                "%02d:%02d:%02d",
-                hours,
-                minutes,
-                seconds
-            )
-        }
-    }
-
-    fun getSectionName(mediaTitle: String?, stripPrefix: Boolean = false): String {
-        var musicMediaTitle = mediaTitle
-        return try {
-            if (musicMediaTitle.isNullOrEmpty()) {
-                return "-"
-            }
-            musicMediaTitle = musicMediaTitle.trim { it <= ' ' }.lowercase()
-            if (stripPrefix) {
-                if (musicMediaTitle.startsWith("the ")) {
-                    musicMediaTitle = musicMediaTitle.substring(4)
-                } else if (musicMediaTitle.startsWith("a ")) {
-                    musicMediaTitle = musicMediaTitle.substring(2)
-                }
-            }
-
-            if (musicMediaTitle.isEmpty()) {
-                ""
-            } else musicMediaTitle.substring(0, 1).uppercase()
-        } catch (e: Exception) {
-            ""
-        }
-    }
-
-    fun getSongCountString(context: Context, songCount: Int): String {
-        val songString = if (songCount == 1) context.resources
-            .getString(R.string.song) else context.resources.getString(R.string.songs)
-        return "$songCount $songString"
-    }
-
-    fun getSongFileUri(songId: Long): Uri {
-        return ContentUris.withAppendedId(
-            MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-            songId
-        )
-    }
-
-    fun getSongFilePath(context: Context, uri: Uri): String {
-        val projection = arrayOf(Constants.DATA)
-        context.contentResolver.query(uri, projection, null, null, null)?.use {
-            if (it.moveToFirst()) {
-                return it.getString(0)
-            }
-        }
-        return ""
-    }
-
-    fun getTotalDuration(songs: List<Song>): Long {
-        var duration: Long = 0
-        for (i in songs.indices) {
-            duration += songs[i].duration
-        }
-        return duration
-    }
-
-    fun getYearString(year: Int): String {
-        return if (year > 0) year.toString() else "-"
-    }
-
-    fun indexOfSongInList(songs: List<Song>, songId: Long): Int {
-        return songs.indexOfFirst { it.id == songId }
-    }
-
-    fun getDateModifiedString(date: Long): String {
-        val calendar: Calendar = Calendar.getInstance()
-        val pattern = "dd/MM/yyyy hh:mm:ss"
-        calendar.timeInMillis = date
-        val formatter = SimpleDateFormat(pattern, Locale.ENGLISH)
-        return formatter.format(calendar.time)
-    }
-
-    fun insertAlbumArt(
-        context: Context,
-        albumId: Long,
-        path: String?,
-    ) {
-        val contentResolver = context.contentResolver
-        val artworkUri = "content://media/external/audio/albumart".toUri()
-        contentResolver.delete(ContentUris.withAppendedId(artworkUri, albumId), null, null)
-        val values = contentValuesOf(
-            "album_id" to albumId,
-            "_data" to path
-        )
-        contentResolver.insert(artworkUri, values)
-        contentResolver.notifyChange(artworkUri, null)
-    }
-
-    fun isArtistNameUnknown(artistName: String?): Boolean {
-        if (artistName.isNullOrEmpty()) {
-            return false
-        }
-        if (artistName == Artist.UNKNOWN_ARTIST_DISPLAY_NAME) {
-            return true
-        }
-        val tempName = artistName.trim { it <= ' ' }.lowercase()
-        return tempName == "unknown" || tempName == "<unknown>"
-    }
-
-    fun isVariousArtists(artistName: String?): Boolean {
-        if (artistName.isNullOrEmpty()) {
-            return false
-        }
-        if (artistName == Artist.VARIOUS_ARTISTS_DISPLAY_NAME) {
-            return true
-        }
-        return false
-    }
-
-    private val repository = get<Repository>()
-    suspend fun toggleFavorite(song: Song) {
-        withContext(IO) {
-            val playlist: PlaylistEntity = repository.favoritePlaylist()
-            val songEntity = song.toSongEntity(playlist.playListId)
-            val isFavorite = repository.isFavoriteSong(songEntity).isNotEmpty()
-            if (isFavorite) {
-                repository.removeSongFromPlaylist(songEntity)
-            } else {
-                repository.insertSongs(listOf(song.toSongEntity(playlist.playListId)))
-            }
-        }
-    }
-
-    suspend fun isFavorite(song: Song) = repository.isSongFavorite(song.id)
-
-    fun deleteTracks(
-        activity: FragmentActivity,
-        songs: List<Song>,
-        safUris: List<Uri>?,
-        callback: Runnable?,
-    ) {
-        val songRepository: SongRepository = get()
-        val projection = arrayOf(
-            BaseColumns._ID, Constants.DATA
-        )
-        // Split the query into multiple batches, and merge the resulting cursors
-        var batchStart: Int
-        var batchEnd = 0
-        val batchSize =
-            1000000 / 10 // 10^6 being the SQLite limite on the query lenth in bytes, 10 being the max number of digits in an int, used to store the track ID
-        val songCount = songs.size
-
-        while (batchEnd < songCount) {
-            batchStart = batchEnd
-
-            val selection = StringBuilder()
-            selection.append(BaseColumns._ID + " IN (")
-
-            var i = 0
-            while (i < batchSize - 1 && batchEnd < songCount - 1) {
-                selection.append(songs[batchEnd].id)
-                selection.append(",")
-                i++
-                batchEnd++
-            }
-            // The last element of a batch
-            // The last element of a batch
-            selection.append(songs[batchEnd].id)
-            batchEnd++
-            selection.append(")")
-
-            try {
-                val cursor = activity.contentResolver.query(
-                    MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, projection, selection.toString(),
-                    null, null
-                )
-                if (cursor != null) {
-                    // Step 1: Remove selected tracks from the current playlist, as well
-                    // as from the album art cache
-                    cursor.moveToFirst()
-                    while (!cursor.isAfterLast) {
-                        val id = cursor.getLong(BaseColumns._ID)
-                        val song: Song = songRepository.song(id)
-                        removeFromQueue(song)
-                        cursor.moveToNext()
-                    }
-
-                    // Step 2: Remove selected tracks from the database
-                    activity.contentResolver.delete(
-                        MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                        selection.toString(), null
-                    )
-                    // Step 3: Remove files from card
-                    cursor.moveToFirst()
-                    var index = batchStart
-                    while (!cursor.isAfterLast) {
-                        val name = cursor.getString(1)
-                        val safUri =
-                            if (safUris == null || safUris.size <= index) null else safUris[index]
-                        SAFUtil.delete(activity, name, safUri)
-                        index++
-                        cursor.moveToNext()
-                    }
-                    cursor.close()
-                }
-            } catch (ignored: SecurityException) {
-
-            }
-            activity.contentResolver.notifyChange("content://media".toUri(), null)
-            activity.runOnUiThread {
-                activity.showToast(activity.getString(R.string.deleted_x_songs, songCount))
-                callback?.run()
-            }
-        }
-    }
-
-    suspend fun deleteTracks(context: Context, songs: List<Song>) {
-        val projection = arrayOf(BaseColumns._ID, Constants.DATA)
-        val selection = StringBuilder()
-        selection.append(BaseColumns._ID + " IN (")
-        for (i in songs.indices) {
-            selection.append(songs[i].id)
-            if (i < songs.size - 1) {
-                selection.append(",")
-            }
-        }
-        selection.append(")")
-        var deletedCount = 0
-        try {
-            val cursor: Cursor? = context.contentResolver.query(
-                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI, projection, selection.toString(),
-                null, null
-            )
-            if (cursor != null) {
-                removeFromQueue(songs)
-
-                // Step 2: Remove files from card
-                cursor.moveToFirst()
-                while (!cursor.isAfterLast) {
-                    val id: Int = cursor.getInt(0)
-                    val name: String = cursor.getString(1)
-                    try { // File.delete can throw a security exception
-                        if (SAFUtil.delete(context, name, null)) {
-                            // Step 3: Remove selected track from the database
-                            context.contentResolver.delete(
-                                ContentUris.withAppendedId(
-                                    MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                                    id.toLong()
-                                ), null, null
-                            )
-                            deletedCount++
-                        } else {
-                            Log.e("MusicUtils", "Failed to delete file $name")
-                        }
-                        cursor.moveToNext()
-                    } catch (ex: SecurityException) {
-                        cursor.moveToNext()
-                    } catch (e: NullPointerException) {
-                        Log.e("MusicUtils", "Failed to find file $name")
-                    }
-                }
-                cursor.close()
-            }
-            withContext(Dispatchers.Main) {
-                context.showToast(context.getString(R.string.deleted_x_songs, deletedCount))
-            }
-
-        } catch (ignored: SecurityException) {
-        }
-    }
-
-    fun songByGenre(genreId: Long): Song {
-        return repository.getSongByGenre(genreId)
-    }
-}
\ No newline at end of file
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
new file mode 100755
index 000000000..5560ca6d3
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.java
@@ -0,0 +1,182 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.app.Activity;
+import android.app.ActivityOptions;
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.media.audiofx.AudioEffect;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+
+import org.jetbrains.annotations.NotNull;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.AboutActivity;
+import code.name.monkey.retromusic.activities.AlbumDetailsActivity;
+import code.name.monkey.retromusic.activities.ArtistDetailActivity;
+import code.name.monkey.retromusic.activities.GenreDetailsActivity;
+import code.name.monkey.retromusic.activities.LicenseActivity;
+import code.name.monkey.retromusic.activities.LyricsActivity;
+import code.name.monkey.retromusic.activities.PlayingQueueActivity;
+import code.name.monkey.retromusic.activities.PlaylistDetailActivity;
+import code.name.monkey.retromusic.activities.PurchaseActivity;
+import code.name.monkey.retromusic.activities.SearchActivity;
+import code.name.monkey.retromusic.activities.SettingsActivity;
+import code.name.monkey.retromusic.activities.SupportDevelopmentActivity;
+import code.name.monkey.retromusic.activities.UserInfoActivity;
+import code.name.monkey.retromusic.activities.WhatsNewActivity;
+import code.name.monkey.retromusic.activities.bugreport.BugReportActivity;
+import code.name.monkey.retromusic.helper.MusicPlayerRemote;
+import code.name.monkey.retromusic.model.Genre;
+import code.name.monkey.retromusic.model.Playlist;
+
+import static code.name.monkey.retromusic.Constants.RATE_ON_GOOGLE_PLAY;
+import static code.name.monkey.retromusic.util.RetroUtil.openUrl;
+
+
+public class NavigationUtil {
+
+    public static void goToAlbum(@NonNull Activity activity, int albumId) {
+        Intent intent = new Intent(activity, AlbumDetailsActivity.class);
+        intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, albumId);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void goToAlbumOptions(@NonNull Activity activity,
+                                        int albumId,
+                                        @NonNull ActivityOptions options) {
+        Intent intent = new Intent(activity, AlbumDetailsActivity.class);
+        intent.putExtra(AlbumDetailsActivity.EXTRA_ALBUM_ID, albumId);
+        ActivityCompat.startActivity(activity, intent, options.toBundle());
+    }
+
+    public static void goToArtistOptions(@NotNull AppCompatActivity activity,
+                                         int artistId,
+                                         @NonNull ActivityOptions options) {
+
+        Intent intent = new Intent(activity, ArtistDetailActivity.class);
+        intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, artistId);
+        ActivityCompat.startActivity(activity, intent, options.toBundle());
+    }
+
+    public static void goToArtist(@NonNull Activity activity, int i) {
+        Intent intent = new Intent(activity, ArtistDetailActivity.class);
+        intent.putExtra(ArtistDetailActivity.EXTRA_ARTIST_ID, i);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void goToPlaylistNew(@NonNull Activity activity, @NonNull Playlist playlist) {
+        Intent intent = new Intent(activity, PlaylistDetailActivity.class);
+        intent.putExtra(PlaylistDetailActivity.Companion.getEXTRA_PLAYLIST(), playlist);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void openEqualizer(@NonNull final Activity activity) {
+        stockEqalizer(activity);
+    }
+
+    private static void stockEqalizer(@NonNull Activity activity) {
+        final int sessionId = MusicPlayerRemote.INSTANCE.getAudioSessionId();
+        if (sessionId == AudioEffect.ERROR_BAD_VALUE) {
+            Toast.makeText(activity, activity.getResources().getString(R.string.no_audio_ID),
+                    Toast.LENGTH_LONG).show();
+        } else {
+            try {
+                final Intent effects = new Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL);
+                effects.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, sessionId);
+                effects.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC);
+                activity.startActivityForResult(effects, 0);
+            } catch (@NonNull final ActivityNotFoundException notFound) {
+                Toast.makeText(activity, activity.getResources().getString(R.string.no_equalizer),
+                        Toast.LENGTH_SHORT).show();
+            }
+        }
+    }
+
+    public static void goToPlayingQueue(@NonNull Activity activity) {
+        Intent intent = new Intent(activity, PlayingQueueActivity.class);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void goToLyrics(@NonNull Activity activity) {
+        Intent intent = new Intent(activity, LyricsActivity.class);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void goToGenre(@NonNull Activity activity, @NonNull Genre genre) {
+        Intent intent = new Intent(activity, GenreDetailsActivity.class);
+        intent.putExtra(GenreDetailsActivity.EXTRA_GENRE_ID, genre);
+        ActivityCompat.startActivity(activity, intent, null);
+    }
+
+    public static void goToProVersion(@NonNull Context context) {
+        ActivityCompat.startActivity(context, new Intent(context, PurchaseActivity.class), null);
+    }
+
+    public static void goToSettings(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, SettingsActivity.class), null);
+    }
+
+    public static void goToAbout(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, AboutActivity.class), null);
+    }
+
+    public static void goToUserInfo(@NonNull Activity activity,
+                                    @NonNull ActivityOptions activityOptions) {
+        ActivityCompat.startActivity(activity, new Intent(activity, UserInfoActivity.class),
+                activityOptions.toBundle());
+    }
+
+    public static void goToOpenSource(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, LicenseActivity.class), null);
+    }
+
+    public static void goToSearch(@NonNull Activity activity,
+                                  @NonNull ActivityOptions activityOptions) {
+        ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class),
+                activityOptions.toBundle());
+    }
+
+    public static void goToSearch(@NonNull Activity activity, boolean isMicOpen,
+                                  @NonNull ActivityOptions activityOptions) {
+        ActivityCompat.startActivity(activity, new Intent(activity, SearchActivity.class)
+                        .putExtra(SearchActivity.EXTRA_SHOW_MIC, isMicOpen),
+                activityOptions.toBundle());
+    }
+
+    public static void goToSupportDevelopment(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, SupportDevelopmentActivity.class), null);
+    }
+
+    public static void goToPlayStore(@NonNull Activity activity) {
+        openUrl(activity, RATE_ON_GOOGLE_PLAY);
+    }
+
+    public static void gotoWhatNews(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, WhatsNewActivity.class), null);
+    }
+
+    public static void bugReport(@NonNull Activity activity) {
+        ActivityCompat.startActivity(activity, new Intent(activity, BugReportActivity.class), null);
+    }
+
+
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt
deleted file mode 100755
index 8c0aa60aa..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/NavigationUtil.kt
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Intent
-import android.media.audiofx.AudioEffect
-import android.widget.Toast
-import androidx.fragment.app.FragmentActivity
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.activities.*
-import code.name.monkey.retromusic.activities.bugreport.BugReportActivity
-import code.name.monkey.retromusic.extensions.showToast
-import code.name.monkey.retromusic.helper.MusicPlayerRemote.audioSessionId
-
-object NavigationUtil {
-    fun bugReport(activity: Activity) {
-        activity.startActivity(
-            Intent(activity, BugReportActivity::class.java), null
-        )
-    }
-
-    fun goToOpenSource(activity: Activity) {
-        activity.startActivity(
-            Intent(activity, LicenseActivity::class.java), null
-        )
-    }
-
-    fun gotoDriveMode(activity: Activity) {
-        activity.startActivity(
-            Intent(activity, DriveModeActivity::class.java), null
-        )
-    }
-
-    fun gotoWhatNews(activity: FragmentActivity) {
-        val changelogBottomSheet = WhatsNewFragment()
-        changelogBottomSheet.show(activity.supportFragmentManager, WhatsNewFragment.TAG)
-    }
-
-    fun openEqualizer(activity: Activity) {
-        stockEqualizer(activity)
-    }
-
-    private fun stockEqualizer(activity: Activity) {
-        val sessionId = audioSessionId
-        if (sessionId == AudioEffect.ERROR_BAD_VALUE) {
-            activity.showToast(R.string.no_audio_ID, Toast.LENGTH_LONG)
-        } else {
-            try {
-                val effects = Intent(AudioEffect.ACTION_DISPLAY_AUDIO_EFFECT_CONTROL_PANEL)
-                effects.putExtra(AudioEffect.EXTRA_AUDIO_SESSION, sessionId)
-                effects.putExtra(AudioEffect.EXTRA_CONTENT_TYPE, AudioEffect.CONTENT_TYPE_MUSIC)
-                activity.startActivityForResult(effects, 0)
-            } catch (notFound: ActivityNotFoundException) {
-                activity.showToast(R.string.no_equalizer)
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt b/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
deleted file mode 100644
index 012dfc85a..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/PackageValidator.kt
+++ /dev/null
@@ -1,351 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.util
-
-
-import android.Manifest.permission.BIND_NOTIFICATION_LISTENER_SERVICE
-import android.Manifest.permission.MEDIA_CONTENT_CONTROL
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.pm.PackageInfo
-import android.content.pm.PackageInfo.REQUESTED_PERMISSION_GRANTED
-import android.content.pm.PackageManager
-import android.content.res.XmlResourceParser
-import android.os.Process
-import android.support.v4.media.session.MediaSessionCompat
-import android.util.Base64
-import android.util.Log
-import androidx.annotation.XmlRes
-import androidx.media.MediaBrowserServiceCompat
-import code.name.monkey.retromusic.BuildConfig
-import org.xmlpull.v1.XmlPullParserException
-import java.io.IOException
-import java.security.MessageDigest
-import java.security.NoSuchAlgorithmException
-import java.util.*
-
-/**
- * Validates that the calling package is authorized to browse a [MediaBrowserServiceCompat].
- *
- * The list of allowed signing certificates and their corresponding package names is defined in
- * res/xml/allowed_media_browser_callers.xml.
- *
- * If you want to add a new caller to allowed_media_browser_callers.xml and you don't know
- * its signature, this class will print to logcat (INFO level) a message with the proper
- * xml tags to add to allow the caller.
- *
- * For more information, see res/xml/allowed_media_browser_callers.xml.
- */
-class PackageValidator(
-        context: Context,
-        @XmlRes xmlResId: Int
-) {
-    private val context: Context
-    private val packageManager: PackageManager
-
-    private val certificateWhitelist: Map<String, KnownCallerInfo>
-    private val platformSignature: String
-
-    private val callerChecked = mutableMapOf<String, Pair<Int, Boolean>>()
-
-    init {
-        val parser = context.resources.getXml(xmlResId)
-        this.context = context.applicationContext
-        this.packageManager = this.context.packageManager
-
-        certificateWhitelist = buildCertificateWhitelist(parser)
-        platformSignature = getSystemSignature()
-    }
-
-    /**
-     * Checks whether the caller attempting to connect to a [MediaBrowserServiceCompat] is known.
-     * See [MediaBrowserServiceCompat.onGetRoot] for where this is utilized.
-     *
-     * @param callingPackage The package name of the caller.
-     * @param callingUid The user id of the caller.
-     * @return `true` if the caller is known, `false` otherwise.
-     */
-    fun isKnownCaller(callingPackage: String, callingUid: Int): Boolean {
-        // If the caller has already been checked, return the previous result here.
-        val (checkedUid, checkResult) = callerChecked[callingPackage] ?: Pair(0, false)
-        if (checkedUid == callingUid) {
-            return checkResult
-        }
-
-        /**
-         * Because some of these checks can be slow, we save the results in [callerChecked] after
-         * this code is run.
-         *
-         * In particular, there's little reason to recompute the calling package's certificate
-         * signature (SHA-256) each call.
-         *
-         * This is safe to do as we know the UID matches the package's UID (from the check above),
-         * and app UIDs are set at install time. Additionally, a package name + UID is guaranteed to
-         * be constant until a reboot. (After a reboot then a previously assigned UID could be
-         * reassigned.)
-         */
-
-        // Build the caller info for the rest of the checks here.
-        val callerPackageInfo = buildCallerInfo(callingPackage)
-                ?: throw IllegalStateException("Caller wasn't found in the system?")
-
-        // Verify that things aren't ... broken. (This test should always pass.)
-        if (callerPackageInfo.uid != callingUid) {
-            throw IllegalStateException("Caller's package UID doesn't match caller's actual UID?")
-        }
-
-        val callerSignature = callerPackageInfo.signature
-        val isPackageInWhitelist = certificateWhitelist[callingPackage]?.signatures?.first {
-            it.signature == callerSignature
-        } != null
-
-        val isCallerKnown = when {
-            // If it's our own app making the call, allow it.
-            callingUid == Process.myUid() -> true
-            // If it's one of the apps on the whitelist, allow it.
-            isPackageInWhitelist -> true
-            // If the system is making the call, allow it.
-            callingUid == Process.SYSTEM_UID -> true
-            // If the app was signed by the same certificate as the platform itself, also allow it.
-            callerSignature == platformSignature -> true
-            /**
-             * [MEDIA_CONTENT_CONTROL] permission is only available to system applications, and
-             * while it isn't required to allow these apps to connect to a
-             * [MediaBrowserServiceCompat], allowing this ensures optimal compatability with apps
-             * such as Android TV and the Google Assistant.
-             */
-            callerPackageInfo.permissions.contains(MEDIA_CONTENT_CONTROL) -> true
-            /**
-             * This last permission can be specifically granted to apps, and, in addition to
-             * allowing them to retrieve notifications, it also allows them to connect to an
-             * active [MediaSessionCompat].
-             * As with the above, it's not required to allow apps holding this permission to
-             * connect to your [MediaBrowserServiceCompat], but it does allow easy comparability
-             * with apps such as Wear OS.
-             */
-            callerPackageInfo.permissions.contains(BIND_NOTIFICATION_LISTENER_SERVICE) -> true
-            // If none of the pervious checks succeeded, then the caller is unrecognized.
-            else -> false
-        }
-
-        if (!isCallerKnown) {
-            logUnknownCaller(callerPackageInfo)
-        }
-
-        // Save our work for next time.
-        callerChecked[callingPackage] = Pair(callingUid, isCallerKnown)
-        return isCallerKnown
-    }
-
-    /**
-     * Logs an info level message with details of how to add a caller to the allowed callers list
-     * when the app is debuggable.
-     */
-    private fun logUnknownCaller(callerPackageInfo: CallerPackageInfo) {
-        if (BuildConfig.DEBUG && callerPackageInfo.signature != null) {
-            Log.i(TAG, "PackageValidator call" + callerPackageInfo.name + callerPackageInfo.packageName + callerPackageInfo.signature)
-        }
-    }
-
-    /**
-     * Builds a [CallerPackageInfo] for a given package that can be used for all the
-     * various checks that are performed before allowing an app to connect to a
-     * [MediaBrowserServiceCompat].
-     */
-    private fun buildCallerInfo(callingPackage: String): CallerPackageInfo? {
-        val packageInfo = getPackageInfo(callingPackage) ?: return null
-
-        val appName = packageInfo.applicationInfo.loadLabel(packageManager).toString()
-        val uid = packageInfo.applicationInfo.uid
-        val signature = getSignature(packageInfo)
-
-        val requestedPermissions = packageInfo.requestedPermissions
-        val permissionFlags = packageInfo.requestedPermissionsFlags
-        val activePermissions = mutableSetOf<String>()
-        requestedPermissions?.forEachIndexed { index, permission ->
-            if (permissionFlags[index] and REQUESTED_PERMISSION_GRANTED != 0) {
-                activePermissions += permission
-            }
-        }
-
-        return CallerPackageInfo(appName, callingPackage, uid, signature, activePermissions.toSet())
-    }
-
-    /**
-     * Looks up the [PackageInfo] for a package name.
-     * This requests both the signatures (for checking if an app is on the whitelist) and
-     * the app's permissions, which allow for more flexibility in the whitelist.
-     *
-     * @return [PackageInfo] for the package name or null if it's not found.
-     */
-    @Suppress("Deprecation")
-    @SuppressLint("PackageManagerGetSignatures")
-    private fun getPackageInfo(callingPackage: String): PackageInfo? =
-            packageManager.getPackageInfo(callingPackage,
-                    PackageManager.GET_SIGNATURES or PackageManager.GET_PERMISSIONS)
-
-    /**
-     * Gets the signature of a given package's [PackageInfo].
-     *
-     * The "signature" is a SHA-256 hash of the public key of the signing certificate used by
-     * the app.
-     *
-     * If the app is not found, or if the app does not have exactly one signature, this method
-     * returns `null` as the signature.
-     */
-    @Suppress("deprecation")
-    private fun getSignature(packageInfo: PackageInfo): String? {
-        // Security best practices dictate that an app should be signed with exactly one (1)
-        // signature. Because of this, if there are multiple signatures, reject it.
-        return if (packageInfo.signatures == null || packageInfo.signatures.size != 1) {
-            null
-        } else {
-            val certificate = packageInfo.signatures[0].toByteArray()
-            getSignatureSha256(certificate)
-        }
-    }
-
-    private fun buildCertificateWhitelist(parser: XmlResourceParser): Map<String, KnownCallerInfo> {
-
-        val certificateWhitelist = LinkedHashMap<String, KnownCallerInfo>()
-        try {
-            var eventType = parser.next()
-            while (eventType != XmlResourceParser.END_DOCUMENT) {
-                if (eventType == XmlResourceParser.START_TAG) {
-                    val callerInfo = when (parser.name) {
-                        "signing_certificate" -> parseV1Tag(parser)
-                        "signature" -> parseV2Tag(parser)
-                        else -> null
-                    }
-
-                    callerInfo?.let { info ->
-                        val packageName = info.packageName
-                        val existingCallerInfo = certificateWhitelist[packageName]
-                        if (existingCallerInfo != null) {
-                            existingCallerInfo.signatures += callerInfo.signatures
-                        } else {
-                            certificateWhitelist[packageName] = callerInfo
-                        }
-                    }
-                }
-
-                eventType = parser.next()
-            }
-        } catch (xmlException: XmlPullParserException) {
-            Log.e(TAG, "Could not read allowed callers from XML.", xmlException)
-        } catch (ioException: IOException) {
-            Log.e(TAG, "Could not read allowed callers from XML.", ioException)
-        }
-
-        return certificateWhitelist
-    }
-
-    /**
-     * Parses a v1 format tag. See allowed_media_browser_callers.xml for more details.
-     */
-    private fun parseV1Tag(parser: XmlResourceParser): KnownCallerInfo {
-        val name = parser.getAttributeValue(null, "name")
-        val packageName = parser.getAttributeValue(null, "package")
-        val isRelease = parser.getAttributeBooleanValue(null, "release", false)
-        val certificate = parser.nextText().replace(WHITESPACE_REGEX, "")
-        val signature = getSignatureSha256(certificate)
-
-        val callerSignature = KnownSignature(signature, isRelease)
-        return KnownCallerInfo(name, packageName, mutableSetOf(callerSignature))
-    }
-
-    /**
-     * Parses a v2 format tag. See allowed_media_browser_callers.xml for more details.
-     */
-    private fun parseV2Tag(parser: XmlResourceParser): KnownCallerInfo {
-        val name = parser.getAttributeValue(null, "name")
-        val packageName = parser.getAttributeValue(null, "package")
-
-        val callerSignatures = mutableSetOf<KnownSignature>()
-        var eventType = parser.next()
-        while (eventType != XmlResourceParser.END_TAG) {
-            val isRelease = parser.getAttributeBooleanValue(null, "release", false)
-            val signature = parser.nextText().replace(WHITESPACE_REGEX, "")
-                .lowercase(Locale.getDefault())
-            callerSignatures += KnownSignature(signature, isRelease)
-
-            eventType = parser.next()
-        }
-
-        return KnownCallerInfo(name, packageName, callerSignatures)
-    }
-
-    /**
-     * Finds the Android platform signing key signature. This key is never null.
-     */
-    private fun getSystemSignature(): String =
-            getPackageInfo(ANDROID_PLATFORM)?.let { platformInfo ->
-                getSignature(platformInfo)
-            } ?: throw IllegalStateException("Platform signature not found")
-
-    /**
-     * Creates a SHA-256 signature given a Base64 encoded certificate.
-     */
-    private fun getSignatureSha256(certificate: String): String {
-        return getSignatureSha256(Base64.decode(certificate, Base64.DEFAULT))
-    }
-
-    /**
-     * Creates a SHA-256 signature given a certificate byte array.
-     */
-    private fun getSignatureSha256(certificate: ByteArray): String {
-        val md: MessageDigest
-        try {
-            md = MessageDigest.getInstance("SHA256")
-        } catch (noSuchAlgorithmException: NoSuchAlgorithmException) {
-            Log.e(TAG, "No such algorithm: $noSuchAlgorithmException")
-            throw RuntimeException("Could not find SHA256 hash algorithm", noSuchAlgorithmException)
-        }
-        md.update(certificate)
-
-        // This code takes the byte array generated by `md.digest()` and joins each of the bytes
-        // to a string, applying the string format `%02x` on each digit before it's appended, with
-        // a colon (':') between each of the items.
-        // For example: input=[0,2,4,6,8,10,12], output="00:02:04:06:08:0a:0c"
-        return md.digest().joinToString(":") { String.format("%02x", it) }
-    }
-
-    private data class KnownCallerInfo(
-        val name: String,
-        val packageName: String,
-        val signatures: MutableSet<KnownSignature>
-    )
-
-    private data class KnownSignature(
-        val signature: String,
-        val release: Boolean
-    )
-
-    /**
-     * Convenience class to hold all of the information about an app that's being checked
-     * to see if it's a known caller.
-     */
-    private data class CallerPackageInfo(
-        val name: String,
-        val packageName: String,
-        val uid: Int,
-        val signature: String?,
-        val permissions: Set<String>
-    )
-}
-
-private const val TAG = "PackageValidator"
-private const val ANDROID_PLATFORM = "android"
-private val WHITESPACE_REGEX = "\\s|\\n".toRegex()
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
new file mode 100644
index 000000000..da5d3b8b1
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PlaylistsUtil.java
@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.content.ContentResolver;
+import android.content.ContentValues;
+import android.content.Context;
+import android.database.Cursor;
+import android.net.Uri;
+import android.os.Environment;
+import android.provider.BaseColumns;
+import android.provider.MediaStore;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.helper.M3UWriter;
+import code.name.monkey.retromusic.model.Playlist;
+import code.name.monkey.retromusic.model.PlaylistSong;
+import code.name.monkey.retromusic.model.Song;
+
+import static android.provider.MediaStore.Audio.Playlists.EXTERNAL_CONTENT_URI;
+
+public class PlaylistsUtil {
+    public static boolean doesPlaylistExist(@NonNull final Context context, final int playlistId) {
+        return playlistId != -1 && doesPlaylistExist(context,
+                MediaStore.Audio.Playlists._ID + "=?",
+                new String[]{String.valueOf(playlistId)});
+    }
+
+    public static boolean doesPlaylistExist(@NonNull final Context context, final String name) {
+        return doesPlaylistExist(context,
+                MediaStore.Audio.PlaylistsColumns.NAME + "=?",
+                new String[]{name});
+    }
+
+    public static int createPlaylist(@NonNull final Context context, @Nullable final String name) {
+        int id = -1;
+        if (name != null && name.length() > 0) {
+            try {
+                Cursor cursor = context.getContentResolver().query(EXTERNAL_CONTENT_URI,
+                        new String[]{MediaStore.Audio.Playlists._ID},
+                        MediaStore.Audio.PlaylistsColumns.NAME + "=?", new String[]{name},
+                        null);
+                if (cursor == null || cursor.getCount() < 1) {
+                    final ContentValues values = new ContentValues(1);
+                    values.put(MediaStore.Audio.PlaylistsColumns.NAME, name);
+                    final Uri uri = context.getContentResolver().insert(
+                            EXTERNAL_CONTENT_URI,
+                            values);
+                    if (uri != null) {
+                        // Necessary because somehow the MediaStoreObserver is not notified when adding a playlist
+                        context.getContentResolver().notifyChange(Uri.parse("content://media"), null);
+                        Toast.makeText(context, context.getResources().getString(R.string.created_playlist_x, name), Toast.LENGTH_SHORT).show();
+                        id = Integer.parseInt(uri.getLastPathSegment());
+                    }
+                } else {
+                    // Playlist exists
+                    if (cursor.moveToFirst()) {
+                        id = cursor.getInt(cursor.getColumnIndex(MediaStore.Audio.Playlists._ID));
+                    }
+                }
+                if (cursor != null) {
+                    cursor.close();
+                }
+            } catch (SecurityException ignored) {
+            }
+        }
+        if (id == -1) {
+            Toast.makeText(context, context.getResources().getString(
+                    R.string.could_not_create_playlist), Toast.LENGTH_SHORT).show();
+        }
+        return id;
+    }
+
+    public static void deletePlaylists(@NonNull final Context context, @NonNull final ArrayList<Playlist> playlists) {
+        final StringBuilder selection = new StringBuilder();
+        selection.append(MediaStore.Audio.Playlists._ID + " IN (");
+        for (int i = 0; i < playlists.size(); i++) {
+            selection.append(playlists.get(i).id);
+            if (i < playlists.size() - 1) {
+                selection.append(",");
+            }
+        }
+        selection.append(")");
+        try {
+            context.getContentResolver().delete(EXTERNAL_CONTENT_URI, selection.toString(), null);
+            context.getContentResolver().notifyChange(Uri.parse("content://media"), null);
+        } catch (SecurityException ignored) {
+        }
+    }
+
+    static void addToPlaylist(@NonNull Context context,
+                              @NonNull Song song,
+                              int playlistId,
+                              boolean showToastOnFinish) {
+        List<Song> helperList = new ArrayList<>();
+        helperList.add(song);
+        addToPlaylist(context, helperList, playlistId, showToastOnFinish);
+    }
+
+    public static void addToPlaylist(@NonNull Context context,
+                                     @NonNull List<Song> songs,
+                                     int playlistId,
+                                     boolean showToastOnFinish) {
+
+        ArrayList<Song> noSongs = new ArrayList<Song>();
+        for (Song song : songs) {
+            if (!doPlaylistContains(context, playlistId, song.getId())) {
+                noSongs.add(song);
+            }
+        }
+
+
+        final int size = noSongs.size();
+        final ContentResolver resolver = context.getContentResolver();
+        final String[] projection = new String[]{"max(" + MediaStore.Audio.Playlists.Members.PLAY_ORDER + ")",};
+        final Uri uri = MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId);
+
+
+        int base = 0;
+        try (Cursor cursor = resolver.query(uri, projection, null, null, null)) {
+
+            if (cursor != null && cursor.moveToFirst()) {
+                base = cursor.getInt(0) + 1;
+            }
+        } catch (SecurityException ignored) {
+        }
+
+        int numInserted = 0;
+        for (int offSet = 0; offSet < size; offSet += 1000)
+            numInserted += resolver.bulkInsert(uri, makeInsertItems(noSongs, offSet, 1000, base));
+
+        if (showToastOnFinish) {
+            Toast.makeText(context, context.getResources().getString(
+                    R.string.inserted_x_songs_into_playlist_x, numInserted, getNameForPlaylist(context, playlistId)), Toast.LENGTH_SHORT).show();
+        }
+    }
+
+    @NonNull
+    public static ContentValues[] makeInsertItems(@NonNull final List<Song> songs, final int offset, int len, final int base) {
+        if (offset + len > songs.size()) {
+            len = songs.size() - offset;
+        }
+
+        ContentValues[] contentValues = new ContentValues[len];
+
+        for (int i = 0; i < len; i++) {
+            contentValues[i] = new ContentValues();
+            contentValues[i].put(MediaStore.Audio.Playlists.Members.PLAY_ORDER, base + offset + i);
+            contentValues[i].put(MediaStore.Audio.Playlists.Members.AUDIO_ID, songs.get(offset + i).getId());
+        }
+        return contentValues;
+    }
+
+    public static void removeFromPlaylist(@NonNull final Context context, @NonNull final Song song, int playlistId) {
+        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri(
+                "external", playlistId);
+        String selection = MediaStore.Audio.Playlists.Members.AUDIO_ID + " =?";
+        String[] selectionArgs = new String[]{String.valueOf(song.getId())};
+
+        try {
+            context.getContentResolver().delete(uri, selection, selectionArgs);
+        } catch (SecurityException ignored) {
+        }
+    }
+
+    public static void removeFromPlaylist(@NonNull final Context context, @NonNull final List<PlaylistSong> songs) {
+        final int playlistId = songs.get(0).getPlaylistId();
+        Uri uri = MediaStore.Audio.Playlists.Members.getContentUri(
+                "external", playlistId);
+        String selectionArgs[] = new String[songs.size()];
+        for (int i = 0; i < selectionArgs.length; i++) {
+            selectionArgs[i] = String.valueOf(songs.get(i).getIdInPlayList());
+        }
+        String selection = MediaStore.Audio.Playlists.Members._ID + " in (";
+        //noinspection unused
+        for (String selectionArg : selectionArgs) selection += "?, ";
+        selection = selection.substring(0, selection.length() - 2) + ")";
+
+        try {
+            context.getContentResolver().delete(uri, selection, selectionArgs);
+        } catch (SecurityException ignored) {
+        }
+    }
+
+    public static boolean doPlaylistContains(@NonNull final Context context, final long playlistId, final int songId) {
+        if (playlistId != -1) {
+            try {
+                Cursor c = context.getContentResolver().query(
+                        MediaStore.Audio.Playlists.Members.getContentUri("external", playlistId),
+                        new String[]{MediaStore.Audio.Playlists.Members.AUDIO_ID}, MediaStore.Audio.Playlists.Members.AUDIO_ID + "=?", new String[]{String.valueOf(songId)}, null);
+                int count = 0;
+                if (c != null) {
+                    count = c.getCount();
+                    c.close();
+                }
+                return count > 0;
+            } catch (SecurityException ignored) {
+            }
+        }
+        return false;
+    }
+
+    public static boolean moveItem(@NonNull final Context context, int playlistId, int from, int to) {
+        return MediaStore.Audio.Playlists.Members.moveItem(context.getContentResolver(),
+                playlistId, from, to);
+    }
+
+    public static void renamePlaylist(@NonNull final Context context, final long id, final String newName) {
+        ContentValues contentValues = new ContentValues();
+        contentValues.put(MediaStore.Audio.PlaylistsColumns.NAME, newName);
+        try {
+            context.getContentResolver().update(EXTERNAL_CONTENT_URI,
+                    contentValues,
+                    MediaStore.Audio.Playlists._ID + "=?",
+                    new String[]{String.valueOf(id)});
+            context.getContentResolver().notifyChange(Uri.parse("content://media"), null);
+        } catch (SecurityException ignored) {
+        }
+    }
+
+    public static String getNameForPlaylist(@NonNull final Context context, final long id) {
+        try {
+            Cursor cursor = context.getContentResolver().query(EXTERNAL_CONTENT_URI,
+                    new String[]{MediaStore.Audio.PlaylistsColumns.NAME},
+                    BaseColumns._ID + "=?",
+                    new String[]{String.valueOf(id)},
+                    null);
+            if (cursor != null) {
+                try {
+                    if (cursor.moveToFirst()) {
+                        return cursor.getString(0);
+                    }
+                } finally {
+                    cursor.close();
+                }
+            }
+        } catch (SecurityException ignored) {
+        }
+        return "";
+    }
+
+    @Nullable
+    public static File savePlaylist(@NonNull Context context,
+                                    @NonNull Playlist playlist) throws IOException {
+        return M3UWriter.write(context, new File(Environment.getExternalStorageDirectory(), "Playlists"), playlist);
+    }
+
+    private static boolean doesPlaylistExist(@NonNull Context context, @NonNull final String selection, @NonNull final String[] values) {
+        Cursor cursor = context.getContentResolver().query(EXTERNAL_CONTENT_URI,
+                new String[]{}, selection, values, null);
+
+        boolean exists = false;
+        if (cursor != null) {
+            exists = cursor.getCount() != 0;
+            cursor.close();
+        }
+        return exists;
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 000000000..324eb5ede
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.java
@@ -0,0 +1,906 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.SharedPreferences.Editor;
+import android.content.res.TypedArray;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StyleRes;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.bottomnavigation.LabelVisibilityMode;
+import com.google.gson.Gson;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+
+import java.io.File;
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+import code.name.monkey.retromusic.App;
+import code.name.monkey.retromusic.R;
+import code.name.monkey.retromusic.activities.MainActivity;
+import code.name.monkey.retromusic.fragments.AlbumCoverStyle;
+import code.name.monkey.retromusic.fragments.NowPlayingScreen;
+import code.name.monkey.retromusic.fragments.mainactivity.folders.FoldersFragment;
+import code.name.monkey.retromusic.helper.SortOrder;
+import code.name.monkey.retromusic.helper.SortOrder.AlbumSongSortOrder;
+import code.name.monkey.retromusic.model.CategoryInfo;
+import code.name.monkey.retromusic.transform.CascadingPageTransformer;
+import code.name.monkey.retromusic.transform.DepthTransformation;
+import code.name.monkey.retromusic.transform.HingeTransformation;
+import code.name.monkey.retromusic.transform.HorizontalFlipTransformation;
+import code.name.monkey.retromusic.transform.NormalPageTransformer;
+import code.name.monkey.retromusic.transform.VerticalFlipTransformation;
+import code.name.monkey.retromusic.transform.VerticalStackTransformer;
+
+public final class PreferenceUtil {
+    public static final String LIBRARY_CATEGORIES = "library_categories";
+    public static final String DESATURATED_COLOR = "desaturated_color";
+    public static final String BLACK_THEME = "black_theme";
+    public static final String DIALOG_CORNER = "dialog_corner";
+    public static final String KEEP_SCREEN_ON = "keep_screen_on";
+    public static final String TOGGLE_HOME_BANNER = "toggle_home_banner";
+    public static final String NOW_PLAYING_SCREEN_ID = "now_playing_screen_id";
+    public static final String CAROUSEL_EFFECT = "carousel_effect";
+    public static final String COLORED_NOTIFICATION = "colored_notification";
+    public static final String CLASSIC_NOTIFICATION = "classic_notification";
+    public static final String GAPLESS_PLAYBACK = "gapless_playback";
+    public static final String ALBUM_ART_ON_LOCKSCREEN = "album_art_on_lockscreen";
+    public static final String BLURRED_ALBUM_ART = "blurred_album_art";
+    public static final String NEW_BLUR_AMOUNT = "new_blur_amount";
+    public static final String SLEEP_TIMER_FINISH_SONG = "sleep_timer_finish_song";
+    public static final String TOGGLE_HEADSET = "toggle_headset";
+    public static final String DOMINANT_COLOR = "dominant_color";
+    public static final String GENERAL_THEME = "general_theme";
+    public static final String CIRCULAR_ALBUM_ART = "circular_album_art";
+    public static final String USER_NAME = "user_name";
+    public static final String USER_BIO = "user_bio";
+    public static final String TOGGLE_FULL_SCREEN = "toggle_full_screen";
+    public static final String TOGGLE_VOLUME = "toggle_volume";
+    public static final String TOGGLE_TAB_TITLES = "toggle_tab_titles";
+    public static final String ROUND_CORNERS = "corner_window";
+    public static final String TOGGLE_GENRE = "toggle_genre";
+    public static final String PROFILE_IMAGE_PATH = "profile_image_path";
+    public static final String BANNER_IMAGE_PATH = "banner_image_path";
+    public static final String ADAPTIVE_COLOR_APP = "adaptive_color_app";
+    public static final String TOGGLE_SEPARATE_LINE = "toggle_separate_line";
+    public static final String ALBUM_GRID_STYLE = "album_grid_style";
+    public static final String HOME_ARTIST_GRID_STYLE = "home_artist_grid_style";
+    public static final String ARTIST_GRID_STYLE = "artist_grid_style";
+    public static final String TOGGLE_ADD_CONTROLS = "toggle_add_controls";
+    public static final String ALBUM_COVER_STYLE = "album_cover_style_id";
+    public static final String ALBUM_COVER_TRANSFORM = "album_cover_transform";
+    public static final String TAB_TEXT_MODE = "tab_text_mode";
+    public static final String SAF_SDCARD_URI = "saf_sdcard_uri";
+    private static final String GENRE_SORT_ORDER = "genre_sort_order";
+    private static final String LAST_PAGE = "last_start_page";
+    private static final String LAST_MUSIC_CHOOSER = "last_music_chooser";
+    private static final String DEFAULT_START_PAGE = "default_start_page";
+    private static final String INITIALIZED_BLACKLIST = "initialized_blacklist";
+    private static final String ARTIST_SORT_ORDER = "artist_sort_order";
+    private static final String ARTIST_SONG_SORT_ORDER = "artist_song_sort_order";
+    private static final String ARTIST_ALBUM_SORT_ORDER = "artist_album_sort_order";
+    private static final String ALBUM_SORT_ORDER = "album_sort_order";
+    private static final String ALBUM_SONG_SORT_ORDER = "album_song_sort_order";
+    private static final String SONG_SORT_ORDER = "song_sort_order";
+    private static final String ALBUM_GRID_SIZE = "album_grid_size";
+    private static final String ALBUM_GRID_SIZE_LAND = "album_grid_size_land";
+    private static final String SONG_GRID_SIZE = "song_grid_size";
+    private static final String SONG_GRID_SIZE_LAND = "song_grid_size_land";
+    private static final String ARTIST_GRID_SIZE = "artist_grid_size";
+    private static final String ARTIST_GRID_SIZE_LAND = "artist_grid_size_land";
+    private static final String ALBUM_COLORED_FOOTERS = "album_colored_footers";
+    private static final String SONG_COLORED_FOOTERS = "song_colored_footers";
+    private static final String ARTIST_COLORED_FOOTERS = "artist_colored_footers";
+    private static final String ALBUM_ARTIST_COLORED_FOOTERS = "album_artist_colored_footers";
+    private static final String COLORED_APP_SHORTCUTS = "colored_app_shortcuts";
+    private static final String AUDIO_DUCKING = "audio_ducking";
+    private static final String LAST_ADDED_CUTOFF = "last_added_interval";
+    private static final String LAST_SLEEP_TIMER_VALUE = "last_sleep_timer_value";
+    private static final String NEXT_SLEEP_TIMER_ELAPSED_REALTIME = "next_sleep_timer_elapsed_real_time";
+    private static final String IGNORE_MEDIA_STORE_ARTWORK = "ignore_media_store_artwork";
+    private static final String LAST_CHANGELOG_VERSION = "last_changelog_version";
+    private static final String INTRO_SHOWN = "intro_shown";
+    private static final String AUTO_DOWNLOAD_IMAGES_POLICY = "auto_download_images_policy";
+    private static final String START_DIRECTORY = "start_directory";
+    private static final String SYNCHRONIZED_LYRICS_SHOW = "synchronized_lyrics_show";
+    private static final String LOCK_SCREEN = "lock_screen";
+    private static final String ALBUM_DETAIL_SONG_SORT_ORDER = "album_detail_song_sort_order";
+    private static final String ARTIST_DETAIL_SONG_SORT_ORDER = "artist_detail_song_sort_order";
+    private static final String LYRICS_OPTIONS = "lyrics_tab_position";
+    private static final String CHOOSE_EQUALIZER = "choose_equalizer";
+    private static final String TOGGLE_SHUFFLE = "toggle_shuffle";
+    private static final String SONG_GRID_STYLE = "song_grid_style";
+    private static final String TOGGLE_ANIMATIONS = "toggle_animations";
+    private static final String LAST_KNOWN_LYRICS_TYPE = "LAST_KNOWN_LYRICS_TYPE";
+    private static final String ALBUM_DETAIL_STYLE = "album_detail_style";
+    private static final String PAUSE_ON_ZERO_VOLUME = "pause_on_zero_volume";
+    private static final String NOW_PLAYING_SCREEN = "now_playing_screen";
+    private static final String SNOW_FALL_EFFECT = "snow_fall_effect";
+    private static final String FILTER_SONG = "filter_song";
+    private static PreferenceUtil sInstance;
+    private final SharedPreferences mPreferences;
+
+    private PreferenceUtil(@NonNull final Context context) {
+        mPreferences = PreferenceManager.getDefaultSharedPreferences(context);
+    }
+
+    public static boolean isAllowedToDownloadMetadata(final Context context) {
+        switch (getInstance(context).autoDownloadImagesPolicy()) {
+            case "always":
+                return true;
+            case "only_wifi":
+                final ConnectivityManager connectivityManager = (ConnectivityManager) context.getSystemService(Context.CONNECTIVITY_SERVICE);
+                NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
+                return netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_WIFI && netInfo.isConnectedOrConnecting();
+            case "never":
+            default:
+                return false;
+        }
+    }
+
+    @NonNull
+    public static PreferenceUtil getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new PreferenceUtil(App.Companion.getContext());
+        }
+        return sInstance;
+    }
+
+    @StyleRes
+    public static int getThemeResFromPrefValue(@NonNull String themePrefValue) {
+        switch (themePrefValue) {
+            case "light":
+                return R.style.Theme_RetroMusic_Light;
+            case "dark":
+            default:
+                return R.style.Theme_RetroMusic;
+        }
+    }
+
+    public boolean desaturatedColor() {
+        return mPreferences.getBoolean(DESATURATED_COLOR, false);
+    }
+
+    public void setDesaturatedColor(boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(DESATURATED_COLOR, value);
+        editor.apply();
+    }
+
+    public boolean getSleepTimerFinishMusic() {
+        return mPreferences.getBoolean(SLEEP_TIMER_FINISH_SONG, false);
+    }
+
+    public void setSleepTimerFinishMusic(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(SLEEP_TIMER_FINISH_SONG, value);
+        editor.apply();
+    }
+
+    public boolean isBlackMode() {
+        return mPreferences.getBoolean(BLACK_THEME, false);
+    }
+
+    public String getUserBio() {
+        return mPreferences.getString(USER_BIO, "");
+    }
+
+    public void setUserBio(String bio) {
+        mPreferences.edit().putString(USER_BIO, bio).apply();
+    }
+
+    public int getFilterLength() {
+        return mPreferences.getInt(FILTER_SONG, 20);
+    }
+
+    public float getDialogCorner() {
+        return mPreferences.getInt(DIALOG_CORNER, 16);
+    }
+
+    public boolean isSnowFall() {
+        return mPreferences.getBoolean(SNOW_FALL_EFFECT, false);
+    }
+
+    public final String getArtistSortOrder() {
+        return mPreferences.getString(ARTIST_SORT_ORDER, SortOrder.ArtistSortOrder.ARTIST_A_Z);
+    }
+
+    public void setArtistSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(ARTIST_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
+    public final String getArtistSongSortOrder() {
+        return mPreferences.getString(ARTIST_SONG_SORT_ORDER, SortOrder.ArtistSongSortOrder.SONG_A_Z);
+    }
+
+    public final boolean isHomeBanner() {
+        return mPreferences.getBoolean(TOGGLE_HOME_BANNER, false);
+    }
+
+    public final String getArtistAlbumSortOrder() {
+        return mPreferences.getString(ARTIST_ALBUM_SORT_ORDER, SortOrder.ArtistAlbumSortOrder.ALBUM_YEAR);
+    }
+
+    public final String getAlbumSortOrder() {
+        return mPreferences.getString(ALBUM_SORT_ORDER, SortOrder.AlbumSortOrder.ALBUM_A_Z);
+    }
+
+    public void setAlbumSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(ALBUM_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
+    public final String getAlbumSongSortOrder() {
+        return mPreferences
+                .getString(ALBUM_SONG_SORT_ORDER, AlbumSongSortOrder.SONG_TRACK_LIST);
+    }
+
+    public final String getSongSortOrder() {
+        return mPreferences.getString(SONG_SORT_ORDER, SortOrder.SongSortOrder.SONG_A_Z);
+    }
+
+    public void setSongSortOrder(final String sortOrder) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(SONG_SORT_ORDER, sortOrder);
+        editor.apply();
+    }
+
+    public final String getGenreSortOrder() {
+        return mPreferences.getString(GENRE_SORT_ORDER, SortOrder.GenreSortOrder.GENRE_A_Z);
+    }
+
+    public boolean isScreenOnEnabled() {
+        return mPreferences.getBoolean(KEEP_SCREEN_ON, false);
+    }
+
+    public void setInitializedBlacklist() {
+        final Editor editor = mPreferences.edit();
+        editor.putBoolean(INITIALIZED_BLACKLIST, true);
+        editor.apply();
+    }
+
+    public final boolean initializedBlacklist() {
+        return mPreferences.getBoolean(INITIALIZED_BLACKLIST, false);
+    }
+
+    public boolean isExtraControls() {
+        return mPreferences.getBoolean(TOGGLE_ADD_CONTROLS, false);
+    }
+
+    public boolean carouselEffect() {
+        return mPreferences.getBoolean(CAROUSEL_EFFECT, false);
+    }
+
+    public boolean isRoundCorners() {
+        return mPreferences.getBoolean(ROUND_CORNERS, false);
+    }
+
+    public void registerOnSharedPreferenceChangedListener(
+            SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener) {
+        mPreferences.registerOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+    }
+
+    public void unregisterOnSharedPreferenceChangedListener(
+            SharedPreferences.OnSharedPreferenceChangeListener sharedPreferenceChangeListener) {
+        mPreferences.unregisterOnSharedPreferenceChangeListener(sharedPreferenceChangeListener);
+    }
+
+    public final int getDefaultStartPage() {
+        return Integer.parseInt(mPreferences.getString(DEFAULT_START_PAGE, "-1"));
+    }
+
+    public final int getLastPage() {
+        return mPreferences.getInt(LAST_PAGE, R.id.action_song);
+    }
+
+    public void setLastPage(final int value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(LAST_PAGE, value);
+        editor.apply();
+    }
+
+    public void setLastLyricsType(int group) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(LAST_KNOWN_LYRICS_TYPE, group);
+        editor.apply();
+    }
+
+    public final int getLastMusicChooser() {
+        return mPreferences.getInt(LAST_MUSIC_CHOOSER, MainActivity.HOME);
+    }
+
+    public void setLastMusicChooser(int value) {
+        mPreferences.edit().putInt(LAST_MUSIC_CHOOSER, value).apply();
+    }
+
+    public final boolean coloredNotification() {
+        return mPreferences.getBoolean(COLORED_NOTIFICATION, true);
+    }
+
+    public final void setColoredNotification(boolean b) {
+        mPreferences.edit().putBoolean(COLORED_NOTIFICATION, b).apply();
+    }
+
+    public final boolean classicNotification() {
+        return mPreferences.getBoolean(CLASSIC_NOTIFICATION, false);
+    }
+
+    public void setClassicNotification(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(CLASSIC_NOTIFICATION, value);
+        editor.apply();
+    }
+
+    public final NowPlayingScreen getNowPlayingScreen() {
+        int id = mPreferences.getInt(NOW_PLAYING_SCREEN_ID, 0);
+        for (NowPlayingScreen nowPlayingScreen : NowPlayingScreen.values()) {
+            if (nowPlayingScreen.getId() == id) {
+                return nowPlayingScreen;
+            }
+        }
+        return NowPlayingScreen.ADAPTIVE;
+    }
+
+    @SuppressLint("CommitPrefEdits")
+    public void setNowPlayingScreen(NowPlayingScreen nowPlayingScreen) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(NOW_PLAYING_SCREEN_ID, nowPlayingScreen.getId());
+        editor.apply();
+    }
+
+    public final AlbumCoverStyle getAlbumCoverStyle() {
+        int id = mPreferences.getInt(ALBUM_COVER_STYLE, 0);
+        for (AlbumCoverStyle albumCoverStyle : AlbumCoverStyle.values()) {
+            if (albumCoverStyle.getId() == id) {
+                return albumCoverStyle;
+            }
+        }
+        return AlbumCoverStyle.CARD;
+    }
+
+    public void setAlbumCoverStyle(AlbumCoverStyle albumCoverStyle) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ALBUM_COVER_STYLE, albumCoverStyle.getId());
+        editor.apply();
+    }
+
+    public void setColoredAppShortcuts(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(COLORED_APP_SHORTCUTS, value);
+        editor.apply();
+    }
+
+    public final boolean coloredAppShortcuts() {
+        return mPreferences.getBoolean(COLORED_APP_SHORTCUTS, true);
+    }
+
+    public final boolean gaplessPlayback() {
+        return mPreferences.getBoolean(GAPLESS_PLAYBACK, false);
+    }
+
+    public final boolean audioDucking() {
+        return mPreferences.getBoolean(AUDIO_DUCKING, true);
+    }
+
+    public final boolean albumArtOnLockscreen() {
+        return mPreferences.getBoolean(ALBUM_ART_ON_LOCKSCREEN, true);
+    }
+
+    public final boolean blurredAlbumArt() {
+        return mPreferences.getBoolean(BLURRED_ALBUM_ART, false);
+    }
+
+    public final boolean ignoreMediaStoreArtwork() {
+        return mPreferences.getBoolean(IGNORE_MEDIA_STORE_ARTWORK, false);
+    }
+
+    public int getLastSleepTimerValue() {
+        return mPreferences.getInt(LAST_SLEEP_TIMER_VALUE, 30);
+    }
+
+    public void setLastSleepTimerValue(final int value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(LAST_SLEEP_TIMER_VALUE, value);
+        editor.apply();
+    }
+
+    public long getNextSleepTimerElapsedRealTime() {
+        return mPreferences.getLong(NEXT_SLEEP_TIMER_ELAPSED_REALTIME, -1);
+    }
+
+    public void setNextSleepTimerElapsedRealtime(final long value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putLong(NEXT_SLEEP_TIMER_ELAPSED_REALTIME, value);
+        editor.apply();
+    }
+
+    public final int getAlbumGridSize(Context context) {
+        return mPreferences
+                .getInt(ALBUM_GRID_SIZE, context.getResources().getInteger(R.integer.default_grid_columns));
+    }
+
+    public void setSongGridSize(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(SONG_GRID_SIZE, gridSize);
+        editor.apply();
+    }
+
+    public final int getSongGridSize(Context context) {
+        return mPreferences
+                .getInt(SONG_GRID_SIZE, context.getResources().getInteger(R.integer.default_list_columns));
+    }
+
+    public void setArtistGridSize(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ARTIST_GRID_SIZE, gridSize);
+        editor.apply();
+    }
+
+    public final int getArtistGridSize(Context context) {
+        return mPreferences.getInt(ARTIST_GRID_SIZE,
+                context.getResources().getInteger(R.integer.default_list_artist_columns));
+    }
+
+    public void setAlbumGridSizeLand(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ALBUM_GRID_SIZE_LAND, gridSize);
+        editor.apply();
+    }
+
+    public final int getAlbumGridSizeLand(Context context) {
+        return mPreferences.getInt(ALBUM_GRID_SIZE_LAND,
+                context.getResources().getInteger(R.integer.default_grid_columns_land));
+    }
+
+    public void setSongGridSizeLand(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(SONG_GRID_SIZE_LAND, gridSize);
+        editor.apply();
+    }
+
+    public final int getSongGridSizeLand(Context context) {
+        return mPreferences.getInt(SONG_GRID_SIZE_LAND,
+                context.getResources().getInteger(R.integer.default_list_columns_land));
+    }
+
+    public void setArtistGridSizeLand(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ARTIST_GRID_SIZE_LAND, gridSize);
+        editor.apply();
+    }
+
+    public final int getArtistGridSizeLand(Context context) {
+        return mPreferences.getInt(ARTIST_GRID_SIZE_LAND,
+                context.getResources().getInteger(R.integer.default_list_artist_columns_land));
+    }
+
+    public void setAlbumGridSize(final int gridSize) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putInt(ALBUM_GRID_SIZE, gridSize);
+        editor.apply();
+    }
+
+    public void setAlbumColoredFooters(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(ALBUM_COLORED_FOOTERS, value);
+        editor.apply();
+    }
+
+    public final boolean albumColoredFooters() {
+        return mPreferences.getBoolean(ALBUM_COLORED_FOOTERS, false);
+    }
+
+    public void setAlbumArtistColoredFooters(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(ALBUM_ARTIST_COLORED_FOOTERS, value);
+        editor.apply();
+    }
+
+    public final boolean albumArtistColoredFooters() {
+        return mPreferences.getBoolean(ALBUM_ARTIST_COLORED_FOOTERS, true);
+    }
+
+    public void setSongColoredFooters(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(SONG_COLORED_FOOTERS, value);
+        editor.apply();
+    }
+
+    public final boolean songColoredFooters() {
+        return mPreferences.getBoolean(SONG_COLORED_FOOTERS, false);
+    }
+
+    public void setArtistColoredFooters(final boolean value) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putBoolean(ARTIST_COLORED_FOOTERS, value);
+        editor.apply();
+    }
+
+    public final boolean artistColoredFooters() {
+        return mPreferences.getBoolean(ARTIST_COLORED_FOOTERS, true);
+    }
+
+    public void setLastChangeLogVersion(int version) {
+        mPreferences.edit().putInt(LAST_CHANGELOG_VERSION, version).apply();
+    }
+
+    public final int getLastChangelogVersion() {
+        return mPreferences.getInt(LAST_CHANGELOG_VERSION, -1);
+    }
+
+    @SuppressLint("CommitPrefEdits")
+    public void setIntroShown() {
+        // don't use apply here
+        mPreferences.edit().putBoolean(INTRO_SHOWN, true).commit();
+    }
+
+    public final File getStartDirectory() {
+        return new File(mPreferences
+                .getString(START_DIRECTORY, FoldersFragment.getDefaultStartDirectory().getPath()));
+    }
+
+    public void setStartDirectory(File file) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(START_DIRECTORY, FileUtil.safeGetCanonicalPath(file));
+        editor.apply();
+    }
+
+    public final boolean introShown() {
+        return mPreferences.getBoolean(INTRO_SHOWN, false);
+    }
+
+    public final String autoDownloadImagesPolicy() {
+        return mPreferences.getString(AUTO_DOWNLOAD_IMAGES_POLICY, "only_wifi");
+    }
+
+    public final boolean synchronizedLyricsShow() {
+        return mPreferences.getBoolean(SYNCHRONIZED_LYRICS_SHOW, true);
+    }
+
+    public int getGeneralTheme() {
+        return getThemeResFromPrefValue(mPreferences.getString(GENERAL_THEME, "dark"));
+    }
+
+    public void setGeneralTheme(String theme) {
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(GENERAL_THEME, theme);
+        editor.apply();
+    }
+
+    @NonNull
+    public String getGeneralThemeValue() {
+        if (isBlackMode()) return "black";
+        else
+            return mPreferences.getString(GENERAL_THEME, "dark");
+    }
+
+    public String getBaseTheme() {
+        return mPreferences.getString(GENERAL_THEME, "dark");
+    }
+
+    public long getLastAddedCutoff() {
+        final CalendarUtil calendarUtil = new CalendarUtil();
+        long interval;
+
+        switch (mPreferences.getString(LAST_ADDED_CUTOFF, "")) {
+            case "today":
+                interval = calendarUtil.getElapsedToday();
+                break;
+            case "this_week":
+                interval = calendarUtil.getElapsedWeek();
+                break;
+            case "past_three_months":
+                interval = calendarUtil.getElapsedMonths(3);
+                break;
+            case "this_year":
+                interval = calendarUtil.getElapsedYear();
+                break;
+            case "this_month":
+            default:
+                interval = calendarUtil.getElapsedMonth();
+                break;
+        }
+
+        return (System.currentTimeMillis() - interval) / 1000;
+    }
+
+    public boolean getAdaptiveColor() {
+        return mPreferences.getBoolean(ADAPTIVE_COLOR_APP, false);
+    }
+
+    public boolean getLockScreen() {
+        return mPreferences.getBoolean(LOCK_SCREEN, false);
+    }
+
+    public String getUserName() {
+        return mPreferences.getString(USER_NAME, "User");
+    }
+
+    public void setUserName(String name) {
+        mPreferences.edit().putString(USER_NAME, name).apply();
+    }
+
+    public boolean getFullScreenMode() {
+        return mPreferences.getBoolean(TOGGLE_FULL_SCREEN, false);
+    }
+
+    public void setFullScreenMode(int newValue) {
+        mPreferences.edit().putInt(TOGGLE_FULL_SCREEN, newValue).apply();
+    }
+
+    public void saveProfileImage(String profileImagePath) {
+        mPreferences.edit().putString(PROFILE_IMAGE_PATH, profileImagePath).apply();
+    }
+
+    public String getProfileImage() {
+        return mPreferences.getString(PROFILE_IMAGE_PATH, "");
+    }
+
+    public String getBannerImage() {
+        return mPreferences.getString(BANNER_IMAGE_PATH, "");
+    }
+
+    public void setBannerImagePath(String bannerImagePath) {
+        mPreferences.edit().putString(BANNER_IMAGE_PATH, bannerImagePath)
+                .apply();
+    }
+
+    public String getAlbumDetailSongSortOrder() {
+        return mPreferences
+                .getString(ALBUM_DETAIL_SONG_SORT_ORDER, AlbumSongSortOrder.SONG_TRACK_LIST);
+    }
+
+    public void setAlbumDetailSongSortOrder(String sortOrder) {
+        Editor edit = this.mPreferences.edit();
+        edit.putString(ALBUM_DETAIL_SONG_SORT_ORDER, sortOrder);
+        edit.apply();
+    }
+
+    public String getArtistDetailSongSortOrder() {
+        return mPreferences
+                .getString(ARTIST_DETAIL_SONG_SORT_ORDER, SortOrder.ArtistSongSortOrder.SONG_A_Z);
+    }
+
+    public void setArtistDetailSongSortOrder(String sortOrder) {
+        Editor edit = this.mPreferences.edit();
+        edit.putString(ARTIST_DETAIL_SONG_SORT_ORDER, sortOrder);
+        edit.apply();
+    }
+
+    public boolean getVolumeToggle() {
+        return mPreferences.getBoolean(TOGGLE_VOLUME, false);
+    }
+
+    public int getLyricsOptions() {
+        return mPreferences.getInt(LYRICS_OPTIONS, 1);
+    }
+
+    public void setLyricsOptions(int i) {
+        mPreferences.edit().putInt(LYRICS_OPTIONS, i).apply();
+    }
+
+    public boolean getHeadsetPlugged() {
+        return mPreferences.getBoolean(TOGGLE_HEADSET, false);
+    }
+
+    public boolean isDominantColor() {
+        return mPreferences.getBoolean(DOMINANT_COLOR, false);
+    }
+
+    public boolean isGenreShown() {
+        return mPreferences.getBoolean(TOGGLE_GENRE, false);
+    }
+
+    public String getSelectedEqualizer() {
+        return mPreferences.getString(CHOOSE_EQUALIZER, "system");
+    }
+
+    public boolean isShuffleModeOn() {
+        return mPreferences.getBoolean(TOGGLE_SHUFFLE, false);
+    }
+
+    public void resetCarouselEffect() {
+        mPreferences.edit().putBoolean(CAROUSEL_EFFECT, false).apply();
+    }
+
+    public void resetCircularAlbumArt() {
+        mPreferences.edit().putBoolean(CIRCULAR_ALBUM_ART, false).apply();
+    }
+
+    public String getAlbumDetailsStyle() {
+        return mPreferences.getString(ALBUM_DETAIL_STYLE, "0");
+    }
+
+    public int getAlbumDetailsStyle(Context context) {
+        int pos = Integer.parseInt(Objects.requireNonNull(mPreferences.getString(ALBUM_DETAIL_STYLE, "0")));
+        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_album_details_style_layout);
+        int layoutRes = typedArray.getResourceId(pos, -1);
+        typedArray.recycle();
+        if (layoutRes == -1) {
+            return R.layout.activity_album;
+        }
+        return layoutRes;
+    }
+
+    public void setArtistGridStyle(int viewAs) {
+        mPreferences.edit().putInt(ARTIST_GRID_STYLE, viewAs).apply();
+    }
+
+    public boolean toggleSeparateLine() {
+        return mPreferences.getBoolean(TOGGLE_SEPARATE_LINE, false);
+    }
+
+    public int getSongGridStyle() {
+        return mPreferences.getInt(SONG_GRID_STYLE, R.layout.item_list);
+    }
+
+    public void setSongGridStyle(int viewAs) {
+        mPreferences.edit().putInt(SONG_GRID_STYLE, viewAs).apply();
+    }
+
+    public boolean enableAnimations() {
+        return mPreferences.getBoolean(TOGGLE_ANIMATIONS, false);
+    }
+
+    public boolean pauseOnZeroVolume() {
+        return mPreferences.getBoolean(PAUSE_ON_ZERO_VOLUME, false);
+    }
+
+    public ViewPager.PageTransformer getAlbumCoverTransform() {
+        int style = Integer.parseInt(Objects.requireNonNull(mPreferences.getString(ALBUM_COVER_TRANSFORM, "0")));
+        switch (style) {
+            default:
+            case 0:
+                return new NormalPageTransformer();
+            case 1:
+                return new CascadingPageTransformer();
+            case 2:
+                return new DepthTransformation();
+            case 3:
+                return new HorizontalFlipTransformation();
+            case 4:
+                return new VerticalFlipTransformation();
+            case 5:
+                return new HingeTransformation();
+            case 6:
+                return new VerticalStackTransformer();
+        }
+    }
+
+    @LabelVisibilityMode
+    public int getTabTitleMode() {
+        int mode = Integer.parseInt(mPreferences.getString(TAB_TEXT_MODE, "1"));
+        switch (mode) {
+            default:
+            case 1:
+                return LabelVisibilityMode.LABEL_VISIBILITY_LABELED;
+            case 0:
+                return LabelVisibilityMode.LABEL_VISIBILITY_AUTO;
+            case 2:
+                return LabelVisibilityMode.LABEL_VISIBILITY_SELECTED;
+            case 3:
+                return LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED;
+        }
+    }
+
+    public boolean tabTitles() {
+        return getTabTitleMode() != LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED;
+    }
+
+    @LayoutRes
+    public int getHomeGridStyle(@NonNull Context context) {
+        int pos = Integer.parseInt(mPreferences.getString(HOME_ARTIST_GRID_STYLE, "0"));
+        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_home_grid_style_layout);
+        int layoutRes = typedArray.getResourceId(pos, -1);
+        typedArray.recycle();
+        if (layoutRes == -1) {
+            return R.layout.item_artist;
+        }
+        return layoutRes;
+    }
+
+    @LayoutRes
+    public int getArtistGridStyle(Context context) {
+        int pos = Integer.parseInt(Objects.requireNonNull(mPreferences.getString(ARTIST_GRID_STYLE, "0")));
+        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_grid_style_layout);
+        int layoutRes = typedArray.getResourceId(pos, -1);
+        typedArray.recycle();
+        if (layoutRes == -1) {
+            return R.layout.item_card;
+        }
+        return layoutRes;
+    }
+
+    @LayoutRes
+    public int getAlbumGridStyle(Context context) {
+        int pos = Integer.parseInt(mPreferences.getString(ALBUM_GRID_STYLE, "0"));
+        TypedArray typedArray = context.getResources().obtainTypedArray(R.array.pref_grid_style_layout);
+        int layoutRes = typedArray.getResourceId(pos, -1);
+        typedArray.recycle();
+        if (layoutRes == -1) {
+            return R.layout.item_card;
+        }
+        return layoutRes;
+    }
+
+    public boolean isClickOrSave() {
+        return mPreferences.getBoolean(NOW_PLAYING_SCREEN, false);
+    }
+
+    @NonNull
+    public List<CategoryInfo> getLibraryCategoryInfos() {
+        String data = mPreferences.getString(LIBRARY_CATEGORIES, null);
+        if (data != null) {
+            Gson gson = new Gson();
+            Type collectionType = new TypeToken<List<CategoryInfo>>() {
+            }.getType();
+
+            try {
+                return gson.fromJson(data, collectionType);
+            } catch (JsonSyntaxException e) {
+                e.printStackTrace();
+            }
+        }
+
+        return getDefaultLibraryCategoryInfos();
+    }
+
+    public void setLibraryCategoryInfos(List<CategoryInfo> categories) {
+        Gson gson = new Gson();
+        Type collectionType = new TypeToken<List<CategoryInfo>>() {
+        }.getType();
+
+        final SharedPreferences.Editor editor = mPreferences.edit();
+        editor.putString(LIBRARY_CATEGORIES, gson.toJson(categories, collectionType));
+        editor.apply();
+    }
+
+    @NonNull
+    public List<CategoryInfo> getDefaultLibraryCategoryInfos() {
+        List<CategoryInfo> defaultCategoryInfos = new ArrayList<>(7);
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.HOME, true));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.SONGS, true));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.ALBUMS, true));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.ARTISTS, true));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.PLAYLISTS, true));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.GENRES, false));
+        defaultCategoryInfos.add(new CategoryInfo(CategoryInfo.Category.QUEUE, false));
+        return defaultCategoryInfos;
+    }
+
+    public final String getSAFSDCardUri() {
+        return mPreferences.getString(SAF_SDCARD_URI, "");
+    }
+
+    public final void setSAFSDCardUri(Uri uri) {
+        mPreferences.edit().putString(SAF_SDCARD_URI, uri.toString()).apply();
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
deleted file mode 100644
index 13f4f3948..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/PreferenceUtil.kt
+++ /dev/null
@@ -1,720 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.SharedPreferences.OnSharedPreferenceChangeListener
-import androidx.core.content.edit
-import androidx.core.content.res.use
-import androidx.fragment.app.Fragment
-import androidx.preference.PreferenceManager
-import androidx.viewpager.widget.ViewPager
-import code.name.monkey.appthemehelper.util.VersionUtils
-import code.name.monkey.retromusic.*
-import code.name.monkey.retromusic.extensions.getIntRes
-import code.name.monkey.retromusic.extensions.getStringOrDefault
-import code.name.monkey.retromusic.fragments.AlbumCoverStyle
-import code.name.monkey.retromusic.fragments.GridStyle
-import code.name.monkey.retromusic.fragments.NowPlayingScreen
-import code.name.monkey.retromusic.fragments.folder.FoldersFragment
-import code.name.monkey.retromusic.helper.SortOrder.*
-import code.name.monkey.retromusic.model.CategoryInfo
-import code.name.monkey.retromusic.transform.*
-import code.name.monkey.retromusic.util.theme.ThemeMode
-import code.name.monkey.retromusic.views.TopAppBarLayout
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import com.google.gson.Gson
-import com.google.gson.JsonSyntaxException
-import com.google.gson.reflect.TypeToken
-import java.io.File
-
-
-object PreferenceUtil {
-    private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(App.getContext())
-
-    val defaultCategories = listOf(
-        CategoryInfo(CategoryInfo.Category.Home, true),
-        CategoryInfo(CategoryInfo.Category.Songs, true),
-        CategoryInfo(CategoryInfo.Category.Albums, true),
-        CategoryInfo(CategoryInfo.Category.Artists, true),
-        CategoryInfo(CategoryInfo.Category.Playlists, true),
-        CategoryInfo(CategoryInfo.Category.Genres, false),
-        CategoryInfo(CategoryInfo.Category.Folder, false),
-        CategoryInfo(CategoryInfo.Category.Search, false)
-    )
-
-    var libraryCategory: List<CategoryInfo>
-        get() {
-            val gson = Gson()
-            val collectionType = object : TypeToken<List<CategoryInfo>>() {}.type
-
-            val data = sharedPreferences.getStringOrDefault(
-                LIBRARY_CATEGORIES,
-                gson.toJson(defaultCategories, collectionType)
-            )
-            return try {
-                Gson().fromJson(data, collectionType)
-            } catch (e: JsonSyntaxException) {
-                e.printStackTrace()
-                return defaultCategories
-            }
-        }
-        set(value) {
-            val collectionType = object : TypeToken<List<CategoryInfo?>?>() {}.type
-            sharedPreferences.edit {
-                putString(LIBRARY_CATEGORIES, Gson().toJson(value, collectionType))
-            }
-        }
-
-    fun registerOnSharedPreferenceChangedListener(
-        listener: OnSharedPreferenceChangeListener,
-    ) = sharedPreferences.registerOnSharedPreferenceChangeListener(listener)
-
-
-    fun unregisterOnSharedPreferenceChangedListener(
-        changeListener: OnSharedPreferenceChangeListener,
-    ) = sharedPreferences.unregisterOnSharedPreferenceChangeListener(changeListener)
-
-
-    val baseTheme get() = sharedPreferences.getStringOrDefault(GENERAL_THEME, "auto")
-
-    fun getGeneralThemeValue(isSystemDark: Boolean): ThemeMode {
-        val themeMode: String =
-            sharedPreferences.getStringOrDefault(GENERAL_THEME, "auto")
-        return if (isBlackMode && isSystemDark && themeMode != "light") {
-            ThemeMode.BLACK
-        } else {
-            if (isBlackMode && themeMode == "dark") {
-                ThemeMode.BLACK
-            } else {
-                when (themeMode) {
-                    "light" -> ThemeMode.LIGHT
-                    "dark" -> ThemeMode.DARK
-                    "auto" -> ThemeMode.AUTO
-                    else -> ThemeMode.AUTO
-                }
-            }
-        }
-    }
-
-    var languageCode: String
-        get() = sharedPreferences.getString(LANGUAGE_NAME, "auto") ?: "auto"
-        set(value) = sharedPreferences.edit {
-            putString(LANGUAGE_NAME, value)
-        }
-
-    var isLocaleAutoStorageEnabled: Boolean
-        get() = sharedPreferences.getBoolean(
-            LOCALE_AUTO_STORE_ENABLED,
-            false
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(LOCALE_AUTO_STORE_ENABLED, value)
-        }
-
-    var Fragment.userName
-        get() = sharedPreferences.getString(
-            USER_NAME,
-            getString(R.string.user_name)
-        )
-        set(value) = sharedPreferences.edit {
-            putString(USER_NAME, value)
-        }
-
-    var safSdCardUri
-        get() = sharedPreferences.getStringOrDefault(SAF_SDCARD_URI, "")
-        set(value) = sharedPreferences.edit {
-            putString(SAF_SDCARD_URI, value)
-        }
-
-    var albumArtistsOnly
-        get() = sharedPreferences.getBoolean(
-            ALBUM_ARTISTS_ONLY,
-            false
-        )
-        set(value) = sharedPreferences.edit { putBoolean(ALBUM_ARTISTS_ONLY, value) }
-
-    var albumDetailSongSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ALBUM_DETAIL_SONG_SORT_ORDER,
-            AlbumSongSortOrder.SONG_TRACK_LIST
-        )
-        set(value) = sharedPreferences.edit { putString(ALBUM_DETAIL_SONG_SORT_ORDER, value) }
-
-    var artistDetailSongSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ARTIST_DETAIL_SONG_SORT_ORDER,
-            ArtistSongSortOrder.SONG_A_Z
-        )
-        set(value) = sharedPreferences.edit { putString(ARTIST_DETAIL_SONG_SORT_ORDER, value) }
-
-    var songSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            SONG_SORT_ORDER,
-            SongSortOrder.SONG_A_Z
-        )
-        set(value) = sharedPreferences.edit {
-            putString(SONG_SORT_ORDER, value)
-        }
-
-    var albumSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ALBUM_SORT_ORDER,
-            AlbumSortOrder.ALBUM_A_Z
-        )
-        set(value) = sharedPreferences.edit {
-            putString(ALBUM_SORT_ORDER, value)
-        }
-
-
-    var artistSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ARTIST_SORT_ORDER,
-            ArtistSortOrder.ARTIST_A_Z
-        )
-        set(value) = sharedPreferences.edit {
-            putString(ARTIST_SORT_ORDER, value)
-        }
-
-    val albumSongSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ALBUM_SONG_SORT_ORDER,
-            AlbumSongSortOrder.SONG_TRACK_LIST
-        )
-
-    val artistSongSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ARTIST_SONG_SORT_ORDER,
-            AlbumSongSortOrder.SONG_TRACK_LIST
-        )
-
-    val artistAlbumSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            ARTIST_ALBUM_SORT_ORDER,
-            ArtistAlbumSortOrder.ALBUM_A_Z
-        )
-
-    var playlistSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            PLAYLIST_SORT_ORDER,
-            PlaylistSortOrder.PLAYLIST_A_Z
-        )
-        set(value) = sharedPreferences.edit {
-            putString(PLAYLIST_SORT_ORDER, value)
-        }
-
-    val genreSortOrder
-        get() = sharedPreferences.getStringOrDefault(
-            GENRE_SORT_ORDER,
-            GenreSortOrder.GENRE_A_Z
-        )
-
-    val isIgnoreMediaStoreArtwork
-        get() = sharedPreferences.getBoolean(
-            IGNORE_MEDIA_STORE_ARTWORK,
-            false
-        )
-
-    val isVolumeVisibilityMode
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_VOLUME, false
-        )
-
-    var isInitializedBlacklist
-        get() = sharedPreferences.getBoolean(
-            INITIALIZED_BLACKLIST, false
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(INITIALIZED_BLACKLIST, value)
-        }
-
-    private val isBlackMode
-        get() = sharedPreferences.getBoolean(
-            BLACK_THEME, false
-        )
-
-    val isExtraControls
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_ADD_CONTROLS, false
-        )
-
-    val isHomeBanner
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_HOME_BANNER, false
-        )
-    var isClassicNotification
-        get() = sharedPreferences.getBoolean(CLASSIC_NOTIFICATION, false)
-        set(value) = sharedPreferences.edit { putBoolean(CLASSIC_NOTIFICATION, value) }
-
-    val isScreenOnEnabled get() = sharedPreferences.getBoolean(KEEP_SCREEN_ON, false)
-
-    val isSongInfo get() = sharedPreferences.getBoolean(EXTRA_SONG_INFO, false)
-
-    val isPauseOnZeroVolume get() = sharedPreferences.getBoolean(PAUSE_ON_ZERO_VOLUME, false)
-
-    var isSleepTimerFinishMusic
-        get() = sharedPreferences.getBoolean(
-            SLEEP_TIMER_FINISH_SONG, false
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(SLEEP_TIMER_FINISH_SONG, value)
-        }
-
-    val isExpandPanel get() = sharedPreferences.getBoolean(EXPAND_NOW_PLAYING_PANEL, false)
-
-    val isHeadsetPlugged
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_HEADSET, false
-        )
-
-    val isAlbumArtOnLockScreen
-        get() = sharedPreferences.getBoolean(
-            ALBUM_ART_ON_LOCK_SCREEN, true
-        )
-
-    val isBluetoothSpeaker
-        get() = sharedPreferences.getBoolean(
-            BLUETOOTH_PLAYBACK, false
-        )
-
-    val isBlurredAlbumArt
-        get() = sharedPreferences.getBoolean(
-            BLURRED_ALBUM_ART, false
-        ) && !VersionUtils.hasR()
-
-    val blurAmount get() = sharedPreferences.getInt(NEW_BLUR_AMOUNT, 25)
-
-    val isCarouselEffect
-        get() = sharedPreferences.getBoolean(
-            CAROUSEL_EFFECT, false
-        )
-
-    var isColoredAppShortcuts
-        get() = sharedPreferences.getBoolean(
-            COLORED_APP_SHORTCUTS, true
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(COLORED_APP_SHORTCUTS, value)
-        }
-
-    var isColoredNotification
-        get() = sharedPreferences.getBoolean(
-            COLORED_NOTIFICATION, true
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(COLORED_NOTIFICATION, value)
-        }
-
-    var isDesaturatedColor
-        get() = sharedPreferences.getBoolean(
-            DESATURATED_COLOR, false
-        )
-        set(value) = sharedPreferences.edit {
-            putBoolean(DESATURATED_COLOR, value)
-        }
-
-    val isGapLessPlayback
-        get() = sharedPreferences.getBoolean(
-            GAP_LESS_PLAYBACK, false
-        )
-
-    val isAdaptiveColor
-        get() = sharedPreferences.getBoolean(
-            ADAPTIVE_COLOR_APP, false
-        )
-
-    val isFullScreenMode
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_FULL_SCREEN, false
-        )
-
-    val isAudioFocusEnabled
-        get() = sharedPreferences.getBoolean(
-            MANAGE_AUDIO_FOCUS, false
-        )
-
-    val isLockScreen get() = sharedPreferences.getBoolean(LOCK_SCREEN, false)
-
-    var lyricsOption
-        get() = sharedPreferences.getInt(LYRICS_OPTIONS, 1)
-        set(value) = sharedPreferences.edit {
-            putInt(LYRICS_OPTIONS, value)
-        }
-
-    var songGridStyle: GridStyle
-        get() {
-            val id: Int = sharedPreferences.getInt(SONG_GRID_STYLE, 0)
-            // We can directly use "first" kotlin extension function here but
-            // there maybe layout id stored in this so to avoid a crash we use
-            // "firstOrNull"
-            return GridStyle.values().firstOrNull { gridStyle ->
-                gridStyle.id == id
-            } ?: GridStyle.Grid
-        }
-        set(value) = sharedPreferences.edit {
-            putInt(SONG_GRID_STYLE, value.id)
-        }
-
-    var albumGridStyle: GridStyle
-        get() {
-            val id: Int = sharedPreferences.getInt(ALBUM_GRID_STYLE, 0)
-            return GridStyle.values().firstOrNull { gridStyle ->
-                gridStyle.id == id
-            } ?: GridStyle.Grid
-        }
-        set(value) = sharedPreferences.edit {
-            putInt(ALBUM_GRID_STYLE, value.id)
-        }
-
-    var artistGridStyle: GridStyle
-        get() {
-            val id: Int = sharedPreferences.getInt(ARTIST_GRID_STYLE, 3)
-            return GridStyle.values().firstOrNull { gridStyle ->
-                gridStyle.id == id
-            } ?: GridStyle.Circular
-        }
-        set(value) = sharedPreferences.edit {
-            putInt(ARTIST_GRID_STYLE, value.id)
-        }
-
-    val filterLength get() = sharedPreferences.getInt(FILTER_SONG, 20)
-
-    var lastVersion
-        // This was stored as an integer before now it's a long, so avoid a ClassCastException
-        get() = try {
-            sharedPreferences.getLong(LAST_CHANGELOG_VERSION, 0)
-        } catch (e: ClassCastException) {
-            sharedPreferences.edit { remove(LAST_CHANGELOG_VERSION) }
-            0
-        }
-        set(value) = sharedPreferences.edit {
-            putLong(LAST_CHANGELOG_VERSION, value)
-        }
-
-    var lastSleepTimerValue
-        get() = sharedPreferences.getInt(
-            LAST_SLEEP_TIMER_VALUE,
-            30
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(LAST_SLEEP_TIMER_VALUE, value)
-        }
-
-
-    var nextSleepTimerElapsedRealTime
-        get() = sharedPreferences.getInt(
-            NEXT_SLEEP_TIMER_ELAPSED_REALTIME,
-            -1
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(NEXT_SLEEP_TIMER_ELAPSED_REALTIME, value)
-        }
-
-    fun themeResFromPrefValue(themePrefValue: String): Int {
-        return when (themePrefValue) {
-            "light" -> R.style.Theme_RetroMusic_Light
-            "dark" -> R.style.Theme_RetroMusic
-            else -> R.style.Theme_RetroMusic
-        }
-    }
-
-    val homeArtistGridStyle: Int
-        get() {
-            val position = sharedPreferences.getStringOrDefault(
-                HOME_ARTIST_GRID_STYLE, "0"
-            ).toInt()
-            val layoutRes =
-                App.getContext().resources.obtainTypedArray(R.array.pref_home_grid_style_layout)
-                    .use {
-                        it.getResourceId(position, 0)
-                    }
-            return if (layoutRes == 0) {
-                R.layout.item_artist
-            } else layoutRes
-        }
-
-    val homeAlbumGridStyle: Int
-        get() {
-            val position = sharedPreferences.getStringOrDefault(
-                HOME_ALBUM_GRID_STYLE, "4"
-            ).toInt()
-            val layoutRes = App.getContext()
-                .resources.obtainTypedArray(R.array.pref_home_grid_style_layout).use {
-                    it.getResourceId(position, 0)
-                }
-            return if (layoutRes == 0) {
-                R.layout.item_image
-            } else layoutRes
-        }
-
-    val tabTitleMode: Int
-        get() {
-            return when (sharedPreferences.getStringOrDefault(
-                TAB_TEXT_MODE, "0"
-            ).toInt()) {
-                0 -> BottomNavigationView.LABEL_VISIBILITY_AUTO
-                1 -> BottomNavigationView.LABEL_VISIBILITY_LABELED
-                2 -> BottomNavigationView.LABEL_VISIBILITY_SELECTED
-                3 -> BottomNavigationView.LABEL_VISIBILITY_UNLABELED
-                else -> BottomNavigationView.LABEL_VISIBILITY_LABELED
-            }
-        }
-
-
-    var songGridSize
-        get() = sharedPreferences.getInt(
-            SONG_GRID_SIZE,
-            App.getContext().getIntRes(R.integer.default_list_columns)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(SONG_GRID_SIZE, value)
-        }
-
-    var songGridSizeLand
-        get() = sharedPreferences.getInt(
-            SONG_GRID_SIZE_LAND,
-            App.getContext().getIntRes(R.integer.default_grid_columns_land)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(SONG_GRID_SIZE_LAND, value)
-        }
-
-
-    var albumGridSize: Int
-        get() = sharedPreferences.getInt(
-            ALBUM_GRID_SIZE,
-            App.getContext().getIntRes(R.integer.default_grid_columns)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(ALBUM_GRID_SIZE, value)
-        }
-
-
-    var albumGridSizeLand
-        get() = sharedPreferences.getInt(
-            ALBUM_GRID_SIZE_LAND,
-            App.getContext().getIntRes(R.integer.default_grid_columns_land)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(ALBUM_GRID_SIZE_LAND, value)
-        }
-
-
-    var artistGridSize
-        get() = sharedPreferences.getInt(
-            ARTIST_GRID_SIZE,
-            App.getContext().getIntRes(R.integer.default_grid_columns)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(ARTIST_GRID_SIZE, value)
-        }
-
-
-    var artistGridSizeLand
-        get() = sharedPreferences.getInt(
-            ARTIST_GRID_SIZE_LAND,
-            App.getContext().getIntRes(R.integer.default_grid_columns_land)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(ALBUM_GRID_SIZE_LAND, value)
-        }
-
-
-    var playlistGridSize
-        get() = sharedPreferences.getInt(
-            PLAYLIST_GRID_SIZE,
-            App.getContext().getIntRes(R.integer.default_grid_columns)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(PLAYLIST_GRID_SIZE, value)
-        }
-
-
-    var playlistGridSizeLand
-        get() = sharedPreferences.getInt(
-            PLAYLIST_GRID_SIZE_LAND,
-            App.getContext().getIntRes(R.integer.default_grid_columns_land)
-        )
-        set(value) = sharedPreferences.edit {
-            putInt(PLAYLIST_GRID_SIZE, value)
-        }
-
-    var albumCoverStyle: AlbumCoverStyle
-        get() {
-            val id: Int = sharedPreferences.getInt(ALBUM_COVER_STYLE, 0)
-            for (albumCoverStyle in AlbumCoverStyle.values()) {
-                if (albumCoverStyle.id == id) {
-                    return albumCoverStyle
-                }
-            }
-            return AlbumCoverStyle.Card
-        }
-        set(value) = sharedPreferences.edit { putInt(ALBUM_COVER_STYLE, value.id) }
-
-
-    var nowPlayingScreen: NowPlayingScreen
-        get() {
-            val id: Int = sharedPreferences.getInt(NOW_PLAYING_SCREEN_ID, 0)
-            for (nowPlayingScreen in NowPlayingScreen.values()) {
-                if (nowPlayingScreen.id == id) {
-                    return nowPlayingScreen
-                }
-            }
-            return NowPlayingScreen.Adaptive
-        }
-        set(value) = sharedPreferences.edit {
-            putInt(NOW_PLAYING_SCREEN_ID, value.id)
-            // Also set a cover theme for that now playing
-            value.defaultCoverTheme?.let { coverTheme -> albumCoverStyle = coverTheme }
-        }
-
-    val albumCoverTransform: ViewPager.PageTransformer
-        get() {
-            val style = sharedPreferences.getStringOrDefault(
-                ALBUM_COVER_TRANSFORM,
-                "0"
-            ).toInt()
-            return when (style) {
-                0 -> NormalPageTransformer()
-                1 -> CascadingPageTransformer()
-                2 -> DepthTransformation()
-                3 -> HorizontalFlipTransformation()
-                4 -> VerticalFlipTransformation()
-                5 -> HingeTransformation()
-                6 -> VerticalStackTransformer()
-                else -> ViewPager.PageTransformer { _, _ -> }
-            }
-        }
-
-    var startDirectory: File
-        get() {
-            val folderPath = FoldersFragment.defaultStartDirectory.path
-            val filePath: String = sharedPreferences.getStringOrDefault(START_DIRECTORY, folderPath)
-            return File(filePath)
-        }
-        set(value) = sharedPreferences.edit {
-            putString(
-                START_DIRECTORY,
-                FileUtil.safeGetCanonicalPath(value)
-            )
-        }
-
-    fun getRecentlyPlayedCutoffTimeMillis(): Long {
-        val calendarUtil = CalendarUtil()
-        val interval: Long = when (sharedPreferences.getString(RECENTLY_PLAYED_CUTOFF, "")) {
-            "today" -> calendarUtil.elapsedToday
-            "this_week" -> calendarUtil.elapsedWeek
-            "past_seven_days" -> calendarUtil.getElapsedDays(7)
-            "past_three_months" -> calendarUtil.getElapsedMonths(3)
-            "this_year" -> calendarUtil.elapsedYear
-            "this_month" -> calendarUtil.elapsedMonth
-            else -> calendarUtil.elapsedMonth
-        }
-        return System.currentTimeMillis() - interval
-    }
-
-    val lastAddedCutoff: Long
-        get() {
-            val calendarUtil = CalendarUtil()
-            val interval =
-                when (sharedPreferences.getStringOrDefault(LAST_ADDED_CUTOFF, "this_month")) {
-                    "today" -> calendarUtil.elapsedToday
-                    "this_week" -> calendarUtil.elapsedWeek
-                    "past_three_months" -> calendarUtil.getElapsedMonths(3)
-                    "this_year" -> calendarUtil.elapsedYear
-                    "this_month" -> calendarUtil.elapsedMonth
-                    else -> calendarUtil.elapsedMonth
-                }
-            return (System.currentTimeMillis() - interval) / 1000
-        }
-
-    val homeSuggestions: Boolean
-        get() = sharedPreferences.getBoolean(
-            TOGGLE_SUGGESTIONS,
-            true
-        )
-
-    val pauseHistory: Boolean
-        get() = sharedPreferences.getBoolean(
-            PAUSE_HISTORY,
-            false
-        )
-
-    var audioFadeDuration
-        get() = sharedPreferences
-            .getInt(AUDIO_FADE_DURATION, 0)
-        set(value) = sharedPreferences.edit { putInt(AUDIO_FADE_DURATION, value) }
-
-    var showLyrics: Boolean
-        get() = sharedPreferences.getBoolean(SHOW_LYRICS, false)
-        set(value) = sharedPreferences.edit { putBoolean(SHOW_LYRICS, value) }
-
-    val rememberLastTab: Boolean
-        get() = sharedPreferences.getBoolean(REMEMBER_LAST_TAB, true)
-
-    var lastTab: Int
-        get() = sharedPreferences
-            .getInt(LAST_USED_TAB, 0)
-        set(value) = sharedPreferences.edit { putInt(LAST_USED_TAB, value) }
-
-    val isWhiteList: Boolean
-        get() = sharedPreferences.getBoolean(WHITELIST_MUSIC, false)
-
-    val crossFadeDuration
-        get() = sharedPreferences
-            .getInt(CROSS_FADE_DURATION, 0)
-
-    val isCrossfadeEnabled get() = crossFadeDuration > 0
-
-    val materialYou
-        get() = sharedPreferences.getBoolean(MATERIAL_YOU, VersionUtils.hasS())
-
-    val isCustomFont
-        get() = sharedPreferences.getBoolean(CUSTOM_FONT, false)
-
-    val isSnowFalling
-        get() = sharedPreferences.getBoolean(SNOWFALL, false)
-
-    val lyricsType: CoverLyricsType
-        get() = if (sharedPreferences.getString(LYRICS_TYPE, "0") == "0") {
-            CoverLyricsType.REPLACE_COVER
-        } else {
-            CoverLyricsType.OVER_COVER
-        }
-
-    var playbackSpeed
-        get() = sharedPreferences
-            .getFloat(PLAYBACK_SPEED, 1F)
-        set(value) = sharedPreferences.edit { putFloat(PLAYBACK_SPEED, value) }
-
-    var playbackPitch
-        get() = sharedPreferences
-            .getFloat(PLAYBACK_PITCH, 1F)
-        set(value) = sharedPreferences.edit { putFloat(PLAYBACK_PITCH, value) }
-
-    val appBarMode: TopAppBarLayout.AppBarMode
-        get() = if (sharedPreferences.getString(APPBAR_MODE, "1") == "0") {
-            TopAppBarLayout.AppBarMode.COLLAPSING
-        } else {
-            TopAppBarLayout.AppBarMode.SIMPLE
-        }
-
-    val wallpaperAccent
-        get() = sharedPreferences.getBoolean(
-            WALLPAPER_ACCENT,
-            VersionUtils.hasOreoMR1() && !VersionUtils.hasS()
-        )
-
-    val lyricsScreenOn
-        get() = sharedPreferences.getBoolean(SCREEN_ON_LYRICS, false)
-
-    val circlePlayButton
-        get() = sharedPreferences.getBoolean(CIRCLE_PLAY_BUTTON, false)
-
-    val swipeAnywhereToChangeSong
-        get() = sharedPreferences.getBoolean(SWIPE_ANYWHERE_NOW_PLAYING, true)
-
-    val swipeDownToDismiss
-        get() = sharedPreferences.getBoolean(SWIPE_DOWN_DISMISS, true)
-}
-
-enum class CoverLyricsType {
-    REPLACE_COVER, OVER_COVER
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
index 22d1127c1..0b2781722 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroColorUtil.java
@@ -22,227 +22,204 @@ import android.graphics.Color;
 import androidx.annotation.ColorInt;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.content.ContextCompat;
 import androidx.palette.graphics.Palette;
 
-import org.jetbrains.annotations.NotNull;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
-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.VersionUtils;
+import code.name.monkey.retromusic.R;
 
 public class RetroColorUtil {
-  public static int desaturateColor(int color, float ratio) {
-    float[] hsv = new float[3];
-    Color.colorToHSV(color, hsv);
+    public static int desaturateColor(int color, float ratio) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);
 
-    hsv[1] = (hsv[1] * ratio) + (0.2f * (1.0f - ratio));
+        hsv[1] = (hsv[1] / 1 * ratio) + (0.2f * (1.0f - ratio));
 
-    return Color.HSVToColor(hsv);
-  }
-
-  @Nullable
-  public static Palette generatePalette(@Nullable Bitmap bitmap) {
-    return bitmap == null ? null : Palette.from(bitmap).clearFilters().generate();
-  }
-
-  public static int getTextColor(@Nullable Palette palette) {
-    if (palette == null) {
-      return -1;
+        return Color.HSVToColor(hsv);
     }
 
-    int inverse = -1;
-    if (palette.getVibrantSwatch() != null) {
-      inverse = palette.getVibrantSwatch().getRgb();
-    } else if (palette.getLightVibrantSwatch() != null) {
-      inverse = palette.getLightVibrantSwatch().getRgb();
-    } else if (palette.getDarkVibrantSwatch() != null) {
-      inverse = palette.getDarkVibrantSwatch().getRgb();
+    public static int toolbarColor(@NonNull Context context) {
+        return ATHUtil.INSTANCE.resolveColor(context, R.attr.colorButtonNormal);
     }
 
-    int background = getSwatch(palette).getRgb();
-
-    if (inverse != -1) {
-      return ColorUtil.INSTANCE.getReadableText(inverse, background, 150);
+    @Nullable
+    public static Palette generatePalette(@Nullable Bitmap bitmap) {
+        return bitmap == null ? null : Palette.from(bitmap).clearFilters().generate();
     }
-    return ColorUtil.INSTANCE.stripAlpha(getSwatch(palette).getTitleTextColor());
-  }
 
-  @NonNull
-  public static Palette.Swatch getSwatch(@Nullable Palette palette) {
-    if (palette == null) {
-      return new Palette.Swatch(Color.WHITE, 1);
+    public static int getTextColor(@Nullable Palette palette) {
+        if (palette == null) {
+            return -1;
+        }
+
+        int inverse = -1;
+        if (palette.getVibrantSwatch() != null) {
+            inverse = palette.getVibrantSwatch().getRgb();
+        } else if (palette.getLightVibrantSwatch() != null) {
+            inverse = palette.getLightVibrantSwatch().getRgb();
+        } else if (palette.getDarkVibrantSwatch() != null) {
+            inverse = palette.getDarkVibrantSwatch().getRgb();
+        }
+
+        int background = getSwatch(palette).getRgb();
+
+        if (inverse != -1) {
+            return ColorUtil.INSTANCE.getReadableText(inverse, background, 150);
+        }
+        return ColorUtil.INSTANCE.stripAlpha(getSwatch(palette).getTitleTextColor());
     }
-    return getBestPaletteSwatchFrom(palette.getSwatches());
-  }
 
-  public static int getMatColor(Context context, String typeColor) {
-    int returnColor = Color.BLACK;
-    int arrayId =
-        context
-            .getResources()
-            .getIdentifier(
-                "md_" + typeColor, "array", context.getApplicationContext().getPackageName());
-
-    if (arrayId != 0) {
-      TypedArray colors = context.getResources().obtainTypedArray(arrayId);
-      int index = (int) (Math.random() * colors.length());
-      returnColor = colors.getColor(index, Color.BLACK);
-      colors.recycle();
-    }
-    return returnColor;
-  }
-
-  @ColorInt
-  public static int getColor(@Nullable Palette palette, int fallback) {
-    if (palette != null) {
-      if (palette.getVibrantSwatch() != null) {
-        return palette.getVibrantSwatch().getRgb();
-      } else if (palette.getDarkVibrantSwatch() != null) {
-        return palette.getDarkVibrantSwatch().getRgb();
-      } else if (palette.getLightVibrantSwatch() != null) {
-        return palette.getLightVibrantSwatch().getRgb();
-      } else if (palette.getMutedSwatch() != null) {
-        return palette.getMutedSwatch().getRgb();
-      } else if (palette.getLightMutedSwatch() != null) {
-        return palette.getLightMutedSwatch().getRgb();
-      } else if (palette.getDarkMutedSwatch() != null) {
-        return palette.getDarkMutedSwatch().getRgb();
-      } else if (!palette.getSwatches().isEmpty()) {
-        return Collections.max(palette.getSwatches(), SwatchComparator.getInstance()).getRgb();
-      }
-    }
-    return fallback;
-  }
-
-  private static Palette.Swatch getTextSwatch(@Nullable Palette palette) {
-    if (palette == null) {
-      return new Palette.Swatch(Color.BLACK, 1);
-    }
-    if (palette.getVibrantSwatch() != null) {
-      return palette.getVibrantSwatch();
-    } else {
-      return new Palette.Swatch(Color.BLACK, 1);
-    }
-  }
-
-  @ColorInt
-  public static int getBackgroundColor(@Nullable Palette palette) {
-    return getProperBackgroundSwatch(palette).getRgb();
-  }
-
-  private static Palette.Swatch getProperBackgroundSwatch(@Nullable Palette palette) {
-    if (palette == null) {
-      return new Palette.Swatch(Color.BLACK, 1);
-    }
-    if (palette.getDarkMutedSwatch() != null) {
-      return palette.getDarkMutedSwatch();
-    } else if (palette.getMutedSwatch() != null) {
-      return palette.getMutedSwatch();
-    } else if (palette.getLightMutedSwatch() != null) {
-      return palette.getLightMutedSwatch();
-    } else {
-      return new Palette.Swatch(Color.BLACK, 1);
-    }
-  }
-
-  private static Palette.Swatch getBestPaletteSwatchFrom(Palette palette) {
-    if (palette != null) {
-      if (palette.getVibrantSwatch() != null) {
-        return palette.getVibrantSwatch();
-      } else if (palette.getMutedSwatch() != null) {
-        return palette.getMutedSwatch();
-      } else if (palette.getDarkVibrantSwatch() != null) {
-        return palette.getDarkVibrantSwatch();
-      } else if (palette.getDarkMutedSwatch() != null) {
-        return palette.getDarkMutedSwatch();
-      } else if (palette.getLightVibrantSwatch() != null) {
-        return palette.getLightVibrantSwatch();
-      } else if (palette.getLightMutedSwatch() != null) {
-        return palette.getLightMutedSwatch();
-      } else if (!palette.getSwatches().isEmpty()) {
+    @NonNull
+    public static Palette.Swatch getSwatch(@Nullable Palette palette) {
+        if (palette == null) {
+            return new Palette.Swatch(Color.WHITE, 1);
+        }
         return getBestPaletteSwatchFrom(palette.getSwatches());
-      }
-    }
-    return null;
-  }
 
-  private static Palette.Swatch getBestPaletteSwatchFrom(List<Palette.Swatch> swatches) {
-    if (swatches == null) {
-      return null;
     }
-    return Collections.max(
-        swatches,
-        (opt1, opt2) -> {
-          int a = opt1 == null ? 0 : opt1.getPopulation();
-          int b = opt2 == null ? 0 : opt2.getPopulation();
-          return a - b;
+
+    public static int getMatColor(Context context, String typeColor) {
+        int returnColor = Color.BLACK;
+        int arrayId = context.getResources().getIdentifier("md_" + typeColor, "array",
+                context.getApplicationContext().getPackageName());
+
+        if (arrayId != 0) {
+            TypedArray colors = context.getResources().obtainTypedArray(arrayId);
+            int index = (int) (Math.random() * colors.length());
+            returnColor = colors.getColor(index, Color.BLACK);
+            colors.recycle();
+        }
+        return returnColor;
+    }
+
+    @ColorInt
+    public static int getColor(@Nullable Palette palette, int fallback) {
+        if (palette != null) {
+            if (palette.getVibrantSwatch() != null) {
+                return palette.getVibrantSwatch().getRgb();
+            } else if (palette.getDarkVibrantSwatch() != null) {
+                return palette.getDarkVibrantSwatch().getRgb();
+            } else if (palette.getLightVibrantSwatch() != null) {
+                return palette.getLightVibrantSwatch().getRgb();
+            } else if (palette.getMutedSwatch() != null) {
+                return palette.getMutedSwatch().getRgb();
+            } else if (palette.getLightMutedSwatch() != null) {
+                return palette.getLightMutedSwatch().getRgb();
+            } else if (palette.getDarkMutedSwatch() != null) {
+                return palette.getDarkMutedSwatch().getRgb();
+            } else if (!palette.getSwatches().isEmpty()) {
+                return Collections.max(palette.getSwatches(), SwatchComparator.getInstance()).getRgb();
+            }
+        }
+        return fallback;
+    }
+
+    private static Palette.Swatch getTextSwatch(@Nullable Palette palette) {
+        if (palette == null) {
+            return new Palette.Swatch(Color.BLACK, 1);
+        }
+        if (palette.getVibrantSwatch() != null) {
+            return palette.getVibrantSwatch();
+        } else {
+            return new Palette.Swatch(Color.BLACK, 1);
+        }
+    }
+
+    @ColorInt
+    public static int getBackgroundColor(@Nullable Palette palette) {
+        return getProperBackgroundSwatch(palette).getRgb();
+    }
+
+    private static Palette.Swatch getProperBackgroundSwatch(@Nullable Palette palette) {
+        if (palette == null) {
+            return new Palette.Swatch(Color.BLACK, 1);
+        }
+        if (palette.getDarkMutedSwatch() != null) {
+            return palette.getDarkMutedSwatch();
+        } else if (palette.getMutedSwatch() != null) {
+            return palette.getMutedSwatch();
+        } else if (palette.getLightMutedSwatch() != null) {
+            return palette.getLightMutedSwatch();
+        } else {
+            return new Palette.Swatch(Color.BLACK, 1);
+        }
+    }
+
+    private static Palette.Swatch getBestPaletteSwatchFrom(Palette palette) {
+        if (palette != null) {
+            if (palette.getVibrantSwatch() != null) {
+                return palette.getVibrantSwatch();
+            } else if (palette.getMutedSwatch() != null) {
+                return palette.getMutedSwatch();
+            } else if (palette.getDarkVibrantSwatch() != null) {
+                return palette.getDarkVibrantSwatch();
+            } else if (palette.getDarkMutedSwatch() != null) {
+                return palette.getDarkMutedSwatch();
+            } else if (palette.getLightVibrantSwatch() != null) {
+                return palette.getLightVibrantSwatch();
+            } else if (palette.getLightMutedSwatch() != null) {
+                return palette.getLightMutedSwatch();
+            } else if (!palette.getSwatches().isEmpty()) {
+                return getBestPaletteSwatchFrom(palette.getSwatches());
+            }
+        }
+        return null;
+    }
+
+    private static Palette.Swatch getBestPaletteSwatchFrom(List<Palette.Swatch> swatches) {
+        if (swatches == null) {
+            return null;
+        }
+        return Collections.max(swatches, (opt1, opt2) -> {
+            int a = opt1 == null ? 0 : opt1.getPopulation();
+            int b = opt2 == null ? 0 : opt2.getPopulation();
+            return a - b;
         });
-  }
-
-  public static int getDominantColor(Bitmap bitmap, int defaultFooterColor) {
-    List<Palette.Swatch> swatchesTemp = Palette.from(bitmap).generate().getSwatches();
-    List<Palette.Swatch> swatches = new ArrayList<>(swatchesTemp);
-    Collections.sort(
-        swatches, (swatch1, swatch2) -> swatch2.getPopulation() - swatch1.getPopulation());
-    return swatches.size() > 0 ? swatches.get(0).getRgb() : defaultFooterColor;
-  }
-
-  @ColorInt
-  public static int shiftBackgroundColorForLightText(@ColorInt int backgroundColor) {
-    while (ColorUtil.INSTANCE.isColorLight(backgroundColor)) {
-      backgroundColor = ColorUtil.INSTANCE.darkenColor(backgroundColor);
-    }
-    return backgroundColor;
-  }
-
-  @ColorInt
-  public static int shiftBackgroundColorForDarkText(@ColorInt int backgroundColor) {
-    int color = backgroundColor;
-    while (!ColorUtil.INSTANCE.isColorLight(backgroundColor)) {
-      color = ColorUtil.INSTANCE.lightenColor(backgroundColor);
-    }
-    return color;
-  }
-
-  @ColorInt
-  public static int shiftBackgroundColor(@ColorInt int backgroundColor) {
-    int color = backgroundColor;
-    if (ColorUtil.INSTANCE.isColorLight(color)) {
-      color = ColorUtil.INSTANCE.shiftColor(color, 0.5F);
-    } else {
-      color = ColorUtil.INSTANCE.shiftColor(color, 1.5F);
-    }
-    return color;
-  }
-
-  public static int getMD3AccentColor(@NotNull Context context) {
-    if (VersionUtils.hasS()) {
-      return ContextCompat.getColor(context, code.name.monkey.appthemehelper.R.color.m3_accent_color);
-    } else {
-      return ThemeStore.Companion.accentColor(context);
-    }
-  }
-
-  private static class SwatchComparator implements Comparator<Palette.Swatch> {
-
-    private static SwatchComparator sInstance;
-
-    static SwatchComparator getInstance() {
-      if (sInstance == null) {
-        sInstance = new SwatchComparator();
-      }
-      return sInstance;
     }
 
-    @Override
-    public int compare(Palette.Swatch lhs, Palette.Swatch rhs) {
-      return lhs.getPopulation() - rhs.getPopulation();
+
+    public static int getDominantColor(Bitmap bitmap, int defaultFooterColor) {
+        List<Palette.Swatch> swatchesTemp = Palette.from(bitmap).generate().getSwatches();
+        List<Palette.Swatch> swatches = new ArrayList<Palette.Swatch>(swatchesTemp);
+        Collections.sort(swatches, (swatch1, swatch2) -> swatch2.getPopulation() - swatch1.getPopulation());
+        return swatches.size() > 0 ? swatches.get(0).getRgb() : defaultFooterColor;
+    }
+
+    @ColorInt
+    public static int shiftBackgroundColorForLightText(@ColorInt int backgroundColor) {
+        while (ColorUtil.INSTANCE.isColorLight(backgroundColor)) {
+            backgroundColor = ColorUtil.INSTANCE.darkenColor(backgroundColor);
+        }
+        return backgroundColor;
+    }
+
+    @ColorInt
+    public static int shiftBackgroundColorForDarkText(@ColorInt int backgroundColor) {
+        while (!ColorUtil.INSTANCE.isColorLight(backgroundColor)) {
+            backgroundColor = ColorUtil.INSTANCE.lightenColor(backgroundColor);
+        }
+        return backgroundColor;
+    }
+
+    private static class SwatchComparator implements Comparator<Palette.Swatch> {
+
+        private static SwatchComparator sInstance;
+
+        static SwatchComparator getInstance() {
+            if (sInstance == null) {
+                sInstance = new SwatchComparator();
+            }
+            return sInstance;
+        }
+
+        @Override
+        public int compare(Palette.Swatch lhs, Palette.Swatch rhs) {
+            return lhs.getPopulation() - rhs.getPopulation();
+        }
     }
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java
new file mode 100755
index 000000000..601d17704
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.java
@@ -0,0 +1,185 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.util;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.content.ContentUris;
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Point;
+import android.graphics.drawable.Drawable;
+import android.net.ConnectivityManager;
+import android.net.NetworkInfo;
+import android.net.Uri;
+import android.os.Build;
+import android.util.DisplayMetrics;
+import android.view.Display;
+import android.view.View;
+import android.view.Window;
+import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.vectordrawable.graphics.drawable.VectorDrawableCompat;
+
+import code.name.monkey.appthemehelper.util.TintHelper;
+import code.name.monkey.retromusic.App;
+
+public class RetroUtil {
+
+    private static final int[] TEMP_ARRAY = new int[1];
+    private static final String SHOW_NAV_BAR_RES_NAME = "config_showNavigationBar";
+
+
+    public static int calculateNoOfColumns(@NonNull Context context) {
+        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
+        float dpWidth = displayMetrics.widthPixels / displayMetrics.density;
+        return (int) (dpWidth / 180);
+    }
+
+    public static Uri getAlbumArtUri(long paramInt) {
+        return ContentUris.withAppendedId(Uri.parse("content://media/external/audio/albumart"), paramInt);
+    }
+
+    public static boolean isTablet() {
+        return App.Companion.getContext().getResources().getConfiguration().smallestScreenWidthDp >= 600;
+    }
+
+    public static boolean isLandscape() {
+        return App.Companion.getContext().getResources().getConfiguration().orientation == Configuration.ORIENTATION_LANDSCAPE;
+    }
+
+    @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
+    public static boolean isRTL(@NonNull Context context) {
+        Configuration config = context.getResources().getConfiguration();
+        return config.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
+    }
+
+    public static void openUrl(@NonNull Activity context, @NonNull String str) {
+        Intent intent = new Intent("android.intent.action.VIEW");
+        intent.setData(Uri.parse(str));
+        intent.setFlags(268435456);
+        context.startActivity(intent);
+    }
+
+    public static Point getScreenSize(@NonNull Context c) {
+        Display display = null;
+        if (c.getSystemService(Context.WINDOW_SERVICE) != null) {
+            display = ((WindowManager) c.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
+        }
+        Point size = new Point();
+        if (display != null) {
+            display.getSize(size);
+        }
+        return size;
+    }
+
+    public static void hideSoftKeyboard(@Nullable Activity activity) {
+        if (activity != null) {
+            View currentFocus = activity.getCurrentFocus();
+            if (currentFocus != null) {
+                InputMethodManager inputMethodManager = (InputMethodManager) activity
+                        .getSystemService(Activity.INPUT_METHOD_SERVICE);
+                if (inputMethodManager != null) {
+                    inputMethodManager.hideSoftInputFromWindow(currentFocus.getWindowToken(), 0);
+                }
+            }
+        }
+    }
+
+    @Nullable
+    public static Drawable getVectorDrawable(@NonNull Resources res, @DrawableRes int resId,
+                                             @Nullable Resources.Theme theme) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return res.getDrawable(resId, theme);
+        }
+        return VectorDrawableCompat.create(res, resId, theme);
+    }
+
+    @Nullable
+    public static Drawable getTintedVectorDrawable(@NonNull Context context, @DrawableRes int id,
+                                                   @ColorInt int color) {
+        return TintHelper.createTintedDrawable(
+                getVectorDrawable(context.getResources(), id, context.getTheme()), color);
+    }
+
+    @NonNull
+    public static Bitmap createBitmap(@NonNull Drawable drawable, float sizeMultiplier) {
+        Bitmap bitmap = Bitmap.createBitmap((int) (drawable.getIntrinsicWidth() * sizeMultiplier),
+                (int) (drawable.getIntrinsicHeight() * sizeMultiplier), Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(bitmap);
+        drawable.setBounds(0, 0, c.getWidth(), c.getHeight());
+        drawable.draw(c);
+        return bitmap;
+    }
+
+    @Nullable
+    public static Drawable getTintedVectorDrawable(@NonNull Resources res, @DrawableRes int resId,
+                                                   @Nullable Resources.Theme theme, @ColorInt int color) {
+        return TintHelper.createTintedDrawable(getVectorDrawable(res, resId, theme), color);
+    }
+
+    public static boolean isAllowedToDownloadMetadata(final @NonNull Context context) {
+        switch (PreferenceUtil.getInstance(context).autoDownloadImagesPolicy()) {
+            case "always":
+                return true;
+            case "only_wifi":
+                final ConnectivityManager connectivityManager = (ConnectivityManager) context
+                        .getSystemService(Context.CONNECTIVITY_SERVICE);
+                NetworkInfo netInfo = connectivityManager.getActiveNetworkInfo();
+                return netInfo != null && netInfo.getType() == ConnectivityManager.TYPE_WIFI && netInfo
+                        .isConnectedOrConnecting();
+            case "never":
+            default:
+                return false;
+        }
+    }
+
+    public static int getStatusBarHeight() {
+        int result = 0;
+        int resourceId = App.Companion.getContext().getResources().getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = App.Companion.getContext().getResources().getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
+    public static void setAllowDrawUnderNavigationBar(Window window) {
+        window.setNavigationBarColor(Color.TRANSPARENT);
+        window.getDecorView().setSystemUiVisibility(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ?
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION :
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE
+                        | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                        | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION
+        );
+    }
+
+    public static void setAllowDrawUnderStatusBar(@NonNull Window window) {
+        window.getDecorView().setSystemUiVisibility(
+                View.SYSTEM_UI_FLAG_LAYOUT_STABLE | View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt
deleted file mode 100644
index 60f4f5823..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/RetroUtil.kt
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.content.res.Configuration
-import android.graphics.Point
-import code.name.monkey.retromusic.App.Companion.getContext
-import java.net.InetAddress
-import java.net.NetworkInterface
-import java.text.DecimalFormat
-import java.util.*
-
-object RetroUtil {
-    fun formatValue(numValue: Float): String {
-        var value = numValue
-        val arr = arrayOf("", "K", "M", "B", "T", "P", "E")
-        var index = 0
-        while (value / 1000 >= 1) {
-            value /= 1000
-            index++
-        }
-        val decimalFormat = DecimalFormat("#.##")
-        return String.format("%s %s", decimalFormat.format(value.toDouble()), arr[index])
-    }
-
-    fun frequencyCount(frequency: Int): Float {
-        return (frequency / 1000.0).toFloat()
-    }
-
-    fun getScreenSize(context: Context): Point {
-        val x: Int = context.resources.displayMetrics.widthPixels
-        val y: Int = context.resources.displayMetrics.heightPixels
-        return Point(x, y)
-    }
-
-    val statusBarHeight: Int
-        get() {
-            var result = 0
-            val resourceId = getContext()
-                .resources
-                .getIdentifier("status_bar_height", "dimen", "android")
-            if (resourceId > 0) {
-                result = getContext().resources.getDimensionPixelSize(resourceId)
-            }
-            return result
-        }
-
-    val navigationBarHeight: Int
-        get() {
-            var result = 0
-            val resourceId = getContext()
-                .resources
-                .getIdentifier("navigation_bar_height", "dimen", "android")
-            if (resourceId > 0) {
-                result = getContext().resources.getDimensionPixelSize(resourceId)
-            }
-            return result
-        }
-
-    val isLandscape: Boolean
-        get() = (getContext().resources.configuration.orientation
-                == Configuration.ORIENTATION_LANDSCAPE)
-    val isTablet: Boolean
-        get() = (getContext().resources.configuration.smallestScreenWidthDp
-                >= 600)
-
-    fun getIpAddress(useIPv4: Boolean): String? {
-        try {
-            val interfaces: List<NetworkInterface> =
-                Collections.list(NetworkInterface.getNetworkInterfaces())
-            for (intf in interfaces) {
-                val addrs: List<InetAddress> = Collections.list(intf.inetAddresses)
-                for (addr in addrs) {
-                    if (!addr.isLoopbackAddress) {
-                        val sAddr = addr.hostAddress
-
-                        if (sAddr != null) {
-                            val isIPv4 = sAddr.indexOf(':') < 0
-                            if (useIPv4) {
-                                if (isIPv4) return sAddr
-                            } else {
-                                if (!isIPv4) {
-                                    val delim = sAddr.indexOf('%') // drop ip6 zone suffix
-                                    return if (delim < 0) {
-                                        sAddr.uppercase()
-                                    } else {
-                                        sAddr.substring(
-                                            0,
-                                            delim
-                                        ).uppercase()
-                                    }
-                                }
-                            }
-                        } else {
-                            return null
-                        }
-
-                    }
-                }
-            }
-        } catch (ignored: Exception) {
-        }
-        return ""
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
index 98be17699..013587f3e 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RingtoneManager.kt
@@ -14,63 +14,79 @@
 
 package code.name.monkey.retromusic.util
 
+import android.content.ContentValues
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
+import android.os.Build
 import android.provider.BaseColumns
 import android.provider.MediaStore
 import android.provider.Settings
-import androidx.core.net.toUri
-import code.name.monkey.appthemehelper.util.VersionUtils
+import android.widget.Toast
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.showToast
 import code.name.monkey.retromusic.model.Song
 import code.name.monkey.retromusic.util.MusicUtil.getSongFileUri
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.afollestad.materialdialogs.LayoutMode
+import com.afollestad.materialdialogs.MaterialDialog
+import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 
-object RingtoneManager {
-    fun setRingtone(context: Context, song: Song) {
-        val uri = getSongFileUri(song.id)
+class RingtoneManager(val context: Context) {
+    fun setRingtone(song: Song) {
         val resolver = context.contentResolver
+        val uri = getSongFileUri(song.id)
+        try {
+            val values = ContentValues(2)
+            values.put(MediaStore.Audio.AudioColumns.IS_RINGTONE, "1")
+            values.put(MediaStore.Audio.AudioColumns.IS_ALARM, "1")
+            resolver.update(uri, values, null, null)
+        } catch (ignored: UnsupportedOperationException) {
+            return
+        }
+
 
         try {
-            val cursor = resolver.query(
-                MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
-                arrayOf(MediaStore.MediaColumns.TITLE),
-                BaseColumns._ID + "=?",
-                arrayOf(song.id.toString()), null
-            )
+            val cursor = resolver.query(MediaStore.Audio.Media.EXTERNAL_CONTENT_URI,
+                    arrayOf(MediaStore.MediaColumns.TITLE),
+                    BaseColumns._ID + "=?",
+                    arrayOf(song.id.toString()), null)
             cursor.use { cursorSong ->
                 if (cursorSong != null && cursorSong.count == 1) {
                     cursorSong.moveToFirst()
                     Settings.System.putString(resolver, Settings.System.RINGTONE, uri.toString())
                     val message = context
-                        .getString(R.string.x_has_been_set_as_ringtone, cursorSong.getString(0))
-                    context.showToast(message)
+                            .getString(R.string.x_has_been_set_as_ringtone, cursorSong.getString(0))
+                    Toast.makeText(context, message, Toast.LENGTH_SHORT).show()
                 }
             }
         } catch (ignored: SecurityException) {
         }
     }
 
-    fun requiresDialog(context: Context): Boolean {
-        if (VersionUtils.hasMarshmallow()) {
-            if (!Settings.System.canWrite(context)) {
-                return true
+    companion object {
+        private const val TAG = "RingtoneManager"
+
+        fun requiresDialog(context: Context): Boolean {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                if (!Settings.System.canWrite(context)) {
+                    return true
+                }
+            }
+            return false
+        }
+
+        fun getDialog(context: Context): MaterialDialog {
+            return MaterialDialog(context, BottomSheet(LayoutMode.WRAP_CONTENT)).show {
+                cornerRadius(PreferenceUtil.getInstance(context).dialogCorner)
+                title(R.string.dialog_title_set_ringtone)
+                message(R.string.dialog_message_set_ringtone)
+                positiveButton(android.R.string.ok) {
+                    val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
+                    intent.data = Uri.parse("package:" + context.applicationContext.packageName)
+                    context.startActivity(intent)
+                }
+                negativeButton(android.R.string.cancel)
             }
         }
-        return false
-    }
 
-    fun showDialog(context: Context) {
-        return MaterialAlertDialogBuilder(context, R.style.MaterialAlertDialogTheme)
-            .setTitle(R.string.dialog_title_set_ringtone)
-            .setMessage(R.string.dialog_message_set_ringtone)
-            .setPositiveButton(android.R.string.ok) { _, _ ->
-                val intent = Intent(Settings.ACTION_MANAGE_WRITE_SETTINGS)
-                intent.data = ("package:" + context.applicationContext.packageName).toUri()
-                context.startActivity(intent)
-            }
-            .setNegativeButton(android.R.string.cancel, null)
-            .create().show()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java b/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java
new file mode 100644
index 000000000..6a61c5dba
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/RippleUtils.java
@@ -0,0 +1,146 @@
+package code.name.monkey.retromusic.util;
+
+import android.annotation.TargetApi;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.os.Build;
+import android.util.StateSet;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.Nullable;
+import androidx.core.graphics.ColorUtils;
+
+public class RippleUtils {
+    public static final boolean USE_FRAMEWORK_RIPPLE = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
+    private static final int[] PRESSED_STATE_SET = {
+            android.R.attr.state_pressed,
+    };
+    private static final int[] HOVERED_FOCUSED_STATE_SET = {
+            android.R.attr.state_hovered, android.R.attr.state_focused,
+    };
+    private static final int[] FOCUSED_STATE_SET = {
+            android.R.attr.state_focused,
+    };
+    private static final int[] HOVERED_STATE_SET = {
+            android.R.attr.state_hovered,
+    };
+
+    private static final int[] SELECTED_PRESSED_STATE_SET = {
+            android.R.attr.state_selected, android.R.attr.state_pressed,
+    };
+    private static final int[] SELECTED_HOVERED_FOCUSED_STATE_SET = {
+            android.R.attr.state_selected, android.R.attr.state_hovered, android.R.attr.state_focused,
+    };
+    private static final int[] SELECTED_FOCUSED_STATE_SET = {
+            android.R.attr.state_selected, android.R.attr.state_focused,
+    };
+    private static final int[] SELECTED_HOVERED_STATE_SET = {
+            android.R.attr.state_selected, android.R.attr.state_hovered,
+    };
+    private static final int[] SELECTED_STATE_SET = {
+            android.R.attr.state_selected,
+    };
+
+    private static final int[] ENABLED_PRESSED_STATE_SET = {
+            android.R.attr.state_enabled, android.R.attr.state_pressed
+    };
+
+    public static ColorStateList convertToRippleDrawableColor(@Nullable ColorStateList rippleColor) {
+        if (USE_FRAMEWORK_RIPPLE) {
+            int size = 2;
+
+            final int[][] states = new int[size][];
+            final int[] colors = new int[size];
+            int i = 0;
+
+            // Ideally we would define a different composite color for each state, but that causes the
+            // ripple animation to abort prematurely.
+            // So we only allow two base states: selected, and non-selected. For each base state, we only
+            // base the ripple composite on its pressed state.
+
+            // Selected base state.
+            states[i] = SELECTED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, SELECTED_PRESSED_STATE_SET);
+            i++;
+
+            // Non-selected base state.
+            states[i] = StateSet.NOTHING;
+            colors[i] = getColorForState(rippleColor, PRESSED_STATE_SET);
+            i++;
+
+            return new ColorStateList(states, colors);
+        } else {
+            int size = 10;
+
+            final int[][] states = new int[size][];
+            final int[] colors = new int[size];
+            int i = 0;
+
+            states[i] = SELECTED_PRESSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, SELECTED_PRESSED_STATE_SET);
+            i++;
+
+            states[i] = SELECTED_HOVERED_FOCUSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, SELECTED_HOVERED_FOCUSED_STATE_SET);
+            i++;
+
+            states[i] = SELECTED_FOCUSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, SELECTED_FOCUSED_STATE_SET);
+            i++;
+
+            states[i] = SELECTED_HOVERED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, SELECTED_HOVERED_STATE_SET);
+            i++;
+
+            // Checked state.
+            states[i] = SELECTED_STATE_SET;
+            colors[i] = Color.TRANSPARENT;
+            i++;
+
+            states[i] = PRESSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, PRESSED_STATE_SET);
+            i++;
+
+            states[i] = HOVERED_FOCUSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, HOVERED_FOCUSED_STATE_SET);
+            i++;
+
+            states[i] = FOCUSED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, FOCUSED_STATE_SET);
+            i++;
+
+            states[i] = HOVERED_STATE_SET;
+            colors[i] = getColorForState(rippleColor, HOVERED_STATE_SET);
+            i++;
+
+            // Default state.
+            states[i] = StateSet.NOTHING;
+            colors[i] = Color.TRANSPARENT;
+            i++;
+
+            return new ColorStateList(states, colors);
+        }
+    }
+
+    @ColorInt
+    private static int getColorForState(@Nullable ColorStateList rippleColor, int[] state) {
+        int color;
+        if (rippleColor != null) {
+            color = rippleColor.getColorForState(state, rippleColor.getDefaultColor());
+        } else {
+            color = Color.TRANSPARENT;
+        }
+        return USE_FRAMEWORK_RIPPLE ? doubleAlpha(color) : color;
+    }
+
+    /**
+     * On API 21+, the framework composites a ripple color onto the display at about 50% opacity.
+     * Since we are providing precise ripple colors, cancel that out by doubling the opacity here.
+     */
+    @ColorInt
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    private static int doubleAlpha(@ColorInt int color) {
+        int alpha = Math.min(2 * Color.alpha(color), 255);
+        return ColorUtils.setAlphaComponent(color, alpha);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
index 223f0d8da..d8d2af696 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/SAFUtil.java
@@ -14,11 +14,13 @@
 
 package code.name.monkey.retromusic.util;
 
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.UriPermission;
 import android.net.Uri;
+import android.os.Build;
 import android.os.ParcelFileDescriptor;
 import android.provider.DocumentsContract;
 import android.text.TextUtils;
@@ -45,265 +47,257 @@ import code.name.monkey.retromusic.model.Song;
 
 public class SAFUtil {
 
-  public static final String TAG = SAFUtil.class.getSimpleName();
-  public static final String SEPARATOR = "###/SAF/###";
+    public static final String TAG = SAFUtil.class.getSimpleName();
+    public static final String SEPARATOR = "###/SAF/###";
 
-  public static final int REQUEST_SAF_PICK_FILE = 42;
-  public static final int REQUEST_SAF_PICK_TREE = 43;
+    public static final int REQUEST_SAF_PICK_FILE = 42;
+    public static final int REQUEST_SAF_PICK_TREE = 43;
 
-  public static boolean isSAFRequired(File file) {
-    return !file.canWrite();
-  }
-
-  public static boolean isSAFRequired(String path) {
-    return isSAFRequired(new File(path));
-  }
-
-  public static boolean isSAFRequired(AudioFile audio) {
-    return isSAFRequired(audio.getFile());
-  }
-
-  public static boolean isSAFRequired(Song song) {
-    return isSAFRequired(song.getData());
-  }
-
-  public static boolean isSAFRequired(List<String> paths) {
-    for (String path : paths) {
-      if (isSAFRequired(path)) return true;
-    }
-    return false;
-  }
-
-  public static boolean isSAFRequiredForSongs(List<Song> songs) {
-    for (Song song : songs) {
-      if (isSAFRequired(song)) return true;
-    }
-    return false;
-  }
-
-  public static void openFilePicker(Activity activity) {
-    Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-    i.addCategory(Intent.CATEGORY_OPENABLE);
-    i.setType("audio/*");
-    i.putExtra("android.content.extra.SHOW_ADVANCED", true);
-    activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
-  }
-
-  public static void openFilePicker(Fragment fragment) {
-    Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
-    i.addCategory(Intent.CATEGORY_OPENABLE);
-    i.setType("audio/*");
-    i.putExtra("android.content.extra.SHOW_ADVANCED", true);
-    fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
-  }
-
-  public static void openTreePicker(Activity activity) {
-    Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-    i.putExtra("android.content.extra.SHOW_ADVANCED", true);
-    activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
-  }
-
-  public static void openTreePicker(Fragment fragment) {
-    Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
-    i.putExtra("android.content.extra.SHOW_ADVANCED", true);
-    fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
-  }
-
-  public static void saveTreeUri(Context context, Intent data) {
-    Uri uri = data.getData();
-    if (uri != null) {
-      context.getContentResolver().takePersistableUriPermission(
-              uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
-      PreferenceUtil.INSTANCE.setSafSdCardUri(uri.toString());
-    }
-  }
-
-  public static boolean isTreeUriSaved() {
-    return !TextUtils.isEmpty(PreferenceUtil.INSTANCE.getSafSdCardUri());
-  }
-
-  public static boolean isSDCardAccessGranted(Context context) {
-    if (!isTreeUriSaved()) return false;
-
-    String sdcardUri = PreferenceUtil.INSTANCE.getSafSdCardUri();
-
-    List<UriPermission> perms = context.getContentResolver().getPersistedUriPermissions();
-    for (UriPermission perm : perms) {
-      if (perm.getUri().toString().equals(sdcardUri) && perm.isWritePermission()) return true;
+    public static boolean isSAFRequired(File file) {
+        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && !file.canWrite();
     }
 
-    return false;
-  }
-
-  /**
-   * https://github.com/vanilla-music/vanilla-music-tag-editor/commit/e00e87fef289f463b6682674aa54be834179ccf0#diff-d436417358d5dfbb06846746d43c47a5R359
-   * Finds needed file through Document API for SAF. It's not optimized yet - you can still gain
-   * wrong URI on files such as "/a/b/c.mp3" and "/b/a/c.mp3", but I consider it complete enough to
-   * be usable.
-   *
-   * @param dir - document file representing current dir of search
-   * @param segments - path segments that are left to find
-   * @return URI for found file. Null if nothing found.
-   */
-  @Nullable
-  public static Uri findDocument(DocumentFile dir, List<String> segments) {
-    if (dir == null) {
-      return null;
+    public static boolean isSAFRequired(String path) {
+        return isSAFRequired(new File(path));
     }
 
-    for (DocumentFile file : dir.listFiles()) {
-      int index = segments.indexOf(file.getName());
-      if (index == -1) {
-        continue;
-      }
-
-      if (file.isDirectory()) {
-        segments.remove(file.getName());
-        return findDocument(file, segments);
-      }
-
-      if (file.isFile() && index == segments.size() - 1) {
-        // got to the last part
-        return file.getUri();
-      }
+    public static boolean isSAFRequired(AudioFile audio) {
+        return isSAFRequired(audio.getFile());
     }
 
-    return null;
-  }
-
-  public static void write(Context context, AudioFile audio, Uri safUri) {
-    if (isSAFRequired(audio)) {
-      writeSAF(context, audio, safUri);
-    } else {
-      try {
-        writeFile(audio);
-      } catch (CannotWriteException e) {
-        e.printStackTrace();
-      }
-    }
-  }
-
-  public static void writeFile(AudioFile audio) throws CannotWriteException {
-    audio.commit();
-  }
-
-  public static void writeSAF(Context context, AudioFile audio, Uri safUri) {
-    Uri uri = null;
-
-    if (context == null) {
-      Log.e(TAG, "writeSAF: context == null");
-      return;
+    public static boolean isSAFRequired(Song song) {
+        return isSAFRequired(song.getData());
     }
 
-    if (isTreeUriSaved()) {
-      List<String> pathSegments =
-          new ArrayList<>(Arrays.asList(audio.getFile().getAbsolutePath().split("/")));
-      Uri sdcard = Uri.parse(PreferenceUtil.INSTANCE.getSafSdCardUri());
-      uri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
+    public static boolean isSAFRequired(List<String> paths) {
+        for (String path : paths) {
+            if (isSAFRequired(path)) return true;
+        }
+        return false;
     }
 
-    if (uri == null) {
-      uri = safUri;
+    public static boolean isSAFRequiredForSongs(List<Song> songs) {
+        for (Song song : songs) {
+            if (isSAFRequired(song)) return true;
+        }
+        return false;
     }
 
-    if (uri == null) {
-      Log.e(TAG, "writeSAF: Can't get SAF URI");
-      toast(context, context.getString(R.string.saf_error_uri));
-      return;
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static void openFilePicker(Activity activity) {
+        Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        i.addCategory(Intent.CATEGORY_OPENABLE);
+        i.setType("audio/*");
+        i.putExtra("android.content.extra.SHOW_ADVANCED", true);
+        activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
     }
 
-    try {
-      // copy file to app folder to use jaudiotagger
-      final File original = audio.getFile();
-      File temp = File.createTempFile("tmp-media", '.' + Utils.getExtension(original));
-      Utils.copy(original, temp);
-      temp.deleteOnExit();
-      audio.setFile(temp);
-      writeFile(audio);
-
-      ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "rw");
-      if (pfd == null) {
-        Log.e(TAG, "writeSAF: SAF provided incorrect URI: " + uri);
-        return;
-      }
-
-      // now read persisted data and write it to real FD provided by SAF
-      FileInputStream fis = new FileInputStream(temp);
-      byte[] audioContent = FileUtil.readBytes(fis);
-      FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor());
-      fos.write(audioContent);
-      fos.close();
-
-      temp.delete();
-    } catch (final Exception e) {
-      Log.e(TAG, "writeSAF: Failed to write to file descriptor provided by SAF", e);
-
-      toast(
-          context,
-          String.format(context.getString(R.string.saf_write_failed), e.getLocalizedMessage()));
-    }
-  }
-
-  public static boolean delete(Context context, String path, Uri safUri) {
-    if (isSAFRequired(path)) {
-      return deleteSAF(context, path, safUri);
-    } else {
-      try {
-        return deleteFile(path);
-      } catch (NullPointerException e) {
-        Log.e("MusicUtils", "Failed to find file " + path);
-      } catch (Exception e) {
-        e.printStackTrace();
-      }
-    }
-    return false;
-  }
-
-  public static boolean deleteFile(String path) {
-    return new File(path).delete();
-  }
-
-  public static boolean deleteSAF(Context context, String path, Uri safUri) {
-    Uri uri = null;
-
-    if (context == null) {
-      Log.e(TAG, "deleteSAF: context == null");
-      return false;
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static void openFilePicker(Fragment fragment) {
+        Intent i = new Intent(Intent.ACTION_CREATE_DOCUMENT);
+        i.addCategory(Intent.CATEGORY_OPENABLE);
+        i.setType("audio/*");
+        i.putExtra("android.content.extra.SHOW_ADVANCED", true);
+        fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_FILE);
     }
 
-    if (safUri == null && isTreeUriSaved()) {
-      List<String> pathSegments = new ArrayList<>(Arrays.asList(path.split("/")));
-      Uri sdcard = Uri.parse(PreferenceUtil.INSTANCE.getSafSdCardUri());
-      uri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static void openTreePicker(Activity activity) {
+        Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        i.putExtra("android.content.extra.SHOW_ADVANCED", true);
+        activity.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
     }
 
-    if (uri == null) {
-      uri = safUri;
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static void openTreePicker(Fragment fragment) {
+        Intent i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE);
+        i.putExtra("android.content.extra.SHOW_ADVANCED", true);
+        fragment.startActivityForResult(i, SAFUtil.REQUEST_SAF_PICK_TREE);
     }
 
-    if (uri == null) {
-      Log.e(TAG, "deleteSAF: Can't get SAF URI");
-      toast(context, context.getString(R.string.saf_error_uri));
-      return false;
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static void saveTreeUri(Context context, Intent data) {
+        Uri uri = data.getData();
+        context.getContentResolver().takePersistableUriPermission(uri, Intent.FLAG_GRANT_WRITE_URI_PERMISSION | Intent.FLAG_GRANT_READ_URI_PERMISSION);
+        PreferenceUtil.getInstance(context).setSAFSDCardUri(uri);
     }
 
-    try {
-      DocumentsContract.deleteDocument(context.getContentResolver(), uri);
-    } catch (final Exception e) {
-      Log.e(TAG, "deleteSAF: Failed to delete a file descriptor provided by SAF", e);
-
-      toast(
-          context,
-          String.format(context.getString(R.string.saf_delete_failed), e.getLocalizedMessage()));
-      return false;
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static boolean isTreeUriSaved(Context context) {
+        return !TextUtils.isEmpty(PreferenceUtil.getInstance(context).getSAFSDCardUri());
     }
-    return true;
-  }
 
-  private static void toast(final Context context, final String message) {
-    if (context instanceof Activity) {
-      ((Activity) context)
-          .runOnUiThread(() -> Toast.makeText(context, message, Toast.LENGTH_SHORT).show());
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public static boolean isSDCardAccessGranted(Context context) {
+        if (!isTreeUriSaved(context)) return false;
+
+        String sdcardUri = PreferenceUtil.getInstance(context).getSAFSDCardUri();
+
+        List<UriPermission> perms = context.getContentResolver().getPersistedUriPermissions();
+        for (UriPermission perm : perms) {
+            if (perm.getUri().toString().equals(sdcardUri) && perm.isWritePermission()) return true;
+        }
+
+        return false;
     }
-  }
+
+    /**
+     * https://github.com/vanilla-music/vanilla-music-tag-editor/commit/e00e87fef289f463b6682674aa54be834179ccf0#diff-d436417358d5dfbb06846746d43c47a5R359
+     * Finds needed file through Document API for SAF. It's not optimized yet - you can still gain wrong URI on
+     * files such as "/a/b/c.mp3" and "/b/a/c.mp3", but I consider it complete enough to be usable.
+     *
+     * @param dir      - document file representing current dir of search
+     * @param segments - path segments that are left to find
+     * @return URI for found file. Null if nothing found.
+     */
+    @Nullable
+    public static Uri findDocument(DocumentFile dir, List<String> segments) {
+        for (DocumentFile file : dir.listFiles()) {
+            int index = segments.indexOf(file.getName());
+            if (index == -1) {
+                continue;
+            }
+
+            if (file.isDirectory()) {
+                segments.remove(file.getName());
+                return findDocument(file, segments);
+            }
+
+            if (file.isFile() && index == segments.size() - 1) {
+                // got to the last part
+                return file.getUri();
+            }
+        }
+
+        return null;
+    }
+
+    public static void write(Context context, AudioFile audio, Uri safUri) {
+        if (isSAFRequired(audio)) {
+            writeSAF(context, audio, safUri);
+        } else {
+            try {
+                writeFile(audio);
+            } catch (CannotWriteException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void writeFile(AudioFile audio) throws CannotWriteException {
+        audio.commit();
+    }
+
+    public static void writeSAF(Context context, AudioFile audio, Uri safUri) {
+        Uri uri = null;
+
+        if (context == null) {
+            Log.e(TAG, "writeSAF: context == null");
+            return;
+        }
+
+        if (isTreeUriSaved(context)) {
+            List<String> pathSegments = new ArrayList<>(Arrays.asList(audio.getFile().getAbsolutePath().split("/")));
+            Uri sdcard = Uri.parse(PreferenceUtil.getInstance(context).getSAFSDCardUri());
+            uri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
+        }
+
+        if (uri == null) {
+            uri = safUri;
+        }
+
+        if (uri == null) {
+            Log.e(TAG, "writeSAF: Can't get SAF URI");
+            toast(context, context.getString(R.string.saf_error_uri));
+            return;
+        }
+
+        try {
+            // copy file to app folder to use jaudiotagger
+            final File original = audio.getFile();
+            File temp = File.createTempFile("tmp-media", '.' + Utils.getExtension(original));
+            Utils.copy(original, temp);
+            temp.deleteOnExit();
+            audio.setFile(temp);
+            writeFile(audio);
+
+            ParcelFileDescriptor pfd = context.getContentResolver().openFileDescriptor(uri, "rw");
+            if (pfd == null) {
+                Log.e(TAG, "writeSAF: SAF provided incorrect URI: " + uri);
+                return;
+            }
+
+            // now read persisted data and write it to real FD provided by SAF
+            FileInputStream fis = new FileInputStream(temp);
+            byte[] audioContent = FileUtil.readBytes(fis);
+            FileOutputStream fos = new FileOutputStream(pfd.getFileDescriptor());
+            fos.write(audioContent);
+            fos.close();
+
+            temp.delete();
+        } catch (final Exception e) {
+            Log.e(TAG, "writeSAF: Failed to write to file descriptor provided by SAF", e);
+
+            toast(context, String.format(context.getString(R.string.saf_write_failed), e.getLocalizedMessage()));
+        }
+    }
+
+    public static void delete(Context context, String path, Uri safUri) {
+        if (isSAFRequired(path)) {
+            deleteSAF(context, path, safUri);
+        } else {
+            try {
+                deleteFile(path);
+            } catch (NullPointerException e) {
+                Log.e("MusicUtils", "Failed to find file " + path);
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public static void deleteFile(String path) {
+        new File(path).delete();
+    }
+
+    @TargetApi(Build.VERSION_CODES.KITKAT)
+    public static void deleteSAF(Context context, String path, Uri safUri) {
+        Uri uri = null;
+
+        if (context == null) {
+            Log.e(TAG, "deleteSAF: context == null");
+            return;
+        }
+
+        if (isTreeUriSaved(context)) {
+            List<String> pathSegments = new ArrayList<>(Arrays.asList(path.split("/")));
+            Uri sdcard = Uri.parse(PreferenceUtil.getInstance(context).getSAFSDCardUri());
+            uri = findDocument(DocumentFile.fromTreeUri(context, sdcard), pathSegments);
+        }
+
+        if (uri == null) {
+            uri = safUri;
+        }
+
+        if (uri == null) {
+            Log.e(TAG, "deleteSAF: Can't get SAF URI");
+            toast(context, context.getString(R.string.saf_error_uri));
+            return;
+        }
+
+        try {
+            DocumentsContract.deleteDocument(context.getContentResolver(), uri);
+        } catch (final Exception e) {
+            Log.e(TAG, "deleteSAF: Failed to delete a file descriptor provided by SAF", e);
+
+            toast(context, String.format(context.getString(R.string.saf_delete_failed), e.getLocalizedMessage()));
+        }
+    }
+
+    private static void toast(final Context context, final String message) {
+        if (context instanceof Activity) {
+            ((Activity) context).runOnUiThread(() -> Toast.makeText(context, message, Toast.LENGTH_SHORT).show());
+        }
+    }
+
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt b/app/src/main/java/code/name/monkey/retromusic/util/Share.kt
deleted file mode 100644
index 5994419bf..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/Share.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.util
-
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import androidx.core.content.FileProvider
-import java.io.File
-
-/**
- * Created by hemanths on 2020-02-02.
- */
-
-object Share {
-    fun shareStoryToSocial(context: Context, uri: Uri) {
-        val feedIntent = Intent(Intent.ACTION_SEND)
-        feedIntent.type = "image/*"
-        feedIntent.putExtra(Intent.EXTRA_STREAM, uri)
-        context.startActivity(feedIntent, null)
-    }
-
-    fun shareFile(context: Context, file: File, mimeType: String) {
-        Intent(Intent.ACTION_SEND).apply {
-            type = mimeType
-            putExtra(Intent.EXTRA_STREAM, FileProvider.getUriForFile(
-                context,
-                context.applicationContext.packageName,
-                file
-            ))
-            context.startActivity(Intent.createChooser(this, null))
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java b/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java
index 92c8be038..f8fa85dae 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/SwipeAndDragHelper.java
@@ -17,57 +17,56 @@ package code.name.monkey.retromusic.util;
 import android.graphics.Canvas;
 
 import androidx.annotation.NonNull;
-import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.ItemTouchHelper;
 
 public class SwipeAndDragHelper extends ItemTouchHelper.Callback {
 
-  private final ActionCompletionContract contract;
+    private ActionCompletionContract contract;
 
-  public SwipeAndDragHelper(@NonNull ActionCompletionContract contract) {
-    this.contract = contract;
-  }
-
-  @Override
-  public int getMovementFlags(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder) {
-    int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
-    return makeMovementFlags(dragFlags, 0);
-  }
-
-  @Override
-  public boolean onMove(
-          @NonNull RecyclerView recyclerView,
-          RecyclerView.ViewHolder viewHolder,
-          RecyclerView.ViewHolder target) {
-    contract.onViewMoved(viewHolder.getLayoutPosition(), target.getLayoutPosition());
-    return true;
-  }
-
-  @Override
-  public void onSwiped(@NonNull RecyclerView.ViewHolder viewHolder, int direction) {}
-
-  @Override
-  public boolean isLongPressDragEnabled() {
-    return false;
-  }
-
-  @Override
-  public void onChildDraw(
-          @NonNull Canvas c,
-          @NonNull RecyclerView recyclerView,
-          @NonNull RecyclerView.ViewHolder viewHolder,
-          float dX,
-          float dY,
-          int actionState,
-          boolean isCurrentlyActive) {
-    if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
-      float alpha = 1 - (Math.abs(dX) / recyclerView.getWidth());
-      viewHolder.itemView.setAlpha(alpha);
+    public SwipeAndDragHelper(@NonNull ActionCompletionContract contract) {
+        this.contract = contract;
+    }
+
+    @Override
+    public int getMovementFlags(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder) {
+        int dragFlags = ItemTouchHelper.UP | ItemTouchHelper.DOWN;
+        return makeMovementFlags(dragFlags, 0);
+    }
+
+    @Override
+    public boolean onMove(RecyclerView recyclerView, RecyclerView.ViewHolder viewHolder, RecyclerView.ViewHolder target) {
+        contract.onViewMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+        return true;
+    }
+
+    @Override
+    public void onSwiped(RecyclerView.ViewHolder viewHolder, int direction) {
+    }
+
+    @Override
+    public boolean isLongPressDragEnabled() {
+        return false;
+    }
+
+    @Override
+    public void onChildDraw(Canvas c,
+                            RecyclerView recyclerView,
+                            RecyclerView.ViewHolder viewHolder,
+                            float dX,
+                            float dY,
+                            int actionState,
+                            boolean isCurrentlyActive) {
+        if (actionState == ItemTouchHelper.ACTION_STATE_SWIPE) {
+            float alpha = 1 - (Math.abs(dX) / recyclerView.getWidth());
+            viewHolder.itemView.setAlpha(alpha);
+        }
+        super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
+    }
+
+    public interface ActionCompletionContract {
+        void onViewMoved(int oldPosition, int newPosition);
     }
-    super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive);
-  }
 
-  public interface ActionCompletionContract {
-    void onViewMoved(int oldPosition, int newPosition);
-  }
 }
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java b/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java
index 1f5f1e2b6..2a0fac4e7 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/TempUtils.java
@@ -14,67 +14,69 @@
 
 package code.name.monkey.retromusic.util;
 
-/** @author Hemanth S (h4h13). */
+/**
+ * @author Hemanth S (h4h13).
+ */
 public class TempUtils {
 
-  // Enums
-  public static final int TEMPO_STROLL = 0;
-  public static final int TEMPO_WALK = 1;
-  public static final int TEMPO_LIGHT_JOG = 2;
-  public static final int TEMPO_JOG = 3;
-  public static final int TEMPO_RUN = 4;
-  public static final int TEMPO_SPRINT = 5;
-  public static final int TEMPO_UNKNOWN = 6;
+    // Enums
+    public static final int TEMPO_STROLL = 0;
+    public static final int TEMPO_WALK = 1;
+    public static final int TEMPO_LIGHT_JOG = 2;
+    public static final int TEMPO_JOG = 3;
+    public static final int TEMPO_RUN = 4;
+    public static final int TEMPO_SPRINT = 5;
+    public static final int TEMPO_UNKNOWN = 6;
 
-  // take BPM as an int
-  public static int getTempoFromBPM(int bpm) {
+    // take BPM as an int
+    public static int getTempoFromBPM(int bpm) {
 
-    // STROLL less than 60
-    if (bpm < 60) {
-      return TEMPO_STROLL;
+        // STROLL less than 60
+        if (bpm < 60) {
+            return TEMPO_STROLL;
+        }
+
+        // WALK between 60 and 70, or between 120 and 140
+        else if (bpm < 70 || bpm >= 120 && bpm < 140) {
+            return TEMPO_WALK;
+        }
+
+        // LIGHT_JOG between 70 and 80, or between 140 and 160
+        else if (bpm < 80 || bpm >= 140 && bpm < 160) {
+            return TEMPO_LIGHT_JOG;
+        }
+
+        // JOG between 80 and 90, or between 160 and 180
+        else if (bpm < 90 || bpm >= 160 && bpm < 180) {
+            return TEMPO_JOG;
+        }
+
+        // RUN between 90 and 100, or between 180 and 200
+        else if (bpm < 100 || bpm >= 180 && bpm < 200) {
+            return TEMPO_RUN;
+        }
+
+        // SPRINT between 100 and 120
+        else if (bpm < 120) {
+            return TEMPO_SPRINT;
+        }
+
+        // UNKNOWN
+        else {
+            return TEMPO_UNKNOWN;
+        }
     }
 
-    // WALK between 60 and 70, or between 120 and 140
-    else if (bpm < 70 || bpm >= 120 && bpm < 140) {
-      return TEMPO_WALK;
-    }
+    // take BPM as a string
+    public static int getTempoFromBPM(String bpm) {
+        // cast to an int from string
+        try {
+            // convert the string to an int
+            return getTempoFromBPM(Integer.parseInt(bpm.trim()));
+        } catch (NumberFormatException nfe) {
 
-    // LIGHT_JOG between 70 and 80, or between 140 and 160
-    else if (bpm < 80 || bpm >= 140 && bpm < 160) {
-      return TEMPO_LIGHT_JOG;
+            //
+            return TEMPO_UNKNOWN;
+        }
     }
-
-    // JOG between 80 and 90, or between 160 and 180
-    else if (bpm < 90 || bpm >= 160 && bpm < 180) {
-      return TEMPO_JOG;
-    }
-
-    // RUN between 90 and 100, or between 180 and 200
-    else if (bpm < 100 || bpm >= 180 && bpm < 200) {
-      return TEMPO_RUN;
-    }
-
-    // SPRINT between 100 and 120
-    else if (bpm < 120) {
-      return TEMPO_SPRINT;
-    }
-
-    // UNKNOWN
-    else {
-      return TEMPO_UNKNOWN;
-    }
-  }
-
-  // take BPM as a string
-  public static int getTempoFromBPM(String bpm) {
-    // cast to an int from string
-    try {
-      // convert the string to an int
-      return getTempoFromBPM(Integer.parseInt(bpm.trim()));
-    } catch (NumberFormatException nfe) {
-
-      //
-      return TEMPO_UNKNOWN;
-    }
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt
new file mode 100644
index 000000000..30eb755cc
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ThemeManager.kt
@@ -0,0 +1,32 @@
+package code.name.monkey.retromusic.util
+
+import android.content.Context
+import android.content.res.Configuration.UI_MODE_NIGHT_MASK
+import android.content.res.Configuration.UI_MODE_NIGHT_YES
+import android.os.PowerManager
+import androidx.annotation.StyleRes
+import code.name.monkey.retromusic.R
+
+/**
+ * @author Paolo Valerdi
+ */
+object ThemeManager {
+
+    @StyleRes
+    fun getThemeResValue(context: Context): Int = when (PreferenceUtil.getInstance(context).generalThemeValue) {
+        "light" -> R.style.Theme_RetroMusic_Light
+        "dark" -> R.style.Theme_RetroMusic_Base
+        "auto" -> R.style.Theme_RetroMusic_FollowSystem
+        "black" -> R.style.Theme_RetroMusic_Black
+        else -> R.style.Theme_RetroMusic_FollowSystem
+    }
+
+    private fun isSystemDarkModeEnabled(context: Context): Boolean {
+        val isBatterySaverEnabled = (context.getSystemService(Context.POWER_SERVICE) as PowerManager?)?.isPowerSaveMode
+                ?: false
+        val isDarkModeEnabled = (context.resources.configuration.uiMode and UI_MODE_NIGHT_MASK) == UI_MODE_NIGHT_YES
+
+        return isBatterySaverEnabled or isDarkModeEnabled
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt b/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt
deleted file mode 100644
index 2019fa6a0..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/ThemedFastScroller.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.util
-
-import android.view.ViewGroup
-import code.name.monkey.appthemehelper.ThemeStore.Companion.accentColor
-import code.name.monkey.appthemehelper.util.ColorUtil.isColorLight
-import code.name.monkey.appthemehelper.util.MaterialValueHelper.getPrimaryTextColor
-import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.retromusic.views.PopupBackground
-import me.zhanghai.android.fastscroll.FastScroller
-import me.zhanghai.android.fastscroll.FastScrollerBuilder
-import me.zhanghai.android.fastscroll.PopupStyles
-import me.zhanghai.android.fastscroll.R
-
-object ThemedFastScroller {
-    fun create(view: ViewGroup): FastScroller {
-        val context = view.context
-        val color = accentColor(context)
-        val textColor = getPrimaryTextColor(context, isColorLight(color))
-        val fastScrollerBuilder = FastScrollerBuilder(view)
-        fastScrollerBuilder.useMd2Style()
-        fastScrollerBuilder.setPopupStyle { popupText ->
-            PopupStyles.MD2.accept(popupText)
-            popupText.background = PopupBackground(context, color)
-            popupText.setTextColor(textColor)
-        }
-
-        fastScrollerBuilder.setThumbDrawable(
-            TintHelper.createTintedDrawable(
-                context,
-                R.drawable.afs_md2_thumb,
-                color
-            )
-        )
-        return fastScrollerBuilder.build()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt
deleted file mode 100644
index 923e5dac4..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/UriUtil.kt
+++ /dev/null
@@ -1,26 +0,0 @@
-package code.name.monkey.retromusic.util
-
-import android.content.ContentUris
-import android.content.Context
-import android.net.Uri
-import android.os.Build
-import android.provider.MediaStore
-import androidx.annotation.RequiresApi
-import code.name.monkey.retromusic.Constants
-
-object UriUtil {
-    @RequiresApi(Build.VERSION_CODES.Q)
-    fun getUriFromPath(context: Context, path: String): Uri {
-        val uri = MediaStore.Files.getContentUri(MediaStore.VOLUME_EXTERNAL)
-        val proj = arrayOf(MediaStore.Files.FileColumns._ID)
-        context.contentResolver.query(
-            uri, proj, Constants.DATA + "=?", arrayOf(path), null
-        )?.use { cursor ->
-            if (cursor.count != 0) {
-                cursor.moveToFirst()
-                return ContentUris.withAppendedId(uri, cursor.getLong(0))
-            }
-        }
-        return Uri.EMPTY
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
index fdc23c380..3ad324b67 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/ViewUtil.kt
@@ -14,18 +14,28 @@
 
 package code.name.monkey.retromusic.util
 
+import android.animation.Animator
+import android.animation.ArgbEvaluator
+import android.animation.ObjectAnimator
+import android.content.Context
 import android.content.res.ColorStateList
 import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.PorterDuff
 import android.graphics.drawable.LayerDrawable
 import android.os.Build
 import android.view.View
+import android.view.animation.PathInterpolator
 import android.widget.ProgressBar
 import android.widget.SeekBar
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat.SRC_IN
+import androidx.annotation.ColorInt
+import androidx.core.view.ViewCompat
+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.retromusic.R
+import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
 
 object ViewUtil {
 
@@ -39,45 +49,50 @@ object ViewUtil {
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1) {
             val layerDrawable = progressSlider.progressDrawable as LayerDrawable
             val progressDrawable = layerDrawable.findDrawableByLayerId(android.R.id.progress)
-            progressDrawable.colorFilter =
-                BlendModeColorFilterCompat.createBlendModeColorFilterCompat(newColor, SRC_IN)
+            progressDrawable.setColorFilter(newColor, PorterDuff.Mode.SRC_IN)
         } else {
             progressSlider.progressTintList = ColorStateList.valueOf(newColor)
         }
     }
 
-
     fun setProgressDrawable(progressSlider: ProgressBar, newColor: Int) {
 
-        val layerDrawable = progressSlider.progressDrawable as LayerDrawable
+        val ld = progressSlider.progressDrawable as LayerDrawable
 
-        val progress = layerDrawable.findDrawableByLayerId(android.R.id.progress)
-        progress.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(newColor, SRC_IN)
+        val progress = ld.findDrawableByLayerId(android.R.id.progress)
+        progress.setColorFilter(newColor, PorterDuff.Mode.SRC_IN)
 
-        val background = layerDrawable.findDrawableByLayerId(android.R.id.background)
-        val primaryColor =
-            ATHUtil.resolveColor(progressSlider.context, android.R.attr.windowBackground)
-        background.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            MaterialValueHelper.getPrimaryDisabledTextColor(
-                progressSlider.context,
-                ColorUtil.isColorLight(primaryColor)
-            ), SRC_IN
+        val background = ld.findDrawableByLayerId(android.R.id.background)
+        val primaryColor = ATHUtil.resolveColor(progressSlider.context, android.R.attr.windowBackground)
+        background.setColorFilter(MaterialValueHelper.getPrimaryDisabledTextColor(progressSlider.context, ColorUtil.isColorLight(primaryColor)), PorterDuff.Mode.SRC_IN)
+
+        val secondaryProgress = ld.findDrawableByLayerId(android.R.id.secondaryProgress)
+        secondaryProgress?.setColorFilter(
+                ColorUtil.withAlpha(newColor, 0.65f), PorterDuff.Mode.SRC_IN
         )
+    }
 
-        val secondaryProgress = layerDrawable.findDrawableByLayerId(android.R.id.secondaryProgress)
-        secondaryProgress?.colorFilter =
-            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-                ColorUtil.withAlpha(
-                    newColor,
-                    0.65f
-                ), SRC_IN
-            )
+    private fun createColorAnimator(
+            target: Any, propertyName: String, @ColorInt startColor: Int, @ColorInt endColor: Int
+    ): Animator {
+        val animator: ObjectAnimator
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            animator = ObjectAnimator.ofArgb(target, propertyName, startColor, endColor)
+        } else {
+            animator = ObjectAnimator.ofInt(target, propertyName, startColor, endColor)
+            animator.setEvaluator(ArgbEvaluator())
+        }
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            animator.interpolator = PathInterpolator(0.4f, 0f, 1f, 1f)
+        }
+        animator.duration = RETRO_MUSIC_ANIM_TIME.toLong()
+        return animator
     }
 
     fun hitTest(v: View, x: Int, y: Int): Boolean {
-        val tx = (v.translationX + 0.5f).toInt()
-        val ty = (v.translationY + 0.5f).toInt()
+        val tx = (ViewCompat.getTranslationX(v) + 0.5f).toInt()
+        val ty = (ViewCompat.getTranslationY(v) + 0.5f).toInt()
         val left = v.left + tx
         val right = v.right + tx
         val top = v.top + ty
@@ -86,6 +101,18 @@ object ViewUtil {
         return x in left..right && y >= top && y <= bottom
     }
 
+    fun setUpFastScrollRecyclerViewColor(
+            context: Context,
+            recyclerView: FastScrollRecyclerView,
+            accentColor: Int = ThemeStore.accentColor(context)
+    ) {
+        recyclerView.setPopupBgColor(accentColor)
+        recyclerView.setPopupTextColor(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(accentColor)))
+        recyclerView.setThumbColor(accentColor)
+        recyclerView.setTrackColor(Color.TRANSPARENT)
+        recyclerView.setTrackColor(ColorUtil.withAlpha(ATHUtil.resolveColor(context, R.attr.colorControlNormal), 0.12f))
+    }
+
     fun convertDpToPixel(dp: Float, resources: Resources): Float {
         val metrics = resources.displayMetrics
         return dp * metrics.density
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java b/app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java
deleted file mode 100644
index 53dfc3e5d..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/ImageUtils.java
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-package code.name.monkey.retromusic.util.color;
-
-import android.graphics.Bitmap;
-import android.graphics.Bitmap.Config;
-import android.graphics.Canvas;
-import android.graphics.Matrix;
-import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.graphics.drawable.BitmapDrawable;
-import android.graphics.drawable.Drawable;
-
-/**
- * Utility class for image analysis and processing.
- *
- * @hide
- */
-public class ImageUtils {
-  // Amount (max is 255) that two channels can differ before the color is no longer "gray".
-  private static final int TOLERANCE = 20;
-  // Alpha amount for which values below are considered transparent.
-  private static final int ALPHA_TOLERANCE = 50;
-  // Size of the smaller bitmap we're actually going to scan.
-  private static final int COMPACT_BITMAP_SIZE = 64; // pixels
-  private final Matrix mTempMatrix = new Matrix();
-  private int[] mTempBuffer;
-  private Bitmap mTempCompactBitmap;
-  private Canvas mTempCompactBitmapCanvas;
-  private Paint mTempCompactBitmapPaint;
-
-  /**
-   * Classifies a color as grayscale or not. Grayscale here means "very close to a perfect gray"; if
-   * all three channels are approximately equal, this will return true.
-   *
-   * <p>Note that really transparent colors are always grayscale.
-   */
-  public static boolean isGrayscale(int color) {
-    int alpha = 0xFF & (color >> 24);
-    if (alpha < ALPHA_TOLERANCE) {
-      return true;
-    }
-    int r = 0xFF & (color >> 16);
-    int g = 0xFF & (color >> 8);
-    int b = 0xFF & color;
-    return Math.abs(r - g) < TOLERANCE
-        && Math.abs(r - b) < TOLERANCE
-        && Math.abs(g - b) < TOLERANCE;
-  }
-
-  /** Convert a drawable to a bitmap, scaled to fit within maxWidth and maxHeight. */
-  public static Bitmap buildScaledBitmap(Drawable drawable, int maxWidth, int maxHeight) {
-    if (drawable == null) {
-      return null;
-    }
-    int originalWidth = drawable.getIntrinsicWidth();
-    int originalHeight = drawable.getIntrinsicHeight();
-    if ((originalWidth <= maxWidth)
-        && (originalHeight <= maxHeight)
-        && (drawable instanceof BitmapDrawable)) {
-      return ((BitmapDrawable) drawable).getBitmap();
-    }
-    if (originalHeight <= 0 || originalWidth <= 0) {
-      return null;
-    }
-    // create a new bitmap, scaling down to fit the max dimensions of
-    // a large notification icon if necessary
-    float ratio =
-        Math.min(
-            (float) maxWidth / (float) originalWidth, (float) maxHeight / (float) originalHeight);
-    ratio = Math.min(1.0f, ratio);
-    int scaledWidth = (int) (ratio * originalWidth);
-    int scaledHeight = (int) (ratio * originalHeight);
-    Bitmap result = Bitmap.createBitmap(scaledWidth, scaledHeight, Config.ARGB_8888);
-    // and paint our app bitmap on it
-    Canvas canvas = new Canvas(result);
-    drawable.setBounds(0, 0, scaledWidth, scaledHeight);
-    drawable.draw(canvas);
-    return result;
-  }
-
-  /**
-   * Checks whether a bitmap is grayscale. Grayscale here means "very close to a perfect gray".
-   *
-   * <p>Instead of scanning every pixel in the bitmap, we first resize the bitmap to no more than
-   * COMPACT_BITMAP_SIZE^2 pixels using filtering. The hope is that any non-gray color elements will
-   * survive the squeezing process, contaminating the result with color.
-   */
-  public boolean isGrayscale(Bitmap bitmap) {
-    int height = bitmap.getHeight();
-    int width = bitmap.getWidth();
-
-    // shrink to a more manageable (yet hopefully no more or less colorful) size
-    if (height > COMPACT_BITMAP_SIZE || width > COMPACT_BITMAP_SIZE) {
-      if (mTempCompactBitmap == null) {
-        mTempCompactBitmap =
-            Bitmap.createBitmap(COMPACT_BITMAP_SIZE, COMPACT_BITMAP_SIZE, Config.ARGB_8888);
-        mTempCompactBitmapCanvas = new Canvas(mTempCompactBitmap);
-        mTempCompactBitmapPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-        mTempCompactBitmapPaint.setFilterBitmap(true);
-      }
-      mTempMatrix.reset();
-      mTempMatrix.setScale(
-          (float) COMPACT_BITMAP_SIZE / width, (float) COMPACT_BITMAP_SIZE / height, 0, 0);
-      mTempCompactBitmapCanvas.drawColor(0, PorterDuff.Mode.SRC); // select all, erase
-      mTempCompactBitmapCanvas.drawBitmap(bitmap, mTempMatrix, mTempCompactBitmapPaint);
-      bitmap = mTempCompactBitmap;
-      width = height = COMPACT_BITMAP_SIZE;
-    }
-    final int size = height * width;
-    ensureBufferSize(size);
-    bitmap.getPixels(mTempBuffer, 0, width, 0, 0, width, height);
-    for (int i = 0; i < size; i++) {
-      if (!isGrayscale(mTempBuffer[i])) {
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /** Makes sure that {@code mTempBuffer} has at least length {@code size}. */
-  private void ensureBufferSize(int size) {
-    if (mTempBuffer == null || mTempBuffer.length < size) {
-      mTempBuffer = new int[size];
-    }
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
index 693e7134c..16804d8a6 100644
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
+++ b/app/src/main/java/code/name/monkey/retromusic/util/color/MediaNotificationProcessor.java
@@ -1,484 +1,293 @@
 /*
- * Copyright (C) 2017 The Android Open Source Project
+ * Copyright (c) 2019 Hemanth Savarala.
  *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed under the GNU General Public License v3
  *
- *      http://www.apache.org/licenses/LICENSE-2.0
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
  *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
  */
 
 package code.name.monkey.retromusic.util.color;
 
-import static androidx.core.graphics.ColorUtils.RGBToXYZ;
-
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.os.Handler;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.FloatRange;
-import androidx.annotation.NonNull;
+import androidx.annotation.VisibleForTesting;
 import androidx.palette.graphics.Palette;
 
 import java.util.List;
 
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ColorUtil;
 
-/** A class the processes media notifications and extracts the right text and background colors. */
+/**
+ * @author Hemanth S (h4h13).
+ */
 public class MediaNotificationProcessor {
 
-  /** The fraction below which we select the vibrant instead of the light/dark vibrant color */
-  private static final float POPULATION_FRACTION_FOR_MORE_VIBRANT = 1.0f;
+    /**
+     * The fraction below which we select the vibrant instead of the light/dark vibrant color
+     */
+    private static final float POPULATION_FRACTION_FOR_MORE_VIBRANT = 1.0f;
+    /**
+     * Minimum saturation that a muted color must have if there exists if deciding between two
+     * colors
+     */
+    private static final float MIN_SATURATION_WHEN_DECIDING = 0.19f;
+    /**
+     * Minimum fraction that any color must have to be picked up as a text color
+     */
+    private static final double MINIMUM_IMAGE_FRACTION = 0.002;
+    /**
+     * The population fraction to select the dominant color as the text color over a the colored
+     * ones.
+     */
+    private static final float POPULATION_FRACTION_FOR_DOMINANT = 0.01f;
+    /**
+     * The population fraction to select a white or black color as the background over a color.
+     */
+    private static final float POPULATION_FRACTION_FOR_WHITE_OR_BLACK = 2.5f;
+    private static final float BLACK_MAX_LIGHTNESS = 0.08f;
+    private static final float WHITE_MIN_LIGHTNESS = 0.90f;
+    private static final int RESIZE_BITMAP_AREA = 150 * 150;
+    private final Context mContext;
+    /**
+     * The context of the notification. This is the app context of the package posting the
+     * notification.
+     */
+    private final Context mPackageContext;
+    private float[] mFilteredBackgroundHsl = null;
+    private Palette.Filter mBlackWhiteFilter = (rgb, hsl) -> !isWhiteOrBlack(hsl);
+    private boolean mIsLowPriority;
+    private onColorThing onColorThing;
 
-  /**
-   * Minimum saturation that a muted color must have if there exists if deciding between two colors
-   */
-  private static final float MIN_SATURATION_WHEN_DECIDING = 0.19f;
-
-  /** Minimum fraction that any color must have to be picked up as a text color */
-  private static final double MINIMUM_IMAGE_FRACTION = 0.002;
-
-  /**
-   * The population fraction to select the dominant color as the text color over a the colored ones.
-   */
-  private static final float POPULATION_FRACTION_FOR_DOMINANT = 0.01f;
-
-  /** The population fraction to select a white or black color as the background over a color. */
-  private static final float POPULATION_FRACTION_FOR_WHITE_OR_BLACK = 2.5f;
-
-  private static final float BLACK_MAX_LIGHTNESS = 0.08f;
-  private static final float WHITE_MIN_LIGHTNESS = 0.90f;
-  private static final int RESIZE_BITMAP_AREA = 150 * 150;
-  private static final ThreadLocal<double[]> TEMP_ARRAY = new ThreadLocal<>();
-  /**
-   * The lightness difference that has to be added to the primary text color to obtain the secondary
-   * text color when the background is light.
-   */
-  private static final int LIGHTNESS_TEXT_DIFFERENCE_LIGHT = 20;
-  /**
-   * The lightness difference that has to be added to the primary text color to obtain the secondary
-   * text color when the background is dark. A bit less then the above value, since it looks better
-   * on dark backgrounds.
-   */
-  private static final int LIGHTNESS_TEXT_DIFFERENCE_DARK = -10;
-
-  private float[] mFilteredBackgroundHsl = null;
-  private final Palette.Filter mBlackWhiteFilter =
-          (rgb, hsl) -> !isWhiteOrBlack(hsl);
-  private int backgroundColor;
-  private int secondaryTextColor;
-  private int primaryTextColor;
-  private int actionBarColor;
-  private Drawable drawable;
-  private final Context context;
-
-  public MediaNotificationProcessor(Context context, Drawable drawable) {
-    this.context = context;
-    this.drawable = drawable;
-    getMediaPalette();
-  }
-
-  public MediaNotificationProcessor(Context context, Bitmap bitmap) {
-    this.context = context;
-    this.drawable = new BitmapDrawable(context.getResources(), bitmap);
-    getMediaPalette();
-  }
-
-  public MediaNotificationProcessor(Context context) {
-    this.context = context;
-  }
-
-  private static boolean isColorLight(int backgroundColor) {
-    return calculateLuminance(backgroundColor) > 0.5f;
-  }
-
-  /**
-   * Returns the luminance of a color as a float between {@code 0.0} and {@code 1.0}.
-   *
-   * <p>Defined as the Y component in the XYZ representation of {@code color}.
-   */
-  @FloatRange(from = 0.0, to = 1.0)
-  private static double calculateLuminance(@ColorInt int color) {
-    final double[] result = getTempDouble3Array();
-    colorToXYZ(color, result);
-    // Luminance is the Y component
-    return result[1] / 100;
-  }
-
-  private static double[] getTempDouble3Array() {
-    double[] result = TEMP_ARRAY.get();
-    if (result == null) {
-      result = new double[3];
-      TEMP_ARRAY.set(result);
-    }
-    return result;
-  }
-
-  private static void colorToXYZ(@ColorInt int color, @NonNull double[] outXyz) {
-    RGBToXYZ(Color.red(color), Color.green(color), Color.blue(color), outXyz);
-  }
-
-  public void getPaletteAsync(
-      final OnPaletteLoadedListener onPaletteLoadedListener, Drawable drawable) {
-    this.drawable = drawable;
-    final Handler handler = new Handler();
-    new Thread(
-            () -> {
-              getMediaPalette();
-              handler.post(
-                      () -> onPaletteLoadedListener.onPaletteLoaded(MediaNotificationProcessor.this));
-            })
-        .start();
-  }
-
-  public void getPaletteAsync(OnPaletteLoadedListener onPaletteLoadedListener, Bitmap bitmap) {
-    this.drawable = new BitmapDrawable(context.getResources(), bitmap);
-    getPaletteAsync(onPaletteLoadedListener, this.drawable);
-  }
-
-  /** Processes a drawable and calculates the appropriate colors that should be used. */
-  private void getMediaPalette() {
-    Bitmap bitmap;
-    if (drawable != null) {
-      // We're transforming the builder, let's make sure all baked in RemoteViews are
-      // rebuilt!
-
-      int width = drawable.getIntrinsicWidth();
-      int height = drawable.getIntrinsicHeight();
-      int area = width * height;
-      if (area > RESIZE_BITMAP_AREA) {
-        double factor = Math.sqrt((float) RESIZE_BITMAP_AREA / area);
-        width = (int) (factor * width);
-        height = (int) (factor * height);
-      }
-      bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-      Canvas canvas = new Canvas(bitmap);
-      drawable.setBounds(0, 0, width, height);
-      drawable.draw(canvas);
-
-      // for the background we only take the left side of the image to ensure
-      // a smooth transition
-      Palette.Builder paletteBuilder =
-              Palette.from(bitmap)
-                      .setRegion(0, 0, bitmap.getWidth() / 2, bitmap.getHeight())
-                      .clearFilters() // we want all colors, red / white / black ones too!
-                      .resizeBitmapArea(RESIZE_BITMAP_AREA);
-      Palette palette;
-      backgroundColor = findBackgroundColorAndFilter(drawable);
-      // we want most of the full region again, slightly shifted to the right
-      float textColorStartWidthFraction = 0.4f;
-      paletteBuilder.setRegion(
-              (int) (bitmap.getWidth() * textColorStartWidthFraction),
-              0,
-              bitmap.getWidth(),
-              bitmap.getHeight());
-      if (mFilteredBackgroundHsl != null) {
-        paletteBuilder.addFilter(
-                (rgb, hsl) -> {
-                  // at least 10 degrees hue difference
-                  float diff = Math.abs(hsl[0] - mFilteredBackgroundHsl[0]);
-                  return diff > 10 && diff < 350;
-                });
-      }
-      paletteBuilder.addFilter(mBlackWhiteFilter);
-      palette = paletteBuilder.generate();
-      int foregroundColor = selectForegroundColor(backgroundColor, palette);
-      ensureColors(backgroundColor, foregroundColor);
-    }
-  }
-
-  private int selectForegroundColor(int backgroundColor, Palette palette) {
-    if (isColorLight(backgroundColor)) {
-      return selectForegroundColorForSwatches(
-          palette.getDarkVibrantSwatch(),
-          palette.getVibrantSwatch(),
-          palette.getDarkMutedSwatch(),
-          palette.getMutedSwatch(),
-          palette.getDominantSwatch(),
-          Color.BLACK);
-    } else {
-      return selectForegroundColorForSwatches(
-          palette.getLightVibrantSwatch(),
-          palette.getVibrantSwatch(),
-          palette.getLightMutedSwatch(),
-          palette.getMutedSwatch(),
-          palette.getDominantSwatch(),
-          Color.WHITE);
-    }
-  }
-
-  public boolean isLight() {
-    return isColorLight(backgroundColor);
-  }
-
-  private int selectForegroundColorForSwatches(
-      Palette.Swatch moreVibrant,
-      Palette.Swatch vibrant,
-      Palette.Swatch moreMutedSwatch,
-      Palette.Swatch mutedSwatch,
-      Palette.Swatch dominantSwatch,
-      int fallbackColor) {
-    Palette.Swatch coloredCandidate = selectVibrantCandidate(moreVibrant, vibrant);
-    if (coloredCandidate == null) {
-      coloredCandidate = selectMutedCandidate(mutedSwatch, moreMutedSwatch);
-    }
-    if (coloredCandidate != null) {
-      if (dominantSwatch == coloredCandidate) {
-        return coloredCandidate.getRgb();
-      } else if ((float) coloredCandidate.getPopulation() / dominantSwatch.getPopulation()
-              < POPULATION_FRACTION_FOR_DOMINANT
-          && dominantSwatch.getHsl()[1] > MIN_SATURATION_WHEN_DECIDING) {
-        return dominantSwatch.getRgb();
-      } else {
-        return coloredCandidate.getRgb();
-      }
-    } else if (hasEnoughPopulation(dominantSwatch)) {
-      return dominantSwatch.getRgb();
-    } else {
-      return fallbackColor;
-    }
-  }
-
-  private Palette.Swatch selectMutedCandidate(Palette.Swatch first, Palette.Swatch second) {
-    boolean firstValid = hasEnoughPopulation(first);
-    boolean secondValid = hasEnoughPopulation(second);
-    if (firstValid && secondValid) {
-      float firstSaturation = first.getHsl()[1];
-      float secondSaturation = second.getHsl()[1];
-      float populationFraction = first.getPopulation() / (float) second.getPopulation();
-      if (firstSaturation * populationFraction > secondSaturation) {
-        return first;
-      } else {
-        return second;
-      }
-    } else if (firstValid) {
-      return first;
-    } else if (secondValid) {
-      return second;
-    }
-    return null;
-  }
-
-  private Palette.Swatch selectVibrantCandidate(Palette.Swatch first, Palette.Swatch second) {
-    boolean firstValid = hasEnoughPopulation(first);
-    boolean secondValid = hasEnoughPopulation(second);
-    if (firstValid && secondValid) {
-      int firstPopulation = first.getPopulation();
-      int secondPopulation = second.getPopulation();
-      if (firstPopulation / (float) secondPopulation < POPULATION_FRACTION_FOR_MORE_VIBRANT) {
-        return second;
-      } else {
-        return first;
-      }
-    } else if (firstValid) {
-      return first;
-    } else if (secondValid) {
-      return second;
-    }
-    return null;
-  }
-
-  private boolean hasEnoughPopulation(Palette.Swatch swatch) {
-    // We want a fraction that is at least 1% of the image
-    return swatch != null
-        && (swatch.getPopulation() / (float) RESIZE_BITMAP_AREA > MINIMUM_IMAGE_FRACTION);
-  }
-
-  public int findBackgroundColorAndFilter(Drawable drawable) {
-    int width = drawable.getIntrinsicWidth();
-    int height = drawable.getIntrinsicHeight();
-    int area = width * height;
-
-    double factor = Math.sqrt((float) RESIZE_BITMAP_AREA / area);
-    width = (int) (factor * width);
-    height = (int) (factor * height);
-
-    Bitmap bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
-    Canvas canvas = new Canvas(bitmap);
-    drawable.setBounds(0, 0, width, height);
-    drawable.draw(canvas);
-
-    // for the background we only take the left side of the image to ensure
-    // a smooth transition
-    Palette.Builder paletteBuilder =
-        Palette.from(bitmap)
-            .setRegion(0, 0, bitmap.getWidth() / 2, bitmap.getHeight())
-            .clearFilters() // we want all colors, red / white / black ones too!
-            .resizeBitmapArea(RESIZE_BITMAP_AREA);
-    Palette palette = paletteBuilder.generate();
-    // by default we use the dominant palette
-    Palette.Swatch dominantSwatch = palette.getDominantSwatch();
-    if (dominantSwatch == null) {
-      // We're not filtering on white or black
-      mFilteredBackgroundHsl = null;
-      return Color.WHITE;
+    public MediaNotificationProcessor(Context context, Context packageContext, onColorThing thing) {
+        this(context, packageContext);
+        onColorThing = thing;
     }
 
-    if (!isWhiteOrBlack(dominantSwatch.getHsl())) {
-      mFilteredBackgroundHsl = dominantSwatch.getHsl();
-      return dominantSwatch.getRgb();
+    @VisibleForTesting
+    MediaNotificationProcessor(Context context, Context packageContext) {
+        mContext = context;
+        mPackageContext = packageContext;
     }
-    // Oh well, we selected black or white. Lets look at the second color!
-    List<Palette.Swatch> swatches = palette.getSwatches();
-    float highestNonWhitePopulation = -1;
-    Palette.Swatch second = null;
-    for (Palette.Swatch swatch : swatches) {
-      if (swatch != dominantSwatch
-          && swatch.getPopulation() > highestNonWhitePopulation
-          && !isWhiteOrBlack(swatch.getHsl())) {
-        second = swatch;
-        highestNonWhitePopulation = swatch.getPopulation();
-      }
+
+    /**
+     * Processes a builder of a media notification and calculates the appropriate colors that should
+     * be used.
+     *
+     * @param notification the notification that is being processed
+     * @param builder      the recovered builder for the notification. this will be modified
+     */
+    public int processNotification(Bitmap image) {
+        Bitmap bitmap;
+        Drawable drawable = new BitmapDrawable(mPackageContext.getResources(), image);
+
+        int backgroundColor = 0;
+
+        int width = drawable.getIntrinsicWidth();
+        int height = drawable.getIntrinsicHeight();
+        int area = width * height;
+        if (area > RESIZE_BITMAP_AREA) {
+            double factor = Math.sqrt((float) RESIZE_BITMAP_AREA / area);
+            width = (int) (factor * width);
+            height = (int) (factor * height);
+        }
+        bitmap = Bitmap.createBitmap(width, height, Bitmap.Config.ARGB_8888);
+        Canvas canvas = new Canvas(bitmap);
+        drawable.setBounds(0, 0, width, height);
+        drawable.draw(canvas);
+        // for the background we only take the left side of the image to ensure
+        // a smooth transition
+        Palette.Builder paletteBuilder = Palette.from(bitmap)
+                .setRegion(0, 0, bitmap.getWidth() / 2, bitmap.getHeight())
+                .clearFilters() // we want all colors, red / white / black ones too!
+                .resizeBitmapArea(RESIZE_BITMAP_AREA);
+        Palette palette = paletteBuilder.generate();
+        backgroundColor = findBackgroundColorAndFilter(palette);
+        // we want most of the full region again, slightly shifted to the right
+
+
+        float textColorStartWidthFraction = 0.4f;
+        paletteBuilder.setRegion((int) (bitmap.getWidth() * textColorStartWidthFraction), 0,
+                bitmap.getWidth(),
+                bitmap.getHeight());
+        if (mFilteredBackgroundHsl != null) {
+            paletteBuilder.addFilter((rgb, hsl) -> {
+                // at least 10 degrees hue difference
+                float diff = Math.abs(hsl[0] - mFilteredBackgroundHsl[0]);
+                return diff > 10 && diff < 350;
+            });
+        }
+        paletteBuilder.addFilter(mBlackWhiteFilter);
+        palette = paletteBuilder.generate();
+        int foregroundColor = selectForegroundColor(backgroundColor, palette);
+
+        onColorThing.bothColor(backgroundColor, foregroundColor);
+        return backgroundColor;
     }
-    if (second == null) {
-      // We're not filtering on white or black
-      mFilteredBackgroundHsl = null;
-      return dominantSwatch.getRgb();
-    }
-    if (dominantSwatch.getPopulation() / highestNonWhitePopulation
-        > POPULATION_FRACTION_FOR_WHITE_OR_BLACK) {
-      // The dominant swatch is very dominant, lets take it!
-      // We're not filtering on white or black
-      mFilteredBackgroundHsl = null;
-      return dominantSwatch.getRgb();
-    } else {
-      mFilteredBackgroundHsl = second.getHsl();
-      return second.getRgb();
-    }
-  }
 
-  private boolean isWhiteOrBlack(float[] hsl) {
-    return isBlack(hsl) || isWhite(hsl);
-  }
-
-  /** @return true if the color represents a color which is close to black. */
-  private boolean isBlack(float[] hslColor) {
-    return hslColor[2] <= BLACK_MAX_LIGHTNESS;
-  }
-
-  /** @return true if the color represents a color which is close to white. */
-  private boolean isWhite(float[] hslColor) {
-    return hslColor[2] >= WHITE_MIN_LIGHTNESS;
-  }
-
-  private void ensureColors(int backgroundColor, int mForegroundColor) {
-    {
-      double backLum = NotificationColorUtil.calculateLuminance(backgroundColor);
-      double textLum = NotificationColorUtil.calculateLuminance(mForegroundColor);
-      double contrast = NotificationColorUtil.calculateContrast(mForegroundColor, backgroundColor);
-      // We only respect the given colors if worst case Black or White still has
-      // contrast
-      boolean backgroundLight =
-          backLum > textLum
-                  && NotificationColorUtil.satisfiesTextContrast(backgroundColor, Color.BLACK)
-              || backLum <= textLum
-                  && !NotificationColorUtil.satisfiesTextContrast(backgroundColor, Color.WHITE);
-      if (contrast < 4.5f) {
-        if (backgroundLight) {
-          secondaryTextColor =
-              NotificationColorUtil.findContrastColor(
-                  mForegroundColor, backgroundColor, true /* findFG */, 4.5f);
-          primaryTextColor =
-              NotificationColorUtil.changeColorLightness(
-                  secondaryTextColor, -LIGHTNESS_TEXT_DIFFERENCE_LIGHT);
+    private int selectForegroundColor(int backgroundColor, Palette palette) {
+        if (ColorUtil.INSTANCE.isColorLight(backgroundColor)) {
+            return selectForegroundColorForSwatches(palette.getDarkVibrantSwatch(),
+                    palette.getVibrantSwatch(),
+                    palette.getDarkMutedSwatch(),
+                    palette.getMutedSwatch(),
+                    palette.getDominantSwatch(),
+                    Color.BLACK);
         } else {
-          secondaryTextColor =
-              NotificationColorUtil.findContrastColorAgainstDark(
-                  mForegroundColor, backgroundColor, true /* findFG */, 4.5f);
-          primaryTextColor =
-              NotificationColorUtil.changeColorLightness(
-                  secondaryTextColor, -LIGHTNESS_TEXT_DIFFERENCE_DARK);
+            return selectForegroundColorForSwatches(palette.getLightVibrantSwatch(),
+                    palette.getVibrantSwatch(),
+                    palette.getLightMutedSwatch(),
+                    palette.getMutedSwatch(),
+                    palette.getDominantSwatch(),
+                    Color.WHITE);
         }
-      } else {
-        primaryTextColor = mForegroundColor;
-        secondaryTextColor =
-            NotificationColorUtil.changeColorLightness(
-                primaryTextColor,
-                backgroundLight ? LIGHTNESS_TEXT_DIFFERENCE_LIGHT : LIGHTNESS_TEXT_DIFFERENCE_DARK);
-        if (NotificationColorUtil.calculateContrast(secondaryTextColor, backgroundColor) < 4.5f) {
-          // oh well the secondary is not good enough
-          if (backgroundLight) {
-            secondaryTextColor =
-                NotificationColorUtil.findContrastColor(
-                    secondaryTextColor, backgroundColor, true /* findFG */, 4.5f);
-          } else {
-            secondaryTextColor =
-                NotificationColorUtil.findContrastColorAgainstDark(
-                    secondaryTextColor, backgroundColor, true /* findFG */, 4.5f);
-          }
-          primaryTextColor =
-              NotificationColorUtil.changeColorLightness(
-                  secondaryTextColor,
-                  backgroundLight
-                      ? -LIGHTNESS_TEXT_DIFFERENCE_LIGHT
-                      : -LIGHTNESS_TEXT_DIFFERENCE_DARK);
+    }
+
+    private int selectForegroundColorForSwatches(Palette.Swatch moreVibrant,
+                                                 Palette.Swatch vibrant, Palette.Swatch moreMutedSwatch, Palette.Swatch mutedSwatch,
+                                                 Palette.Swatch dominantSwatch, int fallbackColor) {
+        Palette.Swatch coloredCandidate = selectVibrantCandidate(moreVibrant, vibrant);
+        if (coloredCandidate == null) {
+            coloredCandidate = selectMutedCandidate(mutedSwatch, moreMutedSwatch);
+        }
+        if (coloredCandidate != null) {
+            if (dominantSwatch == coloredCandidate) {
+                return coloredCandidate.getRgb();
+            } else if ((float) coloredCandidate.getPopulation() / dominantSwatch.getPopulation()
+                    < POPULATION_FRACTION_FOR_DOMINANT
+                    && dominantSwatch.getHsl()[1] > MIN_SATURATION_WHEN_DECIDING) {
+                return dominantSwatch.getRgb();
+            } else {
+                return coloredCandidate.getRgb();
+            }
+        } else if (hasEnoughPopulation(dominantSwatch)) {
+            return dominantSwatch.getRgb();
+        } else {
+            return fallbackColor;
         }
-      }
     }
-    actionBarColor = NotificationColorUtil.resolveActionBarColor(context, backgroundColor);
-  }
 
-  public int getPrimaryTextColor() {
-    return primaryTextColor;
-  }
-
-  public int getSecondaryTextColor() {
-    return secondaryTextColor;
-  }
-
-  public int getActionBarColor() {
-    return actionBarColor;
-  }
-
-  public int getBackgroundColor() {
-    return backgroundColor;
-  }
-
-  boolean isWhiteColor(int color) {
-    return calculateLuminance(color) > 0.6f;
-  }
-
-  public int getMightyColor() {
-    boolean isDarkBg =
-        ColorUtil.INSTANCE.isColorLight(
-            ATHUtil.INSTANCE.resolveColor(context, com.google.android.material.R.attr.colorSurface));
-    if (isDarkBg) {
-      if (isColorLight(backgroundColor)) {
-        return primaryTextColor;
-      } else {
-        return backgroundColor;
-      }
-    } else {
-      if (isColorLight(backgroundColor)) {
-        return backgroundColor;
-      } else {
-        return primaryTextColor;
-      }
+    private Palette.Swatch selectMutedCandidate(Palette.Swatch first,
+                                                Palette.Swatch second) {
+        boolean firstValid = hasEnoughPopulation(first);
+        boolean secondValid = hasEnoughPopulation(second);
+        if (firstValid && secondValid) {
+            float firstSaturation = first.getHsl()[1];
+            float secondSaturation = second.getHsl()[1];
+            float populationFraction = first.getPopulation() / (float) second.getPopulation();
+            if (firstSaturation * populationFraction > secondSaturation) {
+                return first;
+            } else {
+                return second;
+            }
+        } else if (firstValid) {
+            return first;
+        } else if (secondValid) {
+            return second;
+        }
+        return null;
     }
-  }
 
-  public interface OnPaletteLoadedListener {
-    void onPaletteLoaded(MediaNotificationProcessor mediaNotificationProcessor);
-  }
+    private Palette.Swatch selectVibrantCandidate(Palette.Swatch first, Palette.Swatch second) {
+        boolean firstValid = hasEnoughPopulation(first);
+        boolean secondValid = hasEnoughPopulation(second);
+        if (firstValid && secondValid) {
+            int firstPopulation = first.getPopulation();
+            int secondPopulation = second.getPopulation();
+            if (firstPopulation / (float) secondPopulation
+                    < POPULATION_FRACTION_FOR_MORE_VIBRANT) {
+                return second;
+            } else {
+                return first;
+            }
+        } else if (firstValid) {
+            return first;
+        } else if (secondValid) {
+            return second;
+        }
+        return null;
+    }
 
-  public static MediaNotificationProcessor errorColor(Context context) {
-    MediaNotificationProcessor errorColors = new MediaNotificationProcessor(context);
-    errorColors.backgroundColor = -15724528;
-    errorColors.primaryTextColor = -6974059;
-    errorColors.secondaryTextColor = -8684677;
-    errorColors.actionBarColor = -6974059;
-    return errorColors;
-  }
+    private boolean hasEnoughPopulation(Palette.Swatch swatch) {
+        // We want a fraction that is at least 1% of the image
+        return swatch != null
+                && (swatch.getPopulation() / (float) RESIZE_BITMAP_AREA > MINIMUM_IMAGE_FRACTION);
+    }
+
+    private int findBackgroundColorAndFilter(Palette palette) {
+        // by default we use the dominant palette
+        Palette.Swatch dominantSwatch = palette.getDominantSwatch();
+        if (dominantSwatch == null) {
+            // We're not filtering on white or black
+            mFilteredBackgroundHsl = null;
+            return Color.WHITE;
+        }
+        if (!isWhiteOrBlack(dominantSwatch.getHsl())) {
+            mFilteredBackgroundHsl = dominantSwatch.getHsl();
+            return dominantSwatch.getRgb();
+        }
+        // Oh well, we selected black or white. Lets look at the second color!
+        List<Palette.Swatch> swatches = palette.getSwatches();
+        float highestNonWhitePopulation = -1;
+        Palette.Swatch second = null;
+        for (Palette.Swatch swatch : swatches) {
+            if (swatch != dominantSwatch
+                    && swatch.getPopulation() > highestNonWhitePopulation
+                    && !isWhiteOrBlack(swatch.getHsl())) {
+                second = swatch;
+                highestNonWhitePopulation = swatch.getPopulation();
+            }
+        }
+        if (second == null) {
+            // We're not filtering on white or black
+            mFilteredBackgroundHsl = null;
+            return dominantSwatch.getRgb();
+        }
+        if (dominantSwatch.getPopulation() / highestNonWhitePopulation
+                > POPULATION_FRACTION_FOR_WHITE_OR_BLACK) {
+            // The dominant swatch is very dominant, lets take it!
+            // We're not filtering on white or black
+            mFilteredBackgroundHsl = null;
+            return dominantSwatch.getRgb();
+        } else {
+            mFilteredBackgroundHsl = second.getHsl();
+            return second.getRgb();
+        }
+    }
+
+    private boolean isWhiteOrBlack(float[] hsl) {
+        return isBlack(hsl) || isWhite(hsl);
+    }
+
+    /**
+     * @return true if the color represents a color which is close to black.
+     */
+    private boolean isBlack(float[] hslColor) {
+        return hslColor[2] <= BLACK_MAX_LIGHTNESS;
+    }
+
+    /**
+     * @return true if the color represents a color which is close to white.
+     */
+    private boolean isWhite(float[] hslColor) {
+        return hslColor[2] >= WHITE_MIN_LIGHTNESS;
+    }
+
+    public void setIsLowPriority(boolean isLowPriority) {
+        mIsLowPriority = isLowPriority;
+    }
+
+    public interface onColorThing {
+        void bothColor(int i, int i2);
+    }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java b/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
deleted file mode 100644
index f23b643f0..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/color/NotificationColorUtil.java
+++ /dev/null
@@ -1,991 +0,0 @@
-/*
- * Copyright (C) 2017 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License
- */
-
-package code.name.monkey.retromusic.util.color;
-
-import android.app.Notification;
-import android.content.Context;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-import android.text.style.BackgroundColorSpan;
-import android.text.style.CharacterStyle;
-import android.text.style.ForegroundColorSpan;
-import android.text.style.TextAppearanceSpan;
-import android.util.Log;
-import android.util.Pair;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.FloatRange;
-import androidx.annotation.IntRange;
-import androidx.annotation.NonNull;
-import androidx.core.content.ContextCompat;
-
-import java.util.Locale;
-import java.util.WeakHashMap;
-
-/**
- * Helper class to process legacy (Holo) notifications to make them look like material
- * notifications.
- *
- * @hide
- */
-public class NotificationColorUtil {
-
-  private static final String TAG = "NotificationColorUtil";
-  private static final boolean DEBUG = false;
-
-  private static final Object sLock = new Object();
-  private static NotificationColorUtil sInstance;
-
-  private final ImageUtils mImageUtils = new ImageUtils();
-  private final WeakHashMap<Bitmap, Pair<Boolean, Integer>> mGrayscaleBitmapCache =
-          new WeakHashMap<>();
-
-  private final int mGrayscaleIconMaxSize; // @dimen/notification_large_icon_width (64dp)
-
-  private NotificationColorUtil(Context context) {
-    mGrayscaleIconMaxSize =
-        context.getResources().getDimensionPixelSize(androidx.core.R.dimen.notification_large_icon_width);
-  }
-
-  public static NotificationColorUtil getInstance(Context context) {
-    synchronized (sLock) {
-      if (sInstance == null) {
-        sInstance = new NotificationColorUtil(context);
-      }
-      return sInstance;
-    }
-  }
-
-  /**
-   * Clears all color spans of a text
-   *
-   * @param charSequence the input text
-   * @return the same text but without color spans
-   */
-  public static CharSequence clearColorSpans(CharSequence charSequence) {
-    if (charSequence instanceof Spanned) {
-      Spanned ss = (Spanned) charSequence;
-      Object[] spans = ss.getSpans(0, ss.length(), Object.class);
-      SpannableStringBuilder builder = new SpannableStringBuilder(ss.toString());
-      for (Object span : spans) {
-        Object resultSpan = span;
-        if (resultSpan instanceof CharacterStyle) {
-          resultSpan = ((CharacterStyle) span).getUnderlying();
-        }
-        if (resultSpan instanceof TextAppearanceSpan) {
-          TextAppearanceSpan originalSpan = (TextAppearanceSpan) resultSpan;
-          if (originalSpan.getTextColor() != null) {
-            resultSpan =
-                new TextAppearanceSpan(
-                    originalSpan.getFamily(),
-                    originalSpan.getTextStyle(),
-                    originalSpan.getTextSize(),
-                    null,
-                    originalSpan.getLinkTextColor());
-          }
-        } else if (resultSpan instanceof ForegroundColorSpan
-            || (resultSpan instanceof BackgroundColorSpan)) {
-          continue;
-        } else {
-          resultSpan = span;
-        }
-        builder.setSpan(
-            resultSpan, ss.getSpanStart(span), ss.getSpanEnd(span), ss.getSpanFlags(span));
-      }
-      return builder;
-    }
-    return charSequence;
-  }
-
-  //    /**
-  //     * Inverts all the grayscale colors set by {@link android.text.style.TextAppearanceSpan}s on
-  //     * the text.
-  //     *
-  //     * @param charSequence The text to process.
-  //     * @return The color inverted text.
-  //     */
-  //    public CharSequence invertCharSequenceColors(CharSequence charSequence) {
-  //        if (charSequence instanceof Spanned) {
-  //            Spanned ss = (Spanned) charSequence;
-  //            Object[] spans = ss.getSpans(0, ss.length(), Object.class);
-  //            SpannableStringBuilder builder = new SpannableStringBuilder(ss.toString());
-  //            for (Object span : spans) {
-  //                Object resultSpan = span;
-  //                if (resultSpan instanceof CharacterStyle) {
-  //                    resultSpan = ((CharacterStyle) span).getUnderlying();
-  //                }
-  //                if (resultSpan instanceof TextAppearanceSpan) {
-  //                    TextAppearanceSpan processedSpan = processTextAppearanceSpan(
-  //                            (TextAppearanceSpan) span);
-  //                    if (processedSpan != resultSpan) {
-  //                        resultSpan = processedSpan;
-  //                    } else {
-  //                        // we need to still take the orgininal for wrapped spans
-  //                        resultSpan = span;
-  //                    }
-  //                } else if (resultSpan instanceof ForegroundColorSpan) {
-  //                    ForegroundColorSpan originalSpan = (ForegroundColorSpan) resultSpan;
-  //                    int foregroundColor = originalSpan.getForegroundColor();
-  //                    resultSpan = new ForegroundColorSpan(processColor(foregroundColor));
-  //                } else {
-  //                    resultSpan = span;
-  //                }
-  //                builder.setSpan(resultSpan, ss.getSpanStart(span), ss.getSpanEnd(span),
-  //                        ss.getSpanFlags(span));
-  //            }
-  //            return builder;
-  //        }
-  //        return charSequence;
-  //    }
-
-  //    private TextAppearanceSpan processTextAppearanceSpan(TextAppearanceSpan span) {
-  //        ColorStateList colorStateList = span.getTextColor();
-  //        if (colorStateList != null) {
-  //            int[] colors = colorStateList.getColors();
-  //            boolean changed = false;
-  //            for (int i = 0; i < colors.length; i++) {
-  //                if (ImageUtils.isGrayscale(colors[i])) {
-  //
-  //                    // Allocate a new array so we don't change the colors in the old color state
-  //                    // list.
-  //                    if (!changed) {
-  //                        colors = Arrays.copyOf(colors, colors.length);
-  //                    }
-  //                    colors[i] = processColor(colors[i]);
-  //                    changed = true;
-  //                }
-  //            }
-  //            if (changed) {
-  //                return new TextAppearanceSpan(
-  //                        span.getFamily(), span.getTextStyle(), span.getTextSize(),
-  //                        new ColorStateList(colorStateList.getStates(), colors),
-  //                        span.getLinkTextColor());
-  //            }
-  //        }
-  //        return span;
-  //    }
-
-  /**
-   * Finds a suitable color such that there's enough contrast.
-   *
-   * @param color the color to start searching from.
-   * @param other the color to ensure contrast against. Assumed to be lighter than {@param color}
-   * @param findFg if true, we assume {@param color} is a foreground, otherwise a background.
-   * @param minRatio the minimum contrast ratio required.
-   * @return a color with the same hue as {@param color}, potentially darkened to meet the contrast
-   *     ratio.
-   */
-  public static int findContrastColor(int color, int other, boolean findFg, double minRatio) {
-    int fg = findFg ? color : other;
-    int bg = findFg ? other : color;
-    if (ColorUtilsFromCompat.calculateContrast(fg, bg) >= minRatio) {
-      return color;
-    }
-
-    double[] lab = new double[3];
-    ColorUtilsFromCompat.colorToLAB(findFg ? fg : bg, lab);
-
-    double low = 0, high = lab[0];
-    final double a = lab[1], b = lab[2];
-    for (int i = 0; i < 15 && high - low > 0.00001; i++) {
-      final double l = (low + high) / 2;
-      if (findFg) {
-        fg = ColorUtilsFromCompat.LABToColor(l, a, b);
-      } else {
-        bg = ColorUtilsFromCompat.LABToColor(l, a, b);
-      }
-      if (ColorUtilsFromCompat.calculateContrast(fg, bg) > minRatio) {
-        low = l;
-      } else {
-        high = l;
-      }
-    }
-    return ColorUtilsFromCompat.LABToColor(low, a, b);
-  }
-
-  /**
-   * Finds a suitable alpha such that there's enough contrast.
-   *
-   * @param color the color to start searching from.
-   * @param backgroundColor the color to ensure contrast against.
-   * @param minRatio the minimum contrast ratio required.
-   * @return the same color as {@param color} with potentially modified alpha to meet contrast
-   */
-  public static int findAlphaToMeetContrast(int color, int backgroundColor, double minRatio) {
-    int fg = color;
-    int bg = backgroundColor;
-    if (ColorUtilsFromCompat.calculateContrast(fg, bg) >= minRatio) {
-      return color;
-    }
-    int startAlpha = Color.alpha(color);
-    int r = Color.red(color);
-    int g = Color.green(color);
-    int b = Color.blue(color);
-
-    int low = startAlpha, high = 255;
-    for (int i = 0; i < 15 && high - low > 0; i++) {
-      final int alpha = (low + high) / 2;
-      fg = Color.argb(alpha, r, g, b);
-      if (ColorUtilsFromCompat.calculateContrast(fg, bg) > minRatio) {
-        high = alpha;
-      } else {
-        low = alpha;
-      }
-    }
-    return Color.argb(high, r, g, b);
-  }
-
-  /**
-   * Finds a suitable color such that there's enough contrast.
-   *
-   * @param color the color to start searching from.
-   * @param other the color to ensure contrast against. Assumed to be darker than {@param color}
-   * @param findFg if true, we assume {@param color} is a foreground, otherwise a background.
-   * @param minRatio the minimum contrast ratio required.
-   * @return a color with the same hue as {@param color}, potentially darkened to meet the contrast
-   *     ratio.
-   */
-  public static int findContrastColorAgainstDark(
-      int color, int other, boolean findFg, double minRatio) {
-    int fg = findFg ? color : other;
-    int bg = findFg ? other : color;
-    if (ColorUtilsFromCompat.calculateContrast(fg, bg) >= minRatio) {
-      return color;
-    }
-
-    float[] hsl = new float[3];
-    ColorUtilsFromCompat.colorToHSL(findFg ? fg : bg, hsl);
-
-    float low = hsl[2], high = 1;
-    for (int i = 0; i < 15 && high - low > 0.00001; i++) {
-      final float l = (low + high) / 2;
-      hsl[2] = l;
-      if (findFg) {
-        fg = ColorUtilsFromCompat.HSLToColor(hsl);
-      } else {
-        bg = ColorUtilsFromCompat.HSLToColor(hsl);
-      }
-      if (ColorUtilsFromCompat.calculateContrast(fg, bg) > minRatio) {
-        high = l;
-      } else {
-        low = l;
-      }
-    }
-    return findFg ? fg : bg;
-  }
-
-  public static int ensureTextContrastOnBlack(int color) {
-    return findContrastColorAgainstDark(color, Color.BLACK, true /* fg */, 12);
-  }
-
-  /**
-   * Finds a large text color with sufficient contrast over bg that has the same or darker hue as
-   * the original color, depending on the value of {@code isBgDarker}.
-   *
-   * @param isBgDarker {@code true} if {@code bg} is darker than {@code color}.
-   */
-  public static int ensureLargeTextContrast(int color, int bg, boolean isBgDarker) {
-    return isBgDarker
-        ? findContrastColorAgainstDark(color, bg, true, 3)
-        : findContrastColor(color, bg, true, 3);
-  }
-
-  /**
-   * Finds a text color with sufficient contrast over bg that has the same or darker hue as the
-   * original color, depending on the value of {@code isBgDarker}.
-   *
-   * @param isBgDarker {@code true} if {@code bg} is darker than {@code color}.
-   */
-  private static int ensureTextContrast(int color, int bg, boolean isBgDarker) {
-    return isBgDarker
-        ? findContrastColorAgainstDark(color, bg, true, 4.5)
-        : findContrastColor(color, bg, true, 4.5);
-  }
-
-  /**
-   * Finds a background color for a text view with given text color and hint text color, that has
-   * the same hue as the original color.
-   */
-  public static int ensureTextBackgroundColor(int color, int textColor, int hintColor) {
-    color = findContrastColor(color, hintColor, false, 3.0);
-    return findContrastColor(color, textColor, false, 4.5);
-  }
-
-  private static String contrastChange(int colorOld, int colorNew, int bg) {
-    return String.format(Locale.ROOT,
-        "from %.2f:1 to %.2f:1",
-        ColorUtilsFromCompat.calculateContrast(colorOld, bg),
-        ColorUtilsFromCompat.calculateContrast(colorNew, bg));
-  }
-
-  /**
-   * Change a color by a specified value
-   *
-   * @param baseColor the base color to lighten
-   * @param amount the amount to lighten the color from 0 to 100. This corresponds to the L increase
-   *     in the LAB color space. A negative value will darken the color and a positive will lighten
-   *     it.
-   * @return the changed color
-   */
-  public static int changeColorLightness(int baseColor, int amount) {
-    final double[] result = ColorUtilsFromCompat.getTempDouble3Array();
-    ColorUtilsFromCompat.colorToLAB(baseColor, result);
-    result[0] = Math.max(Math.min(100, result[0] + amount), 0);
-    return ColorUtilsFromCompat.LABToColor(result[0], result[1], result[2]);
-  }
-
-  public static int resolvePrimaryColor(Context context, int backgroundColor) {
-    boolean useDark = shouldUseDark(backgroundColor);
-    return ContextCompat.getColor(context, android.R.color.primary_text_light);
-  }
-
-  public static int resolveSecondaryColor(Context context, int backgroundColor) {
-    boolean useDark = shouldUseDark(backgroundColor);
-    if (useDark) {
-      return ContextCompat.getColor(context, android.R.color.secondary_text_light);
-    } else {
-      return ContextCompat.getColor(context, android.R.color.secondary_text_dark);
-    }
-  }
-
-  public static int resolveActionBarColor(Context context, int backgroundColor) {
-    if (backgroundColor == Notification.COLOR_DEFAULT) {
-      return Color.BLACK;
-    }
-    return getShiftedColor(backgroundColor, 7);
-  }
-
-  /** Resolves {@param color} to an actual color if it is {@link Notification#COLOR_DEFAULT} */
-  public static int resolveColor(Context context, int color) {
-    if (color == Notification.COLOR_DEFAULT) {
-      return ContextCompat.getColor(context, android.R.color.background_dark);
-    }
-    return color;
-  }
-
-  //
-  //    public static int resolveContrastColor(Context context, int notificationColor,
-  //                                           int backgroundColor) {
-  //        return NotificationColorUtil.resolveContrastColor(context, notificationColor,
-  //                backgroundColor, false /* isDark */);
-  //    }
-
-  //    /**
-  //     * Resolves a Notification's color such that it has enough contrast to be used as the
-  //     * color for the Notification's action and header text.
-  //     *
-  //     * @param notificationColor the color of the notification or {@link
-  // Notification#COLOR_DEFAULT}
-  //     * @param backgroundColor the background color to ensure the contrast against.
-  //     * @param isDark whether or not the {@code notificationColor} will be placed on a background
-  //     *               that is darker than the color itself
-  //     * @return a color of the same hue with enough contrast against the backgrounds.
-  //     */
-  //    public static int resolveContrastColor(Context context, int notificationColor,
-  //                                           int backgroundColor, boolean isDark) {
-  //        final int resolvedColor = resolveColor(context, notificationColor);
-  //
-  //        final int actionBg = context.getColor(
-  //                com.android.internal.R.color.notification_action_list);
-  //
-  //        int color = resolvedColor;
-  //        color = NotificationColorUtil.ensureLargeTextContrast(color, actionBg, isDark);
-  //        color = NotificationColorUtil.ensureTextContrast(color, backgroundColor, isDark);
-  //
-  //        if (color != resolvedColor) {
-  //            if (DEBUG){
-  //                Log.w(TAG, String.format(
-  //                        "Enhanced contrast of notification for %s %s (over action)"
-  //                                + " and %s (over background) by changing #%s to %s",
-  //                        context.getPackageName(),
-  //                        NotificationColorUtil.contrastChange(resolvedColor, color, actionBg),
-  //                        NotificationColorUtil.contrastChange(resolvedColor, color,
-  // backgroundColor),
-  //                        Integer.toHexString(resolvedColor), Integer.toHexString(color)));
-  //            }
-  //        }
-  //        return color;
-  //    }
-
-  /**
-   * Get a color that stays in the same tint, but darkens or lightens it by a certain amount. This
-   * also looks at the lightness of the provided color and shifts it appropriately.
-   *
-   * @param color the base color to use
-   * @param amount the amount from 1 to 100 how much to modify the color
-   * @return the now color that was modified
-   */
-  public static int getShiftedColor(int color, int amount) {
-    final double[] result = ColorUtilsFromCompat.getTempDouble3Array();
-    ColorUtilsFromCompat.colorToLAB(color, result);
-    if (result[0] >= 4) {
-      result[0] = Math.max(0, result[0] - amount);
-    } else {
-      result[0] = Math.min(100, result[0] + amount);
-    }
-    return ColorUtilsFromCompat.LABToColor(result[0], result[1], result[2]);
-  }
-
-  public static int resolveAmbientColor(Context context, int notificationColor) {
-    final int resolvedColor = resolveColor(context, notificationColor);
-
-    int color = resolvedColor;
-    color = NotificationColorUtil.ensureTextContrastOnBlack(color);
-
-    if (color != resolvedColor) {
-      if (DEBUG) {
-        Log.w(
-            TAG,
-            String.format(
-                "Ambient contrast of notification for %s is %s (over black)"
-                    + " by changing #%s to #%s",
-                context.getPackageName(),
-                NotificationColorUtil.contrastChange(resolvedColor, color, Color.BLACK),
-                Integer.toHexString(resolvedColor),
-                Integer.toHexString(color)));
-      }
-    }
-    return color;
-  }
-
-  private static boolean shouldUseDark(int backgroundColor) {
-    boolean useDark = backgroundColor == Notification.COLOR_DEFAULT;
-    if (!useDark) {
-      useDark = ColorUtilsFromCompat.calculateLuminance(backgroundColor) > 0.5;
-    }
-    return useDark;
-  }
-
-  public static double calculateLuminance(int backgroundColor) {
-    return ColorUtilsFromCompat.calculateLuminance(backgroundColor);
-  }
-
-  public static double calculateContrast(int foregroundColor, int backgroundColor) {
-    return ColorUtilsFromCompat.calculateContrast(foregroundColor, backgroundColor);
-  }
-
-  public static boolean satisfiesTextContrast(int backgroundColor, int foregroundColor) {
-    return NotificationColorUtil.calculateContrast(foregroundColor, backgroundColor) >= 4.5;
-  }
-
-  /** Composite two potentially translucent colors over each other and returns the result. */
-  public static int compositeColors(int foreground, int background) {
-    return ColorUtilsFromCompat.compositeColors(foreground, background);
-  }
-
-  public static boolean isColorLight(int backgroundColor) {
-    return calculateLuminance(backgroundColor) > 0.5f;
-  }
-
-  /**
-   * Checks whether a Bitmap is a small grayscale icon. Grayscale here means "very close to a
-   * perfect gray"; icon means "no larger than 64dp".
-   *
-   * @param bitmap The bitmap to test.
-   * @return True if the bitmap is grayscale; false if it is color or too large to examine.
-   */
-  public boolean isGrayscaleIcon(Bitmap bitmap) {
-    // quick test: reject large bitmaps
-    if (bitmap.getWidth() > mGrayscaleIconMaxSize || bitmap.getHeight() > mGrayscaleIconMaxSize) {
-      return false;
-    }
-
-    synchronized (sLock) {
-      Pair<Boolean, Integer> cached = mGrayscaleBitmapCache.get(bitmap);
-      if (cached != null) {
-        if (cached.second == bitmap.getGenerationId()) {
-          return cached.first;
-        }
-      }
-    }
-    boolean result;
-    int generationId;
-    synchronized (mImageUtils) {
-      result = mImageUtils.isGrayscale(bitmap);
-
-      // generationId and the check whether the Bitmap is grayscale can't be read atomically
-      // here. However, since the thread is in the process of posting the notification, we can
-      // assume that it doesn't modify the bitmap while we are checking the pixels.
-      generationId = bitmap.getGenerationId();
-    }
-    synchronized (sLock) {
-      mGrayscaleBitmapCache.put(bitmap, Pair.create(result, generationId));
-    }
-    return result;
-  }
-
-  private int processColor(int color) {
-    return Color.argb(
-        Color.alpha(color),
-        255 - Color.red(color),
-        255 - Color.green(color),
-        255 - Color.blue(color));
-  }
-
-  /** Framework copy of functions needed from android.support.v4.graphics.ColorUtils. */
-  private static class ColorUtilsFromCompat {
-    private static final double XYZ_WHITE_REFERENCE_X = 95.047;
-    private static final double XYZ_WHITE_REFERENCE_Y = 100;
-    private static final double XYZ_WHITE_REFERENCE_Z = 108.883;
-    private static final double XYZ_EPSILON = 0.008856;
-    private static final double XYZ_KAPPA = 903.3;
-
-    private static final int MIN_ALPHA_SEARCH_MAX_ITERATIONS = 10;
-    private static final int MIN_ALPHA_SEARCH_PRECISION = 1;
-
-    private static final ThreadLocal<double[]> TEMP_ARRAY = new ThreadLocal<>();
-
-    private ColorUtilsFromCompat() {}
-
-    /** Composite two potentially translucent colors over each other and returns the result. */
-    public static int compositeColors(@ColorInt int foreground, @ColorInt int background) {
-      int bgAlpha = Color.alpha(background);
-      int fgAlpha = Color.alpha(foreground);
-      int a = compositeAlpha(fgAlpha, bgAlpha);
-
-      int r = compositeComponent(Color.red(foreground), fgAlpha, Color.red(background), bgAlpha, a);
-      int g =
-          compositeComponent(Color.green(foreground), fgAlpha, Color.green(background), bgAlpha, a);
-      int b =
-          compositeComponent(Color.blue(foreground), fgAlpha, Color.blue(background), bgAlpha, a);
-
-      return Color.argb(a, r, g, b);
-    }
-
-    private static int compositeAlpha(int foregroundAlpha, int backgroundAlpha) {
-      return 0xFF - (((0xFF - backgroundAlpha) * (0xFF - foregroundAlpha)) / 0xFF);
-    }
-
-    private static int compositeComponent(int fgC, int fgA, int bgC, int bgA, int a) {
-      if (a == 0) return 0;
-      return ((0xFF * fgC * fgA) + (bgC * bgA * (0xFF - fgA))) / (a * 0xFF);
-    }
-
-    /**
-     * Returns the luminance of a color as a float between {@code 0.0} and {@code 1.0}.
-     *
-     * <p>Defined as the Y component in the XYZ representation of {@code color}.
-     */
-    @FloatRange(from = 0.0, to = 1.0)
-    public static double calculateLuminance(@ColorInt int color) {
-      final double[] result = getTempDouble3Array();
-      colorToXYZ(color, result);
-      // Luminance is the Y component
-      return result[1] / 100;
-    }
-
-    /**
-     * Returns the contrast ratio between {@code foreground} and {@code background}. {@code
-     * background} must be opaque.
-     *
-     * <p>Formula defined <a
-     * href="http://www.w3.org/TR/2008/REC-WCAG20-20081211/#contrast-ratiodef">here</a>.
-     */
-    public static double calculateContrast(@ColorInt int foreground, @ColorInt int background) {
-      if (Color.alpha(background) != 255) {
-        Log.wtf(TAG, "background can not be translucent: #" + Integer.toHexString(background));
-      }
-      if (Color.alpha(foreground) < 255) {
-        // If the foreground is translucent, composite the foreground over the background
-        foreground = compositeColors(foreground, background);
-      }
-
-      final double luminance1 = calculateLuminance(foreground) + 0.05;
-      final double luminance2 = calculateLuminance(background) + 0.05;
-
-      // Now return the lighter luminance divided by the darker luminance
-      return Math.max(luminance1, luminance2) / Math.min(luminance1, luminance2);
-    }
-
-    /**
-     * Convert the ARGB color to its CIE Lab representative components.
-     *
-     * @param color the ARGB color to convert. The alpha component is ignored
-     * @param outLab 3-element array which holds the resulting LAB components
-     */
-    public static void colorToLAB(@ColorInt int color, @NonNull double[] outLab) {
-      RGBToLAB(Color.red(color), Color.green(color), Color.blue(color), outLab);
-    }
-
-    /**
-     * Convert RGB components to its CIE Lab representative components.
-     *
-     * <ul>
-     *   <li>outLab[0] is L [0 ...100)
-     *   <li>outLab[1] is a [-128...127)
-     *   <li>outLab[2] is b [-128...127)
-     * </ul>
-     *
-     * @param r red component value [0..255]
-     * @param g green component value [0..255]
-     * @param b blue component value [0..255]
-     * @param outLab 3-element array which holds the resulting LAB components
-     */
-    public static void RGBToLAB(
-        @IntRange(from = 0x0, to = 0xFF) int r,
-        @IntRange(from = 0x0, to = 0xFF) int g,
-        @IntRange(from = 0x0, to = 0xFF) int b,
-        @NonNull double[] outLab) {
-      // First we convert RGB to XYZ
-      RGBToXYZ(r, g, b, outLab);
-      // outLab now contains XYZ
-      XYZToLAB(outLab[0], outLab[1], outLab[2], outLab);
-      // outLab now contains LAB representation
-    }
-
-    /**
-     * Convert the ARGB color to it's CIE XYZ representative components.
-     *
-     * <p>The resulting XYZ representation will use the D65 illuminant and the CIE 2° Standard
-     * Observer (1931).
-     *
-     * <ul>
-     *   <li>outXyz[0] is X [0 ...95.047)
-     *   <li>outXyz[1] is Y [0...100)
-     *   <li>outXyz[2] is Z [0...108.883)
-     * </ul>
-     *
-     * @param color the ARGB color to convert. The alpha component is ignored
-     * @param outXyz 3-element array which holds the resulting LAB components
-     */
-    public static void colorToXYZ(@ColorInt int color, @NonNull double[] outXyz) {
-      RGBToXYZ(Color.red(color), Color.green(color), Color.blue(color), outXyz);
-    }
-
-    /**
-     * Convert RGB components to it's CIE XYZ representative components.
-     *
-     * <p>The resulting XYZ representation will use the D65 illuminant and the CIE 2° Standard
-     * Observer (1931).
-     *
-     * <ul>
-     *   <li>outXyz[0] is X [0 ...95.047)
-     *   <li>outXyz[1] is Y [0...100)
-     *   <li>outXyz[2] is Z [0...108.883)
-     * </ul>
-     *
-     * @param r red component value [0..255]
-     * @param g green component value [0..255]
-     * @param b blue component value [0..255]
-     * @param outXyz 3-element array which holds the resulting XYZ components
-     */
-    public static void RGBToXYZ(
-        @IntRange(from = 0x0, to = 0xFF) int r,
-        @IntRange(from = 0x0, to = 0xFF) int g,
-        @IntRange(from = 0x0, to = 0xFF) int b,
-        @NonNull double[] outXyz) {
-      if (outXyz.length != 3) {
-        throw new IllegalArgumentException("outXyz must have a length of 3.");
-      }
-
-      double sr = r / 255.0;
-      sr = sr < 0.04045 ? sr / 12.92 : Math.pow((sr + 0.055) / 1.055, 2.4);
-      double sg = g / 255.0;
-      sg = sg < 0.04045 ? sg / 12.92 : Math.pow((sg + 0.055) / 1.055, 2.4);
-      double sb = b / 255.0;
-      sb = sb < 0.04045 ? sb / 12.92 : Math.pow((sb + 0.055) / 1.055, 2.4);
-
-      outXyz[0] = 100 * (sr * 0.4124 + sg * 0.3576 + sb * 0.1805);
-      outXyz[1] = 100 * (sr * 0.2126 + sg * 0.7152 + sb * 0.0722);
-      outXyz[2] = 100 * (sr * 0.0193 + sg * 0.1192 + sb * 0.9505);
-    }
-
-    /**
-     * Converts a color from CIE XYZ to CIE Lab representation.
-     *
-     * <p>This method expects the XYZ representation to use the D65 illuminant and the CIE 2°
-     * Standard Observer (1931).
-     *
-     * <ul>
-     *   <li>outLab[0] is L [0 ...100)
-     *   <li>outLab[1] is a [-128...127)
-     *   <li>outLab[2] is b [-128...127)
-     * </ul>
-     *
-     * @param x X component value [0...95.047)
-     * @param y Y component value [0...100)
-     * @param z Z component value [0...108.883)
-     * @param outLab 3-element array which holds the resulting Lab components
-     */
-    public static void XYZToLAB(
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_X) double x,
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_Y) double y,
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_Z) double z,
-        @NonNull double[] outLab) {
-      if (outLab.length != 3) {
-        throw new IllegalArgumentException("outLab must have a length of 3.");
-      }
-      x = pivotXyzComponent(x / XYZ_WHITE_REFERENCE_X);
-      y = pivotXyzComponent(y / XYZ_WHITE_REFERENCE_Y);
-      z = pivotXyzComponent(z / XYZ_WHITE_REFERENCE_Z);
-      outLab[0] = Math.max(0, 116 * y - 16);
-      outLab[1] = 500 * (x - y);
-      outLab[2] = 200 * (y - z);
-    }
-
-    /**
-     * Converts a color from CIE Lab to CIE XYZ representation.
-     *
-     * <p>The resulting XYZ representation will use the D65 illuminant and the CIE 2° Standard
-     * Observer (1931).
-     *
-     * <ul>
-     *   <li>outXyz[0] is X [0 ...95.047)
-     *   <li>outXyz[1] is Y [0...100)
-     *   <li>outXyz[2] is Z [0...108.883)
-     * </ul>
-     *
-     * @param l L component value [0...100)
-     * @param a A component value [-128...127)
-     * @param b B component value [-128...127)
-     * @param outXyz 3-element array which holds the resulting XYZ components
-     */
-    public static void LABToXYZ(
-        @FloatRange(from = 0f, to = 100) final double l,
-        @FloatRange(from = -128, to = 127) final double a,
-        @FloatRange(from = -128, to = 127) final double b,
-        @NonNull double[] outXyz) {
-      final double fy = (l + 16) / 116;
-      final double fx = a / 500 + fy;
-      final double fz = fy - b / 200;
-
-      double tmp = Math.pow(fx, 3);
-      final double xr = tmp > XYZ_EPSILON ? tmp : (116 * fx - 16) / XYZ_KAPPA;
-      final double yr = l > XYZ_KAPPA * XYZ_EPSILON ? Math.pow(fy, 3) : l / XYZ_KAPPA;
-
-      tmp = Math.pow(fz, 3);
-      final double zr = tmp > XYZ_EPSILON ? tmp : (116 * fz - 16) / XYZ_KAPPA;
-
-      outXyz[0] = xr * XYZ_WHITE_REFERENCE_X;
-      outXyz[1] = yr * XYZ_WHITE_REFERENCE_Y;
-      outXyz[2] = zr * XYZ_WHITE_REFERENCE_Z;
-    }
-
-    /**
-     * Converts a color from CIE XYZ to its RGB representation.
-     *
-     * <p>This method expects the XYZ representation to use the D65 illuminant and the CIE 2°
-     * Standard Observer (1931).
-     *
-     * @param x X component value [0...95.047)
-     * @param y Y component value [0...100)
-     * @param z Z component value [0...108.883)
-     * @return int containing the RGB representation
-     */
-    @ColorInt
-    public static int XYZToColor(
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_X) double x,
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_Y) double y,
-        @FloatRange(from = 0f, to = XYZ_WHITE_REFERENCE_Z) double z) {
-      double r = (x * 3.2406 + y * -1.5372 + z * -0.4986) / 100;
-      double g = (x * -0.9689 + y * 1.8758 + z * 0.0415) / 100;
-      double b = (x * 0.0557 + y * -0.2040 + z * 1.0570) / 100;
-
-      r = r > 0.0031308 ? 1.055 * Math.pow(r, 1 / 2.4) - 0.055 : 12.92 * r;
-      g = g > 0.0031308 ? 1.055 * Math.pow(g, 1 / 2.4) - 0.055 : 12.92 * g;
-      b = b > 0.0031308 ? 1.055 * Math.pow(b, 1 / 2.4) - 0.055 : 12.92 * b;
-
-      return Color.rgb(
-          constrain((int) Math.round(r * 255), 0, 255),
-          constrain((int) Math.round(g * 255), 0, 255),
-          constrain((int) Math.round(b * 255), 0, 255));
-    }
-
-    /**
-     * Converts a color from CIE Lab to its RGB representation.
-     *
-     * @param l L component value [0...100]
-     * @param a A component value [-128...127]
-     * @param b B component value [-128...127]
-     * @return int containing the RGB representation
-     */
-    @ColorInt
-    public static int LABToColor(
-        @FloatRange(from = 0f, to = 100) final double l,
-        @FloatRange(from = -128, to = 127) final double a,
-        @FloatRange(from = -128, to = 127) final double b) {
-      final double[] result = getTempDouble3Array();
-      LABToXYZ(l, a, b, result);
-      return XYZToColor(result[0], result[1], result[2]);
-    }
-
-    private static int constrain(int amount, int low, int high) {
-      return amount < low ? low : (Math.min(amount, high));
-    }
-
-    private static float constrain(float amount, float low, float high) {
-      return amount < low ? low : (Math.min(amount, high));
-    }
-
-    private static double pivotXyzComponent(double component) {
-      return component > XYZ_EPSILON
-          ? Math.pow(component, 1 / 3.0)
-          : (XYZ_KAPPA * component + 16) / 116;
-    }
-
-    public static double[] getTempDouble3Array() {
-      double[] result = TEMP_ARRAY.get();
-      if (result == null) {
-        result = new double[3];
-        TEMP_ARRAY.set(result);
-      }
-      return result;
-    }
-
-    /**
-     * Convert HSL (hue-saturation-lightness) components to a RGB color.
-     *
-     * <ul>
-     *   <li>hsl[0] is Hue [0 .. 360)
-     *   <li>hsl[1] is Saturation [0...1]
-     *   <li>hsl[2] is Lightness [0...1]
-     * </ul>
-     *
-     * If hsv values are out of range, they are pinned.
-     *
-     * @param hsl 3-element array which holds the input HSL components
-     * @return the resulting RGB color
-     */
-    @ColorInt
-    public static int HSLToColor(@NonNull float[] hsl) {
-      final float h = hsl[0];
-      final float s = hsl[1];
-      final float l = hsl[2];
-
-      final float c = (1f - Math.abs(2 * l - 1f)) * s;
-      final float m = l - 0.5f * c;
-      final float x = c * (1f - Math.abs((h / 60f % 2f) - 1f));
-
-      final int hueSegment = (int) h / 60;
-
-      int r = 0, g = 0, b = 0;
-
-      switch (hueSegment) {
-        case 0:
-          r = Math.round(255 * (c + m));
-          g = Math.round(255 * (x + m));
-          b = Math.round(255 * m);
-          break;
-        case 1:
-          r = Math.round(255 * (x + m));
-          g = Math.round(255 * (c + m));
-          b = Math.round(255 * m);
-          break;
-        case 2:
-          r = Math.round(255 * m);
-          g = Math.round(255 * (c + m));
-          b = Math.round(255 * (x + m));
-          break;
-        case 3:
-          r = Math.round(255 * m);
-          g = Math.round(255 * (x + m));
-          b = Math.round(255 * (c + m));
-          break;
-        case 4:
-          r = Math.round(255 * (x + m));
-          g = Math.round(255 * m);
-          b = Math.round(255 * (c + m));
-          break;
-        case 5:
-        case 6:
-          r = Math.round(255 * (c + m));
-          g = Math.round(255 * m);
-          b = Math.round(255 * (x + m));
-          break;
-      }
-
-      r = constrain(r, 0, 255);
-      g = constrain(g, 0, 255);
-      b = constrain(b, 0, 255);
-
-      return Color.rgb(r, g, b);
-    }
-
-    /**
-     * Convert the ARGB color to its HSL (hue-saturation-lightness) components.
-     *
-     * <ul>
-     *   <li>outHsl[0] is Hue [0 .. 360)
-     *   <li>outHsl[1] is Saturation [0...1]
-     *   <li>outHsl[2] is Lightness [0...1]
-     * </ul>
-     *
-     * @param color the ARGB color to convert. The alpha component is ignored
-     * @param outHsl 3-element array which holds the resulting HSL components
-     */
-    public static void colorToHSL(@ColorInt int color, @NonNull float[] outHsl) {
-      RGBToHSL(Color.red(color), Color.green(color), Color.blue(color), outHsl);
-    }
-
-    /**
-     * Convert RGB components to HSL (hue-saturation-lightness).
-     *
-     * <ul>
-     *   <li>outHsl[0] is Hue [0 .. 360)
-     *   <li>outHsl[1] is Saturation [0...1]
-     *   <li>outHsl[2] is Lightness [0...1]
-     * </ul>
-     *
-     * @param r red component value [0..255]
-     * @param g green component value [0..255]
-     * @param b blue component value [0..255]
-     * @param outHsl 3-element array which holds the resulting HSL components
-     */
-    public static void RGBToHSL(
-        @IntRange(from = 0x0, to = 0xFF) int r,
-        @IntRange(from = 0x0, to = 0xFF) int g,
-        @IntRange(from = 0x0, to = 0xFF) int b,
-        @NonNull float[] outHsl) {
-      final float rf = r / 255f;
-      final float gf = g / 255f;
-      final float bf = b / 255f;
-
-      final float max = Math.max(rf, Math.max(gf, bf));
-      final float min = Math.min(rf, Math.min(gf, bf));
-      final float deltaMaxMin = max - min;
-
-      float h, s;
-      float l = (max + min) / 2f;
-
-      if (max == min) {
-        // Monochromatic
-        h = s = 0f;
-      } else {
-        if (max == rf) {
-          h = ((gf - bf) / deltaMaxMin) % 6f;
-        } else if (max == gf) {
-          h = ((bf - rf) / deltaMaxMin) + 2f;
-        } else {
-          h = ((rf - gf) / deltaMaxMin) + 4f;
-        }
-
-        s = deltaMaxMin / (1f - Math.abs(2f * l - 1f));
-      }
-
-      h = (h * 60f) % 360f;
-      if (h < 0) {
-        h += 360f;
-      }
-
-      outHsl[0] = constrain(h, 0f, 360f);
-      outHsl[1] = constrain(s, 0f, 1f);
-      outHsl[2] = constrain(l, 0f, 1f);
-    }
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
deleted file mode 100644
index c1a8283df..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeManager.kt
+++ /dev/null
@@ -1,29 +0,0 @@
-package code.name.monkey.retromusic.util.theme
-
-import android.content.Context
-import androidx.annotation.StyleRes
-import androidx.appcompat.app.AppCompatDelegate
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.extensions.generalThemeValue
-import code.name.monkey.retromusic.util.PreferenceUtil
-import code.name.monkey.retromusic.util.theme.ThemeMode.*
-
-@StyleRes
-fun Context.getThemeResValue(): Int =
-    if (PreferenceUtil.materialYou) {
-        if (generalThemeValue == BLACK) R.style.Theme_RetroMusic_MD3_Black
-        else R.style.Theme_RetroMusic_MD3
-    } else {
-        when (generalThemeValue) {
-            LIGHT -> R.style.Theme_RetroMusic_Light
-            DARK -> R.style.Theme_RetroMusic_Base
-            BLACK -> R.style.Theme_RetroMusic_Black
-            AUTO -> R.style.Theme_RetroMusic_FollowSystem
-        }
-    }
-
-fun Context.getNightMode(): Int = when (generalThemeValue) {
-    LIGHT -> AppCompatDelegate.MODE_NIGHT_NO
-    DARK -> AppCompatDelegate.MODE_NIGHT_YES
-    else -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt b/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt
deleted file mode 100644
index 88086741c..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/util/theme/ThemeMode.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package code.name.monkey.retromusic.util.theme
-
-enum class ThemeMode {
-    LIGHT,
-    DARK,
-    BLACK,
-    AUTO
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt b/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
deleted file mode 100644
index 74a08e830..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/AccentIcon.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import androidx.appcompat.widget.AppCompatImageView
-import code.name.monkey.appthemehelper.ThemeStore
-
-class AccentIcon @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1
-) : AppCompatImageView(context, attrs, defStyleAttr) {
-    init {
-        imageTintList = ColorStateList.valueOf(ThemeStore.accentColor(context))
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
index 87d4487f3..a82b38c60 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BaselineGridTextView.java
@@ -28,167 +28,168 @@ import code.name.monkey.retromusic.R;
 
 public class BaselineGridTextView extends MaterialTextView {
 
-  private final float FOUR_DIP;
+    private final float FOUR_DIP;
 
-  private int extraBottomPadding = 0;
+    private float lineHeightMultiplierHint = 1f;
+    private float lineHeightHint = 0f;
+    private boolean maxLinesByHeight = false;
+    private int extraTopPadding = 0;
+    private int extraBottomPadding = 0;
+    private @FontRes
+    int fontResId = 0;
 
-  private int extraTopPadding = 0;
-
-  private @FontRes int fontResId = 0;
-
-  private float lineHeightHint = 0f;
-
-  private float lineHeightMultiplierHint = 1f;
-
-  private boolean maxLinesByHeight = false;
-
-  public BaselineGridTextView(Context context) {
-    this(context, null);
-  }
-
-  public BaselineGridTextView(Context context, AttributeSet attrs) {
-    this(context, attrs, android.R.attr.textViewStyle);
-  }
-
-  public BaselineGridTextView(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-
-    final TypedArray a =
-        context.obtainStyledAttributes(attrs, R.styleable.BaselineGridTextView, defStyleAttr, 0);
-
-    // first check TextAppearance for line height & font attributes
-    if (a.hasValue(R.styleable.BaselineGridTextView_android_textAppearance)) {
-      int textAppearanceId =
-          a.getResourceId(
-              R.styleable.BaselineGridTextView_android_textAppearance,
-              android.R.style.TextAppearance);
-      TypedArray ta =
-          context.obtainStyledAttributes(textAppearanceId, R.styleable.BaselineGridTextView);
-      parseTextAttrs(ta);
-      ta.recycle();
+    public BaselineGridTextView(Context context) {
+        this(context, null);
     }
 
-    // then check view attrs
-    parseTextAttrs(a);
-    maxLinesByHeight = a.getBoolean(R.styleable.BaselineGridTextView_maxLinesByHeight, false);
-    a.recycle();
-
-    FOUR_DIP =
-        TypedValue.applyDimension(
-            TypedValue.COMPLEX_UNIT_DIP, 4, getResources().getDisplayMetrics());
-    computeLineHeight();
-  }
-
-  @Override
-  public int getCompoundPaddingBottom() {
-    // include extra padding to make the height a multiple of 4dp
-    return super.getCompoundPaddingBottom() + extraBottomPadding;
-  }
-
-  @Override
-  public int getCompoundPaddingTop() {
-    // include extra padding to place the first line's baseline on the grid
-    return super.getCompoundPaddingTop() + extraTopPadding;
-  }
-
-  public @FontRes int getFontResId() {
-    return fontResId;
-  }
-
-  public float getLineHeightHint() {
-    return lineHeightHint;
-  }
-
-  public void setLineHeightHint(float lineHeightHint) {
-    this.lineHeightHint = lineHeightHint;
-    computeLineHeight();
-  }
-
-  public float getLineHeightMultiplierHint() {
-    return lineHeightMultiplierHint;
-  }
-
-  public void setLineHeightMultiplierHint(float lineHeightMultiplierHint) {
-    this.lineHeightMultiplierHint = lineHeightMultiplierHint;
-    computeLineHeight();
-  }
-
-  public boolean getMaxLinesByHeight() {
-    return maxLinesByHeight;
-  }
-
-  public void setMaxLinesByHeight(boolean maxLinesByHeight) {
-    this.maxLinesByHeight = maxLinesByHeight;
-    requestLayout();
-  }
-
-  @Override
-  protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-    extraTopPadding = 0;
-    extraBottomPadding = 0;
-    super.onMeasure(widthMeasureSpec, heightMeasureSpec);
-    int height = getMeasuredHeight();
-    height += ensureBaselineOnGrid();
-    height += ensureHeightGridAligned(height);
-    setMeasuredDimension(getMeasuredWidth(), height);
-    checkMaxLines(height, MeasureSpec.getMode(heightMeasureSpec));
-  }
-
-  /**
-   * When measured with an exact height, text can be vertically clipped mid-line. Prevent this by
-   * setting the {@code maxLines} property based on the available space.
-   */
-  private void checkMaxLines(int height, int heightMode) {
-    if (!maxLinesByHeight || heightMode != MeasureSpec.EXACTLY) {
-      return;
+    public BaselineGridTextView(Context context, AttributeSet attrs) {
+        this(context, attrs, android.R.attr.textViewStyle);
     }
 
-    int textHeight = height - getCompoundPaddingTop() - getCompoundPaddingBottom();
-    int completeLines = (int) Math.floor(textHeight / getLineHeight());
-    setMaxLines(completeLines);
-  }
+    public BaselineGridTextView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
 
-  /** Ensures line height is a multiple of 4dp. */
-  private void computeLineHeight() {
-    final Paint.FontMetrics fm = getPaint().getFontMetrics();
-    final float fontHeight = Math.abs(fm.ascent - fm.descent) + fm.leading;
-    final float desiredLineHeight =
-        (lineHeightHint > 0) ? lineHeightHint : lineHeightMultiplierHint * fontHeight;
+        final TypedArray a = context.obtainStyledAttributes(
+                attrs, R.styleable.BaselineGridTextView, defStyleAttr, 0);
 
-    final int baselineAlignedLineHeight =
-        (int) ((FOUR_DIP * (float) Math.ceil(desiredLineHeight / FOUR_DIP)) + 0.5f);
-    setLineSpacing(baselineAlignedLineHeight - fontHeight, 1f);
-  }
+        // first check TextAppearance for line height & font attributes
+        if (a.hasValue(R.styleable.BaselineGridTextView_android_textAppearance)) {
+            int textAppearanceId =
+                    a.getResourceId(R.styleable.BaselineGridTextView_android_textAppearance,
+                            android.R.style.TextAppearance);
+            TypedArray ta = context.obtainStyledAttributes(
+                    textAppearanceId, R.styleable.BaselineGridTextView);
+            parseTextAttrs(ta);
+            ta.recycle();
+        }
 
-  /** Ensure that the first line of text sits on the 4dp grid. */
-  private int ensureBaselineOnGrid() {
-    float baseline = getBaseline();
-    float gridAlign = baseline % FOUR_DIP;
-    if (gridAlign != 0) {
-      extraTopPadding = (int) (FOUR_DIP - Math.ceil(gridAlign));
-    }
-    return extraTopPadding;
-  }
+        // then check view attrs
+        parseTextAttrs(a);
+        maxLinesByHeight = a.getBoolean(R.styleable.BaselineGridTextView_maxLinesByHeight, false);
+        a.recycle();
 
-  /** Ensure that height is a multiple of 4dp. */
-  private int ensureHeightGridAligned(int height) {
-    float gridOverhang = height % FOUR_DIP;
-    if (gridOverhang != 0) {
-      extraBottomPadding = (int) (FOUR_DIP - Math.ceil(gridOverhang));
+        FOUR_DIP = TypedValue.applyDimension(
+                TypedValue.COMPLEX_UNIT_DIP, 4, getResources().getDisplayMetrics());
+        computeLineHeight();
     }
-    return extraBottomPadding;
-  }
 
-  private void parseTextAttrs(TypedArray a) {
-    if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightMultiplierHint)) {
-      lineHeightMultiplierHint =
-          a.getFloat(R.styleable.BaselineGridTextView_lineHeightMultiplierHint, 1f);
+    public float getLineHeightMultiplierHint() {
+        return lineHeightMultiplierHint;
     }
-    if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightHint)) {
-      lineHeightHint = a.getDimensionPixelSize(R.styleable.BaselineGridTextView_lineHeightHint, 0);
+
+    public void setLineHeightMultiplierHint(float lineHeightMultiplierHint) {
+        this.lineHeightMultiplierHint = lineHeightMultiplierHint;
+        computeLineHeight();
     }
-    if (a.hasValue(R.styleable.BaselineGridTextView_android_fontFamily)) {
-      fontResId = a.getResourceId(R.styleable.BaselineGridTextView_android_fontFamily, 0);
+
+    public float getLineHeightHint() {
+        return lineHeightHint;
     }
-  }
-}
+
+    public void setLineHeightHint(float lineHeightHint) {
+        this.lineHeightHint = lineHeightHint;
+        computeLineHeight();
+    }
+
+    public boolean getMaxLinesByHeight() {
+        return maxLinesByHeight;
+    }
+
+    public void setMaxLinesByHeight(boolean maxLinesByHeight) {
+        this.maxLinesByHeight = maxLinesByHeight;
+        requestLayout();
+    }
+
+    public @FontRes
+    int getFontResId() {
+        return fontResId;
+    }
+
+    @Override
+    public int getCompoundPaddingTop() {
+        // include extra padding to place the first line's baseline on the grid
+        return super.getCompoundPaddingTop() + extraTopPadding;
+    }
+
+    @Override
+    public int getCompoundPaddingBottom() {
+        // include extra padding to make the height a multiple of 4dp
+        return super.getCompoundPaddingBottom() + extraBottomPadding;
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        extraTopPadding = 0;
+        extraBottomPadding = 0;
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        int height = getMeasuredHeight();
+        height += ensureBaselineOnGrid();
+        height += ensureHeightGridAligned(height);
+        setMeasuredDimension(getMeasuredWidth(), height);
+        checkMaxLines(height, MeasureSpec.getMode(heightMeasureSpec));
+    }
+
+    private void parseTextAttrs(TypedArray a) {
+        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightMultiplierHint)) {
+            lineHeightMultiplierHint =
+                    a.getFloat(R.styleable.BaselineGridTextView_lineHeightMultiplierHint, 1f);
+        }
+        if (a.hasValue(R.styleable.BaselineGridTextView_lineHeightHint)) {
+            lineHeightHint = a.getDimensionPixelSize(
+                    R.styleable.BaselineGridTextView_lineHeightHint, 0);
+        }
+        if (a.hasValue(R.styleable.BaselineGridTextView_android_fontFamily)) {
+            fontResId = a.getResourceId(R.styleable.BaselineGridTextView_android_fontFamily, 0);
+        }
+    }
+
+    /**
+     * Ensures line height is a multiple of 4dp.
+     */
+    private void computeLineHeight() {
+        final Paint.FontMetrics fm = getPaint().getFontMetrics();
+        final float fontHeight = Math.abs(fm.ascent - fm.descent) + fm.leading;
+        final float desiredLineHeight = (lineHeightHint > 0)
+                ? lineHeightHint
+                : lineHeightMultiplierHint * fontHeight;
+
+        final int baselineAlignedLineHeight =
+                (int) ((FOUR_DIP * (float) Math.ceil(desiredLineHeight / FOUR_DIP)) + 0.5f);
+        setLineSpacing(baselineAlignedLineHeight - fontHeight, 1f);
+    }
+
+    /**
+     * Ensure that the first line of text sits on the 4dp grid.
+     */
+    private int ensureBaselineOnGrid() {
+        float baseline = getBaseline();
+        float gridAlign = baseline % FOUR_DIP;
+        if (gridAlign != 0) {
+            extraTopPadding = (int) (FOUR_DIP - Math.ceil(gridAlign));
+        }
+        return extraTopPadding;
+    }
+
+    /**
+     * Ensure that height is a multiple of 4dp.
+     */
+    private int ensureHeightGridAligned(int height) {
+        float gridOverhang = height % FOUR_DIP;
+        if (gridOverhang != 0) {
+            extraBottomPadding = (int) (FOUR_DIP - Math.ceil(gridOverhang));
+        }
+        return extraBottomPadding;
+    }
+
+    /**
+     * When measured with an exact height, text can be vertically clipped mid-line. Prevent
+     * this by setting the {@code maxLines} property based on the available space.
+     */
+    private void checkMaxLines(int height, int heightMode) {
+        if (!maxLinesByHeight || heightMode != MeasureSpec.EXACTLY) return;
+
+        int textHeight = height - getCompoundPaddingTop() - getCompoundPaddingBottom();
+        int completeLines = (int) Math.floor(textHeight / getLineHeight());
+        setMaxLines(completeLines);
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
new file mode 100644
index 000000000..cb964c393
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.RippleDrawable
+import android.util.AttributeSet
+import androidx.core.content.ContextCompat
+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.util.PreferenceUtil
+import code.name.monkey.retromusic.util.RippleUtils
+import com.google.android.material.bottomnavigation.BottomNavigationView
+
+class BottomNavigationBarTinted @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : BottomNavigationView(context, attrs, defStyleAttr) {
+
+    init {
+        labelVisibilityMode = PreferenceUtil.getInstance(context).tabTitleMode
+        selectedItemId = PreferenceUtil.getInstance(context).lastPage
+
+        val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
+        val accentColor = ThemeStore.accentColor(context)
+        NavigationViewUtil.setItemIconColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
+        NavigationViewUtil.setItemTextColors(this, ColorUtil.withAlpha(iconColor, 0.5f), accentColor)
+        itemBackground = RippleDrawable(RippleUtils.convertToRippleDrawableColor(ColorStateList.valueOf(ThemeStore.accentColor(context).addAlpha())), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background), ContextCompat.getDrawable(context, R.drawable.bottom_navigation_item_background_mask))
+        setOnApplyWindowInsetsListener(null)
+        //itemRippleColor = ColorStateList.valueOf(accentColor)
+        background = ColorDrawable(ATHUtil.resolveColor(context, R.attr.colorSurface))
+    }
+}
+
+private fun Int.addAlpha(): Int {
+    return ColorUtil.withAlpha(this, 0.12f)
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
index 4b492a854..c942a1be8 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/BreadCrumbLayout.java
@@ -16,8 +16,11 @@ package code.name.monkey.retromusic.views;
 
 import android.content.Context;
 import android.graphics.PorterDuff;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.NonNull;
 import android.util.AttributeSet;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -27,8 +30,7 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.annotation.ColorInt;
-import androidx.annotation.NonNull;
+import code.name.monkey.appthemehelper.ThemeStore;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -36,423 +38,394 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
-import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.retromusic.R;
 
-/** @author Aidan Follestad (afollestad), modified for Phonograph by Karim Abou Zeid (kabouzeid) */
+/**
+ * @author Aidan Follestad (afollestad), modified for Phonograph by Karim Abou Zeid (kabouzeid)
+ */
 public class BreadCrumbLayout extends HorizontalScrollView implements View.OnClickListener {
 
-  @ColorInt private int contentColorActivated;
-  @ColorInt private int contentColorDeactivated;
-  private int mActive;
-  private SelectionCallback mCallback;
-  private LinearLayout mChildFrame;
-  // Stores currently visible crumbs
-  private List<Crumb> mCrumbs;
-  // Stores user's navigation history, like a fragment back stack
-  private List<Crumb> mHistory;
-  // Used in setActiveOrAdd() between clearing crumbs and adding the new set, nullified afterwards
-  private List<Crumb> mOldCrumbs;
+    @ColorInt
+    private int contentColorActivated;
+    @ColorInt
+    private int contentColorDeactivated;
 
-  public BreadCrumbLayout(Context context) {
-    super(context);
-    init();
-  }
+    public static class Crumb implements Parcelable {
 
-  public BreadCrumbLayout(Context context, AttributeSet attrs) {
-    super(context, attrs);
-    init();
-  }
-
-  public BreadCrumbLayout(Context context, AttributeSet attrs, int defStyleAttr) {
-    super(context, attrs, defStyleAttr);
-    init();
-  }
-
-  public void addCrumb(@NonNull Crumb crumb, boolean refreshLayout) {
-    LinearLayout view =
-        (LinearLayout) LayoutInflater.from(getContext()).inflate(R.layout.bread_crumb, this, false);
-    view.setTag(mCrumbs.size());
-    view.setOnClickListener(this);
-
-    ImageView iv = (ImageView) view.getChildAt(1);
-    if (iv.getDrawable() != null) {
-      iv.getDrawable().setAutoMirrored(true);
-    }
-    iv.setVisibility(View.GONE);
-
-    mChildFrame.addView(
-        view,
-        new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
-    mCrumbs.add(crumb);
-    if (refreshLayout) {
-      mActive = mCrumbs.size() - 1;
-      requestLayout();
-    }
-    invalidateActivatedAll();
-  }
-
-  public void addHistory(Crumb crumb) {
-    mHistory.add(crumb);
-  }
-
-  public void clearCrumbs() {
-    try {
-      mOldCrumbs = new ArrayList<>(mCrumbs);
-      mCrumbs.clear();
-      mChildFrame.removeAllViews();
-    } catch (IllegalStateException e) {
-      e.printStackTrace();
-    }
-  }
-
-  public void clearHistory() {
-    mHistory.clear();
-  }
-
-  public Crumb findCrumb(@NonNull File forDir) {
-    for (int i = 0; i < mCrumbs.size(); i++) {
-      if (mCrumbs.get(i).getFile().equals(forDir)) {
-        return mCrumbs.get(i);
-      }
-    }
-    return null;
-  }
-
-  public int getActiveIndex() {
-    return mActive;
-  }
-
-  public Crumb getCrumb(int index) {
-    return mCrumbs.get(index);
-  }
-
-  public SavedStateWrapper getStateWrapper() {
-    return new SavedStateWrapper(this);
-  }
-
-  public int historySize() {
-    return mHistory.size();
-  }
-
-  public Crumb lastHistory() {
-    if (mHistory.size() == 0) {
-      return null;
-    }
-    return mHistory.get(mHistory.size() - 1);
-  }
-
-  @Override
-  public void onClick(View v) {
-    if (mCallback != null) {
-      int index = (Integer) v.getTag();
-      mCallback.onCrumbSelection(mCrumbs.get(index), index);
-    }
-  }
-
-  public boolean popHistory() {
-    if (mHistory.size() == 0) {
-      return false;
-    }
-    mHistory.remove(mHistory.size() - 1);
-    return mHistory.size() != 0;
-  }
-
-  public void restoreFromStateWrapper(SavedStateWrapper mSavedState) {
-    if (mSavedState != null) {
-      mActive = mSavedState.mActive;
-      for (Crumb c : mSavedState.mCrumbs) {
-        addCrumb(c, false);
-      }
-      requestLayout();
-      setVisibility(mSavedState.mVisibility);
-    }
-  }
-
-  public void reverseHistory() {
-    Collections.reverse(mHistory);
-  }
-
-  public void setActivatedContentColor(@ColorInt int contentColorActivated) {
-    this.contentColorActivated = contentColorActivated;
-  }
-
-  public void setActiveOrAdd(@NonNull Crumb crumb, boolean forceRecreate) {
-    if (forceRecreate || !setActive(crumb)) {
-      clearCrumbs();
-      final List<File> newPathSet = new ArrayList<>();
-
-      newPathSet.add(0, crumb.getFile());
-
-      File p = crumb.getFile();
-      while ((p = p.getParentFile()) != null) {
-        newPathSet.add(0, p);
-      }
-
-      for (int index = 0; index < newPathSet.size(); index++) {
-        final File fi = newPathSet.get(index);
-        crumb = new Crumb(fi);
-
-        // Restore scroll positions saved before clearing
-        if (mOldCrumbs != null) {
-          for (Iterator<Crumb> iterator = mOldCrumbs.iterator(); iterator.hasNext(); ) {
-            Crumb old = iterator.next();
-            if (old.equals(crumb)) {
-              crumb.setScrollPosition(old.getScrollPosition());
-              iterator.remove(); // minimize number of linear passes by removing un-used crumbs from
-              // history
-              break;
-            }
-          }
+        public Crumb(File file) {
+            this.file = file;
         }
 
-        addCrumb(crumb, true);
-      }
+        private final File file;
+        private int scrollPos;
 
-      // History no longer needed
-      mOldCrumbs = null;
-    }
-  }
+        public int getScrollPosition() {
+            return scrollPos;
+        }
 
-  public void setCallback(SelectionCallback callback) {
-    mCallback = callback;
-  }
+        public void setScrollPosition(int scrollY) {
+            this.scrollPos = scrollY;
+        }
 
-  public void setDeactivatedContentColor(@ColorInt int contentColorDeactivated) {
-    this.contentColorDeactivated = contentColorDeactivated;
-  }
+        public String getTitle() {
+            return file.getPath().equals("/") ? "root" : file.getName();
+        }
 
-  public int size() {
-    return mCrumbs.size();
-  }
+        public File getFile() {
+            return file;
+        }
 
-  public boolean trim(String path, boolean dir) {
-    if (!dir) {
-      return false;
-    }
-    int index = -1;
-    for (int i = mCrumbs.size() - 1; i >= 0; i--) {
-      File fi = mCrumbs.get(i).getFile();
-      if (fi.getPath().equals(path)) {
-        index = i;
-        break;
-      }
-    }
+        @Override
+        public boolean equals(Object o) {
+            return (o instanceof Crumb) && ((Crumb) o).getFile() != null &&
+                    ((Crumb) o).getFile().equals(getFile());
+        }
 
-    boolean removedActive = index >= mActive;
-    if (index > -1) {
-      while (index <= mCrumbs.size() - 1) {
-        removeCrumbAt(index);
-      }
-      if (mChildFrame.getChildCount() > 0) {
-        int lastIndex = mCrumbs.size() - 1;
-        invalidateActivated(mChildFrame.getChildAt(lastIndex), mActive == lastIndex, false, false);
-      }
-    }
-    return removedActive || mCrumbs.size() == 0;
-  }
+        @Override
+        public String toString() {
+            return "Crumb{" +
+                    "file=" + file +
+                    ", scrollPos=" + scrollPos +
+                    '}';
+        }
 
-  public boolean trim(File file) {
-    return trim(file.getPath(), file.isDirectory());
-  }
+        @Override
+        public int describeContents() {
+            return 0;
+        }
 
-  @Override
-  protected void onLayout(boolean changed, int l, int t, int r, int b) {
-    super.onLayout(changed, l, t, r, b);
-    // RTL works fine like this
-    View child = mChildFrame.getChildAt(mActive);
-    if (child != null) {
-      smoothScrollTo(child.getLeft(), 0);
-    }
-  }
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeSerializable(this.file);
+            dest.writeInt(this.scrollPos);
+        }
 
-  void invalidateActivatedAll() {
-    for (int i = 0; i < mCrumbs.size(); i++) {
-      Crumb crumb = mCrumbs.get(i);
-      invalidateActivated(
-              mChildFrame.getChildAt(i),
-              mActive == mCrumbs.indexOf(crumb),
-              false,
-              i < mCrumbs.size() - 1)
-          .setText(crumb.getTitle());
-    }
-  }
+        protected Crumb(Parcel in) {
+            this.file = (File) in.readSerializable();
+            this.scrollPos = in.readInt();
+        }
 
-  void removeCrumbAt(int index) {
-    mCrumbs.remove(index);
-    mChildFrame.removeViewAt(index);
-  }
+        public static final Creator<Crumb> CREATOR = new Creator<Crumb>() {
+            @Override
+            public Crumb createFromParcel(Parcel source) {
+                return new Crumb(source);
+            }
 
-  void updateIndices() {
-    for (int i = 0; i < mChildFrame.getChildCount(); i++) {
-      mChildFrame.getChildAt(i).setTag(i);
-    }
-  }
-
-  private void init() {
-    contentColorActivated =
-        ATHUtil.INSTANCE.resolveColor(getContext(), android.R.attr.textColorPrimary);
-    contentColorDeactivated =
-        ATHUtil.INSTANCE.resolveColor(getContext(), android.R.attr.textColorSecondary);
-    setMinimumHeight((int) getResources().getDimension(R.dimen.tab_height));
-    setClipToPadding(false);
-    setHorizontalScrollBarEnabled(false);
-    mCrumbs = new ArrayList<>();
-    mHistory = new ArrayList<>();
-    mChildFrame = new LinearLayout(getContext());
-    addView(
-        mChildFrame,
-        new ViewGroup.LayoutParams(
-            ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
-  }
-
-  private TextView invalidateActivated(
-      View view,
-      final boolean isActive,
-      final boolean noArrowIfAlone,
-      final boolean allowArrowVisible) {
-    int contentColor = isActive ? contentColorActivated : contentColorDeactivated;
-    LinearLayout child = (LinearLayout) view;
-    TextView tv = (TextView) child.getChildAt(0);
-    tv.setTextColor(contentColor);
-    ImageView iv = (ImageView) child.getChildAt(1);
-    iv.setColorFilter(contentColor, PorterDuff.Mode.SRC_IN);
-    if (noArrowIfAlone && getChildCount() == 1) {
-      iv.setVisibility(View.GONE);
-    } else if (allowArrowVisible) {
-      iv.setVisibility(View.VISIBLE);
-    } else {
-      iv.setVisibility(View.GONE);
-    }
-    return tv;
-  }
-
-  private boolean setActive(Crumb newActive) {
-    mActive = mCrumbs.indexOf(newActive);
-    invalidateActivatedAll();
-    boolean success = mActive > -1;
-    if (success) {
-      requestLayout();
-    }
-    return success;
-  }
-
-  public interface SelectionCallback {
-
-    void onCrumbSelection(Crumb crumb, int index);
-  }
-
-  public static class Crumb implements Parcelable {
-
-    public static final Creator<Crumb> CREATOR =
-        new Creator<Crumb>() {
-          @Override
-          public Crumb createFromParcel(Parcel source) {
-            return new Crumb(source);
-          }
-
-          @Override
-          public Crumb[] newArray(int size) {
-            return new Crumb[size];
-          }
+            @Override
+            public Crumb[] newArray(int size) {
+                return new Crumb[size];
+            }
         };
-
-    private final File file;
-
-    private int scrollPos;
-
-    public Crumb(File file) {
-      this.file = file;
     }
 
-    protected Crumb(Parcel in) {
-      this.file = (File) in.readSerializable();
-      this.scrollPos = in.readInt();
+    public interface SelectionCallback {
+        void onCrumbSelection(Crumb crumb, int index);
+    }
+
+    public BreadCrumbLayout(Context context) {
+        super(context);
+        init();
+    }
+
+    public BreadCrumbLayout(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init();
+    }
+
+    public BreadCrumbLayout(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init();
+    }
+
+    // Stores currently visible crumbs
+    private List<Crumb> mCrumbs;
+    // Used in setActiveOrAdd() between clearing crumbs and adding the new set, nullified afterwards
+    private List<Crumb> mOldCrumbs;
+    // Stores user's navigation history, like a fragment back stack
+    private List<Crumb> mHistory;
+
+    private LinearLayout mChildFrame;
+    private int mActive;
+    private SelectionCallback mCallback;
+
+    private void init() {
+        contentColorActivated = ThemeStore.Companion.textColorPrimary(getContext());
+        contentColorDeactivated = ThemeStore.Companion.textColorSecondary(getContext());
+        setMinimumHeight((int) getResources().getDimension(R.dimen.tab_height));
+        setClipToPadding(false);
+        setHorizontalScrollBarEnabled(false);
+        mCrumbs = new ArrayList<>();
+        mHistory = new ArrayList<>();
+        mChildFrame = new LinearLayout(getContext());
+        addView(mChildFrame, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.MATCH_PARENT));
+    }
+
+    public void addHistory(Crumb crumb) {
+        mHistory.add(crumb);
+    }
+
+    public Crumb lastHistory() {
+        if (mHistory.size() == 0) return null;
+        return mHistory.get(mHistory.size() - 1);
+    }
+
+    public boolean popHistory() {
+        if (mHistory.size() == 0) return false;
+        mHistory.remove(mHistory.size() - 1);
+        return mHistory.size() != 0;
+    }
+
+    public int historySize() {
+        return mHistory.size();
+    }
+
+    public void clearHistory() {
+        mHistory.clear();
+    }
+
+    public void reverseHistory() {
+        Collections.reverse(mHistory);
+    }
+
+    public void addCrumb(@NonNull Crumb crumb, boolean refreshLayout) {
+        LinearLayout view = (LinearLayout) LayoutInflater.from(getContext()).inflate(R.layout.bread_crumb, this, false);
+        view.setTag(mCrumbs.size());
+        view.setOnClickListener(this);
+
+        ImageView iv = (ImageView) view.getChildAt(1);
+        if (Build.VERSION.SDK_INT >= 19 && iv.getDrawable() != null) {
+            iv.getDrawable().setAutoMirrored(true);
+        }
+        iv.setVisibility(View.GONE);
+
+        mChildFrame.addView(view, new ViewGroup.LayoutParams(
+                ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT));
+        mCrumbs.add(crumb);
+        if (refreshLayout) {
+            mActive = mCrumbs.size() - 1;
+            requestLayout();
+        }
+        invalidateActivatedAll();
     }
 
     @Override
-    public int describeContents() {
-      return 0;
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        //RTL works fine like this
+        View child = mChildFrame.getChildAt(mActive);
+        if (child != null)
+            smoothScrollTo(child.getLeft(), 0);
+    }
+
+    public Crumb findCrumb(@NonNull File forDir) {
+        for (int i = 0; i < mCrumbs.size(); i++) {
+            if (mCrumbs.get(i).getFile().equals(forDir))
+                return mCrumbs.get(i);
+        }
+        return null;
+    }
+
+    public void clearCrumbs() {
+        try {
+            mOldCrumbs = new ArrayList<>(mCrumbs);
+            mCrumbs.clear();
+            mChildFrame.removeAllViews();
+        } catch (IllegalStateException e) {
+            e.printStackTrace();
+        }
+    }
+
+    public Crumb getCrumb(int index) {
+        return mCrumbs.get(index);
+    }
+
+    public void setCallback(SelectionCallback callback) {
+        mCallback = callback;
+    }
+
+    private boolean setActive(Crumb newActive) {
+        mActive = mCrumbs.indexOf(newActive);
+        invalidateActivatedAll();
+        boolean success = mActive > -1;
+        if (success)
+            requestLayout();
+        return success;
+    }
+
+    void invalidateActivatedAll() {
+        for (int i = 0; i < mCrumbs.size(); i++) {
+            Crumb crumb = mCrumbs.get(i);
+            invalidateActivated(mChildFrame.getChildAt(i), mActive == mCrumbs.indexOf(crumb), false, i < mCrumbs.size() - 1).setText(crumb.getTitle());
+        }
+    }
+
+    void removeCrumbAt(int index) {
+        mCrumbs.remove(index);
+        mChildFrame.removeViewAt(index);
+    }
+
+    public boolean trim(String path, boolean dir) {
+        if (!dir) return false;
+        int index = -1;
+        for (int i = mCrumbs.size() - 1; i >= 0; i--) {
+            File fi = mCrumbs.get(i).getFile();
+            if (fi.getPath().equals(path)) {
+                index = i;
+                break;
+            }
+        }
+
+        boolean removedActive = index >= mActive;
+        if (index > -1) {
+            while (index <= mCrumbs.size() - 1)
+                removeCrumbAt(index);
+            if (mChildFrame.getChildCount() > 0) {
+                int lastIndex = mCrumbs.size() - 1;
+                invalidateActivated(mChildFrame.getChildAt(lastIndex), mActive == lastIndex, false, false);
+            }
+        }
+        return removedActive || mCrumbs.size() == 0;
+    }
+
+    public boolean trim(File file) {
+        return trim(file.getPath(), file.isDirectory());
+    }
+
+    void updateIndices() {
+        for (int i = 0; i < mChildFrame.getChildCount(); i++)
+            mChildFrame.getChildAt(i).setTag(i);
+    }
+
+    public void setActiveOrAdd(@NonNull Crumb crumb, boolean forceRecreate) {
+        if (forceRecreate || !setActive(crumb)) {
+            clearCrumbs();
+            final List<File> newPathSet = new ArrayList<>();
+
+            newPathSet.add(0, crumb.getFile());
+
+            File p = crumb.getFile();
+            while ((p = p.getParentFile()) != null) {
+                newPathSet.add(0, p);
+            }
+
+            for (int index = 0; index < newPathSet.size(); index++) {
+                final File fi = newPathSet.get(index);
+                crumb = new Crumb(fi);
+
+                // Restore scroll positions saved before clearing
+                if (mOldCrumbs != null) {
+                    for (Iterator<Crumb> iterator = mOldCrumbs.iterator(); iterator.hasNext(); ) {
+                        Crumb old = iterator.next();
+                        if (old.equals(crumb)) {
+                            crumb.setScrollPosition(old.getScrollPosition());
+                            iterator.remove(); // minimize number of linear passes by removing un-used crumbs from history
+                            break;
+                        }
+                    }
+                }
+
+                addCrumb(crumb, true);
+            }
+
+            // History no longer needed
+            mOldCrumbs = null;
+        }
+    }
+
+    public int size() {
+        return mCrumbs.size();
+    }
+
+    private TextView invalidateActivated(View view, final boolean isActive, final boolean noArrowIfAlone, final boolean allowArrowVisible) {
+        int contentColor = isActive ? contentColorActivated : contentColorDeactivated;
+        LinearLayout child = (LinearLayout) view;
+        TextView tv = (TextView) child.getChildAt(0);
+        tv.setTextColor(contentColor);
+        ImageView iv = (ImageView) child.getChildAt(1);
+        iv.setColorFilter(contentColor, PorterDuff.Mode.SRC_IN);
+        if (noArrowIfAlone && getChildCount() == 1)
+            iv.setVisibility(View.GONE);
+        else if (allowArrowVisible)
+            iv.setVisibility(View.VISIBLE);
+        else
+            iv.setVisibility(View.GONE);
+        return tv;
+    }
+
+    public int getActiveIndex() {
+        return mActive;
+    }
+
+    public void setActivatedContentColor(@ColorInt int contentColorActivated) {
+        this.contentColorActivated = contentColorActivated;
+    }
+
+    public void setDeactivatedContentColor(@ColorInt int contentColorDeactivated) {
+        this.contentColorDeactivated = contentColorDeactivated;
     }
 
     @Override
-    public boolean equals(Object o) {
-      return (o instanceof Crumb)
-          && ((Crumb) o).getFile() != null
-          && ((Crumb) o).getFile().equals(getFile());
+    public void onClick(View v) {
+        if (mCallback != null) {
+            int index = (Integer) v.getTag();
+            mCallback.onCrumbSelection(mCrumbs.get(index), index);
+        }
     }
 
-    public File getFile() {
-      return file;
-    }
+    public static class SavedStateWrapper implements Parcelable {
 
-    public int getScrollPosition() {
-      return scrollPos;
-    }
+        public final int mActive;
+        public final List<Crumb> mCrumbs;
+        public final int mVisibility;
 
-    public void setScrollPosition(int scrollY) {
-      this.scrollPos = scrollY;
-    }
+        public SavedStateWrapper(BreadCrumbLayout view) {
+            mActive = view.mActive;
+            mCrumbs = view.mCrumbs;
+            mVisibility = view.getVisibility();
+        }
 
-    public String getTitle() {
-      return file.getPath().equals("/") ? "root" : file.getName();
-    }
+        @Override
+        public int describeContents() {
+            return 0;
+        }
 
-    @NonNull
-    @Override
-    public String toString() {
-      return "Crumb{" + "file=" + file + ", scrollPos=" + scrollPos + '}';
-    }
+        @Override
+        public void writeToParcel(Parcel dest, int flags) {
+            dest.writeInt(this.mActive);
+            dest.writeTypedList(mCrumbs);
+            dest.writeInt(this.mVisibility);
+        }
 
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-      dest.writeSerializable(this.file);
-      dest.writeInt(this.scrollPos);
-    }
-  }
+        protected SavedStateWrapper(Parcel in) {
+            this.mActive = in.readInt();
+            this.mCrumbs = in.createTypedArrayList(Crumb.CREATOR);
+            this.mVisibility = in.readInt();
+        }
 
-  public static class SavedStateWrapper implements Parcelable {
+        public static final Creator<SavedStateWrapper> CREATOR = new Creator<SavedStateWrapper>() {
+            public SavedStateWrapper createFromParcel(Parcel source) {
+                return new SavedStateWrapper(source);
+            }
 
-    public static final Creator<SavedStateWrapper> CREATOR =
-        new Creator<SavedStateWrapper>() {
-          public SavedStateWrapper createFromParcel(Parcel source) {
-            return new SavedStateWrapper(source);
-          }
-
-          public SavedStateWrapper[] newArray(int size) {
-            return new SavedStateWrapper[size];
-          }
+            public SavedStateWrapper[] newArray(int size) {
+                return new SavedStateWrapper[size];
+            }
         };
-
-    public final int mActive;
-
-    public final List<Crumb> mCrumbs;
-
-    public final int mVisibility;
-
-    public SavedStateWrapper(BreadCrumbLayout view) {
-      mActive = view.mActive;
-      mCrumbs = view.mCrumbs;
-      mVisibility = view.getVisibility();
     }
 
-    protected SavedStateWrapper(Parcel in) {
-      this.mActive = in.readInt();
-      this.mCrumbs = in.createTypedArrayList(Crumb.CREATOR);
-      this.mVisibility = in.readInt();
+    public SavedStateWrapper getStateWrapper() {
+        return new SavedStateWrapper(this);
     }
 
-    @Override
-    public int describeContents() {
-      return 0;
+    public void restoreFromStateWrapper(SavedStateWrapper mSavedState) {
+        if (mSavedState != null) {
+            mActive = mSavedState.mActive;
+            for (Crumb c : mSavedState.mCrumbs) {
+                addCrumb(c, false);
+            }
+            requestLayout();
+            setVisibility(mSavedState.mVisibility);
+        }
     }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-      dest.writeInt(this.mActive);
-      dest.writeTypedList(mCrumbs);
-      dest.writeInt(this.mVisibility);
-    }
-  }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
new file mode 100644
index 000000000..d99f77bdd
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/CircularImageView.java
@@ -0,0 +1,324 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Bitmap;
+import android.graphics.BitmapShader;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Matrix;
+import android.graphics.Paint;
+import android.graphics.Shader;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import androidx.appcompat.widget.AppCompatImageView;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import code.name.monkey.retromusic.R;
+
+public class CircularImageView extends AppCompatImageView {
+
+    private static final ScaleType SCALE_TYPE = ScaleType.CENTER_CROP;
+
+    // Default Values
+    private static final float DEFAULT_BORDER_WIDTH = 4;
+    private static final float DEFAULT_SHADOW_RADIUS = 8.0f;
+
+    // Properties
+    private float borderWidth;
+    private int canvasSize;
+    private float shadowRadius;
+    private int shadowColor = Color.BLACK;
+
+    // Object used to draw
+    private Bitmap image;
+    private Drawable drawable;
+    private Paint paint;
+    private Paint paintBorder;
+
+    //region Constructor & Init Method
+    public CircularImageView(final Context context) {
+        this(context, null);
+    }
+
+    public CircularImageView(Context context, AttributeSet attrs) {
+        this(context, attrs, 0);
+    }
+
+    public CircularImageView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs, defStyleAttr);
+    }
+
+    private void init(Context context, AttributeSet attrs, int defStyleAttr) {
+        // Init paint
+        paint = new Paint();
+        paint.setAntiAlias(true);
+
+        paintBorder = new Paint();
+        paintBorder.setAntiAlias(true);
+
+        // Load the styled attributes and set their properties
+        TypedArray attributes = context
+                .obtainStyledAttributes(attrs, R.styleable.CircularImageView, defStyleAttr, 0);
+
+        // Init Border
+        if (attributes.getBoolean(R.styleable.CircularImageView_civ_border, true)) {
+            float defaultBorderSize =
+                    DEFAULT_BORDER_WIDTH * getContext().getResources().getDisplayMetrics().density;
+            setBorderWidth(attributes
+                    .getDimension(R.styleable.CircularImageView_civ_border_width, defaultBorderSize));
+            setBorderColor(
+                    attributes.getColor(R.styleable.CircularImageView_civ_border_color, Color.WHITE));
+        }
+
+        // Init Shadow
+        if (attributes.getBoolean(R.styleable.CircularImageView_civ_shadow, false)) {
+            shadowRadius = DEFAULT_SHADOW_RADIUS;
+            drawShadow(attributes.getFloat(R.styleable.CircularImageView_civ_shadow_radius, shadowRadius),
+                    attributes.getColor(R.styleable.CircularImageView_civ_shadow_color, shadowColor));
+        }
+        attributes.recycle();
+    }
+    //endregion
+
+    //region Set Attr Method
+    public void setBorderWidth(float borderWidth) {
+        this.borderWidth = borderWidth;
+        requestLayout();
+        invalidate();
+    }
+
+    public void setBorderColor(int borderColor) {
+        if (paintBorder != null) {
+            paintBorder.setColor(borderColor);
+        }
+        invalidate();
+    }
+
+    public void addShadow() {
+        if (shadowRadius == 0) {
+            shadowRadius = DEFAULT_SHADOW_RADIUS;
+        }
+        drawShadow(shadowRadius, shadowColor);
+        invalidate();
+    }
+
+    public void setShadowRadius(float shadowRadius) {
+        drawShadow(shadowRadius, shadowColor);
+        invalidate();
+    }
+
+    public void setShadowColor(int shadowColor) {
+        drawShadow(shadowRadius, shadowColor);
+        invalidate();
+    }
+
+    @Override
+    public ScaleType getScaleType() {
+        return SCALE_TYPE;
+    }
+
+    @Override
+    public void setScaleType(ScaleType scaleType) {
+        if (scaleType != SCALE_TYPE) {
+            throw new IllegalArgumentException(String.format(
+                    "ScaleType %s not supported. ScaleType.CENTER_CROP is used by default. So you don't need to use ScaleType.",
+                    scaleType));
+        }
+    }
+    //endregion
+
+    //region Draw Method
+    @Override
+    public void onDraw(Canvas canvas) {
+        // Load the bitmap
+        loadBitmap();
+
+        // Check if image isn't null
+        if (image == null) {
+            return;
+        }
+
+        if (!isInEditMode()) {
+            canvasSize = canvas.getWidth();
+            if (canvas.getHeight() < canvasSize) {
+                canvasSize = canvas.getHeight();
+            }
+        }
+
+        // circleCenter is the x or y of the view's center
+        // radius is the radius in pixels of the cirle to be drawn
+        // paint contains the shader that will texture the shape
+        int circleCenter = (int) (canvasSize - (borderWidth * 2)) / 2;
+        // Draw Border
+        canvas.drawCircle(circleCenter + borderWidth, circleCenter + borderWidth,
+                circleCenter + borderWidth - (shadowRadius + shadowRadius / 2), paintBorder);
+        // Draw CircularImageView
+        canvas.drawCircle(circleCenter + borderWidth, circleCenter + borderWidth,
+                circleCenter - (shadowRadius + shadowRadius / 2), paint);
+    }
+
+    private void loadBitmap() {
+        if (this.drawable == getDrawable()) {
+            return;
+        }
+
+        this.drawable = getDrawable();
+        this.image = drawableToBitmap(this.drawable);
+        updateShader();
+    }
+
+    @Override
+    protected void onSizeChanged(int w, int h, int oldw, int oldh) {
+        super.onSizeChanged(w, h, oldw, oldh);
+        canvasSize = w;
+        if (h < canvasSize) {
+            canvasSize = h;
+        }
+        if (image != null) {
+            updateShader();
+        }
+    }
+
+    private void drawShadow(float shadowRadius, int shadowColor) {
+        this.shadowRadius = shadowRadius;
+        this.shadowColor = shadowColor;
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.HONEYCOMB) {
+            setLayerType(LAYER_TYPE_SOFTWARE, paintBorder);
+        }
+        paintBorder.setShadowLayer(shadowRadius, 0.0f, shadowRadius / 2, shadowColor);
+    }
+
+    private void updateShader() {
+        if (image == null) {
+            return;
+        }
+
+        // Crop Center Image
+        image = cropBitmap(image);
+
+        // Create Shader
+        BitmapShader shader = new BitmapShader(image, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP);
+
+        // Center Image in Shader
+        Matrix matrix = new Matrix();
+        matrix.setScale((float) canvasSize / (float) image.getWidth(),
+                (float) canvasSize / (float) image.getHeight());
+        shader.setLocalMatrix(matrix);
+
+        // Set Shader in Paint
+        paint.setShader(shader);
+    }
+
+    private Bitmap cropBitmap(Bitmap bitmap) {
+        Bitmap bmp;
+        if (bitmap.getWidth() >= bitmap.getHeight()) {
+            bmp = Bitmap.createBitmap(
+                    bitmap,
+                    bitmap.getWidth() / 2 - bitmap.getHeight() / 2,
+                    0,
+                    bitmap.getHeight(), bitmap.getHeight());
+        } else {
+            bmp = Bitmap.createBitmap(
+                    bitmap,
+                    0,
+                    bitmap.getHeight() / 2 - bitmap.getWidth() / 2,
+                    bitmap.getWidth(), bitmap.getWidth());
+        }
+        return bmp;
+    }
+
+    private Bitmap drawableToBitmap(Drawable drawable) {
+        if (drawable == null) {
+            return null;
+        } else if (drawable instanceof BitmapDrawable) {
+            return ((BitmapDrawable) drawable).getBitmap();
+        }
+
+        int intrinsicWidth = drawable.getIntrinsicWidth();
+        int intrinsicHeight = drawable.getIntrinsicHeight();
+
+        if (!(intrinsicWidth > 0 && intrinsicHeight > 0)) {
+            return null;
+        }
+
+        try {
+            // Create Bitmap object out of the drawable
+            Bitmap bitmap = Bitmap.createBitmap(intrinsicWidth, intrinsicHeight, Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(bitmap);
+            drawable.setBounds(0, 0, canvas.getWidth(), canvas.getHeight());
+            drawable.draw(canvas);
+            return bitmap;
+        } catch (OutOfMemoryError e) {
+            // Simply return null of failed bitmap creations
+            Log.e(getClass().toString(), "Encountered OutOfMemoryError while generating bitmap!");
+            return null;
+        }
+    }
+    //endregion
+
+    //region Mesure Method
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        int width = measureWidth(widthMeasureSpec);
+        int height = measureHeight(heightMeasureSpec);
+        /*int imageSize = (width < height) ? width : height;
+        setMeasuredDimension(imageSize, imageSize);*/
+        setMeasuredDimension(width, height);
+    }
+
+    private int measureWidth(int measureSpec) {
+        int result;
+        int specMode = MeasureSpec.getMode(measureSpec);
+        int specSize = MeasureSpec.getSize(measureSpec);
+
+        if (specMode == MeasureSpec.EXACTLY) {
+            // The parent has determined an exact size for the child.
+            result = specSize;
+        } else if (specMode == MeasureSpec.AT_MOST) {
+            // The child can be as large as it wants up to the specified size.
+            result = specSize;
+        } else {
+            // The parent has not imposed any constraint on the child.
+            result = canvasSize;
+        }
+
+        return result;
+    }
+
+    private int measureHeight(int measureSpecHeight) {
+        int result;
+        int specMode = MeasureSpec.getMode(measureSpecHeight);
+        int specSize = MeasureSpec.getSize(measureSpecHeight);
+
+        if (specMode == MeasureSpec.EXACTLY) {
+            // We were told how big to be
+            result = specSize;
+        } else if (specMode == MeasureSpec.AT_MOST) {
+            // The child can be as large as it wants up to the specified size.
+            result = specSize;
+        } else {
+            // Measure the text (beware: ascent is a negative number)
+            result = canvasSize;
+        }
+
+        return (result + 2);
+    }
+    //endregion
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt b/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
index c9d4dba9e..f6cb48621 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ColorIconsImageView.kt
@@ -19,48 +19,47 @@ import android.content.res.ColorStateList
 import android.graphics.Color
 import android.util.AttributeSet
 import androidx.appcompat.widget.AppCompatImageView
-import androidx.core.content.ContextCompat
-import androidx.core.content.withStyledAttributes
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroColorUtil
-import com.google.android.material.color.MaterialColors
 
 
-class ColorIconsImageView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1
-) : AppCompatImageView(context, attrs, defStyleAttr) {
+class ColorIconsImageView : AppCompatImageView {
 
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
 
-    init {
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet?) {
         // Load the styled attributes and set their properties
-        context.withStyledAttributes(attrs, R.styleable.ColorIconsImageView, 0, 0) {
-            val color = getColor(R.styleable.ColorIconsImageView_iconBackgroundColor, Color.RED)
-            setIconBackgroundColor(color)
-        }
+        val attributes = context.obtainStyledAttributes(attrs, R.styleable.ColorIconsImageView, 0, 0)
+        val color = attributes.getColor(R.styleable.ColorIconsImageView_iconBackgroundColor, Color.RED);
+        setIconBackgroundColor(color)
+        attributes.recycle()
     }
 
     fun setIconBackgroundColor(color: Int) {
-        background = ContextCompat.getDrawable(context, R.drawable.color_circle_gradient)
-        if (ATHUtil.isWindowBackgroundDark(context) && PreferenceUtil.isDesaturatedColor) {
+        setBackgroundResource(R.drawable.color_circle_gradient)
+        if (ATHUtil.isWindowBackgroundDark(context) && PreferenceUtil.getInstance(context).desaturatedColor()) {
             val desaturatedColor = RetroColorUtil.desaturateColor(color, 0.4f)
             backgroundTintList = ColorStateList.valueOf(desaturatedColor)
-            imageTintList =
-                ColorStateList.valueOf(ATHUtil.resolveColor(context, com.google.android.material.R.attr.colorSurface))
+            imageTintList = ColorStateList.valueOf(ATHUtil.resolveColor(context,  R.attr.colorSurface))
         } else {
-            val finalColor = MaterialColors.harmonize(
-                color,
-                ThemeStore.accentColor(context)
-            )
-            backgroundTintList = ColorStateList.valueOf(ColorUtil.adjustAlpha(finalColor, 0.22f))
-            imageTintList = ColorStateList.valueOf(ColorUtil.withAlpha(finalColor, 0.75f))
+            backgroundTintList = ColorStateList.valueOf(ColorUtil.adjustAlpha(color, 0.22f))
+            imageTintList = ColorStateList.valueOf(ColorUtil.withAlpha(color, 0.75f))
         }
         requestLayout()
         invalidate()
     }
+
 }
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..cd72ea559
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ContributorsView.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+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/DrawableGradient.java b/app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java
index e2a5daa5b..aad7cdbd9 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java
+++ b/app/src/main/java/code/name/monkey/retromusic/views/DrawableGradient.java
@@ -17,19 +17,20 @@ package code.name.monkey.retromusic.views;
 import android.graphics.drawable.GradientDrawable;
 
 public class DrawableGradient extends GradientDrawable {
-  public DrawableGradient(Orientation orientations, int[] colors, int shape) {
-    super(orientations, colors);
-    try {
-      setShape(shape);
-      setGradientType(GradientDrawable.LINEAR_GRADIENT);
-      setCornerRadius(0);
-    } catch (Exception e) {
-      e.printStackTrace();
+    public DrawableGradient(Orientation orientations, int[] colors, int shape) {
+        super(orientations, colors);
+        try {
+            setShape(shape);
+            setGradientType(GradientDrawable.LINEAR_GRADIENT);
+            setCornerRadius(0);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    public DrawableGradient SetTransparency(int transparencyPercent) {
+        this.setAlpha(255 - ((255 * transparencyPercent) / 100));
+        return this;
     }
-  }
 
-  public DrawableGradient SetTransparency(int transparencyPercent) {
-    this.setAlpha(255 - ((255 * transparencyPercent) / 100));
-    return this;
-  }
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.java
new file mode 100755
index 000000000..9aebf19e7
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+public class HeightFitSquareLayout extends FrameLayout {
+    private boolean forceSquare = true;
+
+    public HeightFitSquareLayout(Context context) {
+        super(context);
+    }
+
+    public HeightFitSquareLayout(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    public HeightFitSquareLayout(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+    }
+
+    @TargetApi(21)
+    public HeightFitSquareLayout(Context context, AttributeSet attributeSet, int i, int i2) {
+        super(context, attributeSet, i, i2);
+    }
+
+    public void forceSquare(boolean z) {
+        this.forceSquare = z;
+        requestLayout();
+    }
+
+    protected void onMeasure(int i, int i2) {
+        if (this.forceSquare) {
+            i = i2;
+        }
+        super.onMeasure(i, i2);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt
deleted file mode 100644
index 8ac6172bb..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/HeightFitSquareLayout.kt
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.widget.FrameLayout
-
-class HeightFitSquareLayout  @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr){
-    private var forceSquare = true
-
-    fun setForceSquare(forceSquare: Boolean) {
-        this.forceSquare = forceSquare
-        requestLayout()
-    }
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        var i = widthMeasureSpec
-        if (forceSquare) {
-            i = heightMeasureSpec
-        }
-        super.onMeasure(i, heightMeasureSpec)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
deleted file mode 100644
index 015bf3951..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/HomeImageLayout.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import android.widget.ImageView
-import android.widget.TextView
-import code.name.monkey.retromusic.databinding.BannerImageLayoutBinding
-import code.name.monkey.retromusic.databinding.UserImageLayoutBinding
-import code.name.monkey.retromusic.util.PreferenceUtil
-
-class HomeImageLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
-    private var userImageBinding: UserImageLayoutBinding? = null
-    private var bannerImageBinding: BannerImageLayoutBinding? = null
-
-    init {
-        if (isInEditMode || PreferenceUtil.isHomeBanner) {
-            bannerImageBinding = BannerImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
-        } else {
-            userImageBinding = UserImageLayoutBinding.inflate(LayoutInflater.from(context), this, true)
-        }
-    }
-
-    val userImage: ImageView
-        get() = if (PreferenceUtil.isHomeBanner) {
-            bannerImageBinding!!.userImage
-        } else {
-            userImageBinding!!.userImage
-        }
-
-    val bannerImage: ImageView?
-        get() = if (PreferenceUtil.isHomeBanner) {
-            bannerImageBinding!!.bannerImage
-        } else {
-            null
-        }
-
-    val titleWelcome : TextView
-        get() = if (PreferenceUtil.isHomeBanner) {
-            bannerImageBinding!!.titleWelcome
-        } else {
-            userImageBinding!!.titleWelcome
-        }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
index 37924d275..aea3312c4 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
@@ -16,45 +16,53 @@ package code.name.monkey.retromusic.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.view.LayoutInflater
+import android.view.View
 import android.widget.FrameLayout
-import androidx.core.content.withStyledAttributes
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ListItemViewNoCardBinding
 import code.name.monkey.retromusic.extensions.hide
 import code.name.monkey.retromusic.extensions.show
+import kotlinx.android.synthetic.main.list_item_view.view.*
 
 /**
  * Created by hemanths on 2019-10-02.
  */
-class ListItemView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1
-) : FrameLayout(context, attrs, defStyleAttr) {
+class ListItemView : FrameLayout {
 
-    private var binding =
-        ListItemViewNoCardBinding.inflate(LayoutInflater.from(context), this, true)
 
-    init {
-        context.withStyledAttributes(attrs, R.styleable.ListItemView) {
-            if (hasValue(R.styleable.ListItemView_listItemIcon)) {
-                binding.icon.setImageDrawable(getDrawable(R.styleable.ListItemView_listItemIcon))
-            } else {
-                binding.icon.hide()
-            }
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
 
-            binding.title.text = getText(R.styleable.ListItemView_listItemTitle)
-            if (hasValue(R.styleable.ListItemView_listItemSummary)) {
-                binding.summary.text = getText(R.styleable.ListItemView_listItemSummary)
-            } else {
-                binding.summary.hide()
-            }
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    private fun init(context: Context, attrs: AttributeSet?) {
+        View.inflate(context, R.layout.list_item_view, this)
+
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ListItemView)
+        if (typedArray.hasValue(R.styleable.ListItemView_listItemIcon)) {
+            icon.setImageDrawable(typedArray.getDrawable(R.styleable.ListItemView_listItemIcon))
+        } else {
+
+            icon.hide()
         }
+
+        title.text = typedArray.getText(R.styleable.ListItemView_listItemTitle)
+        if (typedArray.hasValue(R.styleable.ListItemView_listItemSummary)) {
+            summary.text = typedArray.getText(R.styleable.ListItemView_listItemSummary)
+        } else {
+            summary.hide()
+        }
+        typedArray.recycle()
     }
 
     fun setSummary(appVersion: String) {
-        binding.summary.show()
-        binding.summary.text = appVersion
+        summary.show()
+        summary.text = appVersion
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.java b/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.java
new file mode 100644
index 000000000..b599977f1
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.webkit.WebView;
+
+public class LollipopFixedWebView extends WebView {
+    public LollipopFixedWebView(Context context) {
+        super(getFixedContext(context));
+    }
+
+    public LollipopFixedWebView(Context context, AttributeSet attrs) {
+        super(getFixedContext(context), attrs);
+    }
+
+    public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(getFixedContext(context), attrs, defStyleAttr);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(getFixedContext(context), attrs, defStyleAttr, defStyleRes);
+    }
+
+    public LollipopFixedWebView(Context context, AttributeSet attrs, int defStyleAttr, boolean privateBrowsing) {
+        super(getFixedContext(context), attrs, defStyleAttr, privateBrowsing);
+    }
+
+    public static Context getFixedContext(Context context) {
+        return context.createConfigurationContext(new Configuration());
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt
new file mode 100644
index 000000000..39f233f29
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/MetalRecyclerViewPager.kt
@@ -0,0 +1,101 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views
+
+import android.content.Context
+import android.util.AttributeSet
+import android.util.DisplayMetrics
+import android.view.View
+import android.view.ViewGroup
+import androidx.annotation.NonNull
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.PagerSnapHelper
+import androidx.recyclerview.widget.RecyclerView
+import code.name.monkey.retromusic.R
+import code.name.monkey.retromusic.adapter.base.MediaEntryViewHolder
+import code.name.monkey.retromusic.util.RetroUtil
+
+class MetalRecyclerViewPager : RecyclerView {
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    private var itemMargin: Int = 0
+
+    fun init(context: Context, attrs: AttributeSet?) {
+        val typedArray = context.obtainStyledAttributes(attrs, R.styleable.MetalRecyclerViewPager, 0, 0)
+        itemMargin = typedArray.getDimension(R.styleable.MetalRecyclerViewPager_itemMargin, 0f).toInt()
+        typedArray.recycle()
+
+        layoutManager = LinearLayoutManager(context, LinearLayoutManager.HORIZONTAL, false)
+        val snapHelper = PagerSnapHelper()
+        snapHelper.attachToRecyclerView(this)
+    }
+
+    override fun setAdapter(adapter: Adapter<*>?) {
+        if (adapter is MetalAdapter) {
+            adapter.setItemMargin(itemMargin)
+            adapter.updateDisplayMetrics()
+        } else {
+            throw IllegalArgumentException("Only MetalAdapter is allowed here")
+        }
+        super.setAdapter(adapter)
+    }
+
+    abstract class MetalAdapter<VH : MetalViewHolder>(@NonNull val displayMetrics: DisplayMetrics) : RecyclerView.Adapter<VH>() {
+        private var itemMargin: Int = 0
+        private var itemWidth: Int = 0
+
+        fun setItemMargin(itemMargin: Int) {
+            this.itemMargin = itemMargin
+        }
+
+        fun updateDisplayMetrics() {
+            itemWidth = if (RetroUtil.isTablet()) {
+                displayMetrics.widthPixels / 2 - itemMargin * 3
+            } else if (RetroUtil.isLandscape()) {
+                ((displayMetrics.widthPixels / 1.5f) - itemMargin).toInt()
+            } else {
+                displayMetrics.widthPixels - itemMargin
+            }
+        }
+
+        override fun onBindViewHolder(holder: VH, position: Int) {
+            val currentItemWidth = itemWidth
+            if (position == 0) {
+                //currentItemWidth += itemMargin;
+                holder.rootLayout.setPadding(0, 0, 0, 0);
+            } else if (position == itemCount - 1) {
+                //currentItemWidth += itemMargin;
+                holder.rootLayout.setPadding(0, 0, 0, 0);
+            }
+
+            val height = holder.rootLayout.layoutParams.height
+            holder.rootLayout.layoutParams = ViewGroup.LayoutParams(currentItemWidth, height)
+        }
+    }
+
+    abstract class MetalViewHolder(itemView: View) : MediaEntryViewHolder(itemView) {
+        var rootLayout: ViewGroup = itemView.findViewById(R.id.root_layout)
+    }
+}
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
new file mode 100644
index 000000000..11f2f05d0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/NetworkImageView.java
@@ -0,0 +1,66 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.bumptech.glide.Glide;
+
+import code.name.monkey.retromusic.R;
+
+/**
+ * @author Hemanth S (h4h13).
+ */
+public class NetworkImageView extends CircularImageView {
+
+    public NetworkImageView(@NonNull Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public NetworkImageView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public NetworkImageView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    public void setImageUrl(@NonNull String imageUrl) {
+        setImageUrl(getContext(), imageUrl);
+    }
+
+    public void setImageUrl(@NonNull Context context, @NonNull String imageUrl) {
+        Glide.with(context)
+                .load(imageUrl)
+                .error(R.drawable.ic_account_white_24dp)
+                .placeholder(R.drawable.ic_account_white_24dp)
+                .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/NumberRollView.kt b/app/src/main/java/code/name/monkey/retromusic/views/NumberRollView.kt
deleted file mode 100644
index ea2d9cbd1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/NumberRollView.kt
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-package code.name.monkey.retromusic.views
-
-import android.animation.Animator
-import android.animation.ObjectAnimator
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.util.Property
-import android.view.animation.LinearInterpolator
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.annotation.VisibleForTesting
-import code.name.monkey.retromusic.R
-import java.text.NumberFormat
-
-/**
- * View that shows an integer number. It provides a smooth roll animation on changing the
- * number.
- */
-class NumberRollView(context: Context?, attrs: AttributeSet?) :
-    FrameLayout(context!!, attrs) {
-    private var mUpNumber: TextView? = null
-    private var mDownNumber: TextView? = null
-    private var mNumber = 0f
-    private var mLastRollAnimator: Animator? = null
-    private var mStringId = R.string.x_selected
-    private var mStringIdForZero = 0
-    override fun onFinishInflate() {
-        super.onFinishInflate()
-        mUpNumber = findViewById(R.id.up)
-        mDownNumber = findViewById(R.id.down)
-        assert(mUpNumber != null)
-        assert(mDownNumber != null)
-        setNumberRoll(mNumber)
-    }
-
-    /**
-     * Sets a number to display.
-     * @param animate Whether it should smoothly animate to the number.
-     */
-    fun setNumber(number: Int, animate: Boolean) {
-        if (mLastRollAnimator != null) mLastRollAnimator!!.cancel()
-        if (animate) {
-            val rollAnimator: Animator =
-                ObjectAnimator.ofFloat(this, NUMBER_PROPERTY, number.toFloat())
-            rollAnimator.interpolator = LinearInterpolator()
-            rollAnimator.start()
-            mLastRollAnimator = rollAnimator
-        } else {
-            setNumberRoll(number.toFloat())
-        }
-    }
-
-    /**
-     * @param stringId The id of the string to use for the description. The string must be a plural
-     * that has one placeholder for a quantity.
-     */
-    fun setString(stringId: Int) {
-        mStringId = stringId
-    }
-
-    /**
-     * @param stringIdForZero The id of the string to use for the description when the number is
-     * zero.
-     */
-    fun setStringForZero(stringIdForZero: Int) {
-        mStringIdForZero = stringIdForZero
-    }
-
-    /**
-     * Gets the current number roll position.
-     */
-    private fun getNumberRoll(): Float {
-        return mNumber
-    }
-
-    /**
-     * Sets the number roll position.
-     */
-    private fun setNumberRoll(number: Float) {
-        mNumber = number
-        val downNumber = number.toInt()
-        val upNumber = downNumber + 1
-        val numberFormatter = NumberFormat.getIntegerInstance()
-        var newString = if (mStringId != 0) {
-            if (upNumber == 0 && mStringIdForZero != 0) resources.getString(mStringIdForZero) else resources.getString(
-                mStringId,
-                upNumber
-            )
-        } else {
-            numberFormatter.format(upNumber.toLong())
-        }
-        if (newString != mUpNumber!!.text.toString()) {
-            mUpNumber!!.text = newString
-        }
-        newString = if (mStringId != 0) {
-            if (downNumber == 0 && mStringIdForZero != 0) resources.getString(mStringIdForZero) else resources.getString(
-                mStringId,
-                downNumber
-            )
-        } else {
-            numberFormatter.format(downNumber.toLong())
-        }
-        if (newString != mDownNumber!!.text.toString()) {
-            mDownNumber!!.text = newString
-        }
-        val offset = number % 1.0f
-        mUpNumber!!.translationY = mUpNumber!!.height * (offset - 1.0f)
-        mDownNumber!!.translationY = mDownNumber!!.height * offset
-        mUpNumber!!.alpha = offset
-        mDownNumber!!.alpha = 1.0f - offset
-    }
-
-    /** Ends any in-progress animations.  */
-    @VisibleForTesting
-    fun endAnimationsForTesting() {
-        if (mLastRollAnimator != null) mLastRollAnimator!!.end()
-    }
-
-    /**
-     * Update the text color with [ColorStateList] for both [TextView].
-     * @param resId The new text [ColorStateList] to use.
-     */
-    fun setTextColorStateList(colorStateList: ColorStateList?) {
-        mUpNumber!!.setTextColor(colorStateList)
-        mDownNumber!!.setTextColor(colorStateList)
-    }
-
-    companion object {
-        /**
-         * A Property wrapper around the `number` functionality handled by the
-         * [NumberRollView.setNumberRoll] and [NumberRollView.getNumberRoll]
-         * methods.
-         */
-        val NUMBER_PROPERTY: Property<NumberRollView, Float> =
-            object : Property<NumberRollView, Float>(
-                Float::class.java, ""
-            ) {
-                override fun set(view: NumberRollView, value: Float) {
-                    view.setNumberRoll(value)
-                }
-
-                override fun get(view: NumberRollView): Float {
-                    return view.getNumberRoll()
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java b/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java
new file mode 100644
index 000000000..1668d12a6
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.content.res.ColorStateList;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.core.content.ContextCompat;
+
+import code.name.monkey.appthemehelper.ThemeStore;
+import code.name.monkey.appthemehelper.util.ColorUtil;
+import code.name.monkey.retromusic.R;
+
+/**
+ * Created by hemanths on 3/23/19
+ */
+public class OptionMenuItemView extends FrameLayout {
+
+    TextView textView;
+    AppCompatImageView iconImageView;
+
+    public OptionMenuItemView(@NonNull Context context) {
+        this(context, null);
+    }
+
+    public OptionMenuItemView(@NonNull Context context, @Nullable AttributeSet attrs) {
+        this(context, attrs, -1);
+    }
+
+    public OptionMenuItemView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        this(context, attrs, defStyleAttr, -1);
+    }
+
+    public OptionMenuItemView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+
+        setBackground(ContextCompat.getDrawable(context, R.drawable.option_menu_background));
+
+        setClickable(true);
+        setFocusable(true);
+
+        inflate(context, R.layout.item_option_menu, this);
+
+        textView = findViewById(R.id.title);
+        iconImageView = findViewById(R.id.icon);
+
+        TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.OptionMenuItemView, 0, 0);
+
+        String title = attributes.getString(R.styleable.OptionMenuItemView_optionTitle);
+        textView.setText(title);
+
+        Drawable icon = attributes.getDrawable(R.styleable.OptionMenuItemView_optionIcon);
+        iconImageView.setImageDrawable(icon);
+
+        attributes.recycle();
+    }
+
+    @Override
+    public void setSelected(boolean selected) {
+        super.setSelected(selected);
+        if (selected) {
+            int accentColor = ThemeStore.Companion.accentColor(getContext());
+            int colorWithAlpha = ColorUtil.INSTANCE.adjustAlpha(accentColor, 0.22f);
+            textView.setTextColor(accentColor);
+            iconImageView.setImageTintList(ColorStateList.valueOf(accentColor));
+            setBackgroundTintList(ColorStateList.valueOf(colorWithAlpha));
+        }
+    }
+}
+
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt b/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
deleted file mode 100644
index da21fe2dd..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/PermissionItem.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import androidx.core.content.withStyledAttributes
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ItemPermissionBinding
-import code.name.monkey.retromusic.extensions.accentOutlineColor
-
-class PermissionItem @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
-    private var binding: ItemPermissionBinding
-    val checkImage get() = binding.checkImage
-
-    init {
-        binding = ItemPermissionBinding.inflate(LayoutInflater.from(context), this, true)
-
-        context.withStyledAttributes(attrs, R.styleable.PermissionItem, 0, 0) {
-            binding.title.text = getText(R.styleable.PermissionItem_permissionTitle)
-            binding.summary.text = getText(R.styleable.PermissionItem_permissionTitleSubTitle)
-            binding.number.text = getText(R.styleable.PermissionItem_permissionTitleNumber)
-            binding.button.text = getText(R.styleable.PermissionItem_permissionButtonTitle)
-            binding.button.setIconResource(
-                getResourceId(
-                    R.styleable.PermissionItem_permissionIcon,
-                    R.drawable.ic_album
-                )
-            )
-            val color = ThemeStore.accentColor(context)
-            binding.number.backgroundTintList =
-                ColorStateList.valueOf(ColorUtil.withAlpha(color, 0.22f))
-
-            if (!isInEditMode) binding.button.accentOutlineColor()
-        }
-    }
-
-    fun setButtonClick(callBack: () -> Unit) {
-        binding.button.setOnClickListener { callBack() }
-    }
-
-    fun setNumber(number: String) {
-        binding.number.text = number
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java b/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
deleted file mode 100644
index 73c2dbd39..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/PopupBackground.java
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views;
-
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Canvas;
-import android.graphics.ColorFilter;
-import android.graphics.Matrix;
-import android.graphics.Outline;
-import android.graphics.Paint;
-import android.graphics.Path;
-import android.graphics.PixelFormat;
-import android.graphics.Rect;
-import android.graphics.drawable.Drawable;
-import android.os.Build;
-import android.view.View;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableCompat;
-
-public class PopupBackground extends Drawable {
-
-  private final int mPaddingEnd;
-
-  private final int mPaddingStart;
-
-  @NonNull private final Paint mPaint;
-
-  @NonNull private final Path mPath = new Path();
-
-  @NonNull private final Matrix mTempMatrix = new Matrix();
-
-  public PopupBackground(@NonNull Context context, int color) {
-    mPaint = new Paint();
-    mPaint.setAntiAlias(true);
-    mPaint.setColor(color);
-    mPaint.setStyle(Paint.Style.FILL);
-    Resources resources = context.getResources();
-    mPaddingStart = resources.getDimensionPixelOffset(me.zhanghai.android.fastscroll.R.dimen.afs_md2_popup_padding_start);
-    mPaddingEnd = resources.getDimensionPixelOffset(me.zhanghai.android.fastscroll.R.dimen.afs_md2_popup_padding_end);
-  }
-
-  private static void pathArcTo(
-      @NonNull Path path,
-      float centerX,
-      float centerY,
-      float radius,
-      float startAngle,
-      float sweepAngle) {
-    path.arcTo(
-        centerX - radius,
-        centerY - radius,
-        centerX + radius,
-        centerY + radius,
-        startAngle,
-        sweepAngle,
-        false);
-  }
-
-  @Override
-  public void draw(@NonNull Canvas canvas) {
-    canvas.drawPath(mPath, mPaint);
-  }
-
-  @Override
-  public int getOpacity() {
-    return PixelFormat.TRANSLUCENT;
-  }
-
-  @Override
-  public void getOutline(@NonNull Outline outline) {
-    if (Build.VERSION.SDK_INT < Build.VERSION_CODES.Q && !mPath.isConvex()) {
-      // The outline path must be convex before Q, but we may run into floating point error
-      // caused by calculation involving sqrt(2) or OEM implementation difference, so in this
-      // case we just omit the shadow instead of crashing.
-      super.getOutline(outline);
-      return;
-    }
-    outline.setConvexPath(mPath);
-  }
-
-  @Override
-  public void setAlpha(int alpha) {}
-
-  @Override
-  public void setColorFilter(@Nullable ColorFilter colorFilter) {}
-
-  @Override
-  public boolean getPadding(@NonNull Rect padding) {
-    if (needMirroring()) {
-      padding.set(mPaddingEnd, 0, mPaddingStart, 0);
-    } else {
-      padding.set(mPaddingStart, 0, mPaddingEnd, 0);
-    }
-    return true;
-  }
-
-  @Override
-  public boolean isAutoMirrored() {
-    return true;
-  }
-
-  @Override
-  public boolean onLayoutDirectionChanged(int layoutDirection) {
-    updatePath();
-    return true;
-  }
-
-  @Override
-  protected void onBoundsChange(@NonNull Rect bounds) {
-    updatePath();
-  }
-
-  private boolean needMirroring() {
-    return DrawableCompat.getLayoutDirection(this) == View.LAYOUT_DIRECTION_RTL;
-  }
-
-  private void updatePath() {
-
-    mPath.reset();
-
-    Rect bounds = getBounds();
-    float width = bounds.width();
-    float height = bounds.height();
-    float r = height / 2;
-    float sqrt2 = (float) Math.sqrt(2);
-    // Ensure we are convex.
-    width = Math.max(r + sqrt2 * r, width);
-    pathArcTo(mPath, r, r, r, 90, 180);
-    float o1X = width - sqrt2 * r;
-    pathArcTo(mPath, o1X, r, r, -90, 45f);
-    float r2 = r / 5;
-    float o2X = width - sqrt2 * r2;
-    pathArcTo(mPath, o2X, r, r2, -45, 90);
-    pathArcTo(mPath, o1X, r, r, 45f, 45f);
-    mPath.close();
-
-    if (needMirroring()) {
-      mTempMatrix.setScale(-1, 1, width / 2, 0);
-    } else {
-      mTempMatrix.reset();
-    }
-    mTempMatrix.postTranslate(bounds.left, bounds.top);
-    mPath.transform(mTempMatrix);
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt b/app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt
deleted file mode 100644
index de9d391b3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/RetroShapeableImageView.kt
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.core.content.withStyledAttributes
-import code.name.monkey.retromusic.R
-import com.google.android.material.imageview.ShapeableImageView
-import com.google.android.material.shape.CornerFamily
-import com.google.android.material.shape.ShapeAppearanceModel
-
-
-class RetroShapeableImageView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyle: Int = -1
-) : ShapeableImageView(context, attrs, defStyle) {
-
-
-    init {
-        context.withStyledAttributes(attrs, R.styleable.RetroShapeableImageView, defStyle, -1) {
-            addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
-                val radius = width / 2f
-                shapeAppearanceModel = ShapeAppearanceModel().withCornerSize(radius)
-            }
-        }
-    }
-
-    private fun updateCornerSize(cornerSize: Float) {
-        shapeAppearanceModel = ShapeAppearanceModel.Builder()
-            .setAllCorners(CornerFamily.ROUNDED, cornerSize)
-            .build()
-    }
-
-    //For square
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, widthMeasureSpec)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java b/app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java
deleted file mode 100644
index a11950a54..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/ScrollingViewOnApplyWindowInsetsListener.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views;
-
-import android.graphics.Rect;
-import android.view.View;
-import android.view.WindowInsets;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import me.zhanghai.android.fastscroll.FastScroller;
-
-public class ScrollingViewOnApplyWindowInsetsListener implements View.OnApplyWindowInsetsListener {
-
-  @NonNull private final Rect mPadding = new Rect();
-  @Nullable private final FastScroller mFastScroller;
-
-  public ScrollingViewOnApplyWindowInsetsListener(
-      @Nullable View view, @Nullable FastScroller fastScroller) {
-    if (view != null) {
-      mPadding.set(
-          view.getPaddingLeft(),
-          view.getPaddingTop(),
-          view.getPaddingRight(),
-          view.getPaddingBottom());
-    }
-    mFastScroller = fastScroller;
-  }
-
-  public ScrollingViewOnApplyWindowInsetsListener() {
-    this(null, null);
-  }
-
-  @NonNull
-  @Override
-  public WindowInsets onApplyWindowInsets(@NonNull View view, @NonNull WindowInsets insets) {
-    view.setPadding(
-        mPadding.left + insets.getSystemWindowInsetLeft(),
-        mPadding.top,
-        mPadding.right + insets.getSystemWindowInsetRight(),
-        mPadding.bottom + insets.getSystemWindowInsetBottom());
-    if (mFastScroller != null) {
-      mFastScroller.setPadding(
-          insets.getSystemWindowInsetLeft(),
-          0,
-          insets.getSystemWindowInsetRight(),
-          insets.getSystemWindowInsetBottom());
-    }
-    return insets;
-  }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt b/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
index 055ca002d..cca4c97e1 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/SettingListItemView.kt
@@ -16,33 +16,41 @@ package code.name.monkey.retromusic.views
 import android.content.Context
 import android.graphics.Color
 import android.util.AttributeSet
-import android.view.LayoutInflater
+import android.view.View
 import android.widget.FrameLayout
-import androidx.core.content.withStyledAttributes
 import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.databinding.ListSettingItemViewBinding
+import kotlinx.android.synthetic.main.list_setting_item_view.view.*
 
 /**
  * Created by hemanths on 2019-12-10.
  */
-class SettingListItemView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : FrameLayout(context, attrs, defStyleAttr, defStyleRes) {
-    init {
-        val binding: ListSettingItemViewBinding =
-            ListSettingItemViewBinding.inflate(LayoutInflater.from(context), this, true)
-        context.withStyledAttributes(attrs, R.styleable.SettingListItemView) {
-            if (hasValue(R.styleable.SettingListItemView_settingListItemIcon)) {
-                binding.icon.setImageDrawable(getDrawable(R.styleable.SettingListItemView_settingListItemIcon))
-            }
-            binding.icon.setIconBackgroundColor(
-                getColor(R.styleable.SettingListItemView_settingListItemIconColor, Color.WHITE)
-            )
-            binding.title.text = getText(R.styleable.SettingListItemView_settingListItemTitle)
-            binding.text.text = getText(R.styleable.SettingListItemView_settingListItemText)
+class SettingListItemView : FrameLayout {
+    constructor(context: Context) : super(context) {
+        init(context, null)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context, attrs)
+    }
+
+    constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init(context, attrs)
+    }
+
+    private fun init(context: Context, attributeSet: AttributeSet?) {
+        View.inflate(context, R.layout.list_setting_item_view, this)
+        val typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.SettingListItemView)
+        icon as ColorIconsImageView
+        if (typedArray.hasValue(R.styleable.SettingListItemView_settingListItemIcon)) {
+            icon.setImageDrawable(typedArray.getDrawable(R.styleable.SettingListItemView_settingListItemIcon))
         }
+        icon.setIconBackgroundColor(typedArray.getColor(R.styleable.SettingListItemView_settingListItemIconColor, Color.WHITE))
+        title.text = typedArray.getText(R.styleable.SettingListItemView_settingListItemTitle)
+        text.text = typedArray.getText(R.styleable.SettingListItemView_settingListItemText)
+        typedArray.recycle()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
new file mode 100644
index 000000000..e9dfc3866
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarMarginFrameLayout.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.WindowInsets;
+import android.widget.FrameLayout;
+
+import androidx.annotation.NonNull;
+
+public class StatusBarMarginFrameLayout extends FrameLayout {
+
+
+    public StatusBarMarginFrameLayout(@NonNull Context context) {
+        super(context);
+    }
+
+    public StatusBarMarginFrameLayout(@NonNull Context context, @NonNull AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public StatusBarMarginFrameLayout(@NonNull Context context, @NonNull AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    @NonNull
+    @Override
+    public WindowInsets onApplyWindowInsets(@NonNull WindowInsets insets) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            MarginLayoutParams lp = (MarginLayoutParams) getLayoutParams();
+            lp.topMargin = insets.getSystemWindowInsetTop();
+            lp.bottomMargin = insets.getSystemWindowInsetBottom();
+            setLayoutParams(lp);
+        }
+        return super.onApplyWindowInsets(insets);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java
new file mode 100644
index 000000000..8eaf325d4
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.content.Context;
+import android.content.res.Resources;
+import android.util.AttributeSet;
+import android.view.View;
+
+import androidx.annotation.NonNull;
+
+public class StatusBarView extends View {
+
+
+    public StatusBarView(@NonNull Context context) {
+        super(context);
+        init(context);
+    }
+
+    public StatusBarView(@NonNull Context context, @NonNull AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    public StatusBarView(@NonNull Context context, @NonNull AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context);
+    }
+
+    public static int getStatusBarHeight(@NonNull Resources r) {
+        int result = 0;
+        int resourceId = r.getIdentifier("status_bar_height", "dimen", "android");
+        if (resourceId > 0) {
+            result = r.getDimensionPixelSize(resourceId);
+        }
+        return result;
+    }
+
+    private void init(Context context) {
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        setMeasuredDimension(MeasureSpec.getSize(widthMeasureSpec), getStatusBarHeight(getResources()));
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt b/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt
deleted file mode 100644
index 4fe57cf30..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/StatusBarView.kt
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.Resources
-import android.util.AttributeSet
-import android.view.View
-
-class StatusBarView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : View(context, attrs, defStyleAttr) {
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        setMeasuredDimension(
-            MeasureSpec.getSize(widthMeasureSpec), getStatusBarHeight(
-                resources
-            )
-        )
-    }
-
-    companion object {
-        fun getStatusBarHeight(r: Resources): Int {
-            var result = 0
-            val resourceId = r.getIdentifier("status_bar_height", "dimen", "android")
-            if (resourceId > 0) {
-                result = r.getDimensionPixelSize(resourceId)
-            }
-            return result
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt b/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt
deleted file mode 100644
index 116f3d0a3..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TintedBottomNavigationView.kt
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.extensions.addAlpha
-import code.name.monkey.retromusic.extensions.setItemColors
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.bottomnavigation.BottomNavigationView
-import dev.chrisbanes.insetter.applyInsetter
-
-class TintedBottomNavigationView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : BottomNavigationView(context, attrs, defStyleAttr) {
-
-    init {
-        if (!isInEditMode) {
-            // If we are in Immersive mode we have to just set empty OnApplyWindowInsetsListener as
-            // bottom, start, and end padding is always applied (with the help of OnApplyWindowInsetsListener) to
-            // BottomNavigationView to dodge the system navigation bar (so we basically clear that listener).
-            if (PreferenceUtil.isFullScreenMode) {
-                setOnApplyWindowInsetsListener { _, insets ->
-                    insets
-                }
-            } else {
-                applyInsetter {
-                    type(navigationBars = true) {
-                        padding(vertical = true)
-                        margin(horizontal = true)
-                    }
-                }
-            }
-
-            labelVisibilityMode = PreferenceUtil.tabTitleMode
-
-            if (!PreferenceUtil.materialYou) {
-                val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
-                val accentColor = ThemeStore.accentColor(context)
-                setItemColors(iconColor, accentColor)
-                itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
-                itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt b/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt
deleted file mode 100644
index 828e6fc2b..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TintedNavigationRailView.kt
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.extensions.accentColor
-import code.name.monkey.retromusic.extensions.addAlpha
-import code.name.monkey.retromusic.extensions.setItemColors
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.navigationrail.NavigationRailView
-
-class TintedNavigationRailView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : NavigationRailView(context, attrs, defStyleAttr) {
-
-    init {
-        if (!isInEditMode) {
-            labelVisibilityMode = PreferenceUtil.tabTitleMode
-
-            if (!PreferenceUtil.materialYou) {
-                val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal)
-                val accentColor = context.accentColor()
-                setItemColors(iconColor, accentColor)
-                itemRippleColor = ColorStateList.valueOf(accentColor.addAlpha(0.08F))
-                itemActiveIndicatorColor = ColorStateList.valueOf(accentColor.addAlpha(0.12F))
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
deleted file mode 100644
index 043915984..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TopAppBarLayout.kt
+++ /dev/null
@@ -1,80 +0,0 @@
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.Configuration
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import androidx.core.view.updateLayoutParams
-import code.name.monkey.retromusic.databinding.CollapsingAppbarLayoutBinding
-import code.name.monkey.retromusic.databinding.SimpleAppbarLayoutBinding
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.appbar.AppBarLayout
-import com.google.android.material.appbar.AppBarLayout.LayoutParams.SCROLL_FLAG_NO_SCROLL
-import com.google.android.material.appbar.MaterialToolbar
-import com.google.android.material.shape.MaterialShapeDrawable
-import dev.chrisbanes.insetter.applyInsetter
-
-class TopAppBarLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-) : AppBarLayout(context, attrs, defStyleAttr) {
-    private var simpleAppbarBinding: SimpleAppbarLayoutBinding? = null
-    private var collapsingAppbarBinding: CollapsingAppbarLayoutBinding? = null
-
-    val mode: AppBarMode = PreferenceUtil.appBarMode
-
-    init {
-        if (mode == AppBarMode.COLLAPSING) {
-            collapsingAppbarBinding =
-                CollapsingAppbarLayoutBinding.inflate(LayoutInflater.from(context), this, true)
-            val isLandscape =
-                context.resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
-            if (isLandscape) {
-                fitsSystemWindows = false
-            }
-
-        } else {
-            simpleAppbarBinding =
-                SimpleAppbarLayoutBinding.inflate(LayoutInflater.from(context), this, true)
-            simpleAppbarBinding?.root?.applyInsetter {
-                type(navigationBars = true) {
-                    padding(horizontal = true)
-                }
-            }
-            statusBarForeground = MaterialShapeDrawable.createWithElevationOverlay(context)
-        }
-    }
-
-    fun pinWhenScrolled() {
-        simpleAppbarBinding?.root?.updateLayoutParams<LayoutParams> {
-            scrollFlags = SCROLL_FLAG_NO_SCROLL
-        }
-    }
-
-    val toolbar: MaterialToolbar
-        get() = if (mode == AppBarMode.COLLAPSING) {
-            collapsingAppbarBinding?.toolbar!!
-        } else {
-            simpleAppbarBinding?.toolbar!!
-        }
-
-    var title: CharSequence
-        get() = if (mode == AppBarMode.COLLAPSING) {
-            collapsingAppbarBinding?.collapsingToolbarLayout?.title.toString()
-        } else {
-            simpleAppbarBinding?.toolbar?.title.toString()
-        }
-        set(value) {
-            if (mode == AppBarMode.COLLAPSING) {
-                collapsingAppbarBinding?.collapsingToolbarLayout?.title = value
-            } else {
-                simpleAppbarBinding?.toolbar?.title = value
-            }
-        }
-
-    enum class AppBarMode {
-        COLLAPSING,
-        SIMPLE
-    }
-}
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
new file mode 100644
index 000000000..5e79c0967
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+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;
+
+import androidx.appcompat.widget.AppCompatTextView;
+
+
+public class VerticalTextView extends AppCompatTextView {
+    final boolean topDown;
+
+    public VerticalTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        final int gravity = getGravity();
+        if (Gravity.isVertical(gravity) && (gravity & Gravity.VERTICAL_GRAVITY_MASK) == Gravity.BOTTOM) {
+            setGravity((gravity & Gravity.HORIZONTAL_GRAVITY_MASK) | Gravity.TOP);
+            topDown = false;
+        } else
+            topDown = true;
+
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        super.onMeasure(heightMeasureSpec, widthMeasureSpec);
+        setMeasuredDimension(getMeasuredHeight(), getMeasuredWidth());
+    }
+
+    @Override
+    protected void onDraw(Canvas canvas) {
+        TextPaint textPaint = getPaint();
+        textPaint.setColor(getCurrentTextColor());
+        textPaint.drawableState = getDrawableState();
+
+        canvas.save();
+
+        if (topDown) {
+            canvas.translate(getWidth(), 0);
+            canvas.rotate(90);
+        } else {
+            canvas.translate(0, getHeight());
+            canvas.rotate(-90);
+        }
+
+
+        canvas.translate(getCompoundPaddingLeft(), getExtendedPaddingTop());
+
+        getLayout().draw(canvas);
+        canvas.restore();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt b/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt
deleted file mode 100644
index f3538e918..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/VerticalTextView.kt
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.graphics.Canvas
-import android.util.AttributeSet
-import android.view.Gravity
-import androidx.appcompat.widget.AppCompatTextView
-
-class VerticalTextView(context: Context, attrs: AttributeSet?) : AppCompatTextView(
-    context, attrs
-) {
-    private var topDown = false
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(heightMeasureSpec, widthMeasureSpec)
-        setMeasuredDimension(measuredHeight, measuredWidth)
-    }
-
-    override fun onDraw(canvas: Canvas) {
-        val textPaint = paint
-        textPaint.color = currentTextColor
-        textPaint.drawableState = drawableState
-        canvas.save()
-        if (topDown) {
-            canvas.translate(width.toFloat(), 0f)
-            canvas.rotate(90f)
-        } else {
-            canvas.translate(0f, height.toFloat())
-            canvas.rotate(-90f)
-        }
-        canvas.translate(compoundPaddingLeft.toFloat(), extendedPaddingTop.toFloat())
-        layout.draw(canvas)
-        canvas.restore()
-    }
-
-    init {
-        val gravity = gravity
-        topDown = if (Gravity.isVertical(gravity)
-            && gravity and Gravity.VERTICAL_GRAVITY_MASK == Gravity.BOTTOM
-        ) {
-            setGravity(gravity and Gravity.HORIZONTAL_GRAVITY_MASK or Gravity.TOP)
-            false
-        } else true
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt b/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
index ea42d7ad2..ba87f8659 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareCardView.kt
@@ -23,20 +23,24 @@ import com.google.android.material.card.MaterialCardView
  * Created by hemanths on 3/18/19
  */
 class WidthFitSquareCardView : MaterialCardView {
+    constructor(context: Context) : super(context) {}
 
-    constructor(context: Context) : super(context)
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {}
 
-    constructor(
-        context: Context,
-        attrs: AttributeSet
-    ) : super(context, attrs)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {}
 
-    constructor(
-        context: Context, attrs:
-        AttributeSet, defStyleAttr: Int
-    ) : super(context, attrs, defStyleAttr)
-
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, widthMeasureSpec)
+    fun forceSquare(z: Boolean) {
+        this.forceSquare = z
+        requestLayout()
     }
+
+    override fun onMeasure(i: Int, i2: Int) {
+        var width = i2
+        if (this.forceSquare) {
+            width = i
+        }
+        super.onMeasure(i, width)
+    }
+
+    private var forceSquare = true
 }
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.java b/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.java
new file mode 100755
index 000000000..d5131ecf1
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.FrameLayout;
+
+public class WidthFitSquareLayout extends FrameLayout {
+    private boolean forceSquare = true;
+
+    public WidthFitSquareLayout(Context context) {
+        super(context);
+    }
+
+    public WidthFitSquareLayout(Context context, AttributeSet attributeSet) {
+        super(context, attributeSet);
+    }
+
+    public WidthFitSquareLayout(Context context, AttributeSet attributeSet, int i) {
+        super(context, attributeSet, i);
+    }
+
+    @TargetApi(21)
+    public WidthFitSquareLayout(Context context, AttributeSet attributeSet, int i, int i2) {
+        super(context, attributeSet, i, i2);
+    }
+
+    public void forceSquare(boolean z) {
+        this.forceSquare = z;
+        requestLayout();
+    }
+
+    protected void onMeasure(int i, int i2) {
+        if (this.forceSquare) {
+            i2 = i;
+        }
+        super.onMeasure(i, i2);
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt
deleted file mode 100644
index 772145485..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsConstraintLayout.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.views.insets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.constraintlayout.widget.ConstraintLayout
-import code.name.monkey.retromusic.util.PreferenceUtil
-import dev.chrisbanes.insetter.applyInsetter
-
-class InsetsConstraintLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : ConstraintLayout(context, attrs, defStyleAttr) {
-    init {
-        if (!isInEditMode && !PreferenceUtil.isFullScreenMode)
-            applyInsetter {
-                type(navigationBars = true) {
-                    padding(vertical = true)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt b/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt
deleted file mode 100644
index 200c2a999..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/insets/InsetsRecyclerView.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package code.name.monkey.retromusic.views.insets
-
-import android.content.Context
-import android.util.AttributeSet
-import androidx.recyclerview.widget.RecyclerView
-import code.name.monkey.retromusic.util.PreferenceUtil
-import dev.chrisbanes.insetter.applyInsetter
-
-class InsetsRecyclerView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-) : RecyclerView(context, attrs, defStyleAttr) {
-    init {
-        if (!isInEditMode && !PreferenceUtil.isFullScreenMode)
-            applyInsetter {
-                type(navigationBars = true) {
-                    padding(vertical = true)
-                }
-            }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java
new file mode 100644
index 000000000..ae63bce4a
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.volume;
+
+import android.database.ContentObserver;
+import android.media.AudioManager;
+import android.net.Uri;
+import android.os.Handler;
+import androidx.annotation.NonNull;
+
+public class AudioVolumeContentObserver extends ContentObserver {
+
+    private final OnAudioVolumeChangedListener mListener;
+    private final AudioManager mAudioManager;
+    private final int mAudioStreamType;
+    private int mLastVolume;
+
+    AudioVolumeContentObserver(@NonNull Handler handler, @NonNull AudioManager audioManager,
+                               int audioStreamType,
+                               @NonNull OnAudioVolumeChangedListener listener) {
+
+        super(handler);
+        mAudioManager = audioManager;
+        mAudioStreamType = audioStreamType;
+        mListener = listener;
+        mLastVolume = audioManager.getStreamVolume(mAudioStreamType);
+    }
+
+    /**
+     * Depending on the handler this method may be executed on the UI thread
+     */
+    @Override
+    public void onChange(boolean selfChange, Uri uri) {
+        if (mAudioManager != null && mListener != null) {
+            int maxVolume = mAudioManager.getStreamMaxVolume(mAudioStreamType);
+            int currentVolume = mAudioManager.getStreamVolume(mAudioStreamType);
+            if (currentVolume != mLastVolume) {
+                mLastVolume = currentVolume;
+                mListener.onAudioVolumeChanged(currentVolume, maxVolume);
+            }
+        }
+    }
+
+    @Override
+    public boolean deliverSelfNotifications() {
+        return super.deliverSelfNotifications();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt
deleted file mode 100644
index a0dde27e1..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeContentObserver.kt
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.volume
-
-import android.database.ContentObserver
-import android.media.AudioManager
-import android.net.Uri
-import android.os.Handler
-
-class AudioVolumeContentObserver internal constructor(
-    handler: Handler,
-    audioManager: AudioManager,
-    audioStreamType: Int,
-    listener: OnAudioVolumeChangedListener
-) : ContentObserver(handler) {
-    private val mListener: OnAudioVolumeChangedListener?
-    private val mAudioManager: AudioManager?
-    private val mAudioStreamType: Int
-    private var mLastVolume: Float
-
-    /** Depending on the handler this method may be executed on the UI thread  */
-    override fun onChange(selfChange: Boolean, uri: Uri?) {
-        if (mAudioManager != null && mListener != null) {
-            val maxVolume = mAudioManager.getStreamMaxVolume(mAudioStreamType)
-            val currentVolume = mAudioManager.getStreamVolume(mAudioStreamType)
-            if (currentVolume.toFloat() != mLastVolume) {
-                mLastVolume = currentVolume.toFloat()
-                mListener.onAudioVolumeChanged(currentVolume, maxVolume)
-            }
-        }
-    }
-
-    init {
-        mAudioManager = audioManager
-        mAudioStreamType = audioStreamType
-        mListener = listener
-        mLastVolume = audioManager.getStreamVolume(mAudioStreamType).toFloat()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java
new file mode 100644
index 000000000..7e97571c0
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.java
@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.volume;
+
+import android.content.Context;
+import android.media.AudioManager;
+import android.os.Handler;
+import androidx.annotation.NonNull;
+
+public class AudioVolumeObserver {
+
+    private final Context mContext;
+    private final AudioManager mAudioManager;
+    private AudioVolumeContentObserver mAudioVolumeContentObserver;
+
+    public AudioVolumeObserver(@NonNull Context context) {
+        mContext = context;
+        mAudioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
+    }
+
+    public void register(int audioStreamType, @NonNull OnAudioVolumeChangedListener listener) {
+
+        Handler handler = new Handler();
+        // with this handler AudioVolumeContentObserver#onChange() 
+        //   will be executed in the main thread
+        // To execute in another thread you can use a Looper
+        // +info: https://stackoverflow.com/a/35261443/904907
+
+        mAudioVolumeContentObserver = new AudioVolumeContentObserver(
+                handler,
+                mAudioManager,
+                audioStreamType,
+                listener);
+
+        mContext.getContentResolver().registerContentObserver(
+                android.provider.Settings.System.CONTENT_URI,
+                true,
+                mAudioVolumeContentObserver);
+    }
+
+    public void unregister() {
+        if (mAudioVolumeContentObserver != null) {
+            mContext.getContentResolver().unregisterContentObserver(mAudioVolumeContentObserver);
+            mAudioVolumeContentObserver = null;
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt b/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
deleted file mode 100644
index 5b69f31b8..000000000
--- a/app/src/main/java/code/name/monkey/retromusic/volume/AudioVolumeObserver.kt
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (c) 2019 Hemanth Savarala.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by
- *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- */
-package code.name.monkey.retromusic.volume
-
-import android.content.Context
-import android.media.AudioManager
-import android.os.Handler
-import android.os.Looper
-import android.provider.Settings
-import androidx.core.content.getSystemService
-
-class AudioVolumeObserver(private val context: Context) {
-    private val mAudioManager: AudioManager =
-        context.getSystemService()!!
-    private var contentObserver: AudioVolumeContentObserver? = null
-
-    fun register(audioStreamType: Int, listener: OnAudioVolumeChangedListener) {
-        val handler = Handler(Looper.getMainLooper())
-        // with this handler AudioVolumeContentObserver#onChange()
-        //   will be executed in the main thread
-        // To execute in another thread you can use a Looper
-        // +info: https://stackoverflow.com/a/35261443/904907
-        contentObserver = AudioVolumeContentObserver(
-            handler,
-            mAudioManager,
-            audioStreamType,
-            listener
-        )
-        context.contentResolver.registerContentObserver(
-            Settings.System.CONTENT_URI,
-            true,
-            contentObserver!!
-        )
-    }
-
-    fun unregister() {
-        if (contentObserver != null) {
-            context.contentResolver.unregisterContentObserver(contentObserver!!)
-            contentObserver = null
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.java b/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.java
new file mode 100644
index 000000000..31813ada8
--- /dev/null
+++ b/app/src/main/java/code/name/monkey/retromusic/volume/OnAudioVolumeChangedListener.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.retromusic.volume;
+
+public interface OnAudioVolumeChangedListener {
+
+    void onAudioVolumeChanged(int currentVolume, int maxVolume);
+}
\ No newline at end of file
diff --git a/app/src/main/res/anim/item_animation_fall_down.xml b/app/src/main/res/anim/item_animation_fall_down.xml
index f486805c1..a13e21e6f 100644
--- a/app/src/main/res/anim/item_animation_fall_down.xml
+++ b/app/src/main/res/anim/item_animation_fall_down.xml
@@ -19,4 +19,5 @@
         android:pivotY="50%"
         android:toXScale="100%"
         android:toYScale="100%" />
+
 </set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/layout_anim_fade.xml b/app/src/main/res/anim/layout_anim_fade.xml
deleted file mode 100644
index ba154e91e..000000000
--- a/app/src/main/res/anim/layout_anim_fade.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="@android:anim/fade_in"
-    android:animationOrder="normal"
-    android:delay="15%" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/retro_fragment_close_enter.xml b/app/src/main/res/anim/retro_fragment_close_enter.xml
deleted file mode 100644
index 645b3fd36..000000000
--- a/app/src/main/res/anim/retro_fragment_close_enter.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <alpha
-        android:fromAlpha="0"
-        android:toAlpha="1.0"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@android:anim/linear_interpolator"
-        android:startOffset="66"
-        android:duration="50" />
-    <scale
-        android:fromXScale="1.1"
-        android:toXScale="1"
-        android:fromYScale="1.1"
-        android:toYScale="1"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@anim/retro_fragment_fast_out_extra_slow_in"
-        android:duration="300" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/retro_fragment_close_exit.xml b/app/src/main/res/anim/retro_fragment_close_exit.xml
deleted file mode 100644
index 48992983b..000000000
--- a/app/src/main/res/anim/retro_fragment_close_exit.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false"
-    android:zAdjustment="top">
-    <alpha
-        android:fromAlpha="1"
-        android:toAlpha="0.0"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@android:anim/linear_interpolator"
-        android:startOffset="66"
-        android:duration="50" />
-    <scale
-        android:fromXScale="1"
-        android:toXScale="0.9"
-        android:fromYScale="1"
-        android:toYScale="0.9"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@anim/retro_fragment_fast_out_extra_slow_in"
-        android:duration="300" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/retro_fragment_fast_out_extra_slow_in.xml b/app/src/main/res/anim/retro_fragment_fast_out_extra_slow_in.xml
deleted file mode 100644
index 2772e98c8..000000000
--- a/app/src/main/res/anim/retro_fragment_fast_out_extra_slow_in.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<!--Taken from https://googleplex-android.googlesource.com/platform/frameworks/base/+/HEAD/core/res/res/interpolator/decelerate_quad.xml-->
-<decelerateInterpolator />
diff --git a/app/src/main/res/anim/retro_fragment_open_enter.xml b/app/src/main/res/anim/retro_fragment_open_enter.xml
deleted file mode 100644
index c4521e843..000000000
--- a/app/src/main/res/anim/retro_fragment_open_enter.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <alpha
-        android:duration="50"
-        android:fillAfter="true"
-        android:fillBefore="true"
-        android:fillEnabled="true"
-        android:fromAlpha="0"
-        android:interpolator="@android:anim/linear_interpolator"
-        android:startOffset="35"
-        android:toAlpha="1.0" />
-    <scale
-        android:duration="300"
-        android:fillAfter="true"
-        android:fillBefore="true"
-        android:fillEnabled="true"
-        android:fromXScale="0.85"
-        android:fromYScale="0.85"
-        android:interpolator="@anim/retro_fragment_fast_out_extra_slow_in"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:toXScale="1"
-        android:toYScale="1" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/retro_fragment_open_exit.xml b/app/src/main/res/anim/retro_fragment_open_exit.xml
deleted file mode 100644
index 897b5e50b..000000000
--- a/app/src/main/res/anim/retro_fragment_open_exit.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  Copyright 2019 The Android Open Source Project
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false">
-    <!-- Fade out, over a black surface, which simulates a black scrim -->
-    <alpha
-        android:fromAlpha="1"
-        android:toAlpha="0.0"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@android:anim/linear_interpolator"
-        android:startOffset="35"
-        android:duration="50" />
-    <scale
-        android:fromXScale="1"
-        android:toXScale="1.15"
-        android:fromYScale="1"
-        android:toYScale="1.15"
-        android:pivotX="50%"
-        android:pivotY="50%"
-        android:fillEnabled="true"
-        android:fillBefore="true"
-        android:fillAfter="true"
-        android:interpolator="@anim/retro_fragment_fast_out_extra_slow_in"
-        android:duration="300" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/sliding_in_left.xml b/app/src/main/res/anim/sliding_in_left.xml
new file mode 100644
index 000000000..5b01fc740
--- /dev/null
+++ b/app/src/main/res/anim/sliding_in_left.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="50%p"
+        android:toXDelta="0" />
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="0.0"
+        android:toAlpha="1.0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/sliding_out_right.xml b/app/src/main/res/anim/sliding_out_right.xml
new file mode 100644
index 000000000..964d042f7
--- /dev/null
+++ b/app/src/main/res/anim/sliding_out_right.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<set xmlns:android="http://schemas.android.com/apk/res/android">
+    <translate
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromXDelta="0"
+        android:toXDelta="-50%p" />
+    <alpha
+        android:duration="@android:integer/config_mediumAnimTime"
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0" />
+</set>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml b/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
deleted file mode 100644
index 5f83d4813..000000000
--- a/app/src/main/res/drawable-anydpi-v24/ic_notification.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="26.086956"
-    android:viewportHeight="26.086956"
-    android:tint="#FFFFFF">
-    <group
-        android:translateX="1.0434783"
-        android:translateY="1.0434783">
-        <path
-            android:fillColor="#FF000000"
-            android:pathData="M12,5v8.55c-0.94,-0.54 -2.1,-0.75 -3.33,-0.32 -1.34,0.48 -2.37,1.67 -2.61,3.07 -0.46,2.74 1.86,5.08 4.59,4.65 1.96,-0.31 3.35,-2.11 3.35,-4.1V7h2c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2h-2c-1.1,0 -2,0.9 -2,2z" />
-    </group>
-</vector>
diff --git a/app/src/main/res/drawable-hdpi/default_album_art.webp b/app/src/main/res/drawable-hdpi/default_album_art.webp
index ef3872a29..31557bc7e 100644
Binary files a/app/src/main/res/drawable-hdpi/default_album_art.webp and b/app/src/main/res/drawable-hdpi/default_album_art.webp differ
diff --git a/app/src/main/res/drawable-hdpi/default_artist_art.webp b/app/src/main/res/drawable-hdpi/default_artist_art.webp
index 176d3cf5c..7b63339eb 100644
Binary files a/app/src/main/res/drawable-hdpi/default_artist_art.webp and b/app/src/main/res/drawable-hdpi/default_artist_art.webp differ
diff --git a/app/src/main/res/drawable-hdpi/default_audio_art.webp b/app/src/main/res/drawable-hdpi/default_audio_art.webp
deleted file mode 100644
index 0f6e0a213..000000000
Binary files a/app/src/main/res/drawable-hdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_notification.png b/app/src/main/res/drawable-hdpi/ic_notification.png
index 73792fe25..99464a03b 100755
Binary files a/app/src/main/res/drawable-hdpi/ic_notification.png and b/app/src/main/res/drawable-hdpi/ic_notification.png differ
diff --git a/app/src/main/res/drawable-mdpi/default_album_art.webp b/app/src/main/res/drawable-mdpi/default_album_art.webp
index a6ce05dc2..e0faff68f 100644
Binary files a/app/src/main/res/drawable-mdpi/default_album_art.webp and b/app/src/main/res/drawable-mdpi/default_album_art.webp differ
diff --git a/app/src/main/res/drawable-mdpi/default_artist_art.webp b/app/src/main/res/drawable-mdpi/default_artist_art.webp
index 6428e9b37..1af6b65c7 100644
Binary files a/app/src/main/res/drawable-mdpi/default_artist_art.webp and b/app/src/main/res/drawable-mdpi/default_artist_art.webp differ
diff --git a/app/src/main/res/drawable-mdpi/default_audio_art.webp b/app/src/main/res/drawable-mdpi/default_audio_art.webp
deleted file mode 100644
index 7f22b4309..000000000
Binary files a/app/src/main/res/drawable-mdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_notification.png b/app/src/main/res/drawable-mdpi/ic_notification.png
index d14b8bdc7..03d796b76 100755
Binary files a/app/src/main/res/drawable-mdpi/ic_notification.png and b/app/src/main/res/drawable-mdpi/ic_notification.png differ
diff --git a/app/src/main/res/drawable-night-hdpi/default_album_art.webp b/app/src/main/res/drawable-night-hdpi/default_album_art.webp
deleted file mode 100644
index 744489568..000000000
Binary files a/app/src/main/res/drawable-night-hdpi/default_album_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-hdpi/default_artist_art.webp b/app/src/main/res/drawable-night-hdpi/default_artist_art.webp
deleted file mode 100644
index bb551b29e..000000000
Binary files a/app/src/main/res/drawable-night-hdpi/default_artist_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-hdpi/default_audio_art.webp b/app/src/main/res/drawable-night-hdpi/default_audio_art.webp
deleted file mode 100644
index b5dc131ab..000000000
Binary files a/app/src/main/res/drawable-night-hdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/default_album_art.webp b/app/src/main/res/drawable-night-mdpi/default_album_art.webp
deleted file mode 100644
index 6ffd34f02..000000000
Binary files a/app/src/main/res/drawable-night-mdpi/default_album_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/default_artist_art.webp b/app/src/main/res/drawable-night-mdpi/default_artist_art.webp
deleted file mode 100644
index c5e115d22..000000000
Binary files a/app/src/main/res/drawable-night-mdpi/default_artist_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-mdpi/default_audio_art.webp b/app/src/main/res/drawable-night-mdpi/default_audio_art.webp
deleted file mode 100644
index ad86e0e0c..000000000
Binary files a/app/src/main/res/drawable-night-mdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xhdpi/default_album_art.webp
deleted file mode 100644
index 0c50842cb..000000000
Binary files a/app/src/main/res/drawable-night-xhdpi/default_album_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp
deleted file mode 100644
index d519bac07..000000000
Binary files a/app/src/main/res/drawable-night-xhdpi/default_artist_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp
deleted file mode 100644
index 7ee8cdc52..000000000
Binary files a/app/src/main/res/drawable-night-xhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp
deleted file mode 100644
index 0b8fe94ac..000000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/default_album_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp
deleted file mode 100644
index ad8396ae7..000000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/default_artist_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp
deleted file mode 100644
index 4688f9dc3..000000000
Binary files a/app/src/main/res/drawable-night-xxhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp
deleted file mode 100644
index c6e9b5a85..000000000
Binary files a/app/src/main/res/drawable-night-xxxhdpi/default_album_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp
deleted file mode 100644
index 1acef0849..000000000
Binary files a/app/src/main/res/drawable-night-xxxhdpi/default_artist_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp b/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp
deleted file mode 100644
index 357baba58..000000000
Binary files a/app/src/main/res/drawable-night-xxxhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/notification_selector.xml b/app/src/main/res/drawable-v21/notification_selector.xml
new file mode 100644
index 000000000..83aed83c3
--- /dev/null
+++ b/app/src/main/res/drawable-v21/notification_selector.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_light" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_selector.xml b/app/src/main/res/drawable-v21/round_selector.xml
new file mode 100644
index 000000000..c38d4e9cd
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_selector.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?android:attr/colorControlHighlight">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/round_selector_mask" />
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/round_selector_dark.xml b/app/src/main/res/drawable-v21/round_selector_dark.xml
new file mode 100644
index 000000000..6499f8972
--- /dev/null
+++ b/app/src/main/res/drawable-v21/round_selector_dark.xml
@@ -0,0 +1,8 @@
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="?attr/colorOnSecondary">
+
+    <item
+        android:id="@android:id/mask"
+        android:drawable="@drawable/round_selector_mask" />
+
+</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/saf_guide_1.webp b/app/src/main/res/drawable-v21/saf_guide_1.webp
similarity index 100%
rename from app/src/main/res/drawable/saf_guide_1.webp
rename to app/src/main/res/drawable-v21/saf_guide_1.webp
diff --git a/app/src/main/res/drawable/saf_guide_2.webp b/app/src/main/res/drawable-v21/saf_guide_2.webp
similarity index 100%
rename from app/src/main/res/drawable/saf_guide_2.webp
rename to app/src/main/res/drawable-v21/saf_guide_2.webp
diff --git a/app/src/main/res/drawable/saf_guide_3.webp b/app/src/main/res/drawable-v21/saf_guide_3.webp
similarity index 100%
rename from app/src/main/res/drawable/saf_guide_3.webp
rename to app/src/main/res/drawable-v21/saf_guide_3.webp
diff --git a/app/src/main/res/drawable-v21/widget_selector.xml b/app/src/main/res/drawable-v21/widget_selector.xml
new file mode 100644
index 000000000..f03604195
--- /dev/null
+++ b/app/src/main/res/drawable-v21/widget_selector.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    android:color="@color/ripple_material_dark" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/widget_selector_light.xml b/app/src/main/res/drawable-v21/widget_selector_light.xml
new file mode 100644
index 000000000..86c53d73d
--- /dev/null
+++ b/app/src/main/res/drawable-v21/widget_selector_light.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/ripple_material_light"/>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-xhdpi/default_album_art.webp b/app/src/main/res/drawable-xhdpi/default_album_art.webp
index fc8e05c61..3e65bf37e 100644
Binary files a/app/src/main/res/drawable-xhdpi/default_album_art.webp and b/app/src/main/res/drawable-xhdpi/default_album_art.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/default_artist_art.webp b/app/src/main/res/drawable-xhdpi/default_artist_art.webp
index 3522db793..5057fbaf7 100644
Binary files a/app/src/main/res/drawable-xhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xhdpi/default_artist_art.webp differ
diff --git a/app/src/main/res/drawable-xhdpi/default_audio_art.webp b/app/src/main/res/drawable-xhdpi/default_audio_art.webp
deleted file mode 100644
index 458590631..000000000
Binary files a/app/src/main/res/drawable-xhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_notification.png b/app/src/main/res/drawable-xhdpi/ic_notification.png
index 35ccc8aaf..ce0c680d0 100755
Binary files a/app/src/main/res/drawable-xhdpi/ic_notification.png and b/app/src/main/res/drawable-xhdpi/ic_notification.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/default_album_art.webp b/app/src/main/res/drawable-xxhdpi/default_album_art.webp
index d8e3a1333..b9e49f47a 100644
Binary files a/app/src/main/res/drawable-xxhdpi/default_album_art.webp and b/app/src/main/res/drawable-xxhdpi/default_album_art.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/default_artist_art.webp b/app/src/main/res/drawable-xxhdpi/default_artist_art.webp
index 946b95e2b..eee9b2490 100644
Binary files a/app/src/main/res/drawable-xxhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xxhdpi/default_artist_art.webp differ
diff --git a/app/src/main/res/drawable-xxhdpi/default_audio_art.webp b/app/src/main/res/drawable-xxhdpi/default_audio_art.webp
deleted file mode 100644
index c025db78f..000000000
Binary files a/app/src/main/res/drawable-xxhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_notification.png b/app/src/main/res/drawable-xxhdpi/ic_notification.png
index 927de0a58..d22f7944e 100755
Binary files a/app/src/main/res/drawable-xxhdpi/ic_notification.png and b/app/src/main/res/drawable-xxhdpi/ic_notification.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/default_album_art.webp b/app/src/main/res/drawable-xxxhdpi/default_album_art.webp
index 9c2f5c51b..5281065f6 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/default_album_art.webp and b/app/src/main/res/drawable-xxxhdpi/default_album_art.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp b/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp
index c3a67b99f..4f74e964e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp and b/app/src/main/res/drawable-xxxhdpi/default_artist_art.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp b/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp
deleted file mode 100644
index 4398ea0f2..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/default_audio_art.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_splash.png b/app/src/main/res/drawable-xxxhdpi/ic_splash.png
index 727bc25f2..07a310c4c 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/ic_splash.png and b/app/src/main/res/drawable-xxxhdpi/ic_splash.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp b/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp
index 5cfb7997f..c60809ec9 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp and b/app/src/main/res/drawable-xxxhdpi/np_adaptive.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur.webp b/app/src/main/res/drawable-xxxhdpi/np_blur.webp
index 7f859bf0f..5a164d1c6 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_blur.webp and b/app/src/main/res/drawable-xxxhdpi/np_blur.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp b/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp
index 885da0a94..cc42ebff2 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp and b/app/src/main/res/drawable-xxxhdpi/np_blur_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_card.webp b/app/src/main/res/drawable-xxxhdpi/np_card.webp
index 5f340374b..cd3279e93 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_card.webp and b/app/src/main/res/drawable-xxxhdpi/np_card.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_circle.webp b/app/src/main/res/drawable-xxxhdpi/np_circle.webp
index 0988d3c6d..7a812475e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_circle.webp and b/app/src/main/res/drawable-xxxhdpi/np_circle.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_classic.webp b/app/src/main/res/drawable-xxxhdpi/np_classic.webp
deleted file mode 100644
index 505ff6417..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_classic.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_color.webp b/app/src/main/res/drawable-xxxhdpi/np_color.webp
index 5ec91cfc2..b5edff242 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_color.webp and b/app/src/main/res/drawable-xxxhdpi/np_color.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_fit.webp b/app/src/main/res/drawable-xxxhdpi/np_fit.webp
index 944a55926..b93dca492 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_fit.webp and b/app/src/main/res/drawable-xxxhdpi/np_fit.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_flat.webp b/app/src/main/res/drawable-xxxhdpi/np_flat.webp
index 10386e52c..f445b5960 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_flat.webp and b/app/src/main/res/drawable-xxxhdpi/np_flat.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_full.webp b/app/src/main/res/drawable-xxxhdpi/np_full.webp
index ae8cb1a51..fc1fcca2e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_full.webp and b/app/src/main/res/drawable-xxxhdpi/np_full.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_gradient.webp b/app/src/main/res/drawable-xxxhdpi/np_gradient.webp
deleted file mode 100644
index 5dc269570..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_gradient.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_material.webp b/app/src/main/res/drawable-xxxhdpi/np_material.webp
index d12a40ae9..692893dd4 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_material.webp and b/app/src/main/res/drawable-xxxhdpi/np_material.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_minimalistic_circle.webp b/app/src/main/res/drawable-xxxhdpi/np_minimalistic_circle.webp
deleted file mode 100644
index 039d35850..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_minimalistic_circle.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_normal.webp b/app/src/main/res/drawable-xxxhdpi/np_normal.webp
index 99f607d2b..06965c7a4 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_normal.webp and b/app/src/main/res/drawable-xxxhdpi/np_normal.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_peak.webp b/app/src/main/res/drawable-xxxhdpi/np_peak.webp
new file mode 100644
index 000000000..6af06443d
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/np_peak.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_peek.webp b/app/src/main/res/drawable-xxxhdpi/np_peek.webp
deleted file mode 100644
index eb4333e67..000000000
Binary files a/app/src/main/res/drawable-xxxhdpi/np_peek.webp and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_plain.webp b/app/src/main/res/drawable-xxxhdpi/np_plain.webp
index 861329431..35c1448e2 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_plain.webp and b/app/src/main/res/drawable-xxxhdpi/np_plain.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_simple.webp b/app/src/main/res/drawable-xxxhdpi/np_simple.webp
index e906822f0..d44abc08e 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_simple.webp and b/app/src/main/res/drawable-xxxhdpi/np_simple.webp differ
diff --git a/app/src/main/res/drawable-xxxhdpi/np_tiny.webp b/app/src/main/res/drawable-xxxhdpi/np_tiny.webp
index 98eaa2eaf..3cc976cdb 100644
Binary files a/app/src/main/res/drawable-xxxhdpi/np_tiny.webp and b/app/src/main/res/drawable-xxxhdpi/np_tiny.webp differ
diff --git a/app/src/main/res/drawable/app_widget_background.xml b/app/src/main/res/drawable/app_widget_background.xml
deleted file mode 100644
index a4cf661fa..000000000
--- a/app/src/main/res/drawable/app_widget_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Background for widgets to make the rounded corners based on the
-appWidgetRadius attribute value
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="16dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_album.xml b/app/src/main/res/drawable/asld_album.xml
deleted file mode 100644
index 2a57875a8..000000000
--- a/app/src/main/res/drawable/asld_album.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_album"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_album" />
-    <transition
-        android:drawable="@drawable/avd_album"
-        android:fromId="@id/state_off"
-        android:toId="@id/state_on" />
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_artist.xml b/app/src/main/res/drawable/asld_artist.xml
deleted file mode 100644
index 55a8e3679..000000000
--- a/app/src/main/res/drawable/asld_artist.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_artist"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_artist" />
-    <transition
-        android:drawable="@drawable/avd_artist"
-        android:fromId="@+id/state_off"
-        android:toId="@+id/state_on" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_face.xml b/app/src/main/res/drawable/asld_face.xml
deleted file mode 100644
index 63fd8ae48..000000000
--- a/app/src/main/res/drawable/asld_face.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_face"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_face" />
-    <transition
-        android:drawable="@drawable/avd_face"
-        android:fromId="@+id/state_off"
-        android:toId="@+id/state_on" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_folder.xml b/app/src/main/res/drawable/asld_folder.xml
deleted file mode 100644
index c8abb3f6c..000000000
--- a/app/src/main/res/drawable/asld_folder.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_folder"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_folder" />
-    <transition
-        android:drawable="@drawable/avd_folder"
-        android:fromId="@id/state_off"
-        android:toId="@id/state_on" />
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_guitar.xml b/app/src/main/res/drawable/asld_guitar.xml
deleted file mode 100644
index 3f2148678..000000000
--- a/app/src/main/res/drawable/asld_guitar.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_guitar"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_guitar" />
-    <transition
-        android:drawable="@drawable/avd_guitar"
-        android:fromId="@id/state_off"
-        android:toId="@id/state_on" />
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_heart.xml b/app/src/main/res/drawable/asld_heart.xml
deleted file mode 100644
index 4433377a3..000000000
--- a/app/src/main/res/drawable/asld_heart.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_favorite"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_favorite_border" />
-    <transition
-        android:drawable="@drawable/avd_favorite"
-        android:fromId="@+id/state_off"
-        android:toId="@+id/state_on" />
-    <transition
-        android:drawable="@drawable/avd_unfavorite"
-        android:fromId="@+id/state_on"
-        android:toId="@+id/state_off" />
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_music_note.xml b/app/src/main/res/drawable/asld_music_note.xml
deleted file mode 100644
index 7251de26b..000000000
--- a/app/src/main/res/drawable/asld_music_note.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_audiotrack"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_audiotrack" />
-    <transition
-        android:drawable="@drawable/avd_music_note"
-        android:fromId="@id/state_off"
-        android:toId="@id/state_on" />
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/asld_playlist.xml b/app/src/main/res/drawable/asld_playlist.xml
deleted file mode 100644
index 2410010e3..000000000
--- a/app/src/main/res/drawable/asld_playlist.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/state_on"
-        android:drawable="@drawable/ic_queue_music"
-        android:state_checked="true" />
-    <item
-        android:id="@+id/state_off"
-        android:drawable="@drawable/ic_queue_music" />
-    <transition
-        android:drawable="@drawable/avd_playlist"
-        android:fromId="@+id/state_off"
-        android:toId="@+id/state_on" />
-
-</animated-selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_album.xml b/app/src/main/res/drawable/avd_album.xml
deleted file mode 100644
index 454ae79eb..000000000
--- a/app/src/main/res/drawable/avd_album.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 16.5 C 9.51 16.5 7.5 14.49 7.5 12 C 7.5 9.51 9.51 7.5 12 7.5 C 14.49 7.5 16.5 9.51 16.5 12 C 16.5 14.49 14.49 16.5 12 16.5 Z M 12 11 C 11.45 11 11 11.45 11 12 C 11 12.55 11.45 13 12 13 C 12.55 13 13 12.55 13 12 C 13 11.45 12.55 11 12 11 Z"
-                android:fillColor="#000"
-                android:strokeWidth="1" />
-        </vector>
-    </aapt:attr>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:duration="200"
-                    android:valueFrom="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 16.5 C 9.51 16.5 7.5 14.49 7.5 12 C 7.5 9.51 9.51 7.5 12 7.5 C 14.49 7.5 16.5 9.51 16.5 12 C 16.5 14.49 14.49 16.5 12 16.5 Z M 12 11 C 11.45 11 11 11.45 11 12 C 11 12.55 11.45 13 12 13 C 12.55 13 13 12.55 13 12 C 13 11.45 12.55 11 12 11 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12"
-                    android:valueTo="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 Z M 12 7.5 C 9.51 7.5 7.5 9.51 7.5 12 C 7.5 14.49 9.51 16.5 12 16.5 C 14.49 16.5 16.5 14.49 16.5 12 C 16.5 9.51 14.49 7.5 12 7.5 Z M 12 13 C 11.45 13 11 12.55 11 12 C 11 11.45 11.45 11 12 11 C 12.55 11 13 11.45 13 12 C 13 12.55 12.55 13 12 13 L 12 13"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="200"
-                    android:duration="200"
-                    android:valueFrom="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 20 C 7.59 20 4 16.41 4 12 C 4 7.59 7.59 4 12 4 C 16.41 4 20 7.59 20 12 C 20 16.41 16.41 20 12 20 Z M 12 7.5 C 9.51 7.5 7.5 9.51 7.5 12 C 7.5 14.49 9.51 16.5 12 16.5 C 14.49 16.5 16.5 14.49 16.5 12 C 16.5 9.51 14.49 7.5 12 7.5 Z M 12 13 C 12.55 13 13 12.55 13 12 C 13 11.45 12.55 11 12 11 C 11.45 11 11 11.45 11 12 C 11 12.55 11.45 13 12 13 L 12 13"
-                    android:valueTo="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 16.5 C 9.51 16.5 7.5 14.49 7.5 12 C 7.5 9.51 9.51 7.5 12 7.5 C 14.49 7.5 16.5 9.51 16.5 12 C 16.5 14.49 14.49 16.5 12 16.5 Z M 12 11 C 11.45 11 11 11.45 11 12 C 11 12.55 11.45 13 12 13 C 12.55 13 13 12.55 13 12 C 13 11.45 12.55 11 12 11 Z M 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 C 12 12 12 12 12 12 L 12 12"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_artist.xml b/app/src/main/res/drawable/avd_artist.xml
deleted file mode 100644
index 47fe7343b..000000000
--- a/app/src/main/res/drawable/avd_artist.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 11 14 C 12 14 13.05 14.16 14.2 14.44 C 13.39 15.31 13 16.33 13 17.5 C 13 18.39 13.25 19.23 13.78 20 L 3 20 L 3 18 C 3 16.81 3.91 15.85 5.74 15.12 C 7.57 14.38 9.33 14 11 14 M 11 12 C 9.92 12 9 11.61 8.18 10.83 C 7.38 10.05 7 9.11 7 8 C 7 6.92 7.38 6 8.18 5.18 C 9 4.38 9.92 4 11 4 C 12.11 4 13.05 4.38 13.83 5.18 C 14.61 6 15 6.92 15 8 C 15 9.11 14.61 10.05 13.83 10.83 C 13.05 11.61 12.11 12 11 12"
-                android:fillColor="#000000" />
-            <group
-                android:name="group"
-                android:pivotX="18"
-                android:pivotY="15">
-                <path
-                    android:name="path_1"
-                    android:pathData="M 18.5 10 L 20 10 L 22 10 L 22 12 L 20 12 L 20 17.5 C 20 18.163 19.736 18.799 19.268 19.268 C 18.799 19.736 18.163 20 17.5 20 C 16.837 20 16.201 19.736 15.732 19.268 C 15.264 18.799 15 18.163 15 17.5 C 15 16.837 15.264 16.201 15.732 15.732 C 16.201 15.264 16.837 15 17.5 15 C 17.86 15 18.19 15.07 18.5 15.21 L 18.5 10 Z"
-                    android:fillColor="#000000" />
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="group">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:duration="150"
-                    android:valueFrom="0"
-                    android:valueTo="-45"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:startOffset="150"
-                    android:duration="150"
-                    android:valueFrom="-45"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_face.xml b/app/src/main/res/drawable/avd_face.xml
deleted file mode 100644
index 0e7bb6b45..000000000
--- a/app/src/main/res/drawable/avd_face.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:name="path"
-                android:pathData="M 12 2 C 6.48 2 2 6.48 2 12 C 2 17.52 6.48 22 12 22 C 17.52 22 22 17.52 22 12 C 22 6.48 17.52 2 12 2 Z M 12 20 C 7.59 20 4 16.41 4 12 C 4 11.71 4.02 11.42 4.05 11.14 C 6.41 10.09 8.28 8.16 9.26 5.77 C 11.07 8.33 14.05 10 17.42 10 C 18.2 10 18.95 9.91 19.67 9.74 C 19.88 10.45 20 11.21 20 12 C 20 16.41 16.41 20 12 20 Z"
-                android:fillColor="@android:color/white"/>
-            <group
-                android:name="group"
-                android:pivotX="15"
-                android:pivotY="13">
-                <path
-                    android:pathData="M 9 11.75 C 8.31 11.75 7.75 12.31 7.75 13 C 7.75 13.69 8.31 14.25 9 14.25 C 9.69 14.25 10.25 13.69 10.25 13 C 10.25 12.31 9.69 11.75 9 11.75 Z"
-                    android:fillColor="@android:color/white" />
-                <path
-                    android:pathData="M 15 11.75 C 14.31 11.75 13.75 12.31 13.75 13 C 13.75 13.69 14.31 14.25 15 14.25 C 15.69 14.25 16.25 13.69 16.25 13 C 16.25 12.31 15.69 11.75 15 11.75 Z"
-                    android:fillColor="@android:color/white" />
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="group">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:duration="250"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:startOffset="250"
-                    android:duration="250"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_favorite.xml b/app/src/main/res/drawable/avd_favorite.xml
deleted file mode 100644
index a94d5f6b3..000000000
--- a/app/src/main/res/drawable/avd_favorite.xml
+++ /dev/null
@@ -1,81 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="heartbreak"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="56"
-            android:viewportHeight="56">
-            <group
-                android:name="group"
-                android:pivotX="28"
-                android:pivotY="28"
-                android:scaleX="2"
-                android:scaleY="2">
-                <group
-                    android:name="broken_heart_left_group"
-                    android:pivotX="28"
-                    android:pivotY="37.3">
-                    <path
-                        android:name="broken_heart_left"
-                        android:pathData="M 28.031 21.054 C 28.02 21.066 28.01 21.078 28 21.09 C 26.91 19.81 25.24 19 23.5 19 C 20.42 19 18 21.42 18 24.5 C 18 28.28 21.4 31.36 26.55 36.03 L 28 37.35 L 28.002 37.348 L 27.781 36.988 L 28.489 36.073 L 27.506 34.764 L 28.782 33.027 L 26.944 31.008 L 29.149 28.725 L 27.117 27.143 L 29.149 25.018 L 26.488 22.977 L 28.031 21.054 L 28.031 21.054 Z"
-                        android:fillColor="@color/md_white_1000"
-                        android:fillAlpha="0"/>
-                </group>
-                <group
-                    android:name="broken_heart_right_group"
-                    android:pivotX="28"
-                    android:pivotY="37.3">
-                    <path
-                        android:name="broken_heart_right"
-                        android:pathData="M 28.031 21.054 C 28.169 20.895 28.316 20.743 28.471 20.599 L 28.915 20.226 C 29.926 19.457 31.193 19 32.5 19 C 35.58 19 38 21.42 38 24.5 C 38 28.28 34.6 31.36 29.45 36.04 L 28.002 37.348 L 27.781 36.988 L 28.489 36.073 L 27.506 34.764 L 28.782 33.027 L 26.944 31.008 L 29.149 28.725 L 27.117 27.143 L 29.149 25.018 L 26.488 22.977 L 28.031 21.054 L 28.031 21.054 Z"
-                        android:fillColor="@color/md_white_1000"
-                        android:fillAlpha="0"/>
-                </group>
-                <path
-                    android:name="heart_stroke_left"
-                    android:pathData="M 28.719 38.296 L 25.669 35.552 C 21.621 31.793 18.016 28.891 18.016 24.845 C 18.016 21.588 20.631 19.965 23.634 19.965 C 24.999 19.965 26.799 21.181 28.644 23.13"
-                    android:strokeColor="@color/md_white_1000"
-                    android:strokeWidth="2"/>
-                <path
-                    android:name="heart_stroke_right"
-                    android:pathData="M 27.231 38.294 L 30.765 35.2 C 34.834 31.235 37.752 29.118 38.004 25.084 C 38.168 22.459 35.773 20.035 33.379 20.035 C 30.432 20.035 29.672 21.047 27.231 23.133"
-                    android:strokeColor="@color/md_white_1000"
-                    android:strokeWidth="2"/>
-                <group android:name="filled">
-                    <clip-path
-                        android:name="clip"
-                        android:pathData="M 18 37 L 38 37 L 38 37 L 18 37 Z"/>
-                    <path
-                        android:name="fill"
-                        android:pathData="M 28 39 L 26.405 37.567 C 20.74 32.471 17 29.109 17 24.995 C 17 21.632 19.657 19 23.05 19 C 24.964 19 26.801 19.883 28 21.272 C 29.199 19.883 31.036 19 32.95 19 C 36.343 19 39 21.632 39 24.995 C 39 29.109 35.26 32.471 29.595 37.567 L 28 39 L 28 39 Z"
-                        android:fillColor="@color/md_white_1000"/>
-                </group>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="clip">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="360"
-                    android:duration="140"
-                    android:valueFrom="M 18 26 C 18 26 21 28 24 28 C 27 28 29 25 32 25 C 35 25 38 26 38 26 L 38 38 L 18 38 L 18 26 Z"
-                    android:valueTo="M 18 18 C 18 18 24 18 24 18 C 24 18 32 18 32 18 C 32 18 38 18 38 18 L 38 38 L 18 38 L 18 18 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_linear_in"/>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="200"
-                    android:duration="160"
-                    android:valueFrom="M 18 38 C 18 38 24 38 24 38 C 24 38 32 38 32 38 C 32 38 38 38 38 38 L 38 38 L 18 38 L 18 38 Z"
-                    android:valueTo="M 18 26 C 18 26 21 28 24 28 C 27 28 29 25 32 25 C 35 25 38 26 38 26 L 38 38 L 18 38 L 18 26 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:interpolator/fast_out_linear_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_folder.xml b/app/src/main/res/drawable/avd_folder.xml
deleted file mode 100644
index ce8fc6798..000000000
--- a/app/src/main/res/drawable/avd_folder.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group
-                android:name="folder"
-                android:pivotX="12"
-                android:pivotY="12"
-                android:translateY="4"
-                android:scaleX="0.9"
-                android:scaleY="0.9">
-                <path
-                    android:name="path"
-                    android:pathData="M 10.59 4.59 C 10.21 4.21 9.7 4 9.17 4 L 4 4 C 2.9 4 2.01 4.9 2.01 6 L 2 18 C 2 19.1 2.9 20 4 20 L 20 20 C 21.1 20 22 19.1 22 18 L 22 8 C 22 6.9 21.1 6 20 6 L 12 6 L 10.59 4.59 Z"
-                    android:fillColor="#000000"
-                    android:strokeWidth="1"
-                    android:strokeLineCap="round"/>
-            </group>
-            <group
-                android:name="album"
-                android:translateX="7"
-                android:translateY="-7">
-                <path
-                    android:name="path_1"
-                    android:pathData="M 12 7 C 9.24 7 7 9.24 7 12 C 7 14.76 9.24 17 12 17 C 14.76 17 17 14.76 17 12 C 17 9.24 14.76 7 12 7 Z M 12 14.25 C 10.755 14.25 9.75 13.245 9.75 12 C 9.75 10.755 10.755 9.75 12 9.75 C 13.245 9.75 14.25 10.755 14.25 12 C 14.25 13.245 13.245 14.25 12 14.25 Z M 12 11.5 C 11.725 11.5 11.5 11.725 11.5 12 C 11.5 12.275 11.725 12.5 12 12.5 C 12.275 12.5 12.5 12.275 12.5 12 C 12.5 11.725 12.275 11.5 12 11.5 Z"
-                    android:fillColor="#000000"
-                    android:strokeWidth="1"/>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="album">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:startOffset="500"
-                    android:duration="300"
-                    android:valueFrom="-7"
-                    android:valueTo="3"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="translateX"
-                    android:startOffset="200"
-                    android:duration="300"
-                    android:valueFrom="7"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="folder">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="400"
-                    android:duration="400"
-                    android:valueFrom="0.9"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:startOffset="400"
-                    android:duration="400"
-                    android:valueFrom="0.9"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:startOffset="600"
-                    android:duration="200"
-                    android:valueFrom="4"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:duration="200"
-                    android:valueFrom="1"
-                    android:valueTo="0.9"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="scaleY"
-                    android:duration="200"
-                    android:valueFrom="1"
-                    android:valueTo="0.9"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:duration="200"
-                    android:valueFrom="0"
-                    android:valueTo="4"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_guitar.xml b/app/src/main/res/drawable/avd_guitar.xml
deleted file mode 100644
index a9ceaf7e9..000000000
--- a/app/src/main/res/drawable/avd_guitar.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group
-                android:name="group"
-                android:pivotX="12"
-                android:pivotY="12">
-                <path
-                    android:name="path"
-                    android:pathData="M 19.59 3 L 22 3 L 22 5 L 20.41 5 L 16.17 9.24 C 15.8 8.68 15.32 8.2 14.76 7.83 L 19.59 3 Z M 12 8 C 13.06 8 14.079 8.422 14.828 9.172 C 15.578 9.921 16 10.94 16 12 C 16 13.82 14.77 15.42 13 15.87 L 13 16 C 13 17.326 12.473 18.598 11.536 19.536 C 10.598 20.473 9.326 21 8 21 C 6.674 21 5.402 20.473 4.464 19.536 C 3.527 18.598 3 17.326 3 16 C 3 14.674 3.527 13.402 4.464 12.464 C 5.402 11.527 6.674 11 8 11 L 8.13 11 C 8.58 9.24 10.17 8 12 8 Z M 12 10.5 C 11.602 10.5 11.221 10.658 10.939 10.939 C 10.658 11.221 10.5 11.602 10.5 12 C 10.5 12.398 10.658 12.779 10.939 13.061 C 11.221 13.342 11.602 13.5 12 13.5 C 12.398 13.5 12.779 13.342 13.061 13.061 C 13.342 12.779 13.5 12.398 13.5 12 C 13.5 11.602 13.342 11.221 13.061 10.939 C 12.779 10.658 12.398 10.5 12 10.5 Z M 6.94 14.24 L 6.23 14.94 L 9.06 17.77 L 9.77 17.06 L 6.94 14.24 Z"
-                    android:fillColor="#000000"
-                    android:strokeWidth="1"/>
-            </group>
-            <group
-                android:name="group_2"
-                android:translateX="3">
-                <path
-                    android:name="path_2"
-                    android:pathData="M 18 14 L 18 18.275 C 17.53 18.005 16.95 17.9 16.334 18.115 C 15.664 18.355 15.149 18.95 15.029 19.649 C 14.799 21.02 15.959 22.189 17.325 21.974 C 18.305 21.819 19 20.919 19 19.924 L 19 15 L 20 15 C 20.55 15 21 14.55 21 14 C 21 13.45 20.55 13 20 13 L 19 13 C 18.45 13 18 13.45 18 14 Z"
-                    android:fillColor="#000000"/>
-            </group>
-            <group
-                android:name="group_1"
-                android:translateX="-3">
-                <path
-                    android:name="path_1"
-                    android:pathData="M 6 3 L 6 7.275 C 5.53 7.005 4.949 6.9 4.334 7.115 C 3.664 7.355 3.149 7.95 3.029 8.65 C 2.799 10.02 3.959 11.189 5.325 10.974 C 6.305 10.819 7 9.919 7 8.925 L 7 4 L 8 4 C 8.55 4 9 3.55 9 3 C 9 2.45 8.55 2 8 2 L 7 2 C 6.45 2 6 2.45 6 3 Z"
-                    android:fillColor="#000000"
-                    android:fillAlpha="0"/>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="group">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:duration="300"
-                    android:valueFrom="0"
-                    android:valueTo="-15"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:startOffset="300"
-                    android:duration="300"
-                    android:valueFrom="-15"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="path_2">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:startOffset="200"
-                    android:duration="600"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:duration="200"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:startOffset="200"
-                    android:duration="600"
-                    android:valueFrom="1"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:duration="200"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="group_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="translateY"
-                android:startOffset="198"
-                android:duration="602"
-                android:valueFrom="0"
-                android:valueTo="-22"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="group_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="translateY"
-                android:startOffset="198"
-                android:duration="602"
-                android:valueFrom="0"
-                android:valueTo="22"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_music_note.xml b/app/src/main/res/drawable/avd_music_note.xml
deleted file mode 100644
index 7cb3488ec..000000000
--- a/app/src/main/res/drawable/avd_music_note.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group android:name="group_1">
-                <path
-                    android:name="note_1"
-                    android:pathData="M 12 5 L 12 13.55 C 11.06 13.01 9.9 12.8 8.67 13.23 C 7.33 13.71 6.3 14.9 6.06 16.3 C 5.6 19.04 7.92 21.38 10.65 20.95 C 12.61 20.64 14 18.84 14 16.85 L 14 7 L 16 7 C 17.1 7 18 6.1 18 5 C 18 3.9 17.1 3 16 3 L 14 3 C 12.9 3 12 3.9 12 5 Z"
-                    android:fillColor="#000"
-                    android:strokeWidth="1" />
-            </group>
-            <group
-                android:name="group_2"
-                android:translateX="-2"
-                android:translateY="13"
-                android:scaleX="0.4"
-                android:scaleY="0.4">
-                <path
-                    android:name="note_2"
-                    android:pathData="M 12 5 L 12 13.55 C 11.06 13.01 9.9 12.8 8.67 13.23 C 7.33 13.71 6.3 14.9 6.06 16.3 C 5.6 19.04 7.92 21.38 10.65 20.95 C 12.61 20.64 14 18.84 14 16.85 L 14 7 L 16 7 C 17.1 7 18 6.1 18 5 C 18 3.9 17.1 3 16 3 L 14 3 C 12.9 3 12 3.9 12 5 Z"
-                    android:fillColor="#000" />
-            </group>
-            <group
-                android:name="group_3"
-                android:translateX="16"
-                android:translateY="-1"
-                android:scaleX="0.4"
-                android:scaleY="0.4">
-                <path
-                    android:name="path"
-                    android:pathData="M 12 5 L 12 13.55 C 11.06 13.01 9.9 12.8 8.67 13.23 C 7.33 13.71 6.3 14.9 6.06 16.3 C 5.6 19.04 7.92 21.38 10.65 20.95 C 12.61 20.64 14 18.84 14 16.85 L 14 7 L 16 7 C 17.1 7 18 6.1 18 5 C 18 3.9 17.1 3 16 3 L 14 3 C 12.9 3 12 3.9 12 5 Z"
-                    android:fillColor="#000000" />
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="group_1">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:duration="200"
-                    android:valueFrom="-3"
-                    android:valueTo="3"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:startOffset="250"
-                    android:duration="152"
-                    android:valueFrom="-1"
-                    android:valueTo="-2"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="translateY"
-                    android:startOffset="450"
-                    android:duration="350"
-                    android:valueFrom="-1"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="group_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="translateY"
-                android:duration="800"
-                android:valueFrom="13"
-                android:valueTo="-11"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in" />
-        </aapt:attr>
-    </target>
-    <target android:name="group_3">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="translateY"
-                android:duration="800"
-                android:valueFrom="-1"
-                android:valueTo="15"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in" />
-        </aapt:attr>
-    </target>
-    <target android:name="note_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:duration="800"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in" />
-        </aapt:attr>
-    </target>
-    <target android:name="path">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:duration="800"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in" />
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/avd_playlist.xml b/app/src/main/res/drawable/avd_playlist.xml
deleted file mode 100644
index 4a0daede2..000000000
--- a/app/src/main/res/drawable/avd_playlist.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <group
-                android:name="group"
-                android:pivotX="18"
-                android:pivotY="14">
-                <path
-                    android:name="path_2"
-                    android:pathData="M 19 6 C 17.9 6 17 6.9 17 8 L 17 14.18 C 16.69 14.07 16.35 14 16 14 C 14.16 14 12.72 15.64 13.05 17.54 C 13.26 18.75 14.25 19.74 15.46 19.95 C 17.36 20.28 19 18.84 19 17 L 19 8 L 21 8 C 21.55 8 22 7.55 22 7 C 22 6.45 21.55 6 21 6 L 19 6 Z"
-                    android:fillColor="#000000" />
-            </group>
-            <group
-                android:name="first_line"
-                android:pivotX="3"
-                android:pivotY="7">
-                <path
-                    android:name="path_1"
-                    android:pathData="M 14 6 L 4 6 C 3.45 6 3 6.45 3 7 C 3 7.55 3.45 8 4 8 L 14 8 C 14.55 8 15 7.55 15 7 C 15 6.45 14.55 6 14 6 Z"
-                    android:fillColor="#000000" />
-            </group>
-            <group
-                android:name="second_line"
-                android:pivotX="3">
-                <path
-                    android:name="path"
-                    android:pathData="M 14 10 L 4 10 C 3.45 10 3 10.45 3 11 C 3 11.55 3.45 12 4 12 L 14 12 C 14.55 12 15 11.55 15 11 C 15 10.45 14.55 10 14 10 Z"
-                    android:fillColor="#000000" />
-            </group>
-            <group
-                android:name="third_line"
-                android:pivotX="3">
-                <path
-                    android:name="path_3"
-                    android:pathData="M 4 16 L 10 16 C 10.55 16 11 15.55 11 15 C 11 14.45 10.55 14 10 14 L 4 14 C 3.45 14 3 14.45 3 15 C 3 15.55 3.45 16 4 16 Z"
-                    android:fillColor="#000000" />
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="first_line">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:duration="200"
-                    android:valueFrom="1"
-                    android:valueTo="0.2"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="200"
-                    android:duration="200"
-                    android:valueFrom="0.2"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="second_line">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="74"
-                    android:duration="200"
-                    android:valueFrom="1"
-                    android:valueTo="0.2"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="274"
-                    android:duration="200"
-                    android:valueFrom="0.2"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="third_line">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="200"
-                    android:duration="200"
-                    android:valueFrom="1"
-                    android:valueTo="0.2"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="scaleX"
-                    android:startOffset="400"
-                    android:duration="200"
-                    android:valueFrom="0.2"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="group">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:duration="300"
-                    android:valueFrom="0"
-                    android:valueTo="15"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-                <objectAnimator
-                    android:propertyName="rotation"
-                    android:startOffset="300"
-                    android:duration="300"
-                    android:valueFrom="15"
-                    android:valueTo="0"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in" />
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_splash.xml b/app/src/main/res/drawable/avd_splash.xml
deleted file mode 100644
index 4e4c645fe..000000000
--- a/app/src/main/res/drawable/avd_splash.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="vector"
-            android:width="411dp"
-            android:height="411dp"
-            android:viewportWidth="411"
-            android:viewportHeight="411">
-            <group
-                android:name="group_2"
-                android:pivotX="205.5"
-                android:pivotY="205.5"
-                android:scaleX="0.93"
-                android:scaleY="0.93">
-                <clip-path
-                    android:name="mask"
-                    android:pathData="M 335.76 181.285 L 156.573 77.829 C 138.704 67.513 116.396 80.405 116.396 101.044 L 116.396 307.948 C 116.396 328.587 138.737 341.479 156.605 331.163 L 335.76 227.707 C 353.637 217.392 353.637 191.6 335.76 181.285 Z"/>
-                <path
-                    android:name="path"
-                    android:pathData="M 335.76 181.285 L 156.573 77.829 C 138.704 67.513 116.396 80.405 116.396 101.044 L 116.396 307.948 C 116.396 328.587 138.737 341.479 156.605 331.163 L 335.76 227.707 C 353.637 217.392 353.637 191.6 335.76 181.285 Z"
-                    android:fillColor="#0d0754"
-                    android:strokeWidth="1"/>
-                <group android:name="group">
-                    <path
-                        android:name="path_1"
-                        android:pathData="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.362 203.77 C 116.362 203.77 124.741 210.537 152.877 211.235 C 175.274 211.789 188.32 202.943 210.455 206.362 C 242 211.235 253.569 187.161 273.959 181.389 C 283.479 178.695 293.865 183.097 304.502 186.026 C 315.14 188.956 326.03 190.411 336.56 181.823 C 353.61 192.419 353.353 217.585 335.757 227.739 L 156.605 331.163 Z"
-                        android:fillColor="#ffffff"
-                        android:fillAlpha="0.045"
-                        android:strokeWidth="1"/>
-                    <path
-                        android:name="path_2"
-                        android:pathData="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.396 195.506 C 116.396 195.506 122.5 191.5 133.5 191.5 C 144.5 191.5 165 209.413 186 209.413 C 205.5 209.413 219.761 197.157 232.878 194.53 C 255.5 190 269.5 203.5 295.235 209.413 C 313.5 213.61 323.5 194.53 347.632 195.518 C 349.736 201.424 349.7 207.882 347.53 213.764 C 345.361 219.647 341.195 224.581 335.76 227.707 L 156.605 331.163 Z"
-                        android:fillColor="#ffffff"
-                        android:fillAlpha="0.07"
-                        android:strokeWidth="1"/>
-                    <path
-                        android:name="path_3"
-                        android:pathData="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.34 207.484 C 135.5 199 148 198 163.889 201.361 C 188.089 206.481 223 244 259.611 233.069 C 312.484 217.284 323 221.5 334.299 228.582 L 156.605 331.163 Z"
-                        android:fillColor="#ffffff"
-                        android:fillAlpha="0.045"
-                        android:strokeWidth="1"/>
-                </group>
-                <group android:name="group_1">
-                    <path
-                        android:name="path_4"
-                        android:pathData="M 183.4 250.26 C 214.88 250.26 240 225.74 240 194.26 C 240 162.78 214.88 136.26 183.4 136.26 L 116.4 136.27 L 116.4 250.26 L 183.4 250.26 Z"
-                        android:fillColor="#00f8bc"
-                        android:strokeWidth="1"/>
-                </group>
-                <path
-                    android:name="path_5"
-                    android:pathData="M 116.396 136.268 L 116.396 250.256 L 183.521 250.256 C 190.005 250.261 196.443 249.227 202.554 247.06 L 138.616 136.268 L 116.396 136.268 Z"
-                    android:fillColor="#00d1f7"
-                    android:fillAlpha="0"
-                    android:strokeWidth="1"/>
-                <path
-                    android:name="path_7"
-                    android:pathData="M 116.4 308.016 L 116.4 250.26 L 183.493 250.26 C 189.978 250.257 196.44 249.235 202.55 247.06 L 227.474 290.291 L 156.609 331.231 C 138.74 341.546 116.4 328.654 116.4 308.016 Z"
-                    android:fillColor="#4e75f3"
-                    android:fillAlpha="0"
-                    android:strokeWidth="1"/>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="group_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="translateX"
-                android:duration="400"
-                android:valueFrom="-130"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:anim/decelerate_interpolator"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_5">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="154"
-                    android:duration="446"
-                    android:valueFrom="M 116.396 136.268 L 116.396 140.256 L 120.05 140.256 C 126.534 140.261 132.959 139.227 139.07 137.06 L 138.616 136.268 L 116.396 136.268 Z"
-                    android:valueTo="M 116.396 136.268 L 116.396 250.256 L 183.521 250.256 C 190.005 250.261 196.443 249.227 202.554 247.06 L 138.616 136.268 L 116.396 136.268 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:anim/accelerate_interpolator"/>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:startOffset="154"
-                    android:duration="846"
-                    android:valueFrom="0.1"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/fast_out_slow_in"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="path_7">
-        <aapt:attr name="android:animation">
-            <set>
-                <objectAnimator
-                    android:propertyName="fillAlpha"
-                    android:startOffset="600"
-                    android:duration="400"
-                    android:valueFrom="0"
-                    android:valueTo="1"
-                    android:valueType="floatType"
-                    android:interpolator="@android:interpolator/linear_out_slow_in"/>
-                <objectAnimator
-                    android:propertyName="pathData"
-                    android:startOffset="600"
-                    android:duration="400"
-                    android:valueFrom="M 116.4 251.016 L 116.4 250.26 L 183.493 250.26 C 189.978 250.257 196.44 249.235 202.55 247.06 L 205 251.291 L 156.609 251.231 C 138 251.016 133.5 251.016 116.4 251.016 Z"
-                    android:valueTo="M 116.4 308.016 L 116.4 250.26 L 183.493 250.26 C 189.978 250.257 196.44 249.235 202.55 247.06 L 227.474 290.291 L 156.609 331.231 C 138.74 341.546 116.4 328.654 116.4 308.016 Z"
-                    android:valueType="pathType"
-                    android:interpolator="@android:anim/decelerate_interpolator"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="path_4">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:duration="400"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_3">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:startOffset="154"
-                android:duration="846"
-                android:valueFrom="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.34 207.484 C 135.5 199 148 198 163.889 201.361 C 188.089 206.481 223 244 259.611 233.069 C 312.484 217.284 323 221.5 334.299 228.582 L 156.605 331.163 Z"
-                android:valueTo="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.34 218.484 C 137.051 202.766 178.295 198.479 206.889 201.361 C 257.967 206.515 265.938 234.257 308.611 233.069 C 317.35 232.868 326.009 231.355 334.299 228.582 L 156.605 331.163 Z"
-                android:valueType="pathType"
-                android:interpolator="@android:anim/decelerate_interpolator"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_2">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:startOffset="154"
-                android:duration="846"
-                android:valueFrom="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.396 195.506 C 116.396 195.506 122.5 191.5 133.5 191.5 C 144.5 191.5 165 209.413 186 209.413 C 205.5 209.413 219.761 197.157 232.878 194.53 C 255.5 190 269.5 203.5 295.235 209.413 C 313.5 213.61 323.5 194.53 347.632 195.518 C 349.736 201.424 349.7 207.882 347.53 213.764 C 345.361 219.647 341.195 224.581 335.76 227.707 L 156.605 331.163 Z"
-                android:valueTo="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.396 201.506 C 132.812 196.393 150.914 194.53 167.065 198.15 C 180.96 201.281 195.129 208.883 218.031 206.274 C 236.775 204.163 239.456 197.669 257.878 194.53 C 286.624 189.633 294.339 202.967 320.235 202.413 C 329.787 202.338 339.182 199.974 347.632 195.518 C 349.736 201.424 349.7 207.882 347.53 213.764 C 345.361 219.647 341.195 224.581 335.76 227.707 L 156.605 331.163 Z"
-                android:valueType="pathType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="path_1">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="pathData"
-                android:startOffset="154"
-                android:duration="846"
-                android:valueFrom="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.362 203.77 C 116.362 203.77 124.741 210.537 152.877 211.235 C 175.274 211.789 188.32 202.943 210.455 206.362 C 242 211.235 253.569 187.161 273.959 181.389 C 283.479 178.695 293.865 183.097 304.502 186.026 C 315.14 188.956 326.03 190.411 336.56 181.823 C 353.61 192.419 353.353 217.585 335.757 227.739 L 156.605 331.163 Z"
-                android:valueTo="M 156.605 331.163 C 138.737 341.479 116.396 328.587 116.396 307.948 L 116.362 203.77 C 122.961 203.328 130.643 203.416 140.276 203.529 C 168.588 203.866 173.741 210.537 201.877 211.235 C 224.274 211.789 242.094 213.097 263.455 206.362 C 298.35 195.365 301.48 182.152 326.959 181.389 C 330.166 181.31 333.374 181.454 336.56 181.823 C 353.61 192.419 353.353 217.585 335.757 227.739 L 156.605 331.163 Z"
-                android:valueType="pathType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/avd_unfavorite.xml b/app/src/main/res/drawable/avd_unfavorite.xml
deleted file mode 100644
index aae7e0365..000000000
--- a/app/src/main/res/drawable/avd_unfavorite.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<animated-vector
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector
-            android:name="heartbreak"
-            android:width="24dp"
-            android:height="24dp"
-            android:viewportWidth="56"
-            android:viewportHeight="56">
-            <group
-                android:name="group"
-                android:pivotX="28"
-                android:pivotY="28"
-                android:scaleX="2"
-                android:scaleY="2">
-                <group
-                    android:name="broken_heart_left_group"
-                    android:pivotX="28"
-                    android:pivotY="37.3">
-                    <path
-                        android:name="broken_heart_left"
-                        android:pathData="M 28.031 21.054 C 28.02 21.066 28.01 21.078 28 21.09 C 26.91 19.81 25.24 19 23.5 19 C 20.42 19 18 21.42 18 24.5 C 18 28.28 21.4 31.36 26.55 36.03 L 28 37.35 L 28.002 37.348 L 27.781 36.988 L 28.489 36.073 L 27.506 34.764 L 28.782 33.027 L 26.944 31.008 L 29.149 28.725 L 27.117 27.143 L 29.149 25.018 L 26.488 22.977 L 28.031 21.054 L 28.031 21.054 Z"
-                        android:fillColor="@color/md_white_1000"/>
-                </group>
-                <group
-                    android:name="broken_heart_right_group"
-                    android:pivotX="28"
-                    android:pivotY="37.3">
-                    <path
-                        android:name="broken_heart_right"
-                        android:pathData="M 28.031 21.054 C 28.169 20.895 28.316 20.743 28.471 20.599 L 28.915 20.226 C 29.926 19.457 31.193 19 32.5 19 C 35.58 19 38 21.42 38 24.5 C 38 28.28 34.6 31.36 29.45 36.04 L 28.002 37.348 L 27.781 36.988 L 28.489 36.073 L 27.506 34.764 L 28.782 33.027 L 26.944 31.008 L 29.149 28.725 L 27.117 27.143 L 29.149 25.018 L 26.488 22.977 L 28.031 21.054 L 28.031 21.054 Z"
-                        android:fillColor="@color/md_white_1000"/>
-                </group>
-                <path
-                    android:name="heart_stroke_left"
-                    android:pathData="M 28.719 38.296 L 25.669 35.552 C 21.621 31.793 18.016 28.891 18.016 24.845 C 18.016 21.588 20.631 19.965 23.634 19.965 C 24.999 19.965 26.799 21.181 28.644 23.13"
-                    android:strokeColor="#fff"
-                    android:strokeWidth="2"
-                    android:trimPathEnd="0"/>
-                <path
-                    android:name="heart_stroke_right"
-                    android:pathData="M 27.231 38.294 L 30.765 35.2 C 34.834 31.235 37.752 29.118 38.004 25.084 C 38.168 22.459 35.773 20.035 33.379 20.035 C 30.432 20.035 29.672 21.047 27.231 23.133"
-                    android:strokeColor="#fff"
-                    android:strokeWidth="2"
-                    android:trimPathEnd="0"/>
-                <group android:name="filled">
-                    <clip-path
-                        android:name="clip"
-                        android:pathData="M 18 37 L 38 37 L 38 37 L 18 37 Z"/>
-                    <path
-                        android:name="fill"
-                        android:pathData="M 28 39 L 26.405 37.567 C 20.74 32.471 17 29.109 17 24.995 C 17 21.632 19.657 19 23.05 19 C 24.964 19 26.801 19.883 28 21.272 C 29.199 19.883 31.036 19 32.95 19 C 36.343 19 39 21.632 39 24.995 C 39 29.109 35.26 32.471 29.595 37.567 L 28 39 L 28 39 Z"
-                        android:fillColor="#fff"/>
-                </group>
-            </group>
-        </vector>
-    </aapt:attr>
-    <target android:name="broken_heart_left_group">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="rotation"
-                android:duration="400"
-                android:valueFrom="0"
-                android:valueTo="-20"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="broken_heart_right_group">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="rotation"
-                android:duration="400"
-                android:valueFrom="0"
-                android:valueTo="20"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="broken_heart_left">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:startOffset="100"
-                android:duration="300"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="broken_heart_right">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="fillAlpha"
-                android:startOffset="100"
-                android:duration="300"
-                android:valueFrom="1"
-                android:valueTo="0"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/linear_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="heart_stroke_left">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="trimPathEnd"
-                android:startOffset="500"
-                android:duration="400"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-    <target android:name="heart_stroke_right">
-        <aapt:attr name="android:animation">
-            <objectAnimator
-                android:propertyName="trimPathEnd"
-                android:startOffset="500"
-                android:duration="400"
-                android:valueFrom="0"
-                android:valueTo="1"
-                android:valueType="floatType"
-                android:interpolator="@android:interpolator/fast_out_slow_in"/>
-        </aapt:attr>
-    </target>
-</animated-vector>
diff --git a/app/src/main/res/drawable/bottom_navigation_item_background.xml b/app/src/main/res/drawable/bottom_navigation_item_background.xml
new file mode 100644
index 000000000..ff7e81356
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_navigation_item_background.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="?colorSurface" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/artist_card_gradient_effect.xml b/app/src/main/res/drawable/bottom_navigation_item_background_mask.xml
similarity index 80%
rename from app/src/main/res/drawable/artist_card_gradient_effect.xml
rename to app/src/main/res/drawable/bottom_navigation_item_background_mask.xml
index 2804ee8b8..fd8fd117c 100644
--- a/app/src/main/res/drawable/artist_card_gradient_effect.xml
+++ b/app/src/main/res/drawable/bottom_navigation_item_background_mask.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -14,8 +14,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <gradient
-        android:angle="135"
-        android:endColor="@color/semi_transparent"
-        android:startColor="#80000000" />
+    <solid android:color="?attr/colorSurface" />
+    <corners android:radius="8dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bottom_navigation_item_colors.xml b/app/src/main/res/drawable/bottom_navigation_item_colors.xml
new file mode 100644
index 000000000..330a0f98a
--- /dev/null
+++ b/app/src/main/res/drawable/bottom_navigation_item_colors.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="@android:color/holo_blue_dark" android:state_checked="true" />
+    <item android:color="@android:color/darker_gray" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_progress.xml b/app/src/main/res/drawable/circle_progress.xml
new file mode 100644
index 000000000..6bb955957
--- /dev/null
+++ b/app/src/main/res/drawable/circle_progress.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@android:id/background">
+        <shape
+            android:dither="true"
+            android:shape="ring"
+            android:thickness="3dp"
+            android:type="sweep"
+            android:useLevel="false">
+            <solid android:color="?android:attr/textColorSecondary" />
+        </shape>
+    </item>
+    <item android:id="@android:id/progress">
+        <shape
+            android:shape="ring"
+            android:thickness="3dp"
+            android:type="sweep"
+            android:useLevel="true">
+            <solid android:color="?attr/colorAccent" />
+
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/color_progress_seek.xml b/app/src/main/res/drawable/color_progress_seek.xml
index 4b65c536a..3c6c3e967 100755
--- a/app/src/main/res/drawable/color_progress_seek.xml
+++ b/app/src/main/res/drawable/color_progress_seek.xml
@@ -18,7 +18,7 @@
     <item android:id="@android:id/background">
         <shape>
             <corners android:radius="8dip" />
-            <solid android:color="?android:attr/colorControlHighlight" />
+            <solid android:color="?colorButtonNormal" />
         </shape>
     </item>
 
@@ -26,7 +26,7 @@
         <clip>
             <shape>
                 <corners android:radius="8dip" />
-                <solid android:color="?attr/colorControlNormal" />
+                <solid android:color="?colorButtonNormal" />
             </shape>
         </clip>
     </item>
diff --git a/app/src/main/res/drawable/ic_access_time_white_24dp.xml b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
new file mode 100644
index 000000000..b1fc7d60d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_access_time_white_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm0.5-13H11v6l5.25 3.15 0.75 -1.23-4.5-2.67z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_account.xml b/app/src/main/res/drawable/ic_account.xml
deleted file mode 100644
index e73bc4fc7..000000000
--- a/app/src/main/res/drawable/ic_account.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.85,17.1Q7.125,16.125 8.7,15.562Q10.275,15 12,15Q13.725,15 15.3,15.562Q16.875,16.125 18.15,17.1Q19.025,16.075 19.513,14.775Q20,13.475 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,13.475 4.488,14.775Q4.975,16.075 5.85,17.1ZM12,13Q10.525,13 9.512,11.988Q8.5,10.975 8.5,9.5Q8.5,8.025 9.512,7.012Q10.525,6 12,6Q13.475,6 14.488,7.012Q15.5,8.025 15.5,9.5Q15.5,10.975 14.488,11.988Q13.475,13 12,13ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,20Q13.325,20 14.5,19.613Q15.675,19.225 16.65,18.5Q15.675,17.775 14.5,17.387Q13.325,17 12,17Q10.675,17 9.5,17.387Q8.325,17.775 7.35,18.5Q8.325,19.225 9.5,19.613Q10.675,20 12,20ZM12,11Q12.65,11 13.075,10.575Q13.5,10.15 13.5,9.5Q13.5,8.85 13.075,8.425Q12.65,8 12,8Q11.35,8 10.925,8.425Q10.5,8.85 10.5,9.5Q10.5,10.15 10.925,10.575Q11.35,11 12,11ZM12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5Q12,9.5 12,9.5ZM12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Q12,18.5 12,18.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_library_music.xml b/app/src/main/res/drawable/ic_account_white_24dp.xml
similarity index 61%
rename from app/src/main/res/drawable/ic_library_music.xml
rename to app/src/main/res/drawable/ic_account_white_24dp.xml
index de4b8a912..57af742f1 100644
--- a/app/src/main/res/drawable/ic_library_music.xml
+++ b/app/src/main/res/drawable/ic_account_white_24dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -20,5 +20,5 @@
 
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M20 2H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-3 5h-2v5.37c0 1.27-0.9 2.44-2.16 2.6-1.69 0.23 -3.11-1.25-2.8-2.95 0.2 -1.1 1.18-1.95 2.3-2.02 0.63 -0.04 1.2 0.16 1.66 0.51 V6c0-0.55 0.45 -1 1-1h2c0.55 0 1 0.45 1 1s-0.45 1-1 1zM3 6c-0.55 0-1 0.45-1 1v13c0 1.1 0.9 2 2 2h13c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1-0.45-1-1V7c0-0.55-0.45-1-1-1z" />
+        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zM7.07 18.28c0.43-0.9 3.05-1.78 4.93-1.78s4.51 0.88 4.93 1.78C15.57 19.36 13.86 20 12 20s-3.57-0.64-4.93-1.72zm11.29-1.45c-1.43-1.74-4.9-2.33-6.36-2.33s-4.93 0.59 -6.36 2.33C4.62 15.49 4 13.82 4 12c0-4.41 3.59-8 8-8s8 3.59 8 8c0 1.82-0.62 3.49-1.64 4.83zM12 6c-1.94 0-3.5 1.56-3.5 3.5S10.06 13 12 13s3.5-1.56 3.5-3.5S13.94 6 12 6zm0 5c-0.83 0-1.5-0.67-1.5-1.5S11.17 8 12 8s1.5 0.67 1.5 1.5S12.83 11 12 11z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorite.xml b/app/src/main/res/drawable/ic_add_photo_white_24dp.xml
similarity index 51%
rename from app/src/main/res/drawable/ic_favorite.xml
rename to app/src/main/res/drawable/ic_add_photo_white_24dp.xml
index 786db0198..49d868e98 100644
--- a/app/src/main/res/drawable/ic_favorite.xml
+++ b/app/src/main/res/drawable/ic_add_photo_white_24dp.xml
@@ -5,7 +5,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M13.35 20.13c-0.76 0.69 -1.93 0.69 -2.69-0.01l-0.11-0.1C5.3 15.27 1.87 12.16 2 8.28c0.06-1.7 0.93 -3.33 2.34-4.29 2.64-1.8 5.9-0.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41 0.96 2.28 2.59 2.34 4.29 0.14 3.88-3.3 6.99-8.55 11.76l-0.1 0.09 z" />
+        android:pathData="M18 20H4V6h9V4H4c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-9h-2v9zm-7.79-3.17l-1.96-2.36L5.5 18h11l-3.54-4.71zM20 4V1h-2v3h-3c0.01 0.01 0 2 0 2h3v2.99c0.01 0.01 2 0 2 0V6h3V4h-3z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_album_artist.xml b/app/src/main/res/drawable/ic_album_artist.xml
deleted file mode 100644
index 64784443c..000000000
--- a/app/src/main/res/drawable/ic_album_artist.xml
+++ /dev/null
@@ -1,16 +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:pathData="M11,14C12,14 13.05,14.16 14.2,14.44C13.39,15.31 13,16.33 13,17.5C13,18.39 13.25,19.23 13.78,20H3V18C3,16.81 3.91,15.85 5.74,15.12C7.57,14.38 9.33,14 11,14ZM11,12C9.92,12 9,11.61 8.18,10.83C7.38,10.05 7,9.11 7,8C7,6.92 7.38,6 8.18,5.18C9,4.38 9.92,4 11,4C12.11,4 13.05,4.38 13.83,5.18C14.61,6 15,6.92 15,8C15,9.11 14.61,10.05 13.83,10.83C13.05,11.61 12.11,12 11,12Z"
-      android:fillColor="@color/md_white_1000"/>
-  <path
-      android:pathData="M18.5,17.5m-0.6429,0a0.6429,0.6429 0,1 1,1.2857 0a0.6429,0.6429 0,1 1,-1.2857 0"
-      android:fillColor="@color/md_white_1000"/>
-  <path
-      android:pathData="M18.5,22C20.9853,22 23,19.9853 23,17.5C23,15.0147 20.9853,13 18.5,13C16.0147,13 14,15.0147 14,17.5C14,19.9853 16.0147,22 18.5,22ZM18.5,19.4286C19.5651,19.4286 20.4286,18.5651 20.4286,17.5C20.4286,16.4349 19.5651,15.5714 18.5,15.5714C17.4349,15.5714 16.5714,16.4349 16.5714,17.5C16.5714,18.5651 17.4349,19.4286 18.5,19.4286Z"
-      android:fillColor="@color/md_white_1000"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_album.xml b/app/src/main/res/drawable/ic_album_selected_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_album.xml
rename to app/src/main/res/drawable/ic_album_selected_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_album_white_24dp.xml b/app/src/main/res/drawable/ic_album_white_24dp.xml
new file mode 100644
index 000000000..13d269f24
--- /dev/null
+++ b/app/src/main/res/drawable/ic_album_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm0-12.5c-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5 4.5 4.5-2.01 4.5-4.5-2.01-4.5-4.5-4.5zm0 5.5c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_app_shortcut_background.xml b/app/src/main/res/drawable/ic_app_shortcut_background.xml
index 5c0a5a687..ff13635ef 100644
--- a/app/src/main/res/drawable/ic_app_shortcut_background.xml
+++ b/app/src/main/res/drawable/ic_app_shortcut_background.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="176dp"
     android:height="176dp"
-    android:viewportWidth="176"
-    android:viewportHeight="176">
+    android:viewportHeight="176"
+    android:viewportWidth="176">
 
     <group
         android:pivotX="88"
diff --git a/app/src/main/res/drawable/ic_app_shortcut_search.xml b/app/src/main/res/drawable/ic_app_shortcut_search.xml
new file mode 100644
index 000000000..4e05cab7a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_app_shortcut_search.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="176dp"
+    android:height="176dp"
+    android:viewportWidth="176"
+    android:viewportHeight="176">
+
+    <group
+        android:pivotX="88"
+        android:pivotY="88"
+        android:scaleX="0.916"
+        android:scaleY="0.916"
+        android:translateX="-8"
+        android:translateY="-8">
+        <path
+            android:name="ic_app_shortcut_search_ic"
+            android:fillColor="@color/md_white_1000"
+            android:pathData="M104.333 97.3333H100.647L99.34 96.0733C103.913 90.7533 106.667 83.8467 106.667 76.3333C106.667 59.58 93.0867 46 76.3333 46C59.58 46 46 59.58 46 76.3333C46 93.0867 59.58 106.667 76.3333 106.667C83.8467 106.667 90.7533 103.913 96.0733 99.34L97.3333 100.647V104.333L120.667 127.62L127.62 120.667L104.333 97.3333V97.3333ZM76.3333 97.3333C64.7133 97.3333 55.3333 87.9533 55.3333 76.3333C55.3333 64.7133 64.7133 55.3333 76.3333 55.3333C87.9533 55.3333 97.3333 64.7133 97.3333 76.3333C97.3333 87.9533 87.9533 97.3333 76.3333 97.3333Z" />
+    </group>
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_app_shortcut_shuffle_all.xml b/app/src/main/res/drawable/ic_app_shortcut_shuffle_all.xml
index 048734143..a95a2550b 100644
--- a/app/src/main/res/drawable/ic_app_shortcut_shuffle_all.xml
+++ b/app/src/main/res/drawable/ic_app_shortcut_shuffle_all.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="176dp"
     android:height="176dp"
-    android:viewportWidth="176"
-    android:viewportHeight="176">
+    android:viewportHeight="176"
+    android:viewportWidth="176">
 
     <group
         android:pivotX="88"
diff --git a/app/src/main/res/drawable/ic_app_shortcut_top_tracks.xml b/app/src/main/res/drawable/ic_app_shortcut_top_tracks.xml
index 3f829beb7..09f87856a 100644
--- a/app/src/main/res/drawable/ic_app_shortcut_top_tracks.xml
+++ b/app/src/main/res/drawable/ic_app_shortcut_top_tracks.xml
@@ -2,8 +2,8 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="176dp"
     android:height="176dp"
-    android:viewportWidth="176"
-    android:viewportHeight="176">
+    android:viewportHeight="176"
+    android:viewportWidth="176">
 
     <group
         android:pivotX="88"
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
deleted file mode 100644
index d04be09ed..000000000
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.875,19.3 L4.275,12.7Q4.125,12.55 4.062,12.375Q4,12.2 4,12Q4,11.8 4.062,11.625Q4.125,11.45 4.275,11.3L10.875,4.7Q11.15,4.425 11.562,4.412Q11.975,4.4 12.275,4.7Q12.575,4.975 12.588,5.387Q12.6,5.8 12.3,6.1L7.4,11H18.575Q19,11 19.288,11.287Q19.575,11.575 19.575,12Q19.575,12.425 19.288,12.712Q19,13 18.575,13H7.4L12.3,17.9Q12.575,18.175 12.588,18.6Q12.6,19.025 12.3,19.3Q12.025,19.6 11.6,19.6Q11.175,19.6 10.875,19.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_forward.xml b/app/src/main/res/drawable/ic_arrow_forward.xml
deleted file mode 100644
index a8d3c6fe5..000000000
--- a/app/src/main/res/drawable/ic_arrow_forward.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.3,19.3Q11.025,19.025 11.012,18.6Q11,18.175 11.275,17.9L16.175,13H5Q4.575,13 4.287,12.712Q4,12.425 4,12Q4,11.575 4.287,11.287Q4.575,11 5,11H16.175L11.275,6.1Q11,5.825 11.012,5.4Q11.025,4.975 11.3,4.7Q11.575,4.425 12,4.425Q12.425,4.425 12.7,4.7L19.3,11.3Q19.45,11.425 19.513,11.612Q19.575,11.8 19.575,12Q19.575,12.2 19.513,12.375Q19.45,12.55 19.3,12.7L12.7,19.3Q12.425,19.575 12,19.575Q11.575,19.575 11.3,19.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml b/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
similarity index 71%
rename from app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml
rename to app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
index 1cd7da06f..f909ad41a 100644
--- a/app/src/main/res/drawable/ic_play_arrow_sharp_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_forward_white_24dp.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -13,11 +13,11 @@
   -->
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M8 5v14l11-7L8 5z" />
-</vector>
\ No newline at end of file
+        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_artist.xml b/app/src/main/res/drawable/ic_artist_selected_white_24dp.xml
similarity index 99%
rename from app/src/main/res/drawable/ic_artist.xml
rename to app/src/main/res/drawable/ic_artist_selected_white_24dp.xml
index d4e7cb5c1..4e865f47c 100644
--- a/app/src/main/res/drawable/ic_artist.xml
+++ b/app/src/main/res/drawable/ic_artist_selected_white_24dp.xml
@@ -4,6 +4,7 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/md_white_1000"
         android:pathData="M11,14C12,14 13.05,14.16 14.2,14.44C13.39,15.31 13,16.33 13,17.5C13,18.39 13.25,19.23 13.78,20H3V18C3,16.81 3.91,15.85 5.74,15.12C7.57,14.38 9.33,14 11,14M11,12C9.92,12 9,11.61 8.18,10.83C7.38,10.05 7,9.11 7,8C7,6.92 7.38,6 8.18,5.18C9,4.38 9.92,4 11,4C12.11,4 13.05,4.38 13.83,5.18C14.61,6 15,6.92 15,8C15,9.11 14.61,10.05 13.83,10.83C13.05,11.61 12.11,12 11,12M18.5,10H20L22,10V12H20V17.5A2.5,2.5 0 0,1 17.5,20A2.5,2.5 0 0,1 15,17.5A2.5,2.5 0 0,1 17.5,15C17.86,15 18.19,15.07 18.5,15.21V10Z" />
diff --git a/app/src/main/res/drawable/ic_artist_white_24dp.xml b/app/src/main/res/drawable/ic_artist_white_24dp.xml
new file mode 100644
index 000000000..ce926c92e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_artist_white_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M11,4A4,4 0 0,1 15,8A4,4 0 0,1 11,12A4,4 0 0,1 7,8A4,4 0 0,1 11,4M11,6A2,2 0 0,0 9,8A2,2 0 0,0 11,10A2,2 0 0,0 13,8A2,2 0 0,0 11,6M11,13C12.1,13 13.66,13.23 15.11,13.69C14.5,14.07 14,14.6 13.61,15.23C12.79,15.03 11.89,14.9 11,14.9C8.03,14.9 4.9,16.36 4.9,17V18.1H13.04C13.13,18.8 13.38,19.44 13.76,20H3V17C3,14.34 8.33,13 11,13M18.5,10H20L22,10V12H20V17.5A2.5,2.5 0 0,1 17.5,20A2.5,2.5 0 0,1 15,17.5A2.5,2.5 0 0,1 17.5,15C17.86,15 18.19,15.07 18.5,15.21V10Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_audio_file.xml b/app/src/main/res/drawable/ic_audio_file.xml
deleted file mode 100644
index 470795988..000000000
--- a/app/src/main/res/drawable/ic_audio_file.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.75,19Q11.7,19 12.35,18.35Q13,17.7 13,16.75V13H15Q15.425,13 15.713,12.712Q16,12.425 16,12Q16,11.575 15.713,11.287Q15.425,11 15,11H13Q12.575,11 12.288,11.287Q12,11.575 12,12V14.875Q11.725,14.675 11.413,14.587Q11.1,14.5 10.75,14.5Q9.8,14.5 9.15,15.15Q8.5,15.8 8.5,16.75Q8.5,17.7 9.15,18.35Q9.8,19 10.75,19ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V4Q4,3.175 4.588,2.587Q5.175,2 6,2H13.175Q13.575,2 13.938,2.15Q14.3,2.3 14.575,2.575L19.425,7.425Q19.7,7.7 19.85,8.062Q20,8.425 20,8.825V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM13,4H6Q6,4 6,4Q6,4 6,4V20Q6,20 6,20Q6,20 6,20H18Q18,20 18,20Q18,20 18,20V9H14Q13.575,9 13.288,8.712Q13,8.425 13,8ZM6,4V8Q6,8.425 6,8.712Q6,9 6,9V4V8Q6,8.425 6,8.712Q6,9 6,9V20Q6,20 6,20Q6,20 6,20Q6,20 6,20Q6,20 6,20V4Q6,4 6,4Q6,4 6,4Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_audiotrack.xml b/app/src/main/res/drawable/ic_audiotrack.xml
deleted file mode 100644
index c6da49f3a..000000000
--- a/app/src/main/res/drawable/ic_audiotrack.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,21Q8.35,21 7.175,19.825Q6,18.65 6,17Q6,15.35 7.175,14.175Q8.35,13 10,13Q10.575,13 11.062,13.137Q11.55,13.275 12,13.55V5Q12,4.175 12.588,3.587Q13.175,3 14,3H16Q16.825,3 17.413,3.587Q18,4.175 18,5Q18,5.825 17.413,6.412Q16.825,7 16,7H14V17Q14,18.65 12.825,19.825Q11.65,21 10,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml
new file mode 100644
index 000000000..0cbc058db
--- /dev/null
+++ b/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 3l0.01 10.55c-0.59-0.34-1.27-0.55-2-0.55C7.79 13 6 14.79 6 17s1.79 4 4.01 4S14 19.21 14 17V7h4V3h-6zm-1.99 16c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml
new file mode 100644
index 000000000..57206a2da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 3v10.55c-0.59-0.34-1.27-0.55-2-0.55-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4V7h4V3h-6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_backup.xml b/app/src/main/res/drawable/ic_backup.xml
deleted file mode 100644
index 711f462d0..000000000
--- a/app/src/main/res/drawable/ic_backup.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.5,20Q4.225,20 2.613,18.425Q1,16.85 1,14.575Q1,12.625 2.175,11.1Q3.35,9.575 5.25,9.15Q5.875,6.85 7.75,5.425Q9.625,4 12,4Q14.925,4 16.962,6.037Q19,8.075 19,11Q20.725,11.2 21.863,12.487Q23,13.775 23,15.5Q23,17.375 21.688,18.688Q20.375,20 18.5,20H13Q12.175,20 11.588,19.413Q11,18.825 11,18V12.8L10.1,13.7Q9.825,13.975 9.4,13.975Q8.975,13.975 8.7,13.7Q8.425,13.425 8.425,13Q8.425,12.575 8.7,12.3L11.3,9.7Q11.45,9.55 11.625,9.487Q11.8,9.425 12,9.425Q12.2,9.425 12.375,9.487Q12.55,9.55 12.7,9.7L15.3,12.3Q15.575,12.575 15.575,13Q15.575,13.425 15.3,13.7Q15.025,13.975 14.6,13.975Q14.175,13.975 13.9,13.7L13,12.8V18Q13,18 13,18Q13,18 13,18H18.5Q19.55,18 20.275,17.275Q21,16.55 21,15.5Q21,14.45 20.275,13.725Q19.55,13 18.5,13H17V11Q17,8.925 15.538,7.462Q14.075,6 12,6Q9.925,6 8.463,7.462Q7,8.925 7,11H6.5Q5.05,11 4.025,12.025Q3,13.05 3,14.5Q3,15.95 4.025,16.975Q5.05,18 6.5,18H8Q8.425,18 8.713,18.288Q9,18.575 9,19Q9,19.425 8.713,19.712Q8.425,20 8,20ZM12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_beer_white_24dp.xml b/app/src/main/res/drawable/ic_beer_white_24dp.xml
new file mode 100644
index 000000000..347dc731d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_beer_white_24dp.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="512.0"
+    android:viewportWidth="512.0">
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M418.9,174.5h-23.3c-12.8,0 -23.3,-10.5 -23.3,-23.3c0,-7 -4.7,-11.6 -11.6,-11.6h-128c-7,0 -11.6,4.7 -11.6,11.6c0,7 4.7,11.6 11.6,11.6h116.4v232.7c0,7 4.7,11.6 11.6,11.6s11.6,-4.7 11.6,-11.6V221.1c0,-12.8 10.5,-23.3 23.3,-23.3h23.3c7,0 11.6,4.7 11.6,11.6v139.6c0,7 -4.7,11.6 -11.6,11.6h-11.6c-7,0 -11.6,4.7 -11.6,11.6S400.3,384 407.3,384h11.6c19.8,0 34.9,-15.1 34.9,-34.9V209.5C453.8,189.7 438.7,174.5 418.9,174.5z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M374.7,439.9c-1.2,-1.2 -1.2,-1.2 -1.2,-2.3c-2.3,-4.7 -5.8,-7 -10.5,-7H128c-7,0 -11.6,4.7 -11.6,11.6s4.7,11.6 11.6,11.6h228.1c1.2,1.2 1.2,1.2 2.3,2.3s2.3,3.5 2.3,5.8v15.1c0,7 -4.7,11.6 -11.6,11.6h-256c-7,0 -11.6,-4.7 -11.6,-11.6v-15.1c0,-2.3 1.2,-4.7 2.3,-5.8c5.8,-5.8 9.3,-14 9.3,-22.1V151.3c0,-7 -4.7,-11.6 -11.6,-11.6s-11.6,4.7 -11.6,11.6v282.8c0,2.3 -1.2,4.7 -2.3,5.8c-5.8,5.8 -9.3,14 -9.3,22.1v15.1c0,19.8 15.1,34.9 34.9,34.9h256C368.9,512 384,496.9 384,477.1v-15.1C384,453.8 380.5,445.7 374.7,439.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M381.7,72.1c-3.5,-17.5 -18.6,-32.6 -36.1,-36.1s-34.9,3.5 -45.4,16.3c-4.7,-2.3 -9.3,-4.7 -14,-4.7C278.1,19.8 251.3,0 221.1,0c-29.1,0 -53.5,17.5 -64,43.1c-8.1,-4.7 -18.6,-8.1 -27.9,-8.1c-14,0 -27.9,5.8 -38.4,16.3c-23.3,23.3 -22.1,41.9 -18.6,55.9c1.2,5.8 5.8,9.3 10.5,9.3h33.7c7,0 11.6,4.7 11.6,11.6v81.5c0,19.8 15.1,34.9 34.9,34.9c19.8,0 34.9,-15.1 34.9,-34.9V128c0,-7 4.7,-11.6 11.6,-11.6h153.6c3.5,0 7,-1.2 8.1,-3.5C381.7,101.2 385.2,86.1 381.7,72.1zM357.2,91.9H209.5c-19.8,0 -34.9,15.1 -34.9,34.9v81.5c0,7 -4.7,11.6 -11.6,11.6c-7,0 -11.6,-4.7 -11.6,-11.6v-81.5c0,-19.8 -15.1,-34.9 -34.9,-34.9H93.1c0,-5.8 3.5,-14 14,-24.4c5.8,-5.8 14,-9.3 22.1,-9.3c10.5,0 19.8,4.7 25.6,12.8c3.5,3.5 8.1,4.7 12.8,3.5c3.5,-1.2 7,-4.7 7,-9.3c3.5,-24.4 23.3,-41.9 46.5,-41.9c22.1,0 40.7,15.1 45.4,37.2c1.2,5.8 7,9.3 11.6,9.3c1.2,0 1.2,0 1.2,0c7,0 12.8,2.3 17.5,7c2.3,3.5 5.8,4.7 10.5,3.5c3.5,-1.2 7,-3.5 8.1,-7c3.5,-9.3 12.8,-17.5 26.8,-15.1c8.1,1.2 16.3,9.3 17.5,17.5C360.7,82.6 359.6,88.4 357.2,91.9z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M221.1,197.8c-7,0 -11.6,4.7 -11.6,11.6V384c0,7 4.7,11.6 11.6,11.6c7,0 11.6,-4.7 11.6,-11.6V209.5C232.7,202.5 228.1,197.8 221.1,197.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M290.9,197.8c-7,0 -11.6,4.7 -11.6,11.6V384c0,7 4.7,11.6 11.6,11.6s11.6,-4.7 11.6,-11.6V209.5C302.5,202.5 297.9,197.8 290.9,197.8z" />
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M151.3,267.6c-7,0 -11.6,4.7 -11.6,11.6V384c0,7 4.7,11.6 11.6,11.6c7,0 11.6,-4.7 11.6,-11.6V279.3C162.9,272.3 158.3,267.6 151.3,267.6z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_bluetooth_connect.xml b/app/src/main/res/drawable/ic_bluetooth_connect.xml
deleted file mode 100644
index af4f8ae32..000000000
--- a/app/src/main/res/drawable/ic_bluetooth_connect.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,13.5Q4.375,13.5 3.938,13.062Q3.5,12.625 3.5,12Q3.5,11.375 3.938,10.938Q4.375,10.5 5,10.5Q5.625,10.5 6.062,10.938Q6.5,11.375 6.5,12Q6.5,12.625 6.062,13.062Q5.625,13.5 5,13.5ZM19,13.5Q18.375,13.5 17.938,13.062Q17.5,12.625 17.5,12Q17.5,11.375 17.938,10.938Q18.375,10.5 19,10.5Q19.625,10.5 20.062,10.938Q20.5,11.375 20.5,12Q20.5,12.625 20.062,13.062Q19.625,13.5 19,13.5ZM11,14.4 L7.1,18.3Q6.825,18.575 6.4,18.575Q5.975,18.575 5.7,18.3Q5.425,18.025 5.425,17.6Q5.425,17.175 5.7,16.9L10.6,12L5.7,7.1Q5.425,6.825 5.425,6.4Q5.425,5.975 5.7,5.7Q5.975,5.425 6.4,5.425Q6.825,5.425 7.1,5.7L11,9.6V3.425Q11,3 11.262,2.725Q11.525,2.45 11.925,2.45Q12.175,2.45 12.425,2.562Q12.675,2.675 12.875,2.875L17,7Q17.15,7.15 17.213,7.325Q17.275,7.5 17.275,7.7Q17.275,7.9 17.213,8.075Q17.15,8.25 17,8.4L13.4,12L17,15.6Q17.15,15.75 17.213,15.925Q17.275,16.1 17.275,16.3Q17.275,16.5 17.213,16.675Q17.15,16.85 17,17L12.875,21.125Q12.675,21.325 12.425,21.438Q12.175,21.55 11.925,21.55Q11.525,21.55 11.262,21.275Q11,21 11,20.575ZM13,9.6 L14.9,7.7 13,5.85ZM13,18.15 L14.9,16.3 13,14.4Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_blur_on.xml b/app/src/main/res/drawable/ic_blur_on.xml
deleted file mode 100644
index 1cb5afa66..000000000
--- a/app/src/main/res/drawable/ic_blur_on.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,14.5Q2.8,14.5 2.65,14.35Q2.5,14.2 2.5,14Q2.5,13.8 2.65,13.65Q2.8,13.5 3,13.5Q3.2,13.5 3.35,13.65Q3.5,13.8 3.5,14Q3.5,14.2 3.35,14.35Q3.2,14.5 3,14.5ZM3,10.5Q2.8,10.5 2.65,10.35Q2.5,10.2 2.5,10Q2.5,9.8 2.65,9.65Q2.8,9.5 3,9.5Q3.2,9.5 3.35,9.65Q3.5,9.8 3.5,10Q3.5,10.2 3.35,10.35Q3.2,10.5 3,10.5ZM6,19Q5.575,19 5.287,18.712Q5,18.425 5,18Q5,17.575 5.287,17.288Q5.575,17 6,17Q6.425,17 6.713,17.288Q7,17.575 7,18Q7,18.425 6.713,18.712Q6.425,19 6,19ZM6,15Q5.575,15 5.287,14.712Q5,14.425 5,14Q5,13.575 5.287,13.287Q5.575,13 6,13Q6.425,13 6.713,13.287Q7,13.575 7,14Q7,14.425 6.713,14.712Q6.425,15 6,15ZM6,11Q5.575,11 5.287,10.712Q5,10.425 5,10Q5,9.575 5.287,9.287Q5.575,9 6,9Q6.425,9 6.713,9.287Q7,9.575 7,10Q7,10.425 6.713,10.712Q6.425,11 6,11ZM6,7Q5.575,7 5.287,6.713Q5,6.425 5,6Q5,5.575 5.287,5.287Q5.575,5 6,5Q6.425,5 6.713,5.287Q7,5.575 7,6Q7,6.425 6.713,6.713Q6.425,7 6,7ZM10,15.5Q9.375,15.5 8.938,15.062Q8.5,14.625 8.5,14Q8.5,13.375 8.938,12.938Q9.375,12.5 10,12.5Q10.625,12.5 11.062,12.938Q11.5,13.375 11.5,14Q11.5,14.625 11.062,15.062Q10.625,15.5 10,15.5ZM10,11.5Q9.375,11.5 8.938,11.062Q8.5,10.625 8.5,10Q8.5,9.375 8.938,8.938Q9.375,8.5 10,8.5Q10.625,8.5 11.062,8.938Q11.5,9.375 11.5,10Q11.5,10.625 11.062,11.062Q10.625,11.5 10,11.5ZM10,19Q9.575,19 9.288,18.712Q9,18.425 9,18Q9,17.575 9.288,17.288Q9.575,17 10,17Q10.425,17 10.713,17.288Q11,17.575 11,18Q11,18.425 10.713,18.712Q10.425,19 10,19ZM10,7Q9.575,7 9.288,6.713Q9,6.425 9,6Q9,5.575 9.288,5.287Q9.575,5 10,5Q10.425,5 10.713,5.287Q11,5.575 11,6Q11,6.425 10.713,6.713Q10.425,7 10,7ZM10,21.5Q9.8,21.5 9.65,21.35Q9.5,21.2 9.5,21Q9.5,20.8 9.65,20.65Q9.8,20.5 10,20.5Q10.2,20.5 10.35,20.65Q10.5,20.8 10.5,21Q10.5,21.2 10.35,21.35Q10.2,21.5 10,21.5ZM10,3.5Q9.8,3.5 9.65,3.35Q9.5,3.2 9.5,3Q9.5,2.8 9.65,2.65Q9.8,2.5 10,2.5Q10.2,2.5 10.35,2.65Q10.5,2.8 10.5,3Q10.5,3.2 10.35,3.35Q10.2,3.5 10,3.5ZM14,15.5Q13.375,15.5 12.938,15.062Q12.5,14.625 12.5,14Q12.5,13.375 12.938,12.938Q13.375,12.5 14,12.5Q14.625,12.5 15.062,12.938Q15.5,13.375 15.5,14Q15.5,14.625 15.062,15.062Q14.625,15.5 14,15.5ZM14,11.5Q13.375,11.5 12.938,11.062Q12.5,10.625 12.5,10Q12.5,9.375 12.938,8.938Q13.375,8.5 14,8.5Q14.625,8.5 15.062,8.938Q15.5,9.375 15.5,10Q15.5,10.625 15.062,11.062Q14.625,11.5 14,11.5ZM14,19Q13.575,19 13.288,18.712Q13,18.425 13,18Q13,17.575 13.288,17.288Q13.575,17 14,17Q14.425,17 14.713,17.288Q15,17.575 15,18Q15,18.425 14.713,18.712Q14.425,19 14,19ZM14,7Q13.575,7 13.288,6.713Q13,6.425 13,6Q13,5.575 13.288,5.287Q13.575,5 14,5Q14.425,5 14.713,5.287Q15,5.575 15,6Q15,6.425 14.713,6.713Q14.425,7 14,7ZM14,21.5Q13.8,21.5 13.65,21.35Q13.5,21.2 13.5,21Q13.5,20.8 13.65,20.65Q13.8,20.5 14,20.5Q14.2,20.5 14.35,20.65Q14.5,20.8 14.5,21Q14.5,21.2 14.35,21.35Q14.2,21.5 14,21.5ZM14,3.5Q13.8,3.5 13.65,3.35Q13.5,3.2 13.5,3Q13.5,2.8 13.65,2.65Q13.8,2.5 14,2.5Q14.2,2.5 14.35,2.65Q14.5,2.8 14.5,3Q14.5,3.2 14.35,3.35Q14.2,3.5 14,3.5ZM18,19Q17.575,19 17.288,18.712Q17,18.425 17,18Q17,17.575 17.288,17.288Q17.575,17 18,17Q18.425,17 18.712,17.288Q19,17.575 19,18Q19,18.425 18.712,18.712Q18.425,19 18,19ZM18,15Q17.575,15 17.288,14.712Q17,14.425 17,14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.287Q19,13.575 19,14Q19,14.425 18.712,14.712Q18.425,15 18,15ZM18,11Q17.575,11 17.288,10.712Q17,10.425 17,10Q17,9.575 17.288,9.287Q17.575,9 18,9Q18.425,9 18.712,9.287Q19,9.575 19,10Q19,10.425 18.712,10.712Q18.425,11 18,11ZM18,7Q17.575,7 17.288,6.713Q17,6.425 17,6Q17,5.575 17.288,5.287Q17.575,5 18,5Q18.425,5 18.712,5.287Q19,5.575 19,6Q19,6.425 18.712,6.713Q18.425,7 18,7ZM21,14.5Q20.8,14.5 20.65,14.35Q20.5,14.2 20.5,14Q20.5,13.8 20.65,13.65Q20.8,13.5 21,13.5Q21.2,13.5 21.35,13.65Q21.5,13.8 21.5,14Q21.5,14.2 21.35,14.35Q21.2,14.5 21,14.5ZM21,10.5Q20.8,10.5 20.65,10.35Q20.5,10.2 20.5,10Q20.5,9.8 20.65,9.65Q20.8,9.5 21,9.5Q21.2,9.5 21.35,9.65Q21.5,9.8 21.5,10Q21.5,10.2 21.35,10.35Q21.2,10.5 21,10.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_blur_on_white_24dp.xml b/app/src/main/res/drawable/ic_blur_on_white_24dp.xml
new file mode 100644
index 000000000..d7123060a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_blur_on_white_24dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="M6 13c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-8c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm-3 0.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zM6 5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm15 5.5c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zM14 7c0.55 0 1-0.45 1-1s-0.45-1-1-1-1 0.45-1 1 0.45 1 1 1zm0-3.5c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zm-11 10c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm7 7c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm0-17c0.28 0 0.5-0.22 0.5 -0.5s-0.22-0.5-0.5-0.5-0.5 0.22 -0.5 0.5 0.22 0.5 0.5 0.5 zM10 7c0.55 0 1-0.45 1-1s-0.45-1-1-1-1 0.45-1 1 0.45 1 1 1zm0 5.5c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm8 0.5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-8c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0-4c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm3 8.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zM14 17c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm0 3.5c-0.28 0-0.5 0.22 -0.5 0.5 s0.22 0.5 0.5 0.5 0.5-0.22 0.5 -0.5-0.22-0.5-0.5-0.5zm-4-12c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm0 8.5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1zm4-4.5c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5zm0-4c-0.83 0-1.5 0.67 -1.5 1.5s0.67 1.5 1.5 1.5 1.5-0.67 1.5-1.5-0.67-1.5-1.5-1.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
new file mode 100644
index 000000000..fa10a8faa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bookmark_music_white_24dp.xml
@@ -0,0 +1,10 @@
+<!-- drawable/ic_bookmark_music_white_24dp.xmlwhite_24dp.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="M17,3A2,2 0 0,1 19,5V21L12,18L5,21V5C5,3.89 5.9,3 7,3H17M11,11A2,2 0 0,0 9,13A2,2 0 0,0 11,15A2,2 0 0,0 13,13V8H16V6H12V11.27C11.71,11.1 11.36,11 11,11Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml
deleted file mode 100644
index 91cc94a4c..000000000
--- a/app/src/main/res/drawable/ic_bug_report.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,21Q10.375,21 8.988,20.2Q7.6,19.4 6.8,18H4.975Q4.55,18 4.275,17.712Q4,17.425 4,17Q4,16.575 4.287,16.288Q4.575,16 5,16H6.1Q6.025,15.5 6.013,15Q6,14.5 6,14H4.975Q4.55,14 4.275,13.712Q4,13.425 4,13Q4,12.575 4.287,12.287Q4.575,12 5,12H6Q6,11.5 6.013,11Q6.025,10.5 6.1,10H4.975Q4.55,10 4.275,9.712Q4,9.425 4,9Q4,8.575 4.287,8.287Q4.575,8 5,8H6.8Q7.15,7.425 7.588,6.925Q8.025,6.425 8.6,6.05L7.675,5.1Q7.4,4.8 7.413,4.387Q7.425,3.975 7.7,3.7Q7.975,3.425 8.4,3.425Q8.825,3.425 9.1,3.7L10.55,5.15Q11.25,4.925 11.975,4.925Q12.7,4.925 13.4,5.15L14.9,3.675Q15.2,3.4 15.613,3.412Q16.025,3.425 16.3,3.7Q16.575,3.975 16.575,4.4Q16.575,4.825 16.3,5.1L15.35,6.05Q15.925,6.425 16.388,6.912Q16.85,7.4 17.2,8H19.025Q19.45,8 19.725,8.287Q20,8.575 20,9Q20,9.425 19.712,9.712Q19.425,10 19,10H17.9Q17.975,10.5 17.988,11Q18,11.5 18,12H19.025Q19.45,12 19.725,12.287Q20,12.575 20,13Q20,13.425 19.712,13.712Q19.425,14 19,14H18Q18,14.5 17.988,15Q17.975,15.5 17.9,16H19.025Q19.45,16 19.725,16.288Q20,16.575 20,17Q20,17.425 19.712,17.712Q19.425,18 19,18H17.2Q16.4,19.4 15.013,20.2Q13.625,21 12,21ZM12,19Q13.65,19 14.825,17.825Q16,16.65 16,15V11Q16,9.35 14.825,8.175Q13.65,7 12,7Q10.35,7 9.175,8.175Q8,9.35 8,11V15Q8,16.65 9.175,17.825Q10.35,19 12,19ZM11,16H13.025Q13.45,16 13.725,15.712Q14,15.425 14,15Q14,14.575 13.713,14.287Q13.425,14 13,14H10.975Q10.55,14 10.275,14.287Q10,14.575 10,15Q10,15.425 10.288,15.712Q10.575,16 11,16ZM11,12H13.025Q13.45,12 13.725,11.712Q14,11.425 14,11Q14,10.575 13.713,10.287Q13.425,10 13,10H10.975Q10.55,10 10.275,10.287Q10,10.575 10,11Q10,11.425 10.288,11.712Q10.575,12 11,12ZM12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Q12,13 12,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_bug_report_white_24dp.xml b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
new file mode 100644
index 000000000..e3b7a77ef
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bug_report_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M20 8h-2.81c-0.45-0.78-1.07-1.45-1.82-1.96L17 4.41 15.59 3l-2.17 2.17C12.96 5.06 12.49 5 12 5s-0.96 0.06 -1.41 0.17 L8.41 3 7 4.41l1.62 1.63C7.88 6.55 7.26 7.22 6.81 8H4v2h2.09c-0.05 0.33 -0.09 0.66 -0.09 1v1H4v2h2v1c0 0.34 0.04 0.67 0.09 1H4v2h2.81c1.04 1.79 2.97 3 5.19 3s4.15-1.21 5.19-3H20v-2h-2.09c0.05-0.33 0.09 -0.66 0.09 -1v-1h2v-2h-2v-1c0-0.34-0.04-0.67-0.09-1H20V8zm-4 4v3c0 0.22-0.03 0.47 -0.07 0.7 l-0.1 0.65 -0.37 0.65 c-0.72 1.24-2.04 2-3.46 2s-2.74-0.77-3.46-2l-0.37-0.64-0.1-0.65C8.03 15.48 8 15.23 8 15v-4c0-0.23 0.03 -0.48 0.07 -0.7l0.1-0.65 0.37 -0.65c0.3-0.52 0.72 -0.97 1.21-1.31l0.57-0.39 0.74 -0.18c0.31-0.08 0.63 -0.12 0.94 -0.12 0.32 0 0.63 0.04 0.95 0.12 l0.68 0.16 0.61 0.42 c0.5 0.34 0.91 0.78 1.21 1.31l0.38 0.65 0.1 0.65 c0.04 0.22 0.07 0.47 0.07 0.69 v1zm-6 2h4v2h-4zm0-4h4v2h-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_car.xml b/app/src/main/res/drawable/ic_car.xml
deleted file mode 100644
index 9c3860c1b..000000000
--- a/app/src/main/res/drawable/ic_car.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19V19.525Q6,20.15 5.575,20.575Q5.15,21 4.5,21Q3.875,21 3.438,20.562Q3,20.125 3,19.5V12L5.1,6Q5.25,5.55 5.638,5.275Q6.025,5 6.5,5H17.5Q17.975,5 18.363,5.275Q18.75,5.55 18.9,6L21,12V19.525Q21,20.15 20.575,20.575Q20.15,21 19.5,21Q18.875,21 18.438,20.562Q18,20.125 18,19.5V19ZM5.8,10H18.2L17.15,7H6.85ZM7.5,16Q8.125,16 8.562,15.562Q9,15.125 9,14.5Q9,13.875 8.562,13.438Q8.125,13 7.5,13Q6.875,13 6.438,13.438Q6,13.875 6,14.5Q6,15.125 6.438,15.562Q6.875,16 7.5,16ZM16.5,16Q17.125,16 17.562,15.562Q18,15.125 18,14.5Q18,13.875 17.562,13.438Q17.125,13 16.5,13Q15.875,13 15.438,13.438Q15,13.875 15,14.5Q15,15.125 15.438,15.562Q15.875,16 16.5,16Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
new file mode 100644
index 000000000..2da45ec5a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M20 6h-2.18c0.11-0.31 0.18 -0.65 0.18 -1 0-1.66-1.34-3-3-3-1.05 0-1.96 0.54 -2.5 1.35l-0.5 0.67 -0.5-0.68C10.96 2.54 10.05 2 9 2 7.34 2 6 3.34 6 5c0 0.35 0.07 0.69 0.18 1H4c-1.11 0-1.99 0.89 -1.99 2L2 19c0 1.11 0.89 2 2 2h16c1.11 0 2-0.89 2-2V8c0-1.11-0.89-2-2-2zm-5-2c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zM9 4c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zm11 15H4v-2h16v2zm0-5H4V8h5.08L7 10.83 8.62 12 12 7.4l3.38 4.6L17 10.83 14.92 8H20v6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notifications_active.xml b/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml
similarity index 65%
rename from app/src/main/res/drawable/ic_notifications_active.xml
rename to app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml
index 37c430035..727f837d0 100644
--- a/app/src/main/res/drawable/ic_notifications_active.xml
+++ b/app/src/main/res/drawable/ic_cellphone_lock_white_24dp.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -12,13 +12,13 @@
   ~ See the GNU General Public License for more details.
   -->
 
+<!-- drawable/cellphone_lock.xml -->
 <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="M19.29 17.29L18 16v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-0.83-0.67-1.5-1.5-1.5s-1.5 0.67 -1.5 1.5v0.68C7.63 5.36 6 7.92 6 11v5l-1.29 1.29c-0.63 0.63 -0.19 1.71 0.7 1.71h13.17c0.9 0 1.34-1.08 0.71 -1.71zM16 17H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6zm-4 5c1.1 0 2-0.9 2-2h-4c0 1.1 0.89 2 2 2z" />
+        android:pathData="M17,1H7A2,2 0 0,0 5,3V6H7V4H17V20H7V18H5V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3A2,2 0 0,0 17,1M8.8,11V9.5C8.8,8.1 7.4,7 6,7C4.6,7 3.2,8.1 3.2,9.5V11C2.6,11 2,11.6 2,12.2V15.7C2,16.4 2.6,17 3.2,17H8.7C9.4,17 10,16.4 10,15.8V12.3C10,11.6 9.4,11 8.8,11M7.5,11H4.5V9.5C4.5,8.7 5.2,8.2 6,8.2C6.8,8.2 7.5,8.7 7.5,9.5V11Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_pause_sharp_white_64dp.xml b/app/src/main/res/drawable/ic_cellphone_white_24dp.xml
similarity index 78%
rename from app/src/main/res/drawable/ic_pause_sharp_white_64dp.xml
rename to app/src/main/res/drawable/ic_cellphone_white_24dp.xml
index 1cdfb49da..af68ec029 100644
--- a/app/src/main/res/drawable/ic_pause_sharp_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_cellphone_white_24dp.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -12,13 +12,13 @@
   ~ See the GNU General Public License for more details.
   -->
 
+<!-- drawable/cellphone.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
+    android:width="24dp"
+    android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M6 19h4V5H6v14zm8-14v14h4V5h-4z" />
+        android:pathData="M17,19H7V5H17M17,1H7C5.89,1 5,1.89 5,3V21A2,2 0 0,0 7,23H17A2,2 0 0,0 19,21V3C19,1.89 18.1,1 17,1Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_check_circle.xml b/app/src/main/res/drawable/ic_check_circle.xml
deleted file mode 100644
index 8b58daa37..000000000
--- a/app/src/main/res/drawable/ic_check_circle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.6,13.8 L8.425,11.625Q8.15,11.35 7.75,11.35Q7.35,11.35 7.05,11.65Q6.775,11.925 6.775,12.35Q6.775,12.775 7.05,13.05L9.9,15.9Q10.175,16.175 10.6,16.175Q11.025,16.175 11.3,15.9L16.975,10.225Q17.25,9.95 17.25,9.55Q17.25,9.15 16.95,8.85Q16.675,8.575 16.25,8.575Q15.825,8.575 15.55,8.85ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_clear_all.xml b/app/src/main/res/drawable/ic_clear_all.xml
deleted file mode 100644
index c55888ce5..000000000
--- a/app/src/main/res/drawable/ic_clear_all.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18,13H6Q5.575,13 5.287,12.712Q5,12.425 5,12Q5,11.575 5.287,11.287Q5.575,11 6,11H18Q18.425,11 18.712,11.287Q19,11.575 19,12Q19,12.425 18.712,12.712Q18.425,13 18,13ZM16,17H4Q3.575,17 3.288,16.712Q3,16.425 3,16Q3,15.575 3.288,15.287Q3.575,15 4,15H16Q16.425,15 16.712,15.287Q17,15.575 17,16Q17,16.425 16.712,16.712Q16.425,17 16,17ZM20,9H8Q7.575,9 7.287,8.712Q7,8.425 7,8Q7,7.575 7.287,7.287Q7.575,7 8,7H20Q20.425,7 20.712,7.287Q21,7.575 21,8Q21,8.425 20.712,8.712Q20.425,9 20,9Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_clear_all_black_24dp.xml b/app/src/main/res/drawable/ic_clear_all_black_24dp.xml
new file mode 100644
index 000000000..94db9248b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_clear_all_black_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M5 13h14v-2H5v2zm-2 4h14v-2H3v2zM7 7v2h14V7H7z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
deleted file mode 100644
index c4bfd46b4..000000000
--- a/app/src/main/res/drawable/ic_close.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,13.4 L7.1,18.3Q6.825,18.575 6.4,18.575Q5.975,18.575 5.7,18.3Q5.425,18.025 5.425,17.6Q5.425,17.175 5.7,16.9L10.6,12L5.7,7.1Q5.425,6.825 5.425,6.4Q5.425,5.975 5.7,5.7Q5.975,5.425 6.4,5.425Q6.825,5.425 7.1,5.7L12,10.6L16.9,5.7Q17.175,5.425 17.6,5.425Q18.025,5.425 18.3,5.7Q18.575,5.975 18.575,6.4Q18.575,6.825 18.3,7.1L13.4,12L18.3,16.9Q18.575,17.175 18.575,17.6Q18.575,18.025 18.3,18.3Q18.025,18.575 17.6,18.575Q17.175,18.575 16.9,18.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml
new file mode 100644
index 000000000..555e3b316
--- /dev/null
+++ b/app/src/main/res/drawable/ic_close_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M19 6.41L17.59 5 12 10.59 6.41 5 5 6.41 10.59 12 5 17.59 6.41 19 12 13.41 17.59 19 19 17.59 13.41 12 19 6.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_color_lens_white_24dp.xml b/app/src/main/res/drawable/ic_color_lens_white_24dp.xml
new file mode 100644
index 000000000..31e47f8f5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_color_lens_white_24dp.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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 22C6.49 22 2 17.51 2 12S6.49 2 12 2s10 4.04 10 9c0 3.31-2.69 6-6 6h-1.77c-0.28 0-0.5 0.22 -0.5 0.5 0 0.12 0.05 0.23 0.13 0.33 0.41 0.47 0.64 1.06 0.64 1.67 0 1.38-1.12 2.5-2.5 2.5zm0-18c-4.41 0-8 3.59-8 8s3.59 8 8 8c0.28 0 0.5-0.22 0.5 -0.5 0-0.16-0.08-0.28-0.14-0.35-0.41-0.46-0.63-1.05-0.63-1.65 0-1.38 1.12-2.5 2.5-2.5H16c2.21 0 4-1.79 4-4 0-3.86-3.59-7-8-7z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 6.5 10 C 7.32842712475 10 8 10.6715728753 8 11.5 C 8 12.3284271247 7.32842712475 13 6.5 13 C 5.67157287525 13 5 12.3284271247 5 11.5 C 5 10.6715728753 5.67157287525 10 6.5 10 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 9.5 6 C 10.3284271247 6 11 6.67157287525 11 7.5 C 11 8.32842712475 10.3284271247 9 9.5 9 C 8.67157287525 9 8 8.32842712475 8 7.5 C 8 6.67157287525 8.67157287525 6 9.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 14.5 6 C 15.3284271247 6 16 6.67157287525 16 7.5 C 16 8.32842712475 15.3284271247 9 14.5 9 C 13.6715728753 9 13 8.32842712475 13 7.5 C 13 6.67157287525 13.6715728753 6 14.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 17.5 10 C 18.3284271247 10 19 10.6715728753 19 11.5 C 19 12.3284271247 18.3284271247 13 17.5 13 C 16.6715728753 13 16 12.3284271247 16 11.5 C 16 10.6715728753 16.6715728753 10 17.5 10 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_colorize.xml b/app/src/main/res/drawable/ic_colorize.xml
deleted file mode 100644
index 6d47bd368..000000000
--- a/app/src/main/res/drawable/ic_colorize.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,21Q3.575,21 3.288,20.712Q3,20.425 3,20V16.675Q3,16.475 3.075,16.288Q3.15,16.1 3.3,15.95L11.95,7.3L11.2,6.55Q10.925,6.275 10.925,5.85Q10.925,5.425 11.225,5.125Q11.5,4.85 11.925,4.85Q12.35,4.85 12.65,5.125L13.825,6.325L16.9,3.25Q17.175,2.975 17.6,2.975Q18.025,2.975 18.3,3.25L20.7,5.65Q20.975,5.925 20.975,6.35Q20.975,6.775 20.7,7.05L17.625,10.125L18.875,11.375Q19.15,11.65 19.15,12.075Q19.15,12.5 18.875,12.775Q18.575,13.075 18.15,13.075Q17.725,13.075 17.45,12.775L16.7,12.05L8.05,20.7Q7.9,20.85 7.713,20.925Q7.525,21 7.325,21ZM5,19H6.95L15.25,10.65L13.35,8.75L5,17.05Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_guitar.xml b/app/src/main/res/drawable/ic_colorize_white_24dp.xml
similarity index 66%
rename from app/src/main/res/drawable/ic_guitar.xml
rename to app/src/main/res/drawable/ic_colorize_white_24dp.xml
index 7e0174a5c..a2c2b5b60 100644
--- a/app/src/main/res/drawable/ic_guitar.xml
+++ b/app/src/main/res/drawable/ic_colorize_white_24dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -18,7 +18,8 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+    <path android:pathData="M0 0h24v24H0V0z" />
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M19.59,3H22V5H20.41L16.17,9.24C15.8,8.68 15.32,8.2 14.76,7.83L19.59,3M12,8A4,4 0 0,1 16,12C16,13.82 14.77,15.42 13,15.87V16A5,5 0 0,1 8,21A5,5 0 0,1 3,16A5,5 0 0,1 8,11H8.13C8.58,9.24 10.17,8 12,8M12,10.5A1.5,1.5 0 0,0 10.5,12A1.5,1.5 0 0,0 12,13.5A1.5,1.5 0 0,0 13.5,12A1.5,1.5 0 0,0 12,10.5M6.94,14.24L6.23,14.94L9.06,17.77L9.77,17.06L6.94,14.24Z" />
+        android:pathData="M17.66 5.41l0.92 0.92 -2.69 2.69-0.92-0.92 2.69-2.69M17.67 3c-0.26 0-0.51 0.1 -0.71 0.29 l-3.12 3.12-1.93-1.91-1.41 1.41 1.42 1.42L3 16.25V21h4.75l8.92-8.92 1.42 1.42 1.41-1.41-1.92-1.92 3.12-3.12c0.4-0.4 0.4 -1.03 0.01 -1.42l-2.34-2.34c-0.2-0.19-0.45-0.29-0.7-0.29zM6.92 19L5 17.08l8.06-8.06 1.92 1.92L6.92 19z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_cookie_white_24dp.xml b/app/src/main/res/drawable/ic_cookie_white_24dp.xml
new file mode 100644
index 000000000..7d6ea675b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cookie_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M12,3A9,9 0,0 0,3 12A9,9 0,0 0,12 21A9,9 0,0 0,21 12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0,0 1,11 7.5A1.5,1.5 0,0 1,9.5 9A1.5,1.5 0,0 1,8 7.5A1.5,1.5 0,0 1,9.5 6M6.5,10A1.5,1.5 0,0 1,8 11.5A1.5,1.5 0,0 1,6.5 13A1.5,1.5 0,0 1,5 11.5A1.5,1.5 0,0 1,6.5 10M11.5,11A1.5,1.5 0,0 1,13 12.5A1.5,1.5 0,0 1,11.5 14A1.5,1.5 0,0 1,10 12.5A1.5,1.5 0,0 1,11.5 11M16.5,13A1.5,1.5 0,0 1,18 14.5A1.5,1.5 0,0 1,16.5 16H16.5A1.5,1.5 0,0 1,15 14.5H15A1.5,1.5 0,0 1,16.5 13M11,16A1.5,1.5 0,0 1,12.5 17.5A1.5,1.5 0,0 1,11 19A1.5,1.5 0,0 1,9.5 17.5A1.5,1.5 0,0 1,11 16Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
deleted file mode 100644
index bde670523..000000000
--- a/app/src/main/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,21Q6.175,21 5.588,20.413Q5,19.825 5,19V6Q4.575,6 4.287,5.713Q4,5.425 4,5Q4,4.575 4.287,4.287Q4.575,4 5,4H9Q9,3.575 9.288,3.287Q9.575,3 10,3H14Q14.425,3 14.713,3.287Q15,3.575 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5Q20,5.425 19.712,5.713Q19.425,6 19,6V19Q19,19.825 18.413,20.413Q17.825,21 17,21ZM7,6V19Q7,19 7,19Q7,19 7,19H17Q17,19 17,19Q17,19 17,19V6ZM9,16Q9,16.425 9.288,16.712Q9.575,17 10,17Q10.425,17 10.713,16.712Q11,16.425 11,16V9Q11,8.575 10.713,8.287Q10.425,8 10,8Q9.575,8 9.288,8.287Q9,8.575 9,9ZM13,16Q13,16.425 13.288,16.712Q13.575,17 14,17Q14.425,17 14.713,16.712Q15,16.425 15,16V9Q15,8.575 14.713,8.287Q14.425,8 14,8Q13.575,8 13.288,8.287Q13,8.575 13,9ZM7,6V19Q7,19 7,19Q7,19 7,19Q7,19 7,19Q7,19 7,19V6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_delete_white_24dp.xml b/app/src/main/res/drawable/ic_delete_white_24dp.xml
new file mode 100644
index 000000000..d0d191df3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_delete_white_24dp.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M15 4V3H9v1H4v2h1v13c0 1.1 0.9 2 2 2h10c1.1 0 2-0.9 2-2V6h1V4h-5zm2 15H7V6h10v13z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M9 8h2v9H9zm4 0h2v9h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_diamond.xml b/app/src/main/res/drawable/ic_diamond.xml
deleted file mode 100644
index 3bfd732ee..000000000
--- a/app/src/main/res/drawable/ic_diamond.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,19.875Q11.575,19.875 11.175,19.688Q10.775,19.5 10.475,19.15L2.825,10Q2.45,9.55 2.375,8.95Q2.3,8.35 2.575,7.825L4.45,4.1Q4.725,3.6 5.188,3.3Q5.65,3 6.225,3H17.775Q18.35,3 18.812,3.3Q19.275,3.6 19.55,4.1L21.425,7.825Q21.7,8.35 21.625,8.95Q21.55,9.55 21.175,10L13.525,19.15Q13.225,19.5 12.825,19.688Q12.425,19.875 12,19.875ZM9.625,8H14.375L12.875,5H11.125ZM11,16.675V10H5.45ZM13,16.675 L18.55,10H13ZM16.6,8H19.25L17.75,5Q17.75,5 17.75,5Q17.75,5 17.75,5H15.1ZM4.75,8H7.4L8.9,5H6.25Q6.25,5 6.25,5Q6.25,5 6.25,5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow.xml b/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml
similarity index 78%
rename from app/src/main/res/drawable/ic_play_arrow.xml
rename to app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml
index 977794100..7a27f6716 100644
--- a/app/src/main/res/drawable/ic_play_arrow.xml
+++ b/app/src/main/res/drawable/ic_diamond_stone_white_24dp.xml
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -12,13 +12,15 @@
   ~ See the GNU General Public License for more details.
   -->
 
+<!-- drawable/diamond_stone.xml -->
+
+
 <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="M8 6.82v10.36c0 0.79 0.87 1.27 1.54 0.84 l8.14-5.18c0.62-0.39 0.62 -1.29 0-1.69L9.54 5.98C8.87 5.55 8 6.03 8 6.82z" />
+        android:pathData="M16,9H19L14,16M10,9H14L12,17M5,9H8L10,16M15,4H17L19,7H16M11,4H13L14,7H10M7,4H9L8,7H5M6,2L2,8L12,22L22,8L18,2H6Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_disc_full_black_24dp.xml b/app/src/main/res/drawable/ic_disc_full_black_24dp.xml
new file mode 100644
index 000000000..a3cf65a34
--- /dev/null
+++ b/app/src/main/res/drawable/ic_disc_full_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M20,16h2v-2h-2v2zM20,7v5h2L22,7h-2zM10,4c-4.42,0 -8,3.58 -8,8s3.58,8 8,8 8,-3.58 8,-8 -3.58,-8 -8,-8zM10,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
deleted file mode 100644
index f14867890..000000000
--- a/app/src/main/res/drawable/ic_drag_handle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,11Q4.575,11 4.287,10.712Q4,10.425 4,10Q4,9.575 4.287,9.287Q4.575,9 5,9H19Q19.425,9 19.712,9.287Q20,9.575 20,10Q20,10.425 19.712,10.712Q19.425,11 19,11ZM5,15Q4.575,15 4.287,14.712Q4,14.425 4,14Q4,13.575 4.287,13.287Q4.575,13 5,13H19Q19.425,13 19.712,13.287Q20,13.575 20,14Q20,14.425 19.712,14.712Q19.425,15 19,15Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_drag_vertical.xml b/app/src/main/res/drawable/ic_drag_vertical.xml
deleted file mode 100755
index 3f8e5c7d9..000000000
--- a/app/src/main/res/drawable/ic_drag_vertical.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,20Q8.175,20 7.588,19.413Q7,18.825 7,18Q7,17.175 7.588,16.587Q8.175,16 9,16Q9.825,16 10.413,16.587Q11,17.175 11,18Q11,18.825 10.413,19.413Q9.825,20 9,20ZM15,20Q14.175,20 13.588,19.413Q13,18.825 13,18Q13,17.175 13.588,16.587Q14.175,16 15,16Q15.825,16 16.413,16.587Q17,17.175 17,18Q17,18.825 16.413,19.413Q15.825,20 15,20ZM9,14Q8.175,14 7.588,13.412Q7,12.825 7,12Q7,11.175 7.588,10.587Q8.175,10 9,10Q9.825,10 10.413,10.587Q11,11.175 11,12Q11,12.825 10.413,13.412Q9.825,14 9,14ZM15,14Q14.175,14 13.588,13.412Q13,12.825 13,12Q13,11.175 13.588,10.587Q14.175,10 15,10Q15.825,10 16.413,10.587Q17,11.175 17,12Q17,12.825 16.413,13.412Q15.825,14 15,14ZM9,8Q8.175,8 7.588,7.412Q7,6.825 7,6Q7,5.175 7.588,4.588Q8.175,4 9,4Q9.825,4 10.413,4.588Q11,5.175 11,6Q11,6.825 10.413,7.412Q9.825,8 9,8ZM15,8Q14.175,8 13.588,7.412Q13,6.825 13,6Q13,5.175 13.588,4.588Q14.175,4 15,4Q15.825,4 16.413,4.588Q17,5.175 17,6Q17,6.825 16.413,7.412Q15.825,8 15,8Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_drag_vertical_white_24dp.xml b/app/src/main/res/drawable/ic_drag_vertical_white_24dp.xml
new file mode 100755
index 000000000..402b4b9e5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_drag_vertical_white_24dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+
+    <path android:pathData="M0,0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10 c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,18c0,1.1-0.9,2-2,2s-2-0.9-2-2s0.9-2,2-2S11,16.9,11,18z M9,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2 S10.1,10,9,10z M9,4C7.9,4,7,4.9,7,6s0.9,2,2,2s2-0.9,2-2S10.1,4,9,4z M15,8c1.1,0,2-0.9,2-2s-0.9-2-2-2s-2,0.9-2,2S13.9,8,15,8z M15,10c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,10,15,10z M15,16c-1.1,0-2,0.9-2,2s0.9,2,2,2s2-0.9,2-2S16.1,16,15,16z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
deleted file mode 100644
index 81f9752c9..000000000
--- a/app/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.3,8.925 L15.05,4.725 16.45,3.325Q17.025,2.75 17.863,2.75Q18.7,2.75 19.275,3.325L20.675,4.725Q21.25,5.3 21.275,6.113Q21.3,6.925 20.725,7.5ZM4,21Q3.575,21 3.288,20.712Q3,20.425 3,20V17.175Q3,16.975 3.075,16.788Q3.15,16.6 3.3,16.45L13.6,6.15L17.85,10.4L7.55,20.7Q7.4,20.85 7.213,20.925Q7.025,21 6.825,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml
new file mode 100644
index 000000000..2dd6d0d40
--- /dev/null
+++ b/app/src/main/res/drawable/ic_edit_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M14.06 9.02l0.92 0.92 L5.92 19H5v-0.92l9.06-9.06M17.66 3c-0.25 0-0.51 0.1 -0.7 0.29 l-1.83 1.83 3.75 3.75 1.83-1.83c0.39-0.39 0.39 -1.02 0-1.41l-2.34-2.34c-0.2-0.2-0.45-0.29-0.71-0.29zm-3.6 3.19L3 17.25V21h3.75L17.81 9.94l-3.75-3.75z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_equalizer.xml b/app/src/main/res/drawable/ic_equalizer.xml
deleted file mode 100644
index 4f469b67c..000000000
--- a/app/src/main/res/drawable/ic_equalizer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,20Q5.175,20 4.588,19.413Q4,18.825 4,18V14Q4,13.175 4.588,12.587Q5.175,12 6,12Q6.825,12 7.412,12.587Q8,13.175 8,14V18Q8,18.825 7.412,19.413Q6.825,20 6,20ZM12,20Q11.175,20 10.588,19.413Q10,18.825 10,18V6Q10,5.175 10.588,4.588Q11.175,4 12,4Q12.825,4 13.413,4.588Q14,5.175 14,6V18Q14,18.825 13.413,19.413Q12.825,20 12,20ZM18,20Q17.175,20 16.587,19.413Q16,18.825 16,18V11Q16,10.175 16.587,9.587Q17.175,9 18,9Q18.825,9 19.413,9.587Q20,10.175 20,11V18Q20,18.825 19.413,19.413Q18.825,20 18,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_equalizer_white_24dp.xml b/app/src/main/res/drawable/ic_equalizer_white_24dp.xml
new file mode 100644
index 000000000..2323f94bd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_equalizer_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10 20h4V4h-4v16zm-6 0h4v-8H4v8zM16 9v11h4V9h-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml
deleted file mode 100644
index 5d1cffedd..000000000
--- a/app/src/main/res/drawable/ic_expand_less.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.7,14.675Q6.425,14.4 6.425,13.975Q6.425,13.55 6.7,13.275L11.3,8.675Q11.45,8.525 11.625,8.462Q11.8,8.4 12,8.4Q12.2,8.4 12.375,8.462Q12.55,8.525 12.7,8.675L17.325,13.3Q17.6,13.575 17.6,13.975Q17.6,14.375 17.3,14.675Q17.025,14.95 16.6,14.95Q16.175,14.95 15.9,14.675L12,10.775L8.075,14.7Q7.8,14.975 7.4,14.975Q7,14.975 6.7,14.675Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_face.xml b/app/src/main/res/drawable/ic_face.xml
deleted file mode 100644
index 602d3dc1d..000000000
--- a/app/src/main/res/drawable/ic_face.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="#FFFFFF"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8 0,-0.29 0.02,-0.58 0.05,-0.86 2.36,-1.05 4.23,-2.98 5.21,-5.37C11.07,8.33 14.05,10 17.42,10c0.78,0 1.53,-0.09 2.25,-0.26 0.21,0.71 0.33,1.47 0.33,2.26 0,4.41 -3.59,8 -8,8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_fast_food_meal.xml b/app/src/main/res/drawable/ic_fast_food_meal.xml
deleted file mode 100644
index 65573286f..000000000
--- a/app/src/main/res/drawable/ic_fast_food_meal.xml
+++ /dev/null
@@ -1,10 +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="M15.5,21L14,8H16.23L15.1,3.46L16.84,3L18.09,8H22L20.5,21H15.5M5,11H10A3,3 0 0,1 13,14H2A3,3 0 0,1 5,11M13,18A3,3 0 0,1 10,21H5A3,3 0 0,1 2,18H13M3,15H8L9.5,16.5L11,15H12A1,1 0 0,1 13,16A1,1 0 0,1 12,17H3A1,1 0 0,1 2,16A1,1 0 0,1 3,15Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml b/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml
new file mode 100644
index 000000000..4598c484b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml
@@ -0,0 +1,30 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="496.0"
+    android:viewportWidth="496.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M472,272V168c0,-13.2 -10.8,-24 -24,-24h-16c-6.2,0 -11.7,2.4 -16,6.2c-4.3,-3.8 -9.8,-6.2 -16,-6.2h-16c-6.2,0 -11.7,2.4 -16,6.2c-4.3,-3.8 -9.8,-6.2 -16,-6.2h-16c-13.2,0 -24,10.8 -24,24v102.7c-18.5,-12.8 -45.4,-23.7 -84.8,-28.3l12.6,-88.2c0.2,-1.1 0.2,-2.1 0.2,-3.2C240,138.3 229.7,128 217.1,128H144V56c0,-4.4 3.6,-8 8,-8h64c13.2,0 24,-10.8 24,-24S229.2,0 216,0h-72c-26.5,0 -48,21.5 -48,48v80H22.9C10.3,128 0,138.3 0,150.9c0,1.1 0.1,2.2 0.2,3.2l19.3,134.9C0.5,311.8 0,334.1 0,336c0,14 9,25.7 21.5,30.1C18,371.2 16,377.4 16,384c0,8.5 3.4,16.2 8.9,22C10.1,414.2 0,429.9 0,448c0,26.5 21.5,48 48,48h240h16h192V328v-8v-24C496,282.8 485.2,272 472,272zM424,168c0,-4.4 3.6,-8 8,-8h16c4.4,0 8,3.6 8,8v104h-32V168zM376,168c0,-4.4 3.6,-8 8,-8h16c4.4,0 8,3.6 8,8v104h-32V168zM328,168c0,-4.4 3.6,-8 8,-8h16c4.4,0 8,3.6 8,8v104h-32V168zM200,16h16c4.4,0 8,3.6 8,8s-3.6,8 -8,8h-16V16zM168,16h16v16h-16V16zM112,48c0,-17.6 14.4,-32 32,-32h8v16c-13.2,0 -24,10.8 -24,24v72h-16V48zM17.2,160l-1.2,-8.1c-0,-0.3 -0.1,-0.7 -0.1,-1c0,-3.8 3.1,-6.9 6.9,-6.9H96h48h73.1c3.8,0 6.9,3.1 6.9,6.9c0,0.3 -0,0.7 -0.1,1l-1.2,8.1H200v16h20.5l-4.6,32H24.1l-4.6,-32H184v-16H17.2zM213.6,224l-2.4,16.9C202.7,240.3 193.6,240 184,240h-16c-69.7,0 -110.4,16.2 -134.3,35.4L26.4,224H213.6zM16,336c0,-0.8 1.7,-80 152,-80h16c149.2,0 152,76.8 152,80c0,8.8 -7.2,16 -16,16h-8h-8H48H32C23.2,352 16,344.8 16,336zM48,400c-8.8,0 -16,-7.2 -16,-16c0,-8.8 7.2,-16 16,-16h256c8.8,0 16,7.2 16,16c0,8.8 -7.2,16 -16,16H48zM270.6,416l-32.8,38.3L150.2,416H270.6zM304,480h-16H48c-17.6,0 -32,-14.4 -32,-32s14.4,-32 32,-32h62.3l131.9,57.7L291.7,416H304c17.6,0 32,14.4 32,32S321.6,480 304,480zM327.2,406C332.6,400.2 336,392.5 336,384c0,-5.9 -1.7,-11.3 -4.4,-16H448v80h-96c0,-5.6 -1,-11 -2.8,-16H400v-16h-60.3C336.1,412 331.9,408.6 327.2,406zM480,320h-16v16h16v144H339.7c4.2,-4.6 7.4,-10 9.5,-16H464V352H347.6c2.8,-4.7 4.4,-10.1 4.4,-16h96v-16h-98.7c-2.6,-8.9 -7.7,-20.4 -17.8,-32H472c4.4,0 8,3.6 8,8V320z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M416,416h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M104,272h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M136,288h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M168,272h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M216,296h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M256,272h16v16h-16z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M56,304h16v16h-16z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_favorite_border.xml b/app/src/main/res/drawable/ic_favorite_border.xml
deleted file mode 100644
index 9286ddd0e..000000000
--- a/app/src/main/res/drawable/ic_favorite_border.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:name="heartbreak"
-    android:viewportWidth="56"
-    android:viewportHeight="56">
-    <group
-        android:name="group"
-        android:pivotX="28"
-        android:pivotY="28"
-        android:scaleX="2"
-        android:scaleY="2">
-        <path
-            android:name="heart_stroke_left"
-            android:pathData="M 28.719 38.296 L 25.669 35.552 C 21.621 31.793 18.016 28.891 18.016 24.845 C 18.016 21.588 20.631 19.965 23.634 19.965 C 24.999 19.965 26.799 21.181 28.644 23.13"
-            android:strokeWidth="2"
-            android:strokeColor="@color/md_white_1000" />
-        <path
-            android:name="heart_stroke_right"
-            android:pathData="M 27.231 38.294 L 30.765 35.2 C 34.834 31.235 37.752 29.118 38.004 25.084 C 38.168 22.459 35.773 20.035 33.379 20.035 C 30.432 20.035 29.672 21.047 27.231 23.133"
-            android:strokeWidth="2"
-            android:strokeColor="@color/md_white_1000" />
-    </group>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
new file mode 100644
index 000000000..70a8901fc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M16.5 3c-1.74 0-3.41 0.81 -4.5 2.09C10.91 3.81 9.24 3 7.5 3 4.42 3 2 5.42 2 8.5c0 3.78 3.4 6.86 8.55 11.54L12 21.35l1.45-1.32C18.6 15.36 22 12.28 22 8.5 22 5.42 19.58 3 16.5 3zm-4.4 15.55l-0.1 0.1 -0.1-0.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04 0.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
new file mode 100644
index 000000000..598ed9b5f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorite_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 21.35l-1.45-1.32C5.4 15.36 2 12.28 2 8.5 2 5.42 4.42 3 7.5 3c1.74 0 3.41 0.81 4.5 2.09C13.09 3.81 14.76 3 16.5 3 19.58 3 22 5.42 22 8.5c0 3.78-3.4 6.86-8.55 11.54L12 21.35z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_file_edit.xml b/app/src/main/res/drawable/ic_file_edit.xml
deleted file mode 100644
index d559d38fe..000000000
--- a/app/src/main/res/drawable/ic_file_edit.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="#FFFFFF"
-        android:pathData="M6 2C4.9 2 4 2.9 4 4V20C4 21.1 4.9 22 6 22H10V20.1L20 10.1V8L14 2H6M13 3.5L18.5 9H13V3.5M20.1 13C20 13 19.8 13.1 19.7 13.2L18.7 14.2L20.8 16.3L21.8 15.3C22 15.1 22 14.7 21.8 14.5L20.5 13.2C20.4 13.1 20.3 13 20.1 13M18.1 14.8L12 20.9V23H14.1L20.2 16.9L18.1 14.8Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_file_music_white_24dp.xml b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
new file mode 100644
index 000000000..1cc66b8da
--- /dev/null
+++ b/app/src/main/res/drawable/ic_file_music_white_24dp.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="#FFFFFFFF"
+        android:pathData="M13,9H18.5L13,3.5V9M6,2H14L20,8V20A2,2 0 0,1 18,22H6C4.89,22 4,21.1 4,20V4C4,2.89 4.89,2 6,2M9,16A2,2 0 0,0 7,18A2,2 0 0,0 9,20A2,2 0 0,0 11,18V13H14V11H10V16.27C9.71,16.1 9.36,16 9,16Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_filter_song.xml b/app/src/main/res/drawable/ic_filter_song_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_filter_song.xml
rename to app/src/main/res/drawable/ic_filter_song_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_flag.xml b/app/src/main/res/drawable/ic_flag.xml
deleted file mode 100644
index 8081859dc..000000000
--- a/app/src/main/res/drawable/ic_flag.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,21Q5.575,21 5.287,20.712Q5,20.425 5,20V5Q5,4.575 5.287,4.287Q5.575,4 6,4H13.175Q13.525,4 13.8,4.225Q14.075,4.45 14.15,4.8L14.4,6H19Q19.425,6 19.712,6.287Q20,6.575 20,7V15Q20,15.425 19.712,15.712Q19.425,16 19,16H13.825Q13.475,16 13.2,15.775Q12.925,15.55 12.85,15.2L12.6,14H7V20Q7,20.425 6.713,20.712Q6.425,21 6,21ZM12.5,10ZM14.65,14H18V8H12.75L12.35,6H7V12H14.25Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_flag_white_24dp.xml b/app/src/main/res/drawable/ic_flag_white_24dp.xml
new file mode 100644
index 000000000..245bc0f4a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_flag_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path android:pathData="M0 0h24v24H0V0z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12.36 6l0.4 2H18v6h-3.36l-0.4-2H7V6h5.36M14 4H5v17h2v-7h5.6l0.4 2h7V6h-5.6L14 4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_folder.xml b/app/src/main/res/drawable/ic_folder.xml
deleted file mode 100644
index f40bb0561..000000000
--- a/app/src/main/res/drawable/ic_folder.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H9.175Q9.575,4 9.938,4.15Q10.3,4.3 10.575,4.575L12,6H20Q20.825,6 21.413,6.588Q22,7.175 22,8V18Q22,18.825 21.413,19.413Q20.825,20 20,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_folder_white_24dp.xml b/app/src/main/res/drawable/ic_folder_white_24dp.xml
new file mode 100644
index 000000000..358bc626c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_folder_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M9.17 6l2 2H20v10H4V6h5.17M10 4H4c-1.1 0-1.99 0.9 -1.99 2L2 18c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V8c0-1.1-0.9-2-2-2h-8l-2-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_fullscreen.xml b/app/src/main/res/drawable/ic_fullscreen.xml
deleted file mode 100644
index 65fde109c..000000000
--- a/app/src/main/res/drawable/ic_fullscreen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,19Q5.575,19 5.287,18.712Q5,18.425 5,18V15Q5,14.575 5.287,14.287Q5.575,14 6,14Q6.425,14 6.713,14.287Q7,14.575 7,15V17H9Q9.425,17 9.713,17.288Q10,17.575 10,18Q10,18.425 9.713,18.712Q9.425,19 9,19ZM6,10Q5.575,10 5.287,9.712Q5,9.425 5,9V6Q5,5.575 5.287,5.287Q5.575,5 6,5H9Q9.425,5 9.713,5.287Q10,5.575 10,6Q10,6.425 9.713,6.713Q9.425,7 9,7H7V9Q7,9.425 6.713,9.712Q6.425,10 6,10ZM15,19Q14.575,19 14.288,18.712Q14,18.425 14,18Q14,17.575 14.288,17.288Q14.575,17 15,17H17V15Q17,14.575 17.288,14.287Q17.575,14 18,14Q18.425,14 18.712,14.287Q19,14.575 19,15V18Q19,18.425 18.712,18.712Q18.425,19 18,19ZM18,10Q17.575,10 17.288,9.712Q17,9.425 17,9V7H15Q14.575,7 14.288,6.713Q14,6.425 14,6Q14,5.575 14.288,5.287Q14.575,5 15,5H18Q18.425,5 18.712,5.287Q19,5.575 19,6V9Q19,9.425 18.712,9.712Q18.425,10 18,10Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_gift.xml b/app/src/main/res/drawable/ic_gift.xml
deleted file mode 100644
index df8a20c73..000000000
--- a/app/src/main/res/drawable/ic_gift.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,17V19Q4,19 4,19Q4,19 4,19H20Q20,19 20,19Q20,19 20,19V17ZM4,21Q3.175,21 2.588,20.413Q2,19.825 2,19V8Q2,7.175 2.588,6.588Q3.175,6 4,6H6.2Q6.075,5.775 6.037,5.525Q6,5.275 6,5Q6,3.75 6.875,2.875Q7.75,2 9,2Q9.75,2 10.387,2.387Q11.025,2.775 11.5,3.35L12,4L12.5,3.35Q12.95,2.75 13.6,2.375Q14.25,2 15,2Q16.25,2 17.125,2.875Q18,3.75 18,5Q18,5.275 17.962,5.525Q17.925,5.775 17.8,6H20Q20.825,6 21.413,6.588Q22,7.175 22,8V19Q22,19.825 21.413,20.413Q20.825,21 20,21ZM4,14H20V8Q20,8 20,8Q20,8 20,8H14.9L16.425,10.075Q16.65,10.375 16.562,10.762Q16.475,11.15 16.2,11.425Q15.875,11.675 15.475,11.6Q15.075,11.525 14.825,11.2L12,7.4L9.175,11.225Q8.9,11.575 8.488,11.637Q8.075,11.7 7.8,11.425Q7.45,11.175 7.388,10.775Q7.325,10.375 7.575,10.05L9.05,8H4Q4,8 4,8Q4,8 4,8ZM9,6Q9.425,6 9.713,5.713Q10,5.425 10,5Q10,4.575 9.713,4.287Q9.425,4 9,4Q8.575,4 8.288,4.287Q8,4.575 8,5Q8,5.425 8.288,5.713Q8.575,6 9,6ZM15,6Q15.425,6 15.713,5.713Q16,5.425 16,5Q16,4.575 15.713,4.287Q15.425,4 15,4Q14.575,4 14.288,4.287Q14,4.575 14,5Q14,5.425 14.288,5.713Q14.575,6 15,6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_github_circle.xml b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
similarity index 59%
rename from app/src/main/res/drawable/ic_github_circle.xml
rename to app/src/main/res/drawable/ic_github_circle_white_24dp.xml
index 65c092cac..b2446883c 100644
--- a/app/src/main/res/drawable/ic_github_circle.xml
+++ b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml
@@ -1,23 +1,9 @@
-<!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
 <!-- drawable/ic_github_circlecle.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
         android:fillColor="#FFFFFFFF"
         android:pathData="M12,2A10,10 0 0,0 2,12C2,16.42 4.87,20.17 8.84,21.5C9.34,21.58 9.5,21.27 9.5,21C9.5,20.77 9.5,20.14 9.5,19.31C6.73,19.91 6.14,17.97 6.14,17.97C5.68,16.81 5.03,16.5 5.03,16.5C4.12,15.88 5.1,15.9 5.1,15.9C6.1,15.97 6.63,16.93 6.63,16.93C7.5,18.45 8.97,18 9.54,17.76C9.63,17.11 9.89,16.67 10.17,16.42C7.95,16.17 5.62,15.31 5.62,11.5C5.62,10.39 6,9.5 6.65,8.79C6.55,8.54 6.2,7.5 6.75,6.15C6.75,6.15 7.59,5.88 9.5,7.17C10.29,6.95 11.15,6.84 12,6.84C12.85,6.84 13.71,6.95 14.5,7.17C16.41,5.88 17.25,6.15 17.25,6.15C17.8,7.5 17.45,8.54 17.35,8.79C18,9.5 18.38,10.39 18.38,11.5C18.38,15.32 16.04,16.16 13.81,16.41C14.17,16.72 14.5,17.33 14.5,18.26C14.5,19.6 14.5,20.68 14.5,21C14.5,21.27 14.66,21.59 15.17,21.5C19.14,20.16 22,16.42 22,12A10,10 0 0,0 12,2Z" />
diff --git a/app/src/main/res/drawable/ic_grid_size.xml b/app/src/main/res/drawable/ic_grid_size_white_24dp.xml
similarity index 96%
rename from app/src/main/res/drawable/ic_grid_size.xml
rename to app/src/main/res/drawable/ic_grid_size_white_24dp.xml
index 05380f5bd..5fc1dad32 100644
--- a/app/src/main/res/drawable/ic_grid_size.xml
+++ b/app/src/main/res/drawable/ic_grid_size_white_24dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
diff --git a/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml b/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml
new file mode 100644
index 000000000..ee5d963b3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_guitar_acoustic_white_24dp.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="511.999"
+    android:viewportHeight="511.999">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M276.503 421.573c5.687-26.889 21.401-49.915 44.245-64.834 19.137-12.495 30.74-29.04 33.555-47.846 3.149-21.04-4.592-44.418-23.022-69.629l64.952-64.949-58.682-58.682-65.311 65.315c-24.124-16.967-46.712-24.068-67.286-21.117-18.947 2.72-35.843 14.104-48.864 32.926-15.481 22.39-38.441 37.471-64.657 42.467-25.764 4.921-43.684 12.515-54.784 23.212-23.097 22.258-36.062 54.037-36.506 89.484-0.53 42.25 16.932 85.486 46.71 115.656 29.794 30.185 72.705 48.286 114.787 48.421 0.162 0.001 0.318 0 0.48 0 35.187-0.001 67.001-12.443 89.616-35.062 11.137-11.137 19.239-29.245 24.767-55.362zm-127.857 1.924c-3.839 0-7.678-1.464-10.607-4.393l-45.276-45.276c-5.858-5.858-5.858-15.355 0-21.213 5.857-5.858 15.355-5.858 21.213 0l45.276 45.276c5.858 5.858 5.858 15.355 0 21.213-2.929 2.929-6.768 4.393-10.606 4.393zm64.261-74.466c-12.827 0-25.653-4.88-35.422-14.641-19.529-19.544-19.527-51.322-0.004-70.847 8.539-8.539 19.875-13.705 31.921-14.547 14.474-1.02 28.658 4.281 38.923 14.547 10.266 10.265 15.567 24.455 14.546 38.932-0.834 12.032-5.999 23.364-14.547 31.911-9.762 9.763-22.59 14.645-35.417 14.645z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M359.067 40.306c-5.858 5.858-5.858 15.355 0 21.213l15.16 15.16-15.485 17.719 58.728 58.728 17.719-15.485 15.159 15.159c2.929 2.929 6.768 4.394 10.607 4.393 3.839 0 7.678-1.464 10.606-4.393 5.858-5.858 5.858-15.355 0-21.213l-13.732-13.732 11.057-9.663 13.036 13.036c2.929 2.929 6.768 4.394 10.607 4.393 3.839 0 7.678-1.464 10.606-4.393 5.858-5.858 5.858-15.355 0-21.213l-11.609-11.609 15.213-13.295c3.127-2.733 4.981-6.64 5.121-10.79 0.139 -4.151-1.448-8.174-4.385-11.11l-48.818-48.818c-2.936-2.937-6.943-4.52-11.11-4.385-4.15 0.14 -8.057 1.994-10.79 5.121l-13.295 15.213-11.609-11.609c-5.858-5.858-15.356-5.858-21.213 0-5.858 5.858-5.858 15.355 0 21.213l13.036 13.036-9.663 11.057-13.733-13.733c-5.858-5.859-15.356-5.859-21.213 0z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M232.945 300.364c0.332-4.714-1.009-9.354-3.732-13.136-0.628-0.873-1.33-1.7-2.102-2.472-3.781-3.782-8.89-5.884-14.193-5.884-0.47 0-0.941 0.017 -1.414 0.05 -4.84 0.338 -9.386 2.41-12.81 5.833-7.831 7.832-7.829 20.582 0.004 28.421 7.832 7.826 20.581 7.828 28.413-0.004 3.431-3.43 5.502-7.969 5.832-12.782 0.001 -0.008 0.002 -0.017 0.002 -0.026z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_guitar_white_24dp.xml b/app/src/main/res/drawable/ic_guitar_white_24dp.xml
new file mode 100644
index 000000000..e5ca181e2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_guitar_white_24dp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M511.861 64.321c0.139-4.151-1.448-8.174-4.385-11.11l-48.817-48.818c-2.936-2.937-6.943-4.521-11.11-4.385-4.15 0.14 -8.058 1.994-10.791 5.121l-13.295 15.213-11.608-11.609c-5.857-5.858-15.355-5.858-21.213 0s-5.858 15.355 0 21.213l13.036 13.036-9.663 11.057-13.733-13.733c-5.857-5.858-15.355-5.858-21.213 0s-5.858 15.355 0 21.213l15.16 15.16-102.024 104.305c-22.898-16.082-44.302-23.315-63.925-21.541-20.337 1.838-38.384 13.358-52.188 33.316-15.486 22.389-38.447 37.472-64.653 42.47-25.751 4.912-43.671 12.503-54.782 23.208-23.1 22.254-36.067 54.03-36.514 89.476-0.533 42.25 16.928 85.488 46.708 115.66 29.792 30.185 72.7 48.289 114.779 48.426 0.165 0 0.327 0.001 0.49 0.001 35.188 0 66.999-12.441 89.618-35.06 11.143-11.143 19.245-29.252 24.77-55.363 5.69-26.892 21.404-49.917 44.248-64.835 20.106-13.129 31.83-30.629 33.904-50.607 2.139-20.603-5.537-42.685-23.346-66.899l103.876-101.595 15.16 15.159c2.929 2.929 6.768 4.394 10.606 4.394s7.678-1.464 10.606-4.394c5.858-5.858 5.858-15.355 0-21.213l-13.732-13.732 11.057-9.663 13.036 13.036c2.929 2.929 6.768 4.394 10.606 4.394s7.678-1.464 10.606-4.394c5.858-5.858 5.858-15.355 0-21.213l-11.609-11.609 15.213-13.295c3.128-2.733 4.982-6.64 5.122-10.79zm-187.042 238.716c-1.125 10.834-8.011 20.452-20.468 28.587-29.538 19.289-49.85 49.029-57.195 83.743-5.54 26.185-12.798 36.526-16.632 40.359-17.032 17.032-41.486 26.318-68.797 26.273-34.262-0.113-69.225-14.879-93.526-39.5-24.267-24.587-38.495-59.805-38.062-94.209 0.345 -27.364 10.051-51.602 27.331-68.249 3.767-3.629 13.918-10.448 39.588-15.344 33.986-6.481 63.713-25.969 83.705-54.872 8.701-12.58 18.868-19.479 30.216-20.504 1.046-0.094 2.111-0.142 3.193-0.142 10.609 0 22.904 4.54 36.463 13.373l-47.245 47.245c-9.497 1.824-18.565 6.404-25.904 13.742-19.531 19.531-19.531 51.311 0 70.841 9.766 9.766 22.593 14.648 35.421 14.648s25.655-4.883 35.421-14.648c7.338-7.339 11.918-16.406 13.742-25.904l47.701-47.701c11.128 16.162 16.272 30.472 15.048 42.262zm-97.704-18.283c7.834 7.834 7.834 20.582 0 28.416-7.835 7.834-20.581 7.834-28.416 0-7.834-7.834-7.834-20.581 0-28.416 3.918-3.917 9.062-5.875 14.208-5.875 5.145-0.001 10.291 1.958 14.208 5.875zm28.388-12.135c-1.996-3.227-4.378-6.282-7.175-9.078-2.797-2.797-5.851-5.179-9.079-7.175l130.124-130.124 16.254 16.254zm152.027-150.647-17.633-17.633 58.893-67.389 26.129 26.129z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M113.978 352.615c-5.857-5.858-15.355-5.858-21.213 0s-5.858 15.355 0 21.213l45.276 45.276c2.929 2.929 6.768 4.394 10.606 4.394s7.678-1.464 10.606-4.394c5.858-5.858 5.858-15.355 0-21.213z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_hdr_strong_white_24dp.xml b/app/src/main/res/drawable/ic_hdr_strong_white_24dp.xml
new file mode 100644
index 000000000..20b5a64f9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hdr_strong_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zm0-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml
deleted file mode 100644
index af70fc3af..000000000
--- a/app/src/main/res/drawable/ic_help.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.95,18Q12.475,18 12.838,17.637Q13.2,17.275 13.2,16.75Q13.2,16.225 12.838,15.863Q12.475,15.5 11.95,15.5Q11.425,15.5 11.062,15.863Q10.7,16.225 10.7,16.75Q10.7,17.275 11.062,17.637Q11.425,18 11.95,18ZM12.1,7.7Q12.8,7.7 13.225,8.087Q13.65,8.475 13.65,9.1Q13.65,9.525 13.363,9.962Q13.075,10.4 12.55,10.875Q11.8,11.525 11.45,12.125Q11.1,12.725 11.1,13.325Q11.1,13.675 11.363,13.912Q11.625,14.15 11.975,14.15Q12.325,14.15 12.6,13.9Q12.875,13.65 12.95,13.275Q13.025,12.85 13.288,12.488Q13.55,12.125 14.15,11.55Q14.925,10.825 15.238,10.225Q15.55,9.625 15.55,8.9Q15.55,7.625 14.588,6.812Q13.625,6 12.1,6Q11.05,6 10.238,6.4Q9.425,6.8 8.975,7.625Q8.8,7.95 8.85,8.262Q8.9,8.575 9.2,8.775Q9.525,8.975 9.913,8.9Q10.3,8.825 10.55,8.475Q10.825,8.1 11.213,7.9Q11.6,7.7 12.1,7.7ZM12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.938,4.925Q6.3,3.575 8.125,2.787Q9.95,2 12,2Q14.1,2 15.925,2.787Q17.75,3.575 19.1,4.925Q20.45,6.275 21.225,8.1Q22,9.925 22,12Q22,14.075 21.225,15.9Q20.45,17.725 19.1,19.075Q17.75,20.425 15.925,21.212Q14.1,22 12,22Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_help_white_24dp.xml b/app/src/main/res/drawable/ic_help_white_24dp.xml
new file mode 100644
index 000000000..8c245fcf2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_help_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-0.9 0.92 C13.45 12.9 13 13.5 13 15h-2v-0.5c0-1.1 0.45 -2.1 1.17-2.83l1.24-1.26c0.37-0.36 0.59 -0.86 0.59 -1.41 0-1.1-0.9-2-2-2s-2 0.9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 0.88-0.36 1.68-0.93 2.25z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
deleted file mode 100644
index f27568cca..000000000
--- a/app/src/main/res/drawable/ic_history.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13,11.6 L15.5,14.1Q15.775,14.375 15.775,14.8Q15.775,15.225 15.5,15.5Q15.225,15.775 14.8,15.775Q14.375,15.775 14.1,15.5L11.3,12.7Q11.15,12.55 11.075,12.362Q11,12.175 11,11.975V8Q11,7.575 11.288,7.287Q11.575,7 12,7Q12.425,7 12.713,7.287Q13,7.575 13,8ZM12,21Q8.975,21 6.575,19.212Q4.175,17.425 3.35,14.55Q3.225,14.1 3.438,13.7Q3.65,13.3 4.1,13.2Q4.525,13.1 4.863,13.387Q5.2,13.675 5.325,14.1Q5.975,16.3 7.838,17.65Q9.7,19 12,19Q14.925,19 16.962,16.962Q19,14.925 19,12Q19,9.075 16.962,7.037Q14.925,5 12,5Q10.275,5 8.775,5.8Q7.275,6.6 6.25,8H8Q8.425,8 8.713,8.287Q9,8.575 9,9Q9,9.425 8.713,9.712Q8.425,10 8,10H4Q3.575,10 3.288,9.712Q3,9.425 3,9V5Q3,4.575 3.288,4.287Q3.575,4 4,4Q4.425,4 4.713,4.287Q5,4.575 5,5V6.35Q6.275,4.75 8.113,3.875Q9.95,3 12,3Q13.875,3 15.513,3.712Q17.15,4.425 18.363,5.637Q19.575,6.85 20.288,8.487Q21,10.125 21,12Q21,13.875 20.288,15.512Q19.575,17.15 18.363,18.362Q17.15,19.575 15.513,20.288Q13.875,21 12,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
deleted file mode 100644
index 3ef75679a..000000000
--- a/app/src/main/res/drawable/ic_home.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,21Q5.175,21 4.588,20.413Q4,19.825 4,19V10Q4,9.525 4.213,9.1Q4.425,8.675 4.8,8.4L10.8,3.9Q11.075,3.7 11.375,3.6Q11.675,3.5 12,3.5Q12.325,3.5 12.625,3.6Q12.925,3.7 13.2,3.9L19.2,8.4Q19.575,8.675 19.788,9.1Q20,9.525 20,10V19Q20,19.825 19.413,20.413Q18.825,21 18,21H14V14H10V21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_home_selected_white_24dp.xml b/app/src/main/res/drawable/ic_home_selected_white_24dp.xml
new file mode 100644
index 000000000..6f6136f0c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_selected_white_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10 20v-6h4v6h5v-8h3L12 3 2 12h3v8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable/ic_home_white_24dp.xml
new file mode 100644
index 000000000..76f069b7c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_home_white_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 5.69l5 4.5V18h-2v-6H9v6H7v-7.81l5-4.5M12 3L2 12h3v8h6v-6h2v6h6v-8h3L12 3z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml
deleted file mode 100644
index 69331d946..000000000
--- a/app/src/main/res/drawable/ic_image.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M7,17H17Q17.3,17 17.45,16.725Q17.6,16.45 17.4,16.2L14.65,12.525Q14.5,12.325 14.25,12.325Q14,12.325 13.85,12.525L11.25,16L9.4,13.525Q9.25,13.325 9,13.325Q8.75,13.325 8.6,13.525L6.6,16.2Q6.4,16.45 6.55,16.725Q6.7,17 7,17ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM5,19H19Q19,19 19,19Q19,19 19,19V5Q19,5 19,5Q19,5 19,5H5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19ZM5,5Q5,5 5,5Q5,5 5,5V19Q5,19 5,19Q5,19 5,19Q5,19 5,19Q5,19 5,19V5Q5,5 5,5Q5,5 5,5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image_white_24dp.xml
new file mode 100644
index 000000000..1d0d03613
--- /dev/null
+++ b/app/src/main/res/drawable/ic_image_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M19 5v14H5V5h14m0-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-4.86 8.86l-3 3.87L9 13.14 6 17h12l-3.86-5.14z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_info_outline.xml b/app/src/main/res/drawable/ic_info_outline.xml
deleted file mode 100644
index 8f9a9042a..000000000
--- a/app/src/main/res/drawable/ic_info_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,17Q12.425,17 12.713,16.712Q13,16.425 13,16V11.975Q13,11.55 12.713,11.275Q12.425,11 12,11Q11.575,11 11.288,11.287Q11,11.575 11,12V16.025Q11,16.45 11.288,16.725Q11.575,17 12,17ZM12,9Q12.425,9 12.713,8.712Q13,8.425 13,8Q13,7.575 12.713,7.287Q12.425,7 12,7Q11.575,7 11.288,7.287Q11,7.575 11,8Q11,8.425 11.288,8.712Q11.575,9 12,9ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
new file mode 100644
index 000000000..d55da2e5b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml
@@ -0,0 +1,23 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_instagram.xml b/app/src/main/res/drawable/ic_instagram_white_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_instagram.xml
rename to app/src/main/res/drawable/ic_instagram_white_24dp.xml
diff --git a/app/src/main/res/drawable/ic_keyboard.xml b/app/src/main/res/drawable/ic_keyboard.xml
deleted file mode 100644
index eceeb7d22..000000000
--- a/app/src/main/res/drawable/ic_keyboard.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,21Q2.175,21 1.588,20.413Q1,19.825 1,19V6Q1,5.175 1.588,4.588Q2.175,4 3,4H21Q21.825,4 22.413,4.588Q23,5.175 23,6V19Q23,19.825 22.413,20.413Q21.825,21 21,21ZM9,10H11V8H9ZM5,10H7V8H5ZM8.5,17H15.5Q15.7,17 15.85,16.85Q16,16.7 16,16.5Q16,16.3 15.85,16.15Q15.7,16 15.5,16H8.5Q8.3,16 8.15,16.15Q8,16.3 8,16.5Q8,16.7 8.15,16.85Q8.3,17 8.5,17ZM13,10H15V8H13ZM9,14H11V12H9ZM5,14H7V12H5ZM13,14H15V12H13ZM17,10H19V8H17ZM17,14H19V12H17Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
deleted file mode 100644
index ddbc0306d..000000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,14.975Q11.8,14.975 11.613,14.9Q11.425,14.825 11.3,14.7L6.7,10.1Q6.425,9.825 6.425,9.4Q6.425,8.975 6.7,8.7Q6.975,8.425 7.4,8.425Q7.825,8.425 8.1,8.7L12,12.6L15.9,8.7Q16.175,8.425 16.6,8.425Q17.025,8.425 17.3,8.7Q17.575,8.975 17.575,9.4Q17.575,9.825 17.3,10.1L12.7,14.7Q12.55,14.85 12.375,14.912Q12.2,14.975 12,14.975Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
new file mode 100644
index 000000000..fbe65eb04
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7.41 8.59L12 13.17l4.59-4.58L18 10l-6 6-6-6 1.41-1.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
deleted file mode 100644
index 0811dc2c2..000000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_right.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_keyboard_arrow_down"
-    android:fromDegrees="270" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml
new file mode 100644
index 000000000..80e5acc7d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M8.59 16.59L13.17 12 8.59 7.41 10 6l6 6-6 6-1.41-1.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
deleted file mode 100755
index 0f7f5ae32..000000000
--- a/app/src/main/res/drawable/ic_keyboard_arrow_up.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/ic_keyboard_arrow_down"
-    android:fromDegrees="180" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml
new file mode 100755
index 000000000..a127ed524
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7.41 15.41L12 10.83l4.59 4.58L18 14l-6-6-6 6 1.41 1.41z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml
new file mode 100644
index 000000000..8ae23acb7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M21 11H6.83l3.58-3.59L9 6l-6 6 6 6 1.41-1.41L6.83 13H21v-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_keyboard_white_24dp.xml
similarity index 64%
rename from app/src/main/res/drawable/ic_more_vert.xml
rename to app/src/main/res/drawable/ic_keyboard_white_24dp.xml
index 7cbf5c009..f9e899abb 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_keyboard_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -18,6 +18,6 @@
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_kofi.xml b/app/src/main/res/drawable/ic_kofi.xml
deleted file mode 100644
index 715f0341d..000000000
--- a/app/src/main/res/drawable/ic_kofi.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?colorControlNormal">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M23.881,8.948c-0.773,-4.085 -4.859,-4.593 -4.859,-4.593L0.723,4.355c-0.604,0 -0.679,0.798 -0.679,0.798s-0.082,7.324 -0.022,11.822c0.164,2.424 2.586,2.672 2.586,2.672s8.267,-0.023 11.966,-0.049c2.438,-0.426 2.683,-2.566 2.658,-3.734 4.352,0.24 7.422,-2.831 6.649,-6.916zM12.819,12.459c-1.246,1.453 -4.011,3.976 -4.011,3.976s-0.121,0.119 -0.31,0.023c-0.076,-0.057 -0.108,-0.09 -0.108,-0.09 -0.443,-0.441 -3.368,-3.049 -4.034,-3.954 -0.709,-0.965 -1.041,-2.7 -0.091,-3.71 0.951,-1.01 3.005,-1.086 4.363,0.407 0,0 1.565,-1.782 3.468,-0.963 1.904,0.82 1.832,3.011 0.723,4.311zM18.992,12.937c-0.928,0.116 -1.682,0.028 -1.682,0.028L17.31,7.284h1.77s1.971,0.551 1.971,2.638c0,1.913 -0.985,2.667 -2.059,3.015z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
deleted file mode 100644
index bcce6eeac..000000000
--- a/app/src/main/res/drawable/ic_language.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13.35,22Q12.75,22 12.488,21.613Q12.225,21.225 12.425,20.65L16.075,10.975Q16.225,10.575 16.638,10.287Q17.05,10 17.5,10Q17.925,10 18.35,10.287Q18.775,10.575 18.925,10.975L22.575,20.65Q22.775,21.225 22.513,21.613Q22.25,22 21.625,22Q21.35,22 21.125,21.825Q20.9,21.65 20.8,21.4L19.95,18.95H15.1L14.225,21.4Q14.125,21.65 13.875,21.825Q13.625,22 13.35,22ZM15.7,17.2H19.3L17.55,12.25H17.45ZM7.15,8.55Q7.55,9.275 8,9.887Q8.45,10.5 9.05,11.15Q10.15,9.95 10.875,8.688Q11.6,7.425 12.1,6H2Q1.575,6 1.288,5.713Q1,5.425 1,5Q1,4.575 1.288,4.287Q1.575,4 2,4H8V3Q8,2.575 8.288,2.287Q8.575,2 9,2Q9.425,2 9.713,2.287Q10,2.575 10,3V4H16Q16.425,4 16.712,4.287Q17,4.575 17,5Q17,5.425 16.712,5.713Q16.425,6 16,6H14.1Q13.575,7.775 12.675,9.45Q11.775,11.125 10.45,12.6L12.85,15.05L12.1,17.1L9,14L4.7,18.3Q4.425,18.575 4,18.575Q3.575,18.575 3.3,18.3Q3.025,18.025 3.025,17.6Q3.025,17.175 3.3,16.9L7.65,12.55Q6.975,11.775 6.4,10.987Q5.825,10.2 5.375,9.325Q5.1,8.8 5.35,8.4Q5.6,8 6.225,8Q6.475,8 6.75,8.162Q7.025,8.325 7.15,8.55Z"/>
-</vector>
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 e1feba6d5..000000000
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <group android:scaleX="2.25"
-      android:scaleY="2.25"
-      android:translateX="27"
-      android:translateY="27">
-    <path
-        android:pathData="M20.8636,10.3382L6.8454,2.318C5.4474,1.5183 3.7022,2.5177 3.7022,4.1177V20.1576C3.7022,21.7576 5.4499,22.7571 6.8479,21.9572L20.8636,13.9371C22.2623,13.1374 22.2623,11.1379 20.8636,10.3382Z"
-        android:fillColor="#0D0754"/>
-    <path
-        android:pathData="M20.1755,10.3463C18.1822,10.4054 17.9373,11.4297 15.2074,12.2823C13.5363,12.8044 12.142,12.703 10.3899,12.66C8.1888,12.6059 7.7856,12.0888 5.5706,12.0626C4.817,12.0539 4.216,12.0471 3.6998,12.0813V20.1576C3.6992,20.3933 3.7387,20.6275 3.8166,20.8502C4.6788,21.1744 5.7081,21.5242 6.939,21.9051L20.8637,13.9396C22.2403,13.1523 22.2604,11.2014 20.9266,10.3799C20.6774,10.3514 20.4264,10.3401 20.1755,10.3463Z"
-        android:strokeAlpha="0.0625"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.0625"/>
-    <path
-        android:pathData="M3.7022,11.9058V19.987C4.7838,20.6867 5.9221,21.2965 7.1054,21.8099L20.8636,13.937C21.2889,13.6946 21.6149,13.3121 21.7846,12.8561C21.9543,12.4001 21.957,11.8994 21.7924,11.4416C21.1315,11.787 20.3965,11.9703 19.6491,11.9761C17.6232,12.0191 17.0196,10.9854 14.7708,11.365C13.3296,11.6083 13.1197,12.1118 11.6534,12.2755C9.8617,12.4777 8.7533,11.8884 7.6662,11.6457C6.4026,11.365 4.9865,11.5094 3.7022,11.9058Z"
-        android:strokeAlpha="0.07"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.07"/>
-    <path
-        android:pathData="M3.7022,18.0311C4.4696,19.2821 5.6352,20.6113 7.0746,21.8273L20.7495,14.0048C20.1009,14.2198 19.4235,14.3371 18.7398,14.3527C15.4013,14.4449 14.7778,12.2941 10.7817,11.8946C8.5448,11.6712 5.3181,12.0035 3.6978,13.222L3.7022,18.0311Z"
-        android:strokeAlpha="0.045"
-        android:fillColor="#ffffff"
-        android:fillAlpha="0.045"/>
-    <path
-        android:pathData="M13.4087,11.2667C13.4087,10.6865 13.2932,10.1119 13.0692,9.5759C12.8451,9.0398 12.5168,8.5527 12.1027,8.1425C11.6886,7.7322 11.1971,7.4067 10.6561,7.1847C10.1152,6.9626 9.5354,6.8483 8.9498,6.8483H5.4393L10.4401,15.4299C11.3083,15.1248 12.0598,14.5607 12.5913,13.8154C13.123,13.0699 13.4085,12.1795 13.4087,11.2667Z"
-        android:fillColor="#00F8BC"/>
-    <path
-        android:pathData="M11.9919,18.096L10.4401,15.4299L5.4405,6.8483H3.7022V20.1581C3.7022,21.7581 5.4499,22.7576 6.8479,21.958L12.3918,18.7841L11.9919,18.096Z"
-        android:fillColor="#00D1F7"/>
-    <path
-        android:pathData="M3.7022,15.6851V20.1601C3.7022,21.7601 5.4499,22.7594 6.8479,21.9598L12.3918,18.7861L11.9919,18.096L10.4401,15.4299C9.9621,15.5986 9.4585,15.6849 8.9511,15.6851H3.7022Z"
-        android:fillColor="#4E75F3"/>
-    <path
-        android:pathData="M3.7022,6.8483V15.6851H8.9536C9.4608,15.6855 9.9645,15.5999 10.4426,15.4319L5.4405,6.8483H3.7022Z"
-        android:fillColor="#00D1F7"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_monochrome.xml b/app/src/main/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index f6615115b..000000000
--- a/app/src/main/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
-    android:viewportWidth="192"
-    android:viewportHeight="192">
-  <path
-      android:pathData="M127.54,102.2l-47.91,27.67c-4.78,2.76 -10.75,-0.69 -10.75,-6.21v-55.33c0,-5.52 5.97,-8.97 10.74,-6.21l47.92,27.67c4.78,2.76 4.78,9.66 0,12.41Z"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M90.83,107.35l-15.96,-27.8h11.2c7.86,0 14.23,6.41 14.23,14.31h0c-0,6.06 -3.8,11.46 -9.47,13.49Z"
-      android:strokeAlpha="0.2"
-      android:fillAlpha="0.2"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M86.82,108.23c1.73,-0 3.46,-0.3 5.09,-0.88l5.3,9.2 1.37,2.38 -18.95,10.95c-4.78,2.76 -10.75,-0.69 -10.75,-6.21v-15.44h17.94Z"
-      android:strokeAlpha="0.2"
-      android:fillAlpha="0.2"/>
-  <path
-      android:pathData="M69.02,80.43h17.38c7.67,0 13.9,6.23 13.9,13.9v0c0,7.67 -6.23,13.9 -13.9,13.9h-17.38v-27.8h0Z"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-  <path
-      android:pathData="M97.45,116.96L93.04,109.31"
-      android:strokeWidth="8"
-      android:fillColor="#00000000"
-      android:strokeColor="#000"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_library_add.xml b/app/src/main/res/drawable/ic_library_add.xml
deleted file mode 100644
index 4b95cf651..000000000
--- a/app/src/main/res/drawable/ic_library_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M14,14Q14.425,14 14.713,13.712Q15,13.425 15,13V11H17Q17.425,11 17.712,10.712Q18,10.425 18,10Q18,9.575 17.712,9.287Q17.425,9 17,9H15V7Q15,6.575 14.713,6.287Q14.425,6 14,6Q13.575,6 13.288,6.287Q13,6.575 13,7V9H11Q10.575,9 10.288,9.287Q10,9.575 10,10Q10,10.425 10.288,10.712Q10.575,11 11,11H13V13Q13,13.425 13.288,13.712Q13.575,14 14,14ZM8,18Q7.175,18 6.588,17.413Q6,16.825 6,16V4Q6,3.175 6.588,2.587Q7.175,2 8,2H20Q20.825,2 21.413,2.587Q22,3.175 22,4V16Q22,16.825 21.413,17.413Q20.825,18 20,18ZM4,22Q3.175,22 2.588,21.413Q2,20.825 2,20V7Q2,6.575 2.288,6.287Q2.575,6 3,6Q3.425,6 3.713,6.287Q4,6.575 4,7V20Q4,20 4,20Q4,20 4,20H17Q17.425,20 17.712,20.288Q18,20.575 18,21Q18,21.425 17.712,21.712Q17.425,22 17,22Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_library_add_white_24dp.xml b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
new file mode 100644
index 000000000..7863ff916
--- /dev/null
+++ b/app/src/main/res/drawable/ic_library_add_white_24dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M4 6H2v14c0 1.1 0.9 2 2 2h14v-2H4V6zm16-4H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm0 14H8V4h12v12zm-7-2h2v-3h3V9h-3V6h-2v3h-3v2h3z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_library_music_white_24dp.xml b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
new file mode 100644
index 000000000..03de8419c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_library_music_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M20 2H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm0 14H8V4h12v12zm-7.5-1c1.38 0 2.5-1.12 2.5-2.5V7h3V5h-4v5.51c-0.42-0.32-0.93-0.51-1.5-0.51-1.38 0-2.5 1.12-2.5 2.5s1.12 2.5 2.5 2.5zM4 6H2v14c0 1.1 0.9 2 2 2h14v-2H4V6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_license.xml b/app/src/main/res/drawable/ic_license.xml
deleted file mode 100644
index 9cba8427e..000000000
--- a/app/src/main/res/drawable/ic_license.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="#FFFFFF"
-        android:pathData="M9 10A3.04 3.04 0 0 1 12 7A3.04 3.04 0 0 1 15 10A3.04 3.04 0 0 1 12 13A3.04 3.04 0 0 1 9 10M12 19L16 20V16.92A7.54 7.54 0 0 1 12 18A7.54 7.54 0 0 1 8 16.92V20M12 4A5.78 5.78 0 0 0 7.76 5.74A5.78 5.78 0 0 0 6 10A5.78 5.78 0 0 0 7.76 14.23A5.78 5.78 0 0 0 12 16A5.78 5.78 0 0 0 16.24 14.23A5.78 5.78 0 0 0 18 10A5.78 5.78 0 0 0 16.24 5.74A5.78 5.78 0 0 0 12 4M20 10A8.04 8.04 0 0 1 19.43 12.8A7.84 7.84 0 0 1 18 15.28V23L12 21L6 23V15.28A7.9 7.9 0 0 1 4 10A7.68 7.68 0 0 1 6.33 4.36A7.73 7.73 0 0 1 12 2A7.73 7.73 0 0 1 17.67 4.36A7.68 7.68 0 0 1 20 10Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_lyrics.xml b/app/src/main/res/drawable/ic_lyrics.xml
deleted file mode 100644
index 2064cc4a6..000000000
--- a/app/src/main/res/drawable/ic_lyrics.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="#fff"
-      android:pathData="M2,22V4Q2,3.175 2.588,2.587Q3.175,2 4,2H15Q15.825,2 16.413,2.587Q17,3.175 17,4V4.425Q15.625,5.025 14.812,6.262Q14,7.5 14,9Q14,10.5 14.812,11.738Q15.625,12.975 17,13.575V16Q17,16.825 16.413,17.413Q15.825,18 15,18H6ZM6,14H10V12H6ZM19,12Q17.75,12 16.875,11.125Q16,10.25 16,9Q16,7.725 16.875,6.862Q17.75,6 19,6Q19.275,6 19.525,6.05Q19.775,6.1 20,6.175V1H24V3H22V9Q22,10.25 21.125,11.125Q20.25,12 19,12ZM6,11H13V9H6ZM6,8H13V6H6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_lyrics_outline.xml b/app/src/main/res/drawable/ic_lyrics_outline.xml
deleted file mode 100644
index 4a37173ef..000000000
--- a/app/src/main/res/drawable/ic_lyrics_outline.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="#fff"
-        android:pathData="M2,22V4Q2,3.175 2.588,2.587Q3.175,2 4,2H15Q15.825,2 16.413,2.587Q17,3.175 17,4V4.425Q16.4,4.7 15.9,5.1Q15.4,5.5 15,6V4Q15,4 15,4Q15,4 15,4H4Q4,4 4,4Q4,4 4,4V16.175L4.175,16H15Q15,16 15,16Q15,16 15,16V12Q15.4,12.5 15.9,12.9Q16.4,13.3 17,13.575V16Q17,16.825 16.413,17.413Q15.825,18 15,18H6ZM6,14H10V12H6ZM19,12Q17.75,12 16.875,11.125Q16,10.25 16,9Q16,7.75 16.875,6.875Q17.75,6 19,6Q19.275,6 19.525,6.05Q19.775,6.1 20,6.175V1H24V3H22V9Q22,10.25 21.125,11.125Q20.25,12 19,12ZM6,11H13V9H6ZM6,8H13V6H6ZM4,16.175V4Q4,4 4,4Q4,4 4,4Q4,4 4,4Q4,4 4,4V6Q4,6.625 4,7.387Q4,8.15 4,9Q4,9.85 4,10.613Q4,11.375 4,12V16Q4,16 4,16Q4,16 4,16Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml
new file mode 100644
index 000000000..ecd8a598c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_menu_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_mic.xml b/app/src/main/res/drawable/ic_mic.xml
deleted file mode 100644
index 038fb4db7..000000000
--- a/app/src/main/res/drawable/ic_mic.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,14Q10.75,14 9.875,13.125Q9,12.25 9,11V5Q9,3.75 9.875,2.875Q10.75,2 12,2Q13.25,2 14.125,2.875Q15,3.75 15,5V11Q15,12.25 14.125,13.125Q13.25,14 12,14ZM12,21Q11.575,21 11.288,20.712Q11,20.425 11,20V17.9Q8.675,17.6 7.05,15.975Q5.425,14.35 5.075,12.075Q5,11.65 5.3,11.325Q5.6,11 6.1,11Q6.45,11 6.725,11.262Q7,11.525 7.075,11.9Q7.4,13.65 8.775,14.825Q10.15,16 12,16Q13.85,16 15.225,14.825Q16.6,13.65 16.925,11.9Q17,11.525 17.288,11.262Q17.575,11 17.925,11Q18.4,11 18.7,11.325Q19,11.65 18.925,12.075Q18.575,14.35 16.95,15.975Q15.325,17.6 13,17.9V20Q13,20.425 12.713,20.712Q12.425,21 12,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable/ic_mic_white_24dp.xml
new file mode 100644
index 000000000..1c655c304
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mic_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 14c1.66 0 3-1.34 3-3V5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm-1-9c0-0.55 0.45 -1 1-1s1 0.45 1 1v6c0 0.55-0.45 1-1 1s-1-0.45-1-1V5zm6 6c0 2.76-2.24 5-5 5s-5-2.24-5-5H5c0 3.53 2.61 6.43 6 6.92V21h2v-3.08c3.39-0.49 6-3.39 6-6.92h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
new file mode 100644
index 000000000..c42c1dcda
--- /dev/null
+++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -0,0 +1,9 @@
+<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="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_music_note_off.xml b/app/src/main/res/drawable/ic_music_note_off.xml
deleted file mode 100644
index 84be954de..000000000
--- a/app/src/main/res/drawable/ic_music_note_off.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<!-- drawable/music_note_off.xml -->
-<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="M14 9.61V7h2c1.1 0 2-0.9 2-2s-0.9-2-2-2h-3c-0.55 0-1 0.45-1 1v3.61l2 2zM5.12 3.56c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39 -0.39 1.02 0 1.41l8.29 8.3v0.28c-0.94-0.54-2.1-0.75-3.33-0.32-1.34 0.48 -2.37 1.67-2.61 3.07-0.46 2.74 1.86 5.08 4.59 4.65 1.96-0.31 3.35-2.11 3.35-4.1v-1.58l5.02 5.02c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L5.12 3.56z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml b/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml
new file mode 100644
index 000000000..5643cb819
--- /dev/null
+++ b/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml
@@ -0,0 +1,24 @@
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<!-- drawable/music_note_off.xml -->
+<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="M14 7H18V3H12V7.61L14 9.61M12 10.44L4.41 2.86L3 4.27L12 13.27V13.55A3.94 3.94 0 0 0 8.67 13.23A4 4 0 0 0 10.65 20.95A4.1 4.1 0 0 0 14 16.85V15.27L19.73 21L21.14 19.59M10 19A2 2 0 1 1 12 17A2 2 0 0 1 10 19Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_notification_classic.xml b/app/src/main/res/drawable/ic_notification_classic.xml
deleted file mode 100644
index a4b7167b0..000000000
--- a/app/src/main/res/drawable/ic_notification_classic.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,19Q4.575,19 4.287,18.712Q4,18.425 4,18Q4,17.575 4.287,17.288Q4.575,17 5,17H6V10Q6,7.925 7.25,6.312Q8.5,4.7 10.5,4.2V3.5Q10.5,2.875 10.938,2.438Q11.375,2 12,2Q12.625,2 13.062,2.438Q13.5,2.875 13.5,3.5V4.2Q15.5,4.7 16.75,6.312Q18,7.925 18,10V17H19Q19.425,17 19.712,17.288Q20,17.575 20,18Q20,18.425 19.712,18.712Q19.425,19 19,19ZM12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5Q12,11.5 12,11.5ZM12,22Q11.175,22 10.588,21.413Q10,20.825 10,20H14Q14,20.825 13.413,21.413Q12.825,22 12,22ZM8,17H16V10Q16,8.35 14.825,7.175Q13.65,6 12,6Q10.35,6 9.175,7.175Q8,8.35 8,10Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml b/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml
new file mode 100644
index 000000000..d6b02bfac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_notifications_active_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 22c1.1 0 2-0.9 2-2h-4c0 1.1 0.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-0.83-0.67-1.5-1.5-1.5s-1.5 0.67 -1.5 1.5v0.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6zM7.58 4.08L6.15 2.65C3.75 4.48 2.17 7.3 2.03 10.5h2c0.15-2.65 1.51-4.97 3.55-6.42zm12.39 6.42h2c-0.15-3.2-1.73-6.02-4.12-7.85l-1.42 1.43c2.02 1.45 3.39 3.77 3.54 6.42z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_open_in_browser.xml b/app/src/main/res/drawable/ic_open_in_browser.xml
deleted file mode 100644
index 280cdca67..000000000
--- a/app/src/main/res/drawable/ic_open_in_browser.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,21Q11.575,21 11.288,20.712Q11,20.425 11,20V14.85L10.1,15.75Q9.825,16.025 9.413,16.025Q9,16.025 8.7,15.725Q8.4,15.425 8.413,15Q8.425,14.575 8.725,14.275L11.3,11.7Q11.45,11.55 11.625,11.487Q11.8,11.425 12,11.425Q12.2,11.425 12.375,11.487Q12.55,11.55 12.7,11.7L15.3,14.3Q15.6,14.6 15.6,15.012Q15.6,15.425 15.3,15.725Q15,16.025 14.588,16.025Q14.175,16.025 13.875,15.725L13,14.85V20Q13,20.425 12.713,20.712Q12.425,21 12,21ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H19Q19.825,3 20.413,3.587Q21,4.175 21,5V19Q21,19.825 20.413,20.413Q19.825,21 19,21H16Q15.575,21 15.288,20.712Q15,20.425 15,20Q15,19.575 15.288,19.288Q15.575,19 16,19H19Q19,19 19,19Q19,19 19,19V7H5V19Q5,19 5,19Q5,19 5,19H8Q8.425,19 8.713,19.288Q9,19.575 9,20Q9,20.425 8.713,20.712Q8.425,21 8,21Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
new file mode 100644
index 000000000..d58b804f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M19 4H5c-1.11 0-2 0.9-2 2v12c0 1.1 0.89 2 2 2h4v-2H5V8h14v10h-4v2h4c1.1 0 2-0.9 2-2V6c0-1.1-0.89-2-2-2zm-7 6l-4 4h3v6h2v-6h3l-4-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_palette.xml b/app/src/main/res/drawable/ic_palette.xml
deleted file mode 100644
index 4bd082e6d..000000000
--- a/app/src/main/res/drawable/ic_palette.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_palette_outline.xml b/app/src/main/res/drawable/ic_palette_outline.xml
deleted file mode 100644
index 57909b62f..000000000
--- a/app/src/main/res/drawable/ic_palette_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,22Q9.95,22 8.125,21.212Q6.3,20.425 4.938,19.062Q3.575,17.7 2.788,15.875Q2,14.05 2,12Q2,9.925 2.812,8.1Q3.625,6.275 5.013,4.925Q6.4,3.575 8.25,2.787Q10.1,2 12.2,2Q14.2,2 15.975,2.688Q17.75,3.375 19.087,4.588Q20.425,5.8 21.212,7.463Q22,9.125 22,11.05Q22,13.925 20.25,15.462Q18.5,17 16,17H14.15Q13.925,17 13.838,17.125Q13.75,17.25 13.75,17.4Q13.75,17.7 14.125,18.262Q14.5,18.825 14.5,19.55Q14.5,20.8 13.812,21.4Q13.125,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM6.5,13Q7.15,13 7.575,12.575Q8,12.15 8,11.5Q8,10.85 7.575,10.425Q7.15,10 6.5,10Q5.85,10 5.425,10.425Q5,10.85 5,11.5Q5,12.15 5.425,12.575Q5.85,13 6.5,13ZM9.5,9Q10.15,9 10.575,8.575Q11,8.15 11,7.5Q11,6.85 10.575,6.425Q10.15,6 9.5,6Q8.85,6 8.425,6.425Q8,6.85 8,7.5Q8,8.15 8.425,8.575Q8.85,9 9.5,9ZM14.5,9Q15.15,9 15.575,8.575Q16,8.15 16,7.5Q16,6.85 15.575,6.425Q15.15,6 14.5,6Q13.85,6 13.425,6.425Q13,6.85 13,7.5Q13,8.15 13.425,8.575Q13.85,9 14.5,9ZM17.5,13Q18.15,13 18.575,12.575Q19,12.15 19,11.5Q19,10.85 18.575,10.425Q18.15,10 17.5,10Q16.85,10 16.425,10.425Q16,10.85 16,11.5Q16,12.15 16.425,12.575Q16.85,13 17.5,13ZM12,20Q12.225,20 12.363,19.875Q12.5,19.75 12.5,19.55Q12.5,19.2 12.125,18.725Q11.75,18.25 11.75,17.3Q11.75,16.25 12.475,15.625Q13.2,15 14.25,15H16Q17.65,15 18.825,14.037Q20,13.075 20,11.05Q20,8.025 17.688,6.012Q15.375,4 12.2,4Q8.8,4 6.4,6.325Q4,8.65 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pause_outline.xml b/app/src/main/res/drawable/ic_pause_outline.xml
deleted file mode 100644
index 8d4364c6e..000000000
--- a/app/src/main/res/drawable/ic_pause_outline.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:strokeWidth="1.5"
-      android:pathData="M6.5,5.5h3v13h-3z"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000" />
-  <path
-      android:strokeWidth="1.5"
-      android:pathData="M14.5,5.5h3v13h-3z"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_pause_outline_small.xml b/app/src/main/res/drawable/ic_pause_outline_small.xml
deleted file mode 100644
index aadd8e81d..000000000
--- a/app/src/main/res/drawable/ic_pause_outline_small.xml
+++ /dev/null
@@ -1,16 +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:strokeWidth="1.5"
-      android:pathData="M6.5,5.5h3v13h-3z"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000" />
-  <path
-      android:strokeWidth="1.5"
-      android:pathData="M14.5,5.5h3v13h-3z"
-      android:fillColor="#00000000"
-      android:strokeColor="#000000" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_hdr_strong.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml
similarity index 75%
rename from app/src/main/res/drawable/ic_hdr_strong.xml
rename to app/src/main/res/drawable/ic_pause_white_24dp.xml
index 59456ff34..c5d23ca37 100644
--- a/app/src/main/res/drawable/ic_hdr_strong.xml
+++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -17,7 +18,9 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M17 6c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zM5 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" />
-</vector>
+        android:fillType="evenOdd"
+        android:pathData="M17 6H15V18H17V6ZM15 4H13V6V18V20H15H17H19V18V6V4H17H15ZM8 6H6V18H8V6ZM6 4H4V6V18V20H6H8H10V18V6V4H8H6Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_pause_white_48dp.xml b/app/src/main/res/drawable/ic_pause_white_48dp.xml
index cc5c06f7e..3410da84d 100644
--- a/app/src/main/res/drawable/ic_pause_white_48dp.xml
+++ b/app/src/main/res/drawable/ic_pause_white_48dp.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
diff --git a/app/src/main/res/drawable/ic_pause_white_64dp.xml b/app/src/main/res/drawable/ic_pause_white_64dp.xml
index c3e65e8b0..5d9dea57c 100644
--- a/app/src/main/res/drawable/ic_pause_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_pause_white_64dp.xml
@@ -4,7 +4,9 @@
     android:height="64dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M8 19c1.1 0 2-0.9 2-2V7c0-1.1-0.9-2-2-2s-2 0.9-2 2v10c0 1.1 0.9 2 2 2zm6-12v10c0 1.1 0.9 2 2 2s2-0.9 2-2V7c0-1.1-0.9-2-2-2s-2 0.9-2 2z" />
+        android:fillType="evenOdd"
+        android:pathData="M17 6H15V18H17V6ZM15 4H13V6V18V20H15H17H19V18V6V4H17H15ZM8 6H6V18H8V6ZM6 4H4V6V18V20H6H8H10V18V6V4H8H6Z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_paypal.xml b/app/src/main/res/drawable/ic_paypal.xml
deleted file mode 100644
index f3f437ff5..000000000
--- a/app/src/main/res/drawable/ic_paypal.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="50dp"
-    android:height="50dp"
-    android:viewportWidth="54.009"
-    android:viewportHeight="54.009"
-    android:tint="?colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M45.269,17.21c-0.038,-0.029 -0.083,-0.038 -0.123,-0.061c0.058,-0.542 0.09,-1.092 0.09,-1.649c0,-8.547 -6.954,-15.5 -15.502,-15.5H11.237c-0.498,0 -0.921,0.367 -0.99,0.86L3.781,46.865c-0.04,0.287 0.046,0.577 0.235,0.796c0.19,0.219 0.466,0.344 0.755,0.344h10.326c-0.424,2.77 -0.836,4.78 -0.84,4.803c-0.061,0.294 0.015,0.601 0.204,0.833c0.19,0.233 0.475,0.368 0.775,0.368h10.32c0.497,0 0.919,-0.365 0.99,-0.857l1.878,-13.04h8.668c7.247,0 13.144,-5.758 13.144,-12.835C50.237,23.332 48.427,19.663 45.269,17.21zM12.106,2h17.629c7.445,0 13.502,6.056 13.502,13.503C43.237,22.945 37.181,29 29.735,29H18.661c-0.498,0 -0.921,0.367 -0.99,0.861l-2.269,16.144h-9.48L12.106,2zM37.094,38.111H27.56c-0.497,0 -0.919,0.365 -0.99,0.857l-1.878,13.04h-8.243c0.199,-1.067 0.496,-2.76 0.779,-4.721c0.002,-0.012 -0.003,-0.023 -0.002,-0.035c0.01,-0.037 0.031,-0.07 0.036,-0.109L19.53,31h10.205c7.205,0 13.259,-4.946 14.99,-11.616c2.236,2.046 3.512,4.87 3.512,7.893C48.237,33.251 43.238,38.111 37.094,38.111z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_person_flat.xml b/app/src/main/res/drawable/ic_person_flat.xml
index ec29de6da..c0c3cbdf8 100644
--- a/app/src/main/res/drawable/ic_person_flat.xml
+++ b/app/src/main/res/drawable/ic_person_flat.xml
@@ -1,42 +1,42 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64.0"
-    android:viewportHeight="64.0">
+        android:width="64dp"
+        android:height="64dp"
+        android:viewportHeight="64.0"
+        android:viewportWidth="64.0">
     <path
         android:fillColor="#5093FF"
-        android:pathData="M32,0c17.7,0 32,14.3 32,32S49.7,64 32,64S0,49.7 0,32S14.3,0 32,0z" />
+        android:pathData="M32,0c17.7,0 32,14.3 32,32S49.7,64 32,64S0,49.7 0,32S14.3,0 32,0z"/>
     <path
         android:fillColor="#316CFF"
-        android:pathData="M13,64c0,-9.3 8.5,-17 19,-17h0c10.4,0 19,7.7 19,17" />
+        android:pathData="M13,64c0,-9.3 8.5,-17 19,-17h0c10.4,0 19,7.7 19,17"/>
     <path
         android:fillColor="#FFFFFF"
-        android:pathData="M32,50m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0" />
+        android:pathData="M32,50m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"/>
     <path
         android:fillColor="#F7BE8F"
-        android:pathData="M36.1,45.3v4.6c0,2.3 -1.9,4.1 -4.1,4.1c-1.1,0 -2.2,-0.5 -2.9,-1.2c-0.7,-0.8 -1.2,-1.8 -1.2,-2.9v-4.6H36.1z" />
+        android:pathData="M36.1,45.3v4.6c0,2.3 -1.9,4.1 -4.1,4.1c-1.1,0 -2.2,-0.5 -2.9,-1.2c-0.7,-0.8 -1.2,-1.8 -1.2,-2.9v-4.6H36.1z"/>
     <path
         android:fillColor="#FAD3A1"
-        android:pathData="M36.3,48.3C34.9,48.8 33.5,49 32,49s-2.9,-0.2 -4.3,-0.7L26,47.5c-3.2,-1.8 -5.4,-4.8 -5.9,-8.2C20,38.7 20,38.2 20,37.7c0,-1 0,-3.1 0,-4.9c0,-1.7 0,-9.8 0,-9.8h24c0,0 0,8.1 0,9.8c0,1.8 0,3.8 0,4.9c0,0.5 0,1.1 -0.1,1.6c-0.2,1.5 -0.7,2.8 -1.5,4.1c-1,1.7 -2.5,3.1 -4.4,4.1C37.4,47.8 36.9,48 36.3,48.3z" />
+        android:pathData="M36.3,48.3C34.9,48.8 33.5,49 32,49s-2.9,-0.2 -4.3,-0.7L26,47.5c-3.2,-1.8 -5.4,-4.8 -5.9,-8.2C20,38.7 20,38.2 20,37.7c0,-1 0,-3.1 0,-4.9c0,-1.7 0,-9.8 0,-9.8h24c0,0 0,8.1 0,9.8c0,1.8 0,3.8 0,4.9c0,0.5 0,1.1 -0.1,1.6c-0.2,1.5 -0.7,2.8 -1.5,4.1c-1,1.7 -2.5,3.1 -4.4,4.1C37.4,47.8 36.9,48 36.3,48.3z"/>
     <path
         android:fillColor="#262647"
-        android:pathData="M26.5,32c0.8,0 1.5,0.7 1.5,1.5c0,0.8 -0.7,1.5 -1.5,1.5c-0.8,0 -1.5,-0.7 -1.5,-1.5C25,32.7 25.7,32 26.5,32z" />
+        android:pathData="M26.5,32c0.8,0 1.5,0.7 1.5,1.5c0,0.8 -0.7,1.5 -1.5,1.5c-0.8,0 -1.5,-0.7 -1.5,-1.5C25,32.7 25.7,32 26.5,32z"/>
     <path
         android:fillColor="#262647"
-        android:pathData="M36,33.5c0,-0.8 0.7,-1.5 1.5,-1.5c0.8,0 1.5,0.7 1.5,1.5c0,0.8 -0.7,1.5 -1.5,1.5C36.7,35 36,34.3 36,33.5z" />
+        android:pathData="M36,33.5c0,-0.8 0.7,-1.5 1.5,-1.5c0.8,0 1.5,0.7 1.5,1.5c0,0.8 -0.7,1.5 -1.5,1.5C36.7,35 36,34.3 36,33.5z"/>
     <path
         android:fillColor="#F7BE8F"
-        android:pathData="M33,39c0,0.6 -0.4,1 -1,1s-1,-0.4 -1,-1H33z" />
+        android:pathData="M33,39c0,0.6 -0.4,1 -1,1s-1,-0.4 -1,-1H33z"/>
     <path
         android:fillColor="#F4B28E"
-        android:pathData="M32,44.5c-1.6,0 -3.1,-0.9 -3.9,-2.2C28,42 28,41.7 28.3,41.6c0.2,-0.1 0.5,-0.1 0.7,0.2c0.6,1.1 1.8,1.8 3,1.8s2.4,-0.7 3,-1.8c0.1,-0.2 0.4,-0.3 0.7,-0.2c0.2,0.1 0.3,0.4 0.2,0.7C35.1,43.6 33.6,44.5 32,44.5z" />
+        android:pathData="M32,44.5c-1.6,0 -3.1,-0.9 -3.9,-2.2C28,42 28,41.7 28.3,41.6c0.2,-0.1 0.5,-0.1 0.7,0.2c0.6,1.1 1.8,1.8 3,1.8s2.4,-0.7 3,-1.8c0.1,-0.2 0.4,-0.3 0.7,-0.2c0.2,0.1 0.3,0.4 0.2,0.7C35.1,43.6 33.6,44.5 32,44.5z"/>
     <path
         android:fillColor="#262647"
-        android:pathData="M46,26v7h-2v-5.4l-5.4,-4.2c-1.5,4 -5.9,6.8 -10.3,6.8c-3,0 -6.4,-1.3 -8.3,-3.4v0.9V33h-2v-8.5c0,-3.1 1,-5.6 2.7,-7.5c2.6,-3 6.5,-5.1 10.3,-5c3.1,0.1 5.4,1.1 9,0c0.3,0.5 0.5,1.2 0.3,2.2c-0.1,0.8 -0.2,1 -0.3,1.5l0,0C43.5,18.3 46,21.2 46,26z" />
+        android:pathData="M46,26v7h-2v-5.4l-5.4,-4.2c-1.5,4 -5.9,6.8 -10.3,6.8c-3,0 -6.4,-1.3 -8.3,-3.4v0.9V33h-2v-8.5c0,-3.1 1,-5.6 2.7,-7.5c2.6,-3 6.5,-5.1 10.3,-5c3.1,0.1 5.4,1.1 9,0c0.3,0.5 0.5,1.2 0.3,2.2c-0.1,0.8 -0.2,1 -0.3,1.5l0,0C43.5,18.3 46,21.2 46,26z"/>
     <path
         android:fillColor="#F7BE8F"
-        android:pathData="M20,37c-1.7,0 -3,-1.3 -3,-3c0,-0.8 0.3,-1.6 0.9,-2.1c0.5,-0.5 1.3,-0.9 2.1,-0.9V37z" />
+        android:pathData="M20,37c-1.7,0 -3,-1.3 -3,-3c0,-0.8 0.3,-1.6 0.9,-2.1c0.5,-0.5 1.3,-0.9 2.1,-0.9V37z"/>
     <path
         android:fillColor="#F7BE8F"
-        android:pathData="M44,37c1.7,0 3,-1.3 3,-3c0,-0.8 -0.3,-1.6 -0.9,-2.1C45.6,31.3 44.8,31 44,31V37z" />
+        android:pathData="M44,37c1.7,0 3,-1.3 3,-3c0,-0.8 -0.3,-1.6 -0.9,-2.1C45.6,31.3 44.8,31 44,31V37z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_phonelink_ring.xml b/app/src/main/res/drawable/ic_phonelink_ring.xml
deleted file mode 100644
index 1f73e85d2..000000000
--- a/app/src/main/res/drawable/ic_phonelink_ring.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,16.5Q19.775,16.275 19.763,15.912Q19.75,15.55 19.95,15.275Q20.475,14.575 20.75,13.737Q21.025,12.9 21.025,12Q21.025,11.1 20.75,10.262Q20.475,9.425 19.95,8.725Q19.75,8.45 19.75,8.1Q19.75,7.75 20,7.5Q20.35,7.15 20.812,7.175Q21.275,7.2 21.55,7.55Q22.275,8.5 22.65,9.637Q23.025,10.775 23.025,12Q23.025,13.225 22.65,14.363Q22.275,15.5 21.55,16.45Q21.275,16.8 20.812,16.825Q20.35,16.85 20,16.5ZM17.475,13.975Q17.275,13.775 17.238,13.45Q17.2,13.125 17.35,12.775Q17.425,12.575 17.475,12.387Q17.525,12.2 17.525,12Q17.525,11.8 17.475,11.612Q17.425,11.425 17.35,11.225Q17.2,10.875 17.238,10.55Q17.275,10.225 17.475,10.025Q17.875,9.625 18.363,9.688Q18.85,9.75 19.075,10.175Q19.3,10.6 19.413,11.05Q19.525,11.5 19.525,12Q19.525,12.5 19.413,12.95Q19.3,13.4 19.075,13.825Q18.85,14.25 18.363,14.312Q17.875,14.375 17.475,13.975ZM7,23Q6.175,23 5.588,22.413Q5,21.825 5,21V3Q5,2.175 5.588,1.587Q6.175,1 7,1H17Q17.825,1 18.413,1.587Q19,2.175 19,3V7H17V6H7V18H17V17H19V21Q19,21.825 18.413,22.413Q17.825,23 17,23Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pinterest.xml b/app/src/main/res/drawable/ic_pinterest_white_24dp.xml
similarity index 63%
rename from app/src/main/res/drawable/ic_pinterest.xml
rename to app/src/main/res/drawable/ic_pinterest_white_24dp.xml
index a484b76df..d53861a36 100644
--- a/app/src/main/res/drawable/ic_pinterest.xml
+++ b/app/src/main/res/drawable/ic_pinterest_white_24dp.xml
@@ -1,17 +1,3 @@
-<!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
 <!-- drawable/pinterest.xml -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
diff --git a/app/src/main/res/drawable/ic_play_arrow_outline.xml b/app/src/main/res/drawable/ic_play_arrow_outline.xml
deleted file mode 100644
index 3bfc086a8..000000000
--- a/app/src/main/res/drawable/ic_play_arrow_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,8.64L15.27,12 10,15.36V8.64M8,5v14l11,-7L8,5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_outline_small.xml b/app/src/main/res/drawable/ic_play_arrow_outline_small.xml
deleted file mode 100644
index 1437cf963..000000000
--- a/app/src/main/res/drawable/ic_play_arrow_outline_small.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M10,8.64L15.27,12 10,15.36V8.64M8,5v14l11,-7L8,5z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
new file mode 100644
index 000000000..8cfcca6d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml
index 937fd4a2b..8ed511c73 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -17,8 +18,8 @@
     android:height="@dimen/icon_notification_dimen"
     android:viewportWidth="24"
     android:viewportHeight="24">
+
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M8 6.82v10.36c0 0.79 0.87 1.27 1.54 0.84 l8.14-5.18c0.62-0.39 0.62 -1.29 0-1.69L9.54 5.98C8.87 5.55 8 6.03 8 6.82z" />
-
+        android:pathData="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_48dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_48dp.xml
index c2947c0d1..14b0a0781 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_48dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_48dp.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
diff --git a/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml
index 8bda30fd6..ec6ea0b65 100644
--- a/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml
+++ b/app/src/main/res/drawable/ic_play_arrow_white_64dp.xml
@@ -1,24 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="64dp"
     android:height="64dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M8 6.82v10.36c0 0.79 0.87 1.27 1.54 0.84 l8.14-5.18c0.62-0.39 0.62 -1.29 0-1.69L9.54 5.98C8.87 5.55 8 6.03 8 6.82z" />
+        android:pathData="M10 8.64L15.27 12 10 15.36V8.64M8 5v14l11-7L8 5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_play_circle.xml b/app/src/main/res/drawable/ic_play_circle.xml
deleted file mode 100644
index 9badfb8a3..000000000
--- a/app/src/main/res/drawable/ic_play_circle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9.5,9.325V14.675Q9.5,15.275 10.025,15.55Q10.55,15.825 11.05,15.5L15.2,12.85Q15.675,12.575 15.675,12Q15.675,11.425 15.2,11.15L11.05,8.5Q10.55,8.175 10.025,8.45Q9.5,8.725 9.5,9.325ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_play_circle_filled.xml b/app/src/main/res/drawable/ic_play_circle_filled.xml
deleted file mode 100644
index 4613121b9..000000000
--- a/app/src/main/res/drawable/ic_play_circle_filled.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M9.5,9.325V14.675Q9.5,15.275 10.025,15.55Q10.55,15.825 11.05,15.5L15.2,12.85Q15.675,12.575 15.675,12Q15.675,11.425 15.2,11.15L11.05,8.5Q10.55,8.175 10.025,8.45Q9.5,8.725 9.5,9.325ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,9.925 2.788,8.1Q3.575,6.275 4.925,4.925Q6.275,3.575 8.1,2.787Q9.925,2 12,2Q14.075,2 15.9,2.787Q17.725,3.575 19.075,4.925Q20.425,6.275 21.212,8.1Q22,9.925 22,12Q22,14.075 21.212,15.9Q20.425,17.725 19.075,19.075Q17.725,20.425 15.9,21.212Q14.075,22 12,22ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM12,20Q15.325,20 17.663,17.663Q20,15.325 20,12Q20,8.675 17.663,6.337Q15.325,4 12,4Q8.675,4 6.338,6.337Q4,8.675 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml b/app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml
new file mode 100644
index 000000000..87619b256
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_circle_filled_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 18c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8-3.59 8-8 8zm-2-3.5l6-4.5-6-4.5z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playback_speed.xml b/app/src/main/res/drawable/ic_playback_speed.xml
deleted file mode 100644
index b2a3b1f80..000000000
--- a/app/src/main/res/drawable/ic_playback_speed.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.025,15.5Q10.525,15.825 10,15.55Q9.475,15.275 9.475,14.675V9.325Q9.475,8.725 10,8.45Q10.525,8.175 11.025,8.5L15.175,11.15Q15.4,11.3 15.512,11.525Q15.625,11.75 15.625,12Q15.625,12.25 15.512,12.475Q15.4,12.7 15.175,12.85ZM9.825,21.775Q8.95,21.575 8.138,21.25Q7.325,20.925 6.55,20.425Q6.15,20.175 6.113,19.725Q6.075,19.275 6.425,18.925Q6.675,18.675 7.062,18.638Q7.45,18.6 7.775,18.8Q8.325,19.15 8.913,19.387Q9.5,19.625 10.125,19.775Q10.475,19.875 10.713,20.163Q10.95,20.45 10.95,20.8Q10.95,21.3 10.613,21.587Q10.275,21.875 9.825,21.775ZM5,17.5Q4.65,17.85 4.213,17.812Q3.775,17.775 3.525,17.4Q3.025,16.675 2.688,15.863Q2.35,15.05 2.15,14.15Q2.025,13.7 2.312,13.35Q2.6,13 3.1,13Q3.45,13 3.75,13.25Q4.05,13.5 4.15,13.85Q4.3,14.5 4.55,15.075Q4.8,15.65 5.125,16.2Q5.325,16.5 5.287,16.875Q5.25,17.25 5,17.5ZM3.125,11Q2.625,11 2.325,10.65Q2.025,10.3 2.125,9.85Q2.325,8.975 2.675,8.137Q3.025,7.3 3.525,6.575Q3.775,6.2 4.213,6.175Q4.65,6.15 5,6.5Q5.25,6.75 5.287,7.125Q5.325,7.5 5.125,7.8Q4.8,8.325 4.55,8.912Q4.3,9.5 4.15,10.15Q4.05,10.5 3.763,10.75Q3.475,11 3.125,11ZM14.05,21.75Q13.6,21.85 13.275,21.575Q12.95,21.3 12.95,20.825Q12.95,20.475 13.188,20.175Q13.425,19.875 13.775,19.775Q16.45,19.075 18.175,16.938Q19.9,14.8 19.9,12Q19.9,9.2 18.175,7.025Q16.45,4.85 13.775,4.2Q13.425,4.1 13.188,3.812Q12.95,3.525 12.95,3.175Q12.95,2.7 13.288,2.412Q13.625,2.125 14.075,2.225Q17.5,2.975 19.7,5.7Q21.9,8.425 21.9,12Q21.9,15.55 19.688,18.25Q17.475,20.95 14.05,21.75ZM7.7,5.225Q7.375,5.425 7.013,5.375Q6.65,5.325 6.4,5.075Q6.05,4.725 6.088,4.275Q6.125,3.825 6.525,3.575Q7.3,3.075 8.125,2.75Q8.95,2.425 9.825,2.225Q10.275,2.125 10.613,2.412Q10.95,2.7 10.95,3.175Q10.95,3.525 10.7,3.812Q10.45,4.1 10.1,4.2Q9.475,4.35 8.875,4.612Q8.275,4.875 7.7,5.225Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_playlist_add.xml b/app/src/main/res/drawable/ic_playlist_add.xml
deleted file mode 100644
index 3134b1311..000000000
--- a/app/src/main/res/drawable/ic_playlist_add.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="M13 10H3c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm0-4H3c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm5 8v-3c0-0.55-0.45-1-1-1s-1 0.45-1 1v3h-3c-0.55 0-1 0.45-1 1s0.45 1 1 1h3v3c0 0.55 0.45 1 1 1s1-0.45 1-1v-3h3c0.55 0 1-0.45 1-1s-0.45-1-1-1h-3zM3 16h6c0.55 0 1-0.45 1-1s-0.45-1-1-1H3c-0.55 0-1 0.45-1 1s0.45 1 1 1z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
new file mode 100644
index 000000000..a4bc4e8b8
--- /dev/null
+++ b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M14 10H2v2h12v-2zm0-4H2v2h12V6zm4 8v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2 16h8v-2H2v2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_playlist_play.xml b/app/src/main/res/drawable/ic_playlist_play.xml
deleted file mode 100644
index 3e5782ed3..000000000
--- a/app/src/main/res/drawable/ic_playlist_play.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.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="@color/md_white_1000"
-        android:pathData="M5 10h10c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm0-4h10c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm0 8h6c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm9 0.88v4.23c0 0.39 0.42 0.63 0.76 0.43l3.53-2.12c0.32-0.19 0.32 -0.66 0-0.86l-3.53-2.12c-0.34-0.19-0.76 0.05 -0.76 0.44 z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml
new file mode 100644
index 000000000..1bae1b2dc
--- /dev/null
+++ b/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M19,9L2,9v2h17L19,9zM19,5L2,5v2h17L19,5zM2,15h13v-2L2,13v2zM17,13v6l5,-3 -5,-3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_playlist_remove.xml b/app/src/main/res/drawable/ic_playlist_remove.xml
deleted file mode 100644
index 1becc9717..000000000
--- a/app/src/main/res/drawable/ic_playlist_remove.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M7,11v2h10v-2L7,11zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_popcorn_white_24dp.xml b/app/src/main/res/drawable/ic_popcorn_white_24dp.xml
new file mode 100644
index 000000000..5f0f93fde
--- /dev/null
+++ b/app/src/main/res/drawable/ic_popcorn_white_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:viewportHeight="512.0"
+    android:viewportWidth="512.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFF" android:pathData="M228.7,57.2c-6.8,0 -13.4,1.8 -19.1,5.1c-6,-5.2 -13.7,-8.2 -21.8,-8.2c-18.4,0 -33.4,15 -33.4,33.4s15,33.4 33.4,33.4c5.3,0 9.6,-4.3 9.6,-9.6c0,-5.3 -4.3,-9.6 -9.6,-9.6c-7.8,0 -14.2,-6.4 -14.2,-14.2s6.4,-14.2 14.2,-14.2c5.1,0 9.6,2.6 12.2,7c1.5,2.6 4.2,4.3 7.1,4.6c3,0.3 5.9,-0.7 8,-2.9c3.6,-3.7 8.4,-5.8 13.6,-5.8c10.4,0 18.9,8.5 18.9,18.9c0,5.3 4.3,9.6 9.6,9.6c5.3,0 9.6,-4.3 9.6,-9.6C266.7,74.3 249.7,57.2 228.7,57.2z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M477.9,255l-6.3,-38.8c-0.8,-4.6 -4.8,-8 -9.5,-8h-9.9l-8,-30.3c-1.1,-4.2 -4.9,-7.1 -9.3,-7.1h-33.9l2.4,-26.8c6.6,-8.5 10.2,-19 10.2,-29.9c0,-21.8 -14,-40.3 -33.8,-46.6c0.1,-1.3 0.2,-2.6 0.2,-3.9c0,-21.7 -17.7,-39.4 -39.4,-39.4c-6.2,0 -12.2,1.4 -17.5,4.1c-8.9,-13.4 -24.1,-21.9 -40.8,-21.9c-10.4,0 -20.3,3.2 -28.5,9.1C246.6,5.9 235.1,0 222.7,0c-11.9,0 -23.1,5.5 -30.4,14.4c-7.9,-5.2 -17.3,-8.1 -27,-8.1c-16.7,0 -31.9,8.4 -40.8,21.9c-5.4,-2.7 -11.4,-4.1 -17.5,-4.1c-21.7,0 -39.4,17.7 -39.4,39.4c0,1.3 0.1,2.6 0.2,3.9c-19.9,6.3 -33.8,24.8 -33.8,46.6c0,10.9 3.6,21.4 10.2,29.9l34.6,359.5c0.5,4.9 4.6,8.7 9.5,8.7L427,512c5,0 9.1,-3.8 9.6,-8.8l19.6,-237.1h12.3c2.8,0 5.5,-1.2 7.3,-3.4C477.6,260.6 478.4,257.7 477.9,255zM427.6,189.8l4.8,18.3H258.8l4.8,-18.3H427.6zM274.9,170.6l1.9,-20.5h52.7l-2.6,20.5H274.9zM346.3,170.6l2.6,-20.5h34.9l-1.9,20.5H346.3zM53.1,114c0,-13.5 8.8,-24.9 21.3,-28.5c4.9,6.8 13.4,13.8 25.8,13.8c1.5,0 3,-0.1 4.7,-0.3c5.2,-0.7 8.9,-5.5 8.2,-10.8c-0.7,-5.3 -5.6,-8.9 -10.8,-8.2c-9.5,1.3 -13.3,-6.9 -14,-8.5c-0,-0 -0,-0.1 -0,-0.1c-0,-0 -0,-0 -0,-0.1c-1,-2.4 -1.5,-5 -1.5,-7.7c0,-11.1 9.1,-20.2 20.2,-20.2c5.4,0 10.5,2.1 14.3,6c2.3,2.3 5.7,3.3 8.9,2.6c3.2,-0.7 5.8,-3.1 6.9,-6.2c4.1,-12 15.4,-20.1 28.2,-20.1c8.5,0 16.6,3.6 22.2,10c2.2,2.5 5.6,3.7 8.9,3.1c3.3,-0.6 6.1,-2.9 7.2,-6.1c2.9,-7.9 10.6,-13.2 19,-13.2c8.9,0 16.9,6 19.4,14.6c1,3.5 3.9,6.1 7.4,6.7c3.5,0.7 7.2,-0.7 9.4,-3.5c5.7,-7.3 14.3,-11.5 23.5,-11.5c12.7,0 24,8.1 28.2,20.1c1.1,3.1 3.7,5.5 6.9,6.2c3.2,0.7 6.6,-0.2 8.9,-2.6c3.8,-3.8 8.9,-5.9 14.3,-5.9c11.1,0 20.2,9.1 20.2,20.2c0,2.6 -0.5,5.2 -1.5,7.7c-1.2,2.8 -0.9,6 0.7,8.6c1.6,2.6 4.3,4.3 7.3,4.6c15.2,1.3 27.1,14.4 27.1,29.6c0,6.1 -1.9,12 -5.4,17H58.5C55,126 53.1,120.1 53.1,114zM97,492.8L64,150.1h34.4l28.4,342.7H97zM146.1,492.8l-28.4,-342.7h56.2l21.8,342.7H146.1zM214.9,492.8l-21.8,-342.7h64.6l-1.9,20.6c-4.1,0.2 -7.7,3 -8.8,7.1l-8,30.3h-9.9c-4.7,0 -8.7,3.4 -9.5,8l-6.3,38.8c-0.5,2.8 0.3,5.6 2.2,7.8c1.8,2.1 4.5,3.4 7.3,3.4h12.3l18.8,226.7H214.9zM424.9,412h-47.6c-18.7,0 -33.9,-15.2 -33.9,-33.9c0,-9.1 3.5,-17.6 9.9,-24c6.4,-6.4 14.9,-9.9 23.9,-9.9h53.3L424.9,412zM432.1,325h-54.8c-14.2,0 -27.5,5.5 -37.5,15.5c-10,10 -15.5,23.3 -15.5,37.5c0,29.3 23.8,53.1 53.1,53.1h46l-5.1,61.7h-39.6v-0H273l-18.8,-226.7h182.7L432.1,325zM447.4,246.9H243.8h-9.8l3.2,-19.7h9.1h198.6h9.1l3.2,19.7H447.4z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_queue_music.xml b/app/src/main/res/drawable/ic_queue_music.xml
deleted file mode 100644
index 7751c8f35..000000000
--- a/app/src/main/res/drawable/ic_queue_music.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16,20Q14.75,20 13.875,19.125Q13,18.25 13,17Q13,15.75 13.875,14.875Q14.75,14 16,14Q16.275,14 16.525,14.037Q16.775,14.075 17,14.2V7Q17,6.575 17.288,6.287Q17.575,6 18,6H21Q21.425,6 21.712,6.287Q22,6.575 22,7Q22,7.425 21.712,7.713Q21.425,8 21,8H19V17Q19,18.25 18.125,19.125Q17.25,20 16,20ZM4,8Q3.575,8 3.288,7.713Q3,7.425 3,7Q3,6.575 3.288,6.287Q3.575,6 4,6H14Q14.425,6 14.713,6.287Q15,6.575 15,7Q15,7.425 14.713,7.713Q14.425,8 14,8ZM4,12Q3.575,12 3.288,11.712Q3,11.425 3,11Q3,10.575 3.288,10.287Q3.575,10 4,10H14Q14.425,10 14.713,10.287Q15,10.575 15,11Q15,11.425 14.713,11.712Q14.425,12 14,12ZM4,16Q3.575,16 3.288,15.712Q3,15.425 3,15Q3,14.575 3.288,14.287Q3.575,14 4,14H10Q10.425,14 10.713,14.287Q11,14.575 11,15Q11,15.425 10.713,15.712Q10.425,16 10,16Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_pause.xml b/app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml
similarity index 84%
rename from app/src/main/res/drawable/ic_pause.xml
rename to app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml
index 76bdc96f2..3d9f11801 100644
--- a/app/src/main/res/drawable/ic_pause.xml
+++ b/app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml
@@ -11,7 +11,6 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
@@ -20,5 +19,5 @@
 
     <path
         android:fillColor="@color/md_white_1000"
-        android:pathData="M8 19c1.1 0 2-0.9 2-2V7c0-1.1-0.9-2-2-2s-2 0.9-2 2v10c0 1.1 0.9 2 2 2zm6-12v10c0 1.1 0.9 2 2 2s2-0.9 2-2V7c0-1.1-0.9-2-2-2s-2 0.9-2 2z" />
+        android:pathData="M15 6H3v2h12V6zm0 4H3v2h12v-2zM3 16h8v-2H3v2zM17 6v8.18c-0.31-0.11-0.65-0.18-1-0.18-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3V8h3V6h-5z" />
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
new file mode 100644
index 000000000..ab5a32242
--- /dev/null
+++ b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+<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="M22,5 L22,7 L19,7 L19,16 C19,17.66 17.66,19 16,19 C14.34,19 13,17.66 13,16 C13,14.34 14.34,13 16,13 C16.35,13 16.69,13.07 17,13.18 L17,5 L22,5 Z M15,16 C15,16.55 15.45,17 16,17 C16.55,17 17,16.55 17,16 C17,15.45 16.55,15 16,15 C15.45,15 15,15.45 15,16 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 15 5 L 3 5 L 3 7 L 15 7 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 15 9 L 3 9 L 3 11 L 15 11 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 11 13 L 3 13 L 3 15 L 11 15 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_redo.xml b/app/src/main/res/drawable/ic_redo_white_24dp.xml
similarity index 92%
rename from app/src/main/res/drawable/ic_redo.xml
rename to app/src/main/res/drawable/ic_redo_white_24dp.xml
index 4f852a86f..14462f542 100644
--- a/app/src/main/res/drawable/ic_redo.xml
+++ b/app/src/main/res/drawable/ic_redo_white_24dp.xml
@@ -2,10 +2,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?colorControlNormal"
     android:viewportWidth="24"
     android:viewportHeight="24">
 
+
     <path
         android:fillColor="@color/md_white_1000"
         android:pathData="M18.4 10.6C16.55 8.99 14.15 8 11.5 8c-4.65 0-8.58 3.03-9.96 7.22L3.9 16c1.05-3.19 4.05-5.5 7.6-5.5 1.95 0 3.73 0.72 5.12 1.88L13 16h9V7l-3.6 3.6z" />
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
deleted file mode 100644
index 66a1e9b6a..000000000
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M12,20Q8.65,20 6.325,17.675Q4,15.35 4,12Q4,8.65 6.325,6.325Q8.65,4 12,4Q13.725,4 15.3,4.713Q16.875,5.425 18,6.75V5Q18,4.575 18.288,4.287Q18.575,4 19,4Q19.425,4 19.712,4.287Q20,4.575 20,5V10Q20,10.425 19.712,10.712Q19.425,11 19,11H14Q13.575,11 13.288,10.712Q13,10.425 13,10Q13,9.575 13.288,9.287Q13.575,9 14,9H17.2Q16.4,7.6 15.013,6.8Q13.625,6 12,6Q9.5,6 7.75,7.75Q6,9.5 6,12Q6,14.5 7.75,16.25Q9.5,18 12,18Q13.725,18 15.188,17.087Q16.65,16.175 17.375,14.65Q17.5,14.375 17.788,14.188Q18.075,14 18.375,14Q18.95,14 19.238,14.4Q19.525,14.8 19.3,15.3Q18.35,17.425 16.375,18.712Q14.4,20 12,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_repeat.xml b/app/src/main/res/drawable/ic_repeat.xml
deleted file mode 100644
index 53fed2aa4..000000000
--- a/app/src/main/res/drawable/ic_repeat.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17,17V14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.275Q19,13.55 19,13.975V18Q19,18.425 18.712,18.712Q18.425,19 18,19H6.85L7.675,19.825Q7.975,20.125 7.988,20.55Q8,20.975 7.7,21.275Q7.4,21.575 6.988,21.575Q6.575,21.575 6.3,21.3L3.7,18.7Q3.425,18.425 3.425,18Q3.425,17.575 3.7,17.3L6.275,14.725Q6.575,14.425 6.988,14.425Q7.4,14.425 7.7,14.725Q8,15.025 8,15.438Q8,15.85 7.7,16.15L6.85,17ZM7,7V10Q7,10.425 6.713,10.712Q6.425,11 6,11Q5.575,11 5.287,10.725Q5,10.45 5,10.025V6Q5,5.575 5.287,5.287Q5.575,5 6,5H17.15L16.325,4.175Q16.025,3.875 16.013,3.45Q16,3.025 16.3,2.725Q16.6,2.425 17.013,2.425Q17.425,2.425 17.7,2.7L20.3,5.3Q20.575,5.575 20.575,6Q20.575,6.425 20.3,6.7L17.725,9.275Q17.425,9.575 17.013,9.575Q16.6,9.575 16.3,9.275Q16,8.975 16,8.562Q16,8.15 16.3,7.85L17.15,7Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_one.xml b/app/src/main/res/drawable/ic_repeat_one.xml
deleted file mode 100644
index b4afbe32b..000000000
--- a/app/src/main/res/drawable/ic_repeat_one.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M11.5,10.5H10.725Q10.425,10.5 10.213,10.287Q10,10.075 10,9.75Q10,9.425 10.213,9.212Q10.425,9 10.75,9H12.25Q12.575,9 12.788,9.212Q13,9.425 13,9.75V14.275Q13,14.575 12.788,14.787Q12.575,15 12.25,15Q11.925,15 11.713,14.787Q11.5,14.575 11.5,14.25ZM17,17V14Q17,13.575 17.288,13.287Q17.575,13 18,13Q18.425,13 18.712,13.275Q19,13.55 19,13.975V18Q19,18.425 18.712,18.712Q18.425,19 18,19H6.85L7.675,19.825Q7.975,20.125 7.988,20.55Q8,20.975 7.7,21.275Q7.4,21.575 6.988,21.575Q6.575,21.575 6.3,21.3L3.7,18.7Q3.425,18.425 3.425,18Q3.425,17.575 3.7,17.3L6.275,14.725Q6.575,14.425 6.988,14.425Q7.4,14.425 7.7,14.725Q8,15.025 8,15.438Q8,15.85 7.7,16.15L6.85,17ZM7,7V10Q7,10.425 6.713,10.712Q6.425,11 6,11Q5.575,11 5.287,10.725Q5,10.45 5,10.025V6Q5,5.575 5.287,5.287Q5.575,5 6,5H17.15L16.325,4.175Q16.025,3.875 16.013,3.45Q16,3.025 16.3,2.725Q16.6,2.425 17.013,2.425Q17.425,2.425 17.7,2.7L20.3,5.3Q20.575,5.575 20.575,6Q20.575,6.425 20.3,6.7L17.725,9.275Q17.425,9.575 17.013,9.575Q16.6,9.575 16.3,9.275Q16,8.975 16,8.562Q16,8.15 16.3,7.85L17.15,7Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
new file mode 100644
index 000000000..64af7f6d5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4zm-4-2V9h-1l-2 1v1h1.5v4H13z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
new file mode 100644
index 000000000..ca9078ffe
--- /dev/null
+++ b/app/src/main/res/drawable/ic_repeat_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M7 7h10v3l4-4-4-4v3H5v6h2V7zm10 10H7v-3l-4 4 4 4v-3h12v-6h-2v4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_repeat_white_circle.xml b/app/src/main/res/drawable/ic_repeat_white_circle_24dp.xml
similarity index 100%
rename from app/src/main/res/drawable/ic_repeat_white_circle.xml
rename to app/src/main/res/drawable/ic_repeat_white_circle_24dp.xml
diff --git a/app/src/main/res/drawable/ic_restore.xml b/app/src/main/res/drawable/ic_restore.xml
deleted file mode 100644
index d4fa3ee61..000000000
--- a/app/src/main/res/drawable/ic_restore.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9L1,12l3.89,3.89 0.07,0.14L9,12L6,12c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08L13.5,8L12,8z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_rounded_corner.xml b/app/src/main/res/drawable/ic_rounded_corner.xml
new file mode 100644
index 000000000..aa36e0ce5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_rounded_corner.xml
@@ -0,0 +1,10 @@
+<!-- drawable/rounded_corner.xml -->
+<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="M19,19H21V21H19V19M19,17H21V15H19V17M3,13H5V11H3V13M3,17H5V15H3V17M3,9H5V7H3V9M3,5H5V3H3V5M7,5H9V3H7V5M15,21H17V19H15V21M11,21H13V19H11V21M15,21H17V19H15V21M7,21H9V19H7V21M3,21H5V19H3V21M21,8A5,5 0 0,0 16,3H11V5H16A3,3 0 0,1 19,8V13H21V8Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_save.xml b/app/src/main/res/drawable/ic_save.xml
deleted file mode 100644
index ceaaba2e4..000000000
--- a/app/src/main/res/drawable/ic_save.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5,21Q4.175,21 3.587,20.413Q3,19.825 3,19V5Q3,4.175 3.587,3.587Q4.175,3 5,3H16.175Q16.575,3 16.938,3.15Q17.3,3.3 17.575,3.575L20.425,6.425Q20.7,6.7 20.85,7.062Q21,7.425 21,7.825V19Q21,19.825 20.413,20.413Q19.825,21 19,21ZM12,18Q13.25,18 14.125,17.125Q15,16.25 15,15Q15,13.75 14.125,12.875Q13.25,12 12,12Q10.75,12 9.875,12.875Q9,13.75 9,15Q9,16.25 9.875,17.125Q10.75,18 12,18ZM7,10H14Q14.425,10 14.713,9.712Q15,9.425 15,9V7Q15,6.575 14.713,6.287Q14.425,6 14,6H7Q6.575,6 6.287,6.287Q6,6.575 6,7V9Q6,9.425 6.287,9.712Q6.575,10 7,10Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml
new file mode 100644
index 000000000..6739a82ad
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M17 3H5c-1.11 0-2 0.9-2 2v14c0 1.1 0.89 2 2 2h14c1.1 0 2-0.9 2-2V7l-4-4zm2 16H5V5h11.17L19 7.83V19zm-7-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3zM6 6h9v4H6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_scanner_white_24dp.xml b/app/src/main/res/drawable/ic_scanner_white_24dp.xml
new file mode 100644
index 000000000..404f47503
--- /dev/null
+++ b/app/src/main/res/drawable/ic_scanner_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M19.8 10.7L4.2 5l-0.7 1.9L17.6 12H5c-1.1 0-2 0.9-2 2v4c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2v-5.5c0-0.8-0.5-1.6-1.2-1.8zM19 18H5v-4h14v4zM6 15h2v2H6zm4 0h8v2h-8z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sd_card.xml b/app/src/main/res/drawable/ic_sd_card.xml
deleted file mode 100644
index 3bf143f65..000000000
--- a/app/src/main/res/drawable/ic_sd_card.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,11Q10.425,11 10.713,10.712Q11,10.425 11,10V8Q11,7.575 10.713,7.287Q10.425,7 10,7Q9.575,7 9.288,7.287Q9,7.575 9,8V10Q9,10.425 9.288,10.712Q9.575,11 10,11ZM13,11Q13.425,11 13.713,10.712Q14,10.425 14,10V8Q14,7.575 13.713,7.287Q13.425,7 13,7Q12.575,7 12.288,7.287Q12,7.575 12,8V10Q12,10.425 12.288,10.712Q12.575,11 13,11ZM16,11Q16.425,11 16.712,10.712Q17,10.425 17,10V8Q17,7.575 16.712,7.287Q16.425,7 16,7Q15.575,7 15.288,7.287Q15,7.575 15,8V10Q15,10.425 15.288,10.712Q15.575,11 16,11ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V8.825Q4,8.425 4.15,8.062Q4.3,7.7 4.575,7.425L9.425,2.575Q9.7,2.3 10.062,2.15Q10.425,2 10.825,2H18Q18.825,2 19.413,2.587Q20,3.175 20,4V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM6,20H18Q18,20 18,20Q18,20 18,20V4Q18,4 18,4Q18,4 18,4H10.85L6,8.85V20Q6,20 6,20Q6,20 6,20ZM6,20Q6,20 6,20Q6,20 6,20H10.85H18Q18,20 18,20Q18,20 18,20Q18,20 18,20Q18,20 18,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sd_storage.xml b/app/src/main/res/drawable/ic_sd_storage.xml
deleted file mode 100644
index 3bf143f65..000000000
--- a/app/src/main/res/drawable/ic_sd_storage.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,11Q10.425,11 10.713,10.712Q11,10.425 11,10V8Q11,7.575 10.713,7.287Q10.425,7 10,7Q9.575,7 9.288,7.287Q9,7.575 9,8V10Q9,10.425 9.288,10.712Q9.575,11 10,11ZM13,11Q13.425,11 13.713,10.712Q14,10.425 14,10V8Q14,7.575 13.713,7.287Q13.425,7 13,7Q12.575,7 12.288,7.287Q12,7.575 12,8V10Q12,10.425 12.288,10.712Q12.575,11 13,11ZM16,11Q16.425,11 16.712,10.712Q17,10.425 17,10V8Q17,7.575 16.712,7.287Q16.425,7 16,7Q15.575,7 15.288,7.287Q15,7.575 15,8V10Q15,10.425 15.288,10.712Q15.575,11 16,11ZM6,22Q5.175,22 4.588,21.413Q4,20.825 4,20V8.825Q4,8.425 4.15,8.062Q4.3,7.7 4.575,7.425L9.425,2.575Q9.7,2.3 10.062,2.15Q10.425,2 10.825,2H18Q18.825,2 19.413,2.587Q20,3.175 20,4V20Q20,20.825 19.413,21.413Q18.825,22 18,22ZM6,20H18Q18,20 18,20Q18,20 18,20V4Q18,4 18,4Q18,4 18,4H10.85L6,8.85V20Q6,20 6,20Q6,20 6,20ZM6,20Q6,20 6,20Q6,20 6,20H10.85H18Q18,20 18,20Q18,20 18,20Q18,20 18,20Q18,20 18,20Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
deleted file mode 100644
index c31bac9ce..000000000
--- a/app/src/main/res/drawable/ic_search.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M18.9,20.3 L13.3,14.7Q12.55,15.3 11.575,15.65Q10.6,16 9.5,16Q6.775,16 4.888,14.113Q3,12.225 3,9.5Q3,6.775 4.888,4.887Q6.775,3 9.5,3Q12.225,3 14.113,4.887Q16,6.775 16,9.5Q16,10.6 15.65,11.575Q15.3,12.55 14.7,13.3L20.325,18.925Q20.6,19.2 20.6,19.6Q20.6,20 20.3,20.3Q20.025,20.575 19.6,20.575Q19.175,20.575 18.9,20.3ZM9.5,14Q11.375,14 12.688,12.688Q14,11.375 14,9.5Q14,7.625 12.688,6.312Q11.375,5 9.5,5Q7.625,5 6.312,6.312Q5,7.625 5,9.5Q5,11.375 6.312,12.688Q7.625,14 9.5,14Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_select_all.xml b/app/src/main/res/drawable/ic_select_all.xml
deleted file mode 100644
index 28347abcf..000000000
--- a/app/src/main/res/drawable/ic_select_all.xml
+++ /dev/null
@@ -1 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/white"
      android:pathData="M3,5Q3,4.175 3.587,3.587Q4.175,3 5,3V5ZM3,13V11H5V13ZM7,21V19H9V21ZM3,9V7H5V9ZM11,5V3H13V5ZM19,5V3Q19.825,3 20.413,3.587Q21,4.175 21,5ZM5,21Q4.175,21 3.587,20.413Q3,19.825 3,19H5ZM3,17V15H5V17ZM7,5V3H9V5ZM11,21V19H13V21ZM19,13V11H21V13ZM19,21V19H21Q21,19.825 20.413,20.413Q19.825,21 19,21ZM19,9V7H21V9ZM19,17V15H21V17ZM15,21V19H17V21ZM15,5V3H17V5ZM8,17Q7.575,17 7.287,16.712Q7,16.425 7,16V8Q7,7.575 7.287,7.287Q7.575,7 8,7H16Q16.425,7 16.712,7.287Q17,7.575 17,8V16Q17,16.425 16.712,16.712Q16.425,17 16,17ZM9,15H15V9H9Z"/>
</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_select_all_white_24dp.xml b/app/src/main/res/drawable/ic_select_all_white_24dp.xml
new file mode 100644
index 000000000..a7029a97f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_select_all_white_24dp.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24.0"
    android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFF"
        android:pathData="M3,5h2L5,3c-1.1,0 -2,0.9 -2,2zM3,13h2v-2L3,11v2zM7,21h2v-2L7,19v2zM3,9h2L5,7L3,7v2zM13,3h-2v2h2L13,3zM19,3v2h2c0,-1.1 -0.9,-2 -2,-2zM5,21v-2L3,19c0,1.1 0.9,2 2,2zM3,17h2v-2L3,15v2zM9,3L7,3v2h2L9,3zM11,21h2v-2h-2v2zM19,13h2v-2h-2v2zM19,21c1.1,0 2,-0.9 2,-2h-2v2zM19,9h2L21,7h-2v2zM19,17h2v-2h-2v2zM15,21h2v-2h-2v2zM15,5h2L17,3h-2v2zM7,17h10L17,7L7,7v10zM9,9h6v6L9,15L9,9z" />
</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_send.xml b/app/src/main/res/drawable/ic_send.xml
deleted file mode 100644
index ed8a26465..000000000
--- a/app/src/main/res/drawable/ic_send.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4.4,19.425Q3.9,19.625 3.45,19.337Q3,19.05 3,18.5V14.775Q3,14.425 3.2,14.15Q3.4,13.875 3.75,13.8L11,12L3.75,10.2Q3.4,10.125 3.2,9.85Q3,9.575 3,9.225V5.5Q3,4.95 3.45,4.662Q3.9,4.375 4.4,4.575L19.8,11.075Q20.425,11.35 20.425,12Q20.425,12.65 19.8,12.925Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_white_24dp.xml
new file mode 100644
index 000000000..243cb7e69
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
deleted file mode 100644
index 43c1ad20c..000000000
--- a/app/src/main/res/drawable/ic_settings.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13.875,22H10.125Q9.75,22 9.475,21.75Q9.2,21.5 9.15,21.125L8.85,18.8Q8.525,18.675 8.238,18.5Q7.95,18.325 7.675,18.125L5.5,19.025Q5.15,19.15 4.8,19.05Q4.45,18.95 4.25,18.625L2.4,15.4Q2.2,15.075 2.275,14.7Q2.35,14.325 2.65,14.1L4.525,12.675Q4.5,12.5 4.5,12.337Q4.5,12.175 4.5,12Q4.5,11.825 4.5,11.662Q4.5,11.5 4.525,11.325L2.65,9.9Q2.35,9.675 2.275,9.3Q2.2,8.925 2.4,8.6L4.25,5.375Q4.425,5.025 4.787,4.937Q5.15,4.85 5.5,4.975L7.675,5.875Q7.95,5.675 8.25,5.5Q8.55,5.325 8.85,5.2L9.15,2.875Q9.2,2.5 9.475,2.25Q9.75,2 10.125,2H13.875Q14.25,2 14.525,2.25Q14.8,2.5 14.85,2.875L15.15,5.2Q15.475,5.325 15.763,5.5Q16.05,5.675 16.325,5.875L18.5,4.975Q18.85,4.85 19.2,4.95Q19.55,5.05 19.75,5.375L21.6,8.6Q21.8,8.925 21.725,9.3Q21.65,9.675 21.35,9.9L19.475,11.325Q19.5,11.5 19.5,11.662Q19.5,11.825 19.5,12Q19.5,12.175 19.5,12.337Q19.5,12.5 19.45,12.675L21.325,14.1Q21.625,14.325 21.7,14.7Q21.775,15.075 21.575,15.4L19.725,18.6Q19.525,18.925 19.163,19.038Q18.8,19.15 18.45,19.025L16.325,18.125Q16.05,18.325 15.75,18.5Q15.45,18.675 15.15,18.8L14.85,21.125Q14.8,21.5 14.525,21.75Q14.25,22 13.875,22ZM12.05,15.5Q13.5,15.5 14.525,14.475Q15.55,13.45 15.55,12Q15.55,10.55 14.525,9.525Q13.5,8.5 12.05,8.5Q10.575,8.5 9.562,9.525Q8.55,10.55 8.55,12Q8.55,13.45 9.562,14.475Q10.575,15.5 12.05,15.5ZM12.05,13.5Q11.425,13.5 10.988,13.062Q10.55,12.625 10.55,12Q10.55,11.375 10.988,10.938Q11.425,10.5 12.05,10.5Q12.675,10.5 13.113,10.938Q13.55,11.375 13.55,12Q13.55,12.625 13.113,13.062Q12.675,13.5 12.05,13.5ZM12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12Q12,12 12,12ZM11,20H12.975L13.325,17.35Q14.1,17.15 14.763,16.762Q15.425,16.375 15.975,15.825L18.45,16.85L19.425,15.15L17.275,13.525Q17.4,13.175 17.45,12.787Q17.5,12.4 17.5,12Q17.5,11.6 17.45,11.212Q17.4,10.825 17.275,10.475L19.425,8.85L18.45,7.15L15.975,8.2Q15.425,7.625 14.763,7.237Q14.1,6.85 13.325,6.65L13,4H11.025L10.675,6.65Q9.9,6.85 9.238,7.237Q8.575,7.625 8.025,8.175L5.55,7.15L4.575,8.85L6.725,10.45Q6.6,10.825 6.55,11.2Q6.5,11.575 6.5,12Q6.5,12.4 6.55,12.775Q6.6,13.15 6.725,13.525L4.575,15.15L5.55,16.85L8.025,15.8Q8.575,16.375 9.238,16.762Q9.9,17.15 10.675,17.35Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_brightness.xml b/app/src/main/res/drawable/ic_settings_brightness.xml
deleted file mode 100644
index 03567d15a..000000000
--- a/app/src/main/res/drawable/ic_settings_brightness.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10.5,16 L11.3,16.8Q11.6,17.1 12,17.1Q12.4,17.1 12.7,16.8L13.5,16H15Q15.425,16 15.713,15.712Q16,15.425 16,15V13.5L16.8,12.7Q17.1,12.4 17.1,12Q17.1,11.6 16.8,11.3L16,10.5V9Q16,8.575 15.713,8.287Q15.425,8 15,8H13.5L12.7,7.2Q12.4,6.9 12,6.9Q11.6,6.9 11.3,7.2L10.5,8H9Q8.575,8 8.288,8.287Q8,8.575 8,9V10.5L7.2,11.3Q6.9,11.6 6.9,12Q6.9,12.4 7.2,12.7L8,13.5V15Q8,15.425 8.288,15.712Q8.575,16 9,16ZM12,15V9Q13.25,9 14.125,9.875Q15,10.75 15,12Q15,13.25 14.125,14.125Q13.25,15 12,15ZM4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18Q4,18 4,18Q4,18 4,18V6Q4,6 4,6Q4,6 4,6Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18ZM4,18H20Q20,18 20,18Q20,18 20,18V6Q20,6 20,6Q20,6 20,6H4Q4,6 4,6Q4,6 4,6V18Q4,18 4,18Q4,18 4,18Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml b/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml
new file mode 100644
index 000000000..013be8c32
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="M21 3H3c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h18c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm0 16.01H3V4.99h18v14.02zM8 16h2.5l1.5 1.5 1.5-1.5H16v-2.5l1.5-1.5-1.5-1.5V8h-2.5L12 6.5 10.5 8H8v2.5L6.5 12 8 13.5V16zm4-7c1.66 0 3 1.34 3 3s-1.34 3-3 3V9z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_white_24dp.xml b/app/src/main/res/drawable/ic_settings_white_24dp.xml
new file mode 100644
index 000000000..da3e202a3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_white_24dp.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M13.85 22.25h-3.7c-0.74 0-1.36-0.54-1.45-1.27l-0.27-1.89c-0.27-0.14-0.53-0.29-0.79-0.46l-1.8 0.72 c-0.7 0.26 -1.47-0.03-1.81-0.65L2.2 15.53c-0.35-0.66-0.2-1.44 0.36 -1.88l1.53-1.19c-0.01-0.15-0.02-0.3-0.02-0.46 0-0.15 0.01 -0.31 0.02 -0.46l-1.52-1.19c-0.59-0.45-0.74-1.26-0.37-1.88l1.85-3.19c0.34-0.62 1.11-0.9 1.79-0.63l1.81 0.73 c0.26-0.17 0.52 -0.32 0.78 -0.46l0.27-1.91c0.09-0.7 0.71 -1.25 1.44-1.25h3.7c0.74 0 1.36 0.54 1.45 1.27l0.27 1.89c0.27 0.14 0.53 0.29 0.79 0.46 l1.8-0.72c0.71-0.26 1.48 0.03 1.82 0.65 l1.84 3.18c0.36 0.66 0.2 1.44-0.36 1.88l-1.52 1.19c0.01 0.15 0.02 0.3 0.02 0.46 s-0.01 0.31 -0.02 0.46 l1.52 1.19c0.56 0.45 0.72 1.23 0.37 1.86l-1.86 3.22c-0.34 0.62 -1.11 0.9 -1.8 0.63 l-1.8-0.72c-0.26 0.17 -0.52 0.32 -0.78 0.46 l-0.27 1.91c-0.1 0.68 -0.72 1.22-1.46 1.22zm-3.23-2h2.76l0.37-2.55 0.53 -0.22c0.44-0.18 0.88 -0.44 1.34-0.78l0.45-0.34 2.38 0.96 1.38-2.4-2.03-1.58 0.07 -0.56c0.03-0.26 0.06 -0.51 0.06 -0.78s-0.03-0.53-0.06-0.78l-0.07-0.56 2.03-1.58-1.39-2.4-2.39 0.96 -0.45-0.35c-0.42-0.32-0.87-0.58-1.33-0.77l-0.52-0.22-0.37-2.55h-2.76l-0.37 2.55-0.53 0.21 c-0.44 0.19 -0.88 0.44 -1.34 0.79 l-0.45 0.33 -2.38-0.95-1.39 2.39 2.03 1.58-0.07 0.56 a7 7 0 0 0-0.06 0.79 c0 0.26 0.02 0.53 0.06 0.78l0.07 0.56 -2.03 1.58 1.38 2.4 2.39-0.96 0.45 0.35c0.43 0.33 0.86 0.58 1.33 0.77 l0.53 0.22 0.38 2.55z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 12 8.5 C 13.9329966244 8.5 15.5 10.0670033756 15.5 12 C 15.5 13.9329966244 13.9329966244 15.5 12 15.5 C 10.0670033756 15.5 8.5 13.9329966244 8.5 12 C 8.5 10.0670033756 10.0670033756 8.5 12 8.5 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
deleted file mode 100644
index a7404b279..000000000
--- a/app/src/main/res/drawable/ic_share.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,22Q16.75,22 15.875,21.125Q15,20.25 15,19Q15,18.825 15.025,18.637Q15.05,18.45 15.1,18.3L8.05,14.2Q7.625,14.575 7.1,14.787Q6.575,15 6,15Q4.75,15 3.875,14.125Q3,13.25 3,12Q3,10.75 3.875,9.875Q4.75,9 6,9Q6.575,9 7.1,9.212Q7.625,9.425 8.05,9.8L15.1,5.7Q15.05,5.55 15.025,5.363Q15,5.175 15,5Q15,3.75 15.875,2.875Q16.75,2 18,2Q19.25,2 20.125,2.875Q21,3.75 21,5Q21,6.25 20.125,7.125Q19.25,8 18,8Q17.425,8 16.9,7.787Q16.375,7.575 15.95,7.2L8.9,11.3Q8.95,11.45 8.975,11.637Q9,11.825 9,12Q9,12.175 8.975,12.362Q8.95,12.55 8.9,12.7L15.95,16.8Q16.375,16.425 16.9,16.212Q17.425,16 18,16Q19.25,16 20.125,16.875Q21,17.75 21,19Q21,20.25 20.125,21.125Q19.25,22 18,22Z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml
new file mode 100644
index 000000000..1446f1dfa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M18 16.08c-0.76 0-1.44 0.3 -1.96 0.77 L8.91 12.7c0.05-0.23 0.09 -0.46 0.09 -0.7s-0.04-0.47-0.09-0.7l7.05-4.11c0.54 0.5 1.25 0.81 2.04 0.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.47 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.12 4.16c-0.05 0.21 -0.08 0.43 -0.08 0.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92c0-1.61-1.31-2.92-2.92-2.92zM18 4c0.55 0 1 0.45 1 1s-0.45 1-1 1-1-0.45-1-1 0.45-1 1-1zM6 13c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1zm12 7.02c-0.55 0-1-0.45-1-1s0.45-1 1-1 1 0.45 1 1-0.45 1-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_shuffle.xml b/app/src/main/res/drawable/ic_shuffle.xml
deleted file mode 100644
index 35a4fd033..000000000
--- a/app/src/main/res/drawable/ic_shuffle.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9.175,10.575 L4.7,6.1Q4.425,5.825 4.425,5.4Q4.425,4.975 4.7,4.7Q4.975,4.425 5.4,4.425Q5.825,4.425 6.1,4.7L10.575,9.175ZM15,20Q14.575,20 14.288,19.712Q14,19.425 14,19Q14,18.575 14.288,18.288Q14.575,18 15,18H16.6L13.4,14.8L14.825,13.375L18,16.55V15Q18,14.575 18.288,14.287Q18.575,14 19,14Q19.425,14 19.712,14.287Q20,14.575 20,15V19Q20,19.425 19.712,19.712Q19.425,20 19,20ZM4.7,19.3Q4.425,19.025 4.425,18.6Q4.425,18.175 4.7,17.9L16.6,6H15Q14.575,6 14.288,5.713Q14,5.425 14,5Q14,4.575 14.288,4.287Q14.575,4 15,4H19Q19.425,4 19.712,4.287Q20,4.575 20,5V9Q20,9.425 19.712,9.712Q19.425,10 19,10Q18.575,10 18.288,9.712Q18,9.425 18,9V7.4L6.1,19.3Q5.825,19.575 5.4,19.575Q4.975,19.575 4.7,19.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
new file mode 100644
index 000000000..e56b2e366
--- /dev/null
+++ b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M10.59 9.17L5.41 4 4 5.41l5.17 5.17 1.42-1.41zM14.5 4l2.04 2.04L4 18.59 5.41 20 17.96 7.46 20 9.5V4h-5.5zm0.33 9.41l-1.41 1.41 3.13 3.13L14.5 20H20v-5.5l-2.04 2.04-3.13-3.13z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next.xml b/app/src/main/res/drawable/ic_skip_next.xml
deleted file mode 100644
index 1d850e6eb..000000000
--- a/app/src/main/res/drawable/ic_skip_next.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/icon_notification_dimen"
-    android:height="@dimen/icon_notification_dimen"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.5,18Q17.075,18 16.788,17.712Q16.5,17.425 16.5,17V7Q16.5,6.575 16.788,6.287Q17.075,6 17.5,6Q17.925,6 18.212,6.287Q18.5,6.575 18.5,7V17Q18.5,17.425 18.212,17.712Q17.925,18 17.5,18ZM7.05,16.975Q6.55,17.325 6.025,17.025Q5.5,16.725 5.5,16.125V7.875Q5.5,7.275 6.025,6.987Q6.55,6.7 7.05,7.025L13.25,11.175Q13.7,11.475 13.7,12Q13.7,12.525 13.25,12.825Z"/>
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next_outline.xml b/app/src/main/res/drawable/ic_skip_next_outline.xml
deleted file mode 100644
index 13c191470..000000000
--- a/app/src/main/res/drawable/ic_skip_next_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12ZM7.5,12ZM7.5,14.25 L10.9,12 7.5,9.75Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml
new file mode 100644
index 000000000..94f5a32ee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7.58 16.89l5.77-4.07c0.56-0.4 0.56 -1.24 0-1.63L7.58 7.11C6.91 6.65 6 7.12 6 7.93v8.14c0 0.81 0.91 1.28 1.58 0.82 zM16 7v10c0 0.55 0.45 1 1 1s1-0.45 1-1V7c0-0.55-0.45-1-1-1s-1 0.45-1 1z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_next_sharp.xml b/app/src/main/res/drawable/ic_skip_next_sharp.xml
deleted file mode 100644
index 2bae0aaaf..000000000
--- a/app/src/main/res/drawable/ic_skip_next_sharp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M16.5,18V6H18.5V18ZM5.5,18V6L14.5,12Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_skip_next_white_24dp.xml b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
new file mode 100644
index 000000000..97ac01fd1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_next_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 18l8.5-6L6 6v12zm2-8.14L11.03 12 8 14.14V9.86zM16 6h2v12h-2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_previous.xml b/app/src/main/res/drawable/ic_skip_previous.xml
deleted file mode 100644
index 4178e0bd5..000000000
--- a/app/src/main/res/drawable/ic_skip_previous.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="@dimen/icon_notification_dimen"
-    android:height="@dimen/icon_notification_dimen"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6.5,18Q6.075,18 5.787,17.712Q5.5,17.425 5.5,17V7Q5.5,6.575 5.787,6.287Q6.075,6 6.5,6Q6.925,6 7.213,6.287Q7.5,6.575 7.5,7V17Q7.5,17.425 7.213,17.712Q6.925,18 6.5,18ZM16.95,16.975 L10.75,12.825Q10.3,12.525 10.3,12Q10.3,11.475 10.75,11.175L16.95,7.025Q17.45,6.7 17.975,6.987Q18.5,7.275 18.5,7.875V16.125Q18.5,16.725 17.975,17.025Q17.45,17.325 16.95,16.975Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_outline.xml b/app/src/main/res/drawable/ic_skip_previous_outline.xml
deleted file mode 100644
index 56b487065..000000000
--- a/app/src/main/res/drawable/ic_skip_previous_outline.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6ZM16.5,12ZM16.5,14.25V9.75L13.1,12Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml b/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml
new file mode 100644
index 000000000..76861cee6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_round_white_32dp.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M7 6c0.55 0 1 0.45 1 1v10c0 0.55-0.45 1-1 1s-1-0.45-1-1V7c0-0.55 0.45 -1 1-1zm3.66 6.82l5.77 4.07c0.66 0.47 1.58-0.01 1.58-0.82V7.93c0-0.81-0.91-1.28-1.58-0.82l-5.77 4.07c-0.57 0.4 -0.57 1.24 0 1.64z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_skip_previous_sharp.xml b/app/src/main/res/drawable/ic_skip_previous_sharp.xml
deleted file mode 100644
index 9de2a4131..000000000
--- a/app/src/main/res/drawable/ic_skip_previous_sharp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M5.5,18V6H7.5V18ZM18.5,18 L9.5,12 18.5,6Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
new file mode 100644
index 000000000..0387843d2
--- /dev/null
+++ b/app/src/main/res/drawable/ic_skip_previous_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="@dimen/icon_notification_dimen"
+    android:height="@dimen/icon_notification_dimen"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
+
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M6 6h2v12H6zm3.5 6l8.5 6V6l-8.5 6zm6.5 2.14L12.97 12 16 9.86v4.28z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_sleep_timer.xml b/app/src/main/res/drawable/ic_sleep_timer.xml
deleted file mode 100644
index be7095163..000000000
--- a/app/src/main/res/drawable/ic_sleep_timer.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,20Q13.35,20 14.613,19.562Q15.875,19.125 16.925,18.3Q15.475,17.775 13.863,16.612Q12.25,15.45 11.025,13.7Q9.8,11.95 9.238,9.637Q8.675,7.325 9.275,4.5Q6.95,5.325 5.475,7.362Q4,9.4 4,12Q4,15.325 6.338,17.663Q8.675,20 12,20ZM12,22Q9.925,22 8.1,21.212Q6.275,20.425 4.925,19.075Q3.575,17.725 2.788,15.9Q2,14.075 2,12Q2,8.325 4.312,5.525Q6.625,2.725 10.5,2.125Q11.225,2 11.538,2.462Q11.85,2.925 11.575,3.675Q10.825,5.775 11.05,7.912Q11.275,10.05 12.275,11.85Q13.275,13.65 14.963,14.962Q16.65,16.275 18.825,16.75Q19.625,16.925 19.837,17.425Q20.05,17.925 19.575,18.475Q18.2,20.1 16.238,21.05Q14.275,22 12,22ZM10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Q10.475,12.25 10.475,12.25Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_sort.xml b/app/src/main/res/drawable/ic_sort.xml
deleted file mode 100644
index 0408aeeac..000000000
--- a/app/src/main/res/drawable/ic_sort.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8,18H4Q3.575,18 3.288,17.712Q3,17.425 3,17Q3,16.575 3.288,16.288Q3.575,16 4,16H8Q8.425,16 8.713,16.288Q9,16.575 9,17Q9,17.425 8.713,17.712Q8.425,18 8,18ZM20,8H4Q3.575,8 3.288,7.713Q3,7.425 3,7Q3,6.575 3.288,6.287Q3.575,6 4,6H20Q20.425,6 20.712,6.287Q21,6.575 21,7Q21,7.425 20.712,7.713Q20.425,8 20,8ZM14,13H4Q3.575,13 3.288,12.712Q3,12.425 3,12Q3,11.575 3.288,11.287Q3.575,11 4,11H14Q14.425,11 14.713,11.287Q15,11.575 15,12Q15,12.425 14.713,12.712Q14.425,13 14,13Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable/ic_sort_white_24dp.xml
new file mode 100644
index 000000000..148d60f40
--- /dev/null
+++ b/app/src/main/res/drawable/ic_sort_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 18h6v-2H3v2zM3 6v2h18V6H3zm0 7h12v-2H3v2z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_star.xml b/app/src/main/res/drawable/ic_star.xml
deleted file mode 100644
index 8cc89371f..000000000
--- a/app/src/main/res/drawable/ic_star.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8.3,20.125Q7.725,20.575 7.125,20.15Q6.525,19.725 6.725,19.025L8.15,14.4L4.525,11.825Q3.925,11.4 4.163,10.7Q4.4,10 5.125,10H9.6L11.05,5.2Q11.175,4.85 11.438,4.662Q11.7,4.475 12,4.475Q12.3,4.475 12.562,4.662Q12.825,4.85 12.95,5.2L14.4,10H18.875Q19.6,10 19.838,10.7Q20.075,11.4 19.475,11.825L15.85,14.4L17.275,19.025Q17.475,19.725 16.875,20.15Q16.275,20.575 15.7,20.125L12,17.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml
similarity index 78%
rename from app/src/main/res/drawable/ic_dashboard.xml
rename to app/src/main/res/drawable/ic_star_white_24dp.xml
index b5f02aa63..f8cbc6aa6 100644
--- a/app/src/main/res/drawable/ic_dashboard.xml
+++ b/app/src/main/res/drawable/ic_star_white_24dp.xml
@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -15,10 +15,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M12,17.27L18.18,21l-1.64,-7.03L22,9.24l-7.19,-0.61L12,2 9.19,8.63 2,9.24l5.46,4.73L5.82,21z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_storage.xml b/app/src/main/res/drawable/ic_storage.xml
deleted file mode 100644
index 1633e252e..000000000
--- a/app/src/main/res/drawable/ic_storage.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18Q2,17.175 2.588,16.587Q3.175,16 4,16H20Q20.825,16 21.413,16.587Q22,17.175 22,18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM5,19H7V17H5ZM4,8Q3.175,8 2.588,7.412Q2,6.825 2,6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6Q22,6.825 21.413,7.412Q20.825,8 20,8ZM5,7H7V5H5ZM4,14Q3.175,14 2.588,13.412Q2,12.825 2,12Q2,11.175 2.588,10.587Q3.175,10 4,10H20Q20.825,10 21.413,10.587Q22,11.175 22,12Q22,12.825 21.413,13.412Q20.825,14 20,14ZM5,13H7V11H5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml
new file mode 100644
index 000000000..93f951c6b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="512.0"
+    android:viewportWidth="512.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M416,64h-32V32c0,-17.6 -14.4,-32 -32,-32H160c-17.6,0 -32,14.4 -32,32v32H96c-17.6,0 -32,14.4 -32,32v32c0,17.6 14.4,32 32,32h2l46.1,338.1C145.2,506.1 152,512 160,512h192c8,0 14.8,-5.9 15.9,-13.9L414,160H416c17.6,0 32,-14.4 32,-32V96C448,78.4 433.6,64 416,64zM160,32h192v32H160V32zM338,480H174l-8.7,-64h181.5L338,480zM351.1,384H160.9l-17.4,-128h225.2L351.1,384zM372.9,224H139.1l-8.7,-64h251.3L372.9,224zM416,128H96V96h320V128z" />
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M256,272c-26.5,0 -48,21.5 -48,48s21.5,48 48,48s48,-21.5 48,-48S282.5,272 256,272zM256,336c-8.8,0 -16,-7.2 -16,-16c0,-8.8 7.2,-16 16,-16c8.8,0 16,7.2 16,16C272,328.8 264.8,336 256,336z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_take_away_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_white_24dp.xml
new file mode 100644
index 000000000..efe7c722b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_take_away_white_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="512.0"
+    android:viewportWidth="512.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M416,96h-16h-73.8l21.3,-64H416c8.8,0 16,-7.2 16,-16c0,-8.8 -7.2,-16 -16,-16h-80c-6.9,0 -13,4.4 -15.2,10.9L292.5,96H112H96c-17.6,0 -32,14.4 -32,32v32c0,17.6 14.4,32 32,32h1.5l30.6,305.6c0.8,8.2 7.7,14.4 15.9,14.4h224c8.2,0 15.1,-6.2 15.9,-14.4l30.6,-305.6H416c17.6,0 32,-14.4 32,-32v-32C448,110.4 433.6,96 416,96zM353.5,480H158.5l-14,-139.7l217.4,55.8L353.5,480zM365.1,363.9l-224,-57.5l-2.9,-29.5l230.1,55.5L365.1,363.9zM371.5,300.2l-236.7,-57.1L129.7,192h252.6L371.5,300.2zM416,160H96v-32h16h288h16V160z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_telegram_white.xml b/app/src/main/res/drawable/ic_telegram_white.xml
index 510f3c12b..c20227ea6 100644
--- a/app/src/main/res/drawable/ic_telegram_white.xml
+++ b/app/src/main/res/drawable/ic_telegram_white.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M9.78,18.65L10.06,14.42L17.74,7.5C18.08,7.19 17.67,7.04 17.22,7.31L7.74,13.3L3.64,12C2.76,11.75 2.75,11.14 3.84,10.7L19.81,4.54C20.54,4.21 21.24,4.72 20.96,5.84L18.24,18.65C18.05,19.56 17.5,19.78 16.74,19.36L12.6,16.3L10.61,18.23C10.38,18.46 10.19,18.65 9.78,18.65Z" />
+        android:pathData="M9.78,18.65L10.06,14.42L17.74,7.5C18.08,7.19 17.67,7.04 17.22,7.31L7.74,13.3L3.64,12C2.76,11.75 2.75,11.14 3.84,10.7L19.81,4.54C20.54,4.21 21.24,4.72 20.96,5.84L18.24,18.65C18.05,19.56 17.5,19.78 16.74,19.36L12.6,16.3L10.61,18.23C10.38,18.46 10.19,18.65 9.78,18.65Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_testing.xml b/app/src/main/res/drawable/ic_testing.xml
deleted file mode 100644
index c95029ded..000000000
--- a/app/src/main/res/drawable/ic_testing.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8.275,11Q7.7,11 7.4,10.488Q7.1,9.975 7.425,9.475L11.15,3.4Q11.45,2.925 12,2.925Q12.55,2.925 12.85,3.4L16.575,9.475Q16.9,9.975 16.6,10.488Q16.3,11 15.725,11ZM17.5,22Q15.625,22 14.312,20.688Q13,19.375 13,17.5Q13,15.625 14.312,14.312Q15.625,13 17.5,13Q19.375,13 20.688,14.312Q22,15.625 22,17.5Q22,19.375 20.688,20.688Q19.375,22 17.5,22ZM4,21.5Q3.575,21.5 3.288,21.212Q3,20.925 3,20.5V14.5Q3,14.075 3.288,13.787Q3.575,13.5 4,13.5H10Q10.425,13.5 10.713,13.787Q11,14.075 11,14.5V20.5Q11,20.925 10.713,21.212Q10.425,21.5 10,21.5ZM17.5,20Q18.55,20 19.275,19.275Q20,18.55 20,17.5Q20,16.45 19.275,15.725Q18.55,15 17.5,15Q16.45,15 15.725,15.725Q15,16.45 15,17.5Q15,18.55 15.725,19.275Q16.45,20 17.5,20ZM5,19.5H9V15.5H5ZM10.05,9H13.95L12,5.85ZM12,9ZM9,15.5ZM17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Q17.5,17.5 17.5,17.5Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_testing_white_24dp.xml b/app/src/main/res/drawable/ic_testing_white_24dp.xml
new file mode 100644
index 000000000..f5fb6f647
--- /dev/null
+++ b/app/src/main/res/drawable/ic_testing_white_24dp.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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 2l-5.5 9h11L12 2zm0 3.84L13.93 9h-3.87L12 5.84zM17.5 13c-2.49 0-4.5 2.01-4.5 4.5s2.01 4.5 4.5 4.5 4.5-2.01 4.5-4.5-2.01-4.5-4.5-4.5zm0 7c-1.38 0-2.5-1.12-2.5-2.5s1.12-2.5 2.5-2.5 2.5 1.12 2.5 2.5-1.12 2.5-2.5 2.5zM3 21.5h8v-8H3v8zm2-6h4v4H5v-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml b/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml
new file mode 100644
index 000000000..c8b923330
--- /dev/null
+++ b/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 22C6.49 22 2 17.51 2 12S6.49 2 12 2s10 4.04 10 9c0 3.31-2.69 6-6 6h-1.77c-0.28 0-0.5 0.22 -0.5 0.5 0 0.12 0.05 0.23 0.13 0.33 0.41 0.47 0.64 1.06 0.64 1.67 0 1.38-1.12 2.5-2.5 2.5zm0-18c-4.41 0-8 3.59-8 8s3.59 8 8 8c0.28 0 0.5-0.22 0.5 -0.5 0-0.16-0.08-0.28-0.14-0.35-0.41-0.46-0.63-1.05-0.63-1.65 0-1.38 1.12-2.5 2.5-2.5H16c2.21 0 4-1.79 4-4 0-3.86-3.59-7-8-7z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 6.5 10 C 7.32842712475 10 8 10.6715728753 8 11.5 C 8 12.3284271247 7.32842712475 13 6.5 13 C 5.67157287525 13 5 12.3284271247 5 11.5 C 5 10.6715728753 5.67157287525 10 6.5 10 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 9.5 6 C 10.3284271247 6 11 6.67157287525 11 7.5 C 11 8.32842712475 10.3284271247 9 9.5 9 C 8.67157287525 9 8 8.32842712475 8 7.5 C 8 6.67157287525 8.67157287525 6 9.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 14.5 6 C 15.3284271247 6 16 6.67157287525 16 7.5 C 16 8.32842712475 15.3284271247 9 14.5 9 C 13.6715728753 9 13 8.32842712475 13 7.5 C 13 6.67157287525 13.6715728753 6 14.5 6 Z" />
+    <path
+        android:fillColor="@color/md_white_1000"
+        android:pathData="M 17.5 10 C 18.3284271247 10 19 10.6715728753 19 11.5 C 19 12.3284271247 18.3284271247 13 17.5 13 C 16.6715728753 13 16 12.3284271247 16 11.5 C 16 10.6715728753 16.6715728753 10 17.5 10 Z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_trending_up.xml b/app/src/main/res/drawable/ic_trending_up.xml
deleted file mode 100644
index e384a28b9..000000000
--- a/app/src/main/res/drawable/ic_trending_up.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M2.7,17.3Q2.425,17.025 2.425,16.612Q2.425,16.2 2.7,15.9L8.7,9.85Q8.85,9.725 9.025,9.65Q9.2,9.575 9.4,9.575Q9.6,9.575 9.788,9.65Q9.975,9.725 10.1,9.85L13.4,13.15L18.6,8H17Q16.575,8 16.288,7.713Q16,7.425 16,7Q16,6.575 16.288,6.287Q16.575,6 17,6H21Q21.425,6 21.712,6.287Q22,6.575 22,7V11Q22,11.425 21.712,11.712Q21.425,12 21,12Q20.575,12 20.288,11.712Q20,11.425 20,11V9.4L14.1,15.3Q13.95,15.45 13.775,15.512Q13.6,15.575 13.4,15.575Q13.2,15.575 13.025,15.512Q12.85,15.45 12.7,15.3L9.4,12L4.075,17.325Q3.8,17.6 3.4,17.6Q3,17.6 2.7,17.3Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
new file mode 100644
index 000000000..abf201b92
--- /dev/null
+++ b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M16 6l2.29 2.29-4.88 4.88-4-4L2 16.59 3.41 18l6-6 4 4 6.3-6.29L22 12V6h-6z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_twitter.xml b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
similarity index 82%
rename from app/src/main/res/drawable/ic_twitter.xml
rename to app/src/main/res/drawable/ic_twitter_white_24dp.xml
index 0698845fe..3ecff0ea8 100755
--- a/app/src/main/res/drawable/ic_twitter.xml
+++ b/app/src/main/res/drawable/ic_twitter_white_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
     <path
         android:fillColor="@android:color/white"
-        android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z" />
+        android:pathData="M22.46,6C21.69,6.35 20.86,6.58 20,6.69C20.88,6.16 21.56,5.32 21.88,4.31C21.05,4.81 20.13,5.16 19.16,5.36C18.37,4.5 17.26,4 16,4C13.65,4 11.73,5.92 11.73,8.29C11.73,8.63 11.77,8.96 11.84,9.27C8.28,9.09 5.11,7.38 3,4.79C2.63,5.42 2.42,6.16 2.42,6.94C2.42,8.43 3.17,9.75 4.33,10.5C3.62,10.5 2.96,10.3 2.38,10C2.38,10 2.38,10 2.38,10.03C2.38,12.11 3.86,13.85 5.82,14.24C5.46,14.34 5.08,14.39 4.69,14.39C4.42,14.39 4.15,14.36 3.89,14.31C4.43,16 6,17.26 7.89,17.29C6.43,18.45 4.58,19.13 2.56,19.13C2.22,19.13 1.88,19.11 1.54,19.07C3.44,20.29 5.7,21 8.12,21C16,21 20.33,14.46 20.33,8.79C20.33,8.6 20.33,8.42 20.32,8.23C21.16,7.63 21.88,6.87 22.46,6Z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml b/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml
new file mode 100644
index 000000000..1e936ba02
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 5.83L15.17 9l1.41-1.41L12 3 7.41 7.59 8.83 9 12 5.83zm0 12.34L8.83 15l-1.41 1.41L12 21l4.59-4.59L15.17 15 12 18.17z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_view_carousel.xml b/app/src/main/res/drawable/ic_view_carousel.xml
deleted file mode 100644
index 2eb0d411f..000000000
--- a/app/src/main/res/drawable/ic_view_carousel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,17Q2.575,17 2.288,16.712Q2,16.425 2,16V8Q2,7.575 2.288,7.287Q2.575,7 3,7H5Q5.425,7 5.713,7.287Q6,7.575 6,8V16Q6,16.425 5.713,16.712Q5.425,17 5,17ZM8,19Q7.575,19 7.287,18.712Q7,18.425 7,18V6Q7,5.575 7.287,5.287Q7.575,5 8,5H16Q16.425,5 16.712,5.287Q17,5.575 17,6V18Q17,18.425 16.712,18.712Q16.425,19 16,19ZM19,17Q18.575,17 18.288,16.712Q18,16.425 18,16V8Q18,7.575 18.288,7.287Q18.575,7 19,7H21Q21.425,7 21.712,7.287Q22,7.575 22,8V16Q22,16.425 21.712,16.712Q21.425,17 21,17Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml b/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml
new file mode 100644
index 000000000..18a044207
--- /dev/null
+++ b/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M2 6h4v11H2zm5 13h10V4H7v15zM9 6h6v11H9V6zm9 0h4v11h-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_down.xml b/app/src/main/res/drawable/ic_volume_down.xml
deleted file mode 100644
index 668e16491..000000000
--- a/app/src/main/res/drawable/ic_volume_down.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,15Q5.575,15 5.287,14.712Q5,14.425 5,14V10Q5,9.575 5.287,9.287Q5.575,9 6,9H9L12.3,5.7Q12.775,5.225 13.387,5.487Q14,5.75 14,6.425V17.575Q14,18.25 13.387,18.512Q12.775,18.775 12.3,18.3L9,15ZM16,16V7.95Q17.125,8.475 17.812,9.575Q18.5,10.675 18.5,12Q18.5,13.325 17.812,14.4Q17.125,15.475 16,16Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down_white_24dp.xml
new file mode 100644
index 000000000..992a363e9
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_down_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M16 7.97v8.05c1.48-0.73 2.5-2.25 2.5-4.02 0-1.77-1.02-3.29-2.5-4.03zM5 9v6h4l5 5V4L9 9H5zm7-0.17v6.34L9.83 13H7v-2h2.83L12 8.83z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_off.xml b/app/src/main/res/drawable/ic_volume_off.xml
deleted file mode 100644
index de83f4243..000000000
--- a/app/src/main/res/drawable/ic_volume_off.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19.1,21.9 L16.775,19.575Q16.425,19.775 16.075,19.962Q15.725,20.15 15.35,20.3Q14.85,20.5 14.425,20.175Q14,19.85 14,19.275Q14,19 14.163,18.788Q14.325,18.575 14.575,18.475Q14.775,18.4 14.963,18.312Q15.15,18.225 15.325,18.125L12,14.8V17.575Q12,18.25 11.387,18.512Q10.775,18.775 10.3,18.3L7,15H4Q3.575,15 3.288,14.712Q3,14.425 3,14V10Q3,9.575 3.288,9.287Q3.575,9 4,9H6.2L2.1,4.9Q1.825,4.625 1.825,4.2Q1.825,3.775 2.1,3.5Q2.375,3.225 2.8,3.225Q3.225,3.225 3.5,3.5L20.5,20.5Q20.775,20.775 20.775,21.2Q20.775,21.625 20.5,21.9Q20.225,22.175 19.8,22.175Q19.375,22.175 19.1,21.9ZM15.35,3.65Q17.9,4.675 19.45,6.925Q21,9.175 21,11.975Q21,13.3 20.638,14.525Q20.275,15.75 19.6,16.8L18.15,15.35Q18.575,14.575 18.788,13.725Q19,12.875 19,11.975Q19,9.775 17.788,8.025Q16.575,6.275 14.575,5.475Q14.3,5.375 14.15,5.15Q14,4.925 14,4.65Q14,4.1 14.425,3.775Q14.85,3.45 15.35,3.65ZM16.25,13.45 L14,11.2V7.95Q15.175,8.5 15.838,9.6Q16.5,10.7 16.5,12Q16.5,12.375 16.438,12.738Q16.375,13.1 16.25,13.45ZM12,9.2 L9.4,6.6 10.3,5.7Q10.775,5.225 11.387,5.487Q12,5.75 12,6.425Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable/ic_volume_off_white_24dp.xml
new file mode 100644
index 000000000..3b7a8c107
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_off_white_24dp.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M4.34 2.93L2.93 4.34 7.29 8.7 7 9H3v6h4l5 5v-6.59l4.18 4.18c-0.65 0.49 -1.38 0.88 -2.18 1.11v2.06c1.34-0.3 2.57-0.92 3.61-1.75l2.05 2.05 1.41-1.41L4.34 2.93zM10 15.17L7.83 13H5v-2h2.83l0.88-0.88L10 11.41v3.76zM19 12c0 0.82-0.15 1.61-0.41 2.34l1.53 1.53c0.56-1.17 0.88 -2.48 0.88 -3.87 0-4.28-2.99-7.86-7-8.77v2.06c2.89 0.86 5 3.54 5 6.71zm-7-8l-1.88 1.88L12 7.76zm4.5 8c0-1.77-1.02-3.29-2.5-4.03v1.79l2.48 2.48c0.01-0.08 0.02 -0.16 0.02 -0.24z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_volume_up.xml b/app/src/main/res/drawable/ic_volume_up.xml
deleted file mode 100644
index 97b63ed9b..000000000
--- a/app/src/main/res/drawable/ic_volume_up.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M15.35,20.3Q14.85,20.5 14.425,20.175Q14,19.85 14,19.275Q14,19 14.163,18.788Q14.325,18.575 14.575,18.475Q16.575,17.675 17.788,15.925Q19,14.175 19,11.975Q19,9.775 17.788,8.025Q16.575,6.275 14.575,5.475Q14.3,5.375 14.15,5.15Q14,4.925 14,4.65Q14,4.1 14.425,3.775Q14.85,3.45 15.35,3.65Q17.9,4.675 19.45,6.925Q21,9.175 21,11.975Q21,14.775 19.45,17.025Q17.9,19.275 15.35,20.3ZM4,15Q3.575,15 3.288,14.712Q3,14.425 3,14V10Q3,9.575 3.288,9.287Q3.575,9 4,9H7L10.3,5.7Q10.775,5.225 11.387,5.487Q12,5.75 12,6.425V17.575Q12,18.25 11.387,18.512Q10.775,18.775 10.3,18.3L7,15ZM14,16V7.95Q15.125,8.475 15.812,9.575Q16.5,10.675 16.5,12Q16.5,13.325 15.812,14.4Q15.125,15.475 14,16Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
new file mode 100644
index 000000000..77e9c780b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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 9v6h4l5 5V4L7 9H3zm7-0.17v6.34L7.83 13H5v-2h2.83L10 8.83zM16.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM14 3.23v2.06c2.89 0.86 5 3.54 5 6.71s-2.11 5.85-5 6.71v2.06c4.01-0.91 7-4.49 7-8.77 0-4.28-2.99-7.86-7-8.77z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_website.xml b/app/src/main/res/drawable/ic_website.xml
deleted file mode 100644
index 5671992a7..000000000
--- a/app/src/main/res/drawable/ic_website.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M4,20Q3.175,20 2.588,19.413Q2,18.825 2,18V6Q2,5.175 2.588,4.588Q3.175,4 4,4H20Q20.825,4 21.413,4.588Q22,5.175 22,6V18Q22,18.825 21.413,19.413Q20.825,20 20,20ZM4,18H14.5V14.5H4V18Q4,18 4,18Q4,18 4,18ZM16.5,18H20Q20,18 20,18Q20,18 20,18V9H16.5ZM4,12.5H14.5V9H4Z"/>
-</vector>
diff --git a/app/src/main/res/drawable/line_button.xml b/app/src/main/res/drawable/line_button.xml
new file mode 100644
index 000000000..ee063c5a4
--- /dev/null
+++ b/app/src/main/res/drawable/line_button.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  android:shape="oval">
+  <corners android:radius="35dp"/>
+  <stroke
+    android:color="@color/md_white_1000"
+    android:width="2dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/lyrics_mask.xml b/app/src/main/res/drawable/lyrics_mask.xml
deleted file mode 100644
index e2d5c451b..000000000
--- a/app/src/main/res/drawable/lyrics_mask.xml
+++ /dev/null
@@ -1,9 +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:centerColor="#50000000"
-        android:endColor="@android:color/transparent"
-        android:startColor="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/notification_selector.xml b/app/src/main/res/drawable/notification_selector.xml
index 83aed83c3..d7867f86c 100644
--- a/app/src/main/res/drawable/notification_selector.xml
+++ b/app/src/main/res/drawable/notification_selector.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light" />
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" />
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/option_menu_background.xml b/app/src/main/res/drawable/option_menu_background.xml
new file mode 100644
index 000000000..ebb61404d
--- /dev/null
+++ b/app/src/main/res/drawable/option_menu_background.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_selected="true">
+        <ripple android:color="?android:attr/colorControlHighlight">
+            <item>
+                <shape android:shape="rectangle">
+                    <corners android:radius="8dp" />
+                    <solid android:color="?colorPrimary" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+    <item android:state_pressed="true" android:state_selected="false">
+        <ripple android:color="?android:attr/colorControlHighlight">
+            <item>
+                <shape android:shape="rectangle">
+                    <corners android:radius="8dp" />
+                    <solid android:color="?attr/colorControlHighlight" />
+                </shape>
+            </item>
+        </ripple>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/popup_background.xml b/app/src/main/res/drawable/popup_background.xml
deleted file mode 100644
index b4902c2eb..000000000
--- a/app/src/main/res/drawable/popup_background.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>
-            <solid android:color="?attr/colorSurface" />
-            <corners android:radius="20dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <solid android:color="@color/m3_popupmenu_overlay_color"/>
-            <corners android:radius="20dp" />
-            <padding
-                android:bottom="10dp"
-                android:top="10dp" />
-        </shape>
-    </item>
-</layer-list>
diff --git a/app/src/main/res/drawable/rect_selector.xml b/app/src/main/res/drawable/rect_selector.xml
index 35a2089f7..1f8618481 100644
--- a/app/src/main/res/drawable/rect_selector.xml
+++ b/app/src/main/res/drawable/rect_selector.xml
@@ -1,34 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
-
+    android:color="?attr/colorControlHighlight">
     <item android:id="@android:id/mask">
         <shape>
-            <corners android:radius="@dimen/m3_card_corner_radius" />
-            <solid android:color="@color/md_green_500" />
+            <corners android:radius="8dp" />
+            <solid android:color="@android:color/transparent" />
         </shape>
     </item>
     <item>
         <selector>
             <item android:state_activated="true">
                 <shape>
-                    <corners android:radius="@dimen/m3_card_corner_radius" />
+                    <corners android:radius="8dp" />
                     <solid android:color="?android:attr/colorControlHighlight" />
                 </shape>
             </item>
+            <item android:state_pressed="true">
+                <ripple android:color="?android:attr/colorControlHighlight">
+                    <item>
+                        <shape>
+                            <corners android:radius="8dp" />
+                            <solid android:color="?android:attr/colorControlHighlight" />
+                        </shape>
+                    </item>
+                </ripple>
+            </item>
         </selector>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_widget_background.xml b/app/src/main/res/drawable/round_selected.xml
similarity index 68%
rename from app/src/main/res/drawable/circle_widget_background.xml
rename to app/src/main/res/drawable/round_selected.xml
index 401d24d88..0a18d9963 100644
--- a/app/src/main/res/drawable/circle_widget_background.xml
+++ b/app/src/main/res/drawable/round_selected.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="@color/widget_md3_button_bg_color" />
+    <solid android:color="@color/ripple_material_light" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selected_dark.xml b/app/src/main/res/drawable/round_selected_dark.xml
new file mode 100644
index 000000000..5f6350ed5
--- /dev/null
+++ b/app/src/main/res/drawable/round_selected_dark.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+       android:shape="oval">
+    <solid android:color="@color/ripple_material_dark"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector.xml b/app/src/main/res/drawable/round_selector.xml
index c38d4e9cd..77f09a4c0 100644
--- a/app/src/main/res/drawable/round_selector.xml
+++ b/app/src/main/res/drawable/round_selector.xml
@@ -1,8 +1,7 @@
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?android:attr/colorControlHighlight">
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
 
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@drawable/round_selector_mask" />
+    <item android:drawable="@drawable/round_selected" android:state_pressed="true" />
+    <item android:drawable="@android:color/transparent" />
 
-</ripple>
\ No newline at end of file
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_selector_dark.xml b/app/src/main/res/drawable/round_selector_dark.xml
new file mode 100644
index 000000000..d17201841
--- /dev/null
+++ b/app/src/main/res/drawable/round_selector_dark.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" android:exitFadeDuration="@android:integer/config_shortAnimTime">
+
+    <item android:drawable="@drawable/round_selected_dark" android:state_pressed="true"/>
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/widget_button_background.xml b/app/src/main/res/drawable/round_window.xml
old mode 100644
new mode 100755
similarity index 53%
rename from app/src/main/res/drawable/widget_button_background.xml
rename to app/src/main/res/drawable/round_window.xml
index 0508710b0..40a02af84
--- a/app/src/main/res/drawable/widget_button_background.xml
+++ b/app/src/main/res/drawable/round_window.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/widget_md3_button_bg_color"/>
-    <corners android:radius="16dp" />
+  <corners android:radius="12dp"/>
+  <solid android:color="@android:color/black"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_blur_theme.xml b/app/src/main/res/drawable/shadow_blur_theme.xml
deleted file mode 100644
index 2304e611f..000000000
--- a/app/src/main/res/drawable/shadow_blur_theme.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="90"
-        android:endColor="#60000000"
-        android:centerColor="#80000000"
-        android:startColor="#BB000000" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down.xml b/app/src/main/res/drawable/shadow_down.xml
new file mode 100755
index 000000000..623e2b6a1
--- /dev/null
+++ b/app/src/main/res/drawable/shadow_down.xml
@@ -0,0 +1,9 @@
+<?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:centerColor="#11000000"
+        android:endColor="@color/twenty_percent_black_overlay"
+        android:startColor="#00000000"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down_full_theme.xml b/app/src/main/res/drawable/shadow_down_full_theme.xml
deleted file mode 100644
index 02009af31..000000000
--- a/app/src/main/res/drawable/shadow_down_full_theme.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="270"
-        android:endColor="#00000000"
-        android:startColor="#80000000" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_down_strong.xml b/app/src/main/res/drawable/shadow_down_strong.xml
index fc796e73d..cc2175df4 100755
--- a/app/src/main/res/drawable/shadow_down_strong.xml
+++ b/app/src/main/res/drawable/shadow_down_strong.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <gradient
         android:angle="90"
         android:centerColor="#30000000"
         android:endColor="#88000000"
-        android:startColor="#00000000" />
+        android:startColor="#00000000"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_pro.xml b/app/src/main/res/drawable/shadow_pro.xml
deleted file mode 100644
index a7c0a9ef0..000000000
--- a/app/src/main/res/drawable/shadow_pro.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="315"
-        android:centerColor="@android:color/transparent"
-        android:endColor="@android:color/transparent"
-        android:startColor="@color/md_deep_purple_500" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up.xml b/app/src/main/res/drawable/shadow_up.xml
index 8f9f10034..39160e500 100755
--- a/app/src/main/res/drawable/shadow_up.xml
+++ b/app/src/main/res/drawable/shadow_up.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <gradient
         android:angle="90"
         android:centerColor="@color/twenty_percent_black_overlay"
         android:endColor="@android:color/transparent"
-        android:startColor="#80000000" />
+        android:startColor="#80000000"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up_down.xml b/app/src/main/res/drawable/shadow_up_down.xml
deleted file mode 100644
index d07db3160..000000000
--- a/app/src/main/res/drawable/shadow_up_down.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:centerColor="@color/transparent"
-        android:endColor="@color/md_black_1000"
-        android:startColor="@color/md_black_1000" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up_edited.xml b/app/src/main/res/drawable/shadow_up_edited.xml
index f2fb39f06..8c67be584 100644
--- a/app/src/main/res/drawable/shadow_up_edited.xml
+++ b/app/src/main/res/drawable/shadow_up_edited.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
+       android:shape="rectangle">
     <gradient
         android:angle="270"
         android:endColor="#DD000000"
-        android:startColor="#00000000" />
+        android:startColor="#00000000"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shadow_up_full_theme.xml b/app/src/main/res/drawable/shadow_up_full_theme.xml
index c1d1226d2..34a8df785 100644
--- a/app/src/main/res/drawable/shadow_up_full_theme.xml
+++ b/app/src/main/res/drawable/shadow_up_full_theme.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <gradient
-        android:angle="90"
-        android:endColor="@android:color/transparent"
-        android:centerColor="#80000000"
-        android:startColor="@color/md_black_1000" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+  >
+  <gradient
+    android:angle="90"
+    android:endColor="@android:color/transparent"
+    android:startColor="#000000"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/sld_lyrics.xml b/app/src/main/res/drawable/sld_lyrics.xml
deleted file mode 100644
index fda662bc9..000000000
--- a/app/src/main/res/drawable/sld_lyrics.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_lyrics" android:state_checked="true" />
-    <item android:drawable="@drawable/ic_lyrics_outline" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rounded_drawable.xml b/app/src/main/res/drawable/square_window.xml
old mode 100644
new mode 100755
similarity index 58%
rename from app/src/main/res/drawable/rounded_drawable.xml
rename to app/src/main/res/drawable/square_window.xml
index 1535a3f46..16787a09c
--- a/app/src/main/res/drawable/rounded_drawable.xml
+++ b/app/src/main/res/drawable/square_window.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="?colorSurface"/>
-    <corners android:radius="28dp" />
+    <solid android:color="@android:color/white"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_thumb.xml b/app/src/main/res/drawable/switch_thumb.xml
deleted file mode 100644
index c5f48c5c5..000000000
--- a/app/src/main/res/drawable/switch_thumb.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="4dp"
-        android:left="4dp"
-        android:right="4dp"
-        android:top="4dp">
-        <shape>
-            <solid android:color="?android:colorAccent" />
-            <corners android:radius="24dp" />
-        </shape>
-    </item>
-    <item>
-        <shape>
-            <size
-                android:width="24dp"
-                android:height="24dp" />
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_track.xml b/app/src/main/res/drawable/switch_track.xml
deleted file mode 100644
index cb59bb7ee..000000000
--- a/app/src/main/res/drawable/switch_track.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="?android:colorPrimary" />
-            <corners android:radius="56dp" />
-            <size
-                android:width="48dp"
-                android:height="24dp" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_indicator.xml b/app/src/main/res/drawable/tab_indicator.xml
new file mode 100644
index 000000000..78af14451
--- /dev/null
+++ b/app/src/main/res/drawable/tab_indicator.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:left="4dp"
+        android:right="4dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners
+                android:bottomLeftRadius="0dp"
+                android:bottomRightRadius="0dp"
+                android:topLeftRadius="3dp"
+                android:topRightRadius="3dp" />
+            <size android:height="3dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_lyrics_indicator.xml b/app/src/main/res/drawable/tab_lyrics_indicator.xml
deleted file mode 100644
index 791c672be..000000000
--- a/app/src/main/res/drawable/tab_lyrics_indicator.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:topLeftRadius="@dimen/indicator_radius"
-        android:topRightRadius="@dimen/indicator_radius">
-    </corners>
-</shape>
-
-
diff --git a/app/src/main/res/values/color_icon_view_attrs.xml b/app/src/main/res/drawable/toggle_album.xml
similarity index 71%
rename from app/src/main/res/values/color_icon_view_attrs.xml
rename to app/src/main/res/drawable/toggle_album.xml
index f5476840b..d4838d2dd 100644
--- a/app/src/main/res/values/color_icon_view_attrs.xml
+++ b/app/src/main/res/drawable/toggle_album.xml
@@ -12,10 +12,7 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<resources>
-    <declare-styleable name="ColorIconsImageView">
-        <attr name="iconBackgroundColor" format="color" />
-        <attr name="colorIconColor" format="color" />
-        <attr name="icon" format="reference" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_album_selected_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_album_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_artist.xml b/app/src/main/res/drawable/toggle_artist.xml
new file mode 100644
index 000000000..46802416f
--- /dev/null
+++ b/app/src/main/res/drawable/toggle_artist.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_artist_selected_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_artist_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_audiotrack.xml b/app/src/main/res/drawable/toggle_audiotrack.xml
new file mode 100644
index 000000000..57e16d194
--- /dev/null
+++ b/app/src/main/res/drawable/toggle_audiotrack.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_audiotrack_selected_black_24dp" android:state_checked="true"  />
+    <item android:drawable="@drawable/ic_audiotrack_black_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/instagram_story_background.xml b/app/src/main/res/drawable/toggle_guitar.xml
similarity index 67%
rename from app/src/main/res/drawable/instagram_story_background.xml
rename to app/src/main/res/drawable/toggle_guitar.xml
index 05b8803e2..954adb12c 100644
--- a/app/src/main/res/drawable/instagram_story_background.xml
+++ b/app/src/main/res/drawable/toggle_guitar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -11,11 +11,7 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <gradient
-        android:angle="270"
-        android:endColor="@color/transparent"
-        android:startColor="@color/md_red_500" />
-</shape>
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_guitar_acoustic_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_guitar_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_home.xml b/app/src/main/res/drawable/toggle_home.xml
new file mode 100644
index 000000000..0574dc92b
--- /dev/null
+++ b/app/src/main/res/drawable/toggle_home.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_home_selected_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_home_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/values/shapeable_imageview.xml b/app/src/main/res/drawable/toggle_playlist.xml
similarity index 67%
rename from app/src/main/res/values/shapeable_imageview.xml
rename to app/src/main/res/drawable/toggle_playlist.xml
index 2ced73f07..6540a2494 100644
--- a/app/src/main/res/values/shapeable_imageview.xml
+++ b/app/src/main/res/drawable/toggle_playlist.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
+  ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
   ~
@@ -12,9 +12,7 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<resources>
-    <declare-styleable name="RetroShapeableImageView">
-        <attr name="retroCornerSize" format="dimension" />
-        <attr name="circleShape" format="boolean" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_playlist_play_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_playlist_play_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/toggle_queue_music.xml b/app/src/main/res/drawable/toggle_queue_music.xml
new file mode 100644
index 000000000..7e9fbf2b8
--- /dev/null
+++ b/app/src/main/res/drawable/toggle_queue_music.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_queue_music_selected_white_24dp" android:state_checked="true" />
+    <item android:drawable="@drawable/ic_queue_music_white_24dp" />
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/widget_big_info.webp b/app/src/main/res/drawable/widget_big_info.webp
deleted file mode 100644
index fa8009686..000000000
Binary files a/app/src/main/res/drawable/widget_big_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_card_info.webp b/app/src/main/res/drawable/widget_card_info.webp
deleted file mode 100644
index 17d398396..000000000
Binary files a/app/src/main/res/drawable/widget_card_info.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_classic.webp b/app/src/main/res/drawable/widget_classic.webp
deleted file mode 100644
index d0074213b..000000000
Binary files a/app/src/main/res/drawable/widget_classic.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_selector.xml b/app/src/main/res/drawable/widget_selector.xml
old mode 100644
new mode 100755
index f03604195..68896bf42
--- a/app/src/main/res/drawable/widget_selector.xml
+++ b/app/src/main/res/drawable/widget_selector.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_dark" />
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true" android:state_pressed="true"/>
+    <item android:drawable="@color/ripple_material_dark" android:state_activated="true"/>
+    <item android:drawable="@color/ripple_material_dark" android:state_pressed="true"/>
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/widget_selector_light.xml b/app/src/main/res/drawable/widget_selector_light.xml
index 83aed83c3..b03bcafaf 100644
--- a/app/src/main/res/drawable/widget_selector_light.xml
+++ b/app/src/main/res/drawable/widget_selector_light.xml
@@ -1,3 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/ripple_material_light" />
\ No newline at end of file
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true" android:state_pressed="true"/>
+    <item android:drawable="@color/ripple_material_light" android:state_activated="true"/>
+    <item android:drawable="@color/ripple_material_light" android:state_pressed="true"/>
+    <item android:drawable="@android:color/transparent"/>
+
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/widget_small.webp b/app/src/main/res/drawable/widget_small.webp
deleted file mode 100644
index 9dbb7955d..000000000
Binary files a/app/src/main/res/drawable/widget_small.webp and /dev/null differ
diff --git a/app/src/main/res/drawable/widget_text.webp b/app/src/main/res/drawable/widget_text.webp
deleted file mode 100644
index e01deb966..000000000
Binary files a/app/src/main/res/drawable/widget_text.webp and /dev/null differ
diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml
new file mode 100644
index 000000000..264d363c5
--- /dev/null
+++ b/app/src/main/res/font/circular.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto">
+    <font
+        app:font="@font/circular_std_book"
+        app:fontStyle="normal"
+        app:fontWeight="400" />
+    <font
+        app:font="@font/circular_std_medium"
+        app:fontStyle="normal"
+        app:fontWeight="600" />
+
+    <font
+        app:font="@font/circular_std_black"
+        app:fontWeight="900" />
+
+</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/circular_std_black.otf b/app/src/main/res/font/circular_std_black.otf
new file mode 100644
index 000000000..c62b210c5
Binary files /dev/null and b/app/src/main/res/font/circular_std_black.otf differ
diff --git a/app/src/main/res/font/circular_std_book.otf b/app/src/main/res/font/circular_std_book.otf
new file mode 100644
index 000000000..3a1f1ad82
Binary files /dev/null and b/app/src/main/res/font/circular_std_book.otf differ
diff --git a/app/src/main/res/font/circular_std_medium.otf b/app/src/main/res/font/circular_std_medium.otf
new file mode 100644
index 000000000..931f4159d
Binary files /dev/null and b/app/src/main/res/font/circular_std_medium.otf differ
diff --git a/app/src/main/res/font/manrope.xml b/app/src/main/res/font/manrope.xml
deleted file mode 100644
index a586ee9d0..000000000
--- a/app/src/main/res/font/manrope.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
-    <font
-        android:font="@font/manrope_extralight"
-        android:fontWeight="200" />
-    <font
-        android:font="@font/manrope_light"
-        android:fontWeight="300" />
-    <font
-        android:font="@font/manrope_regular"
-        android:fontWeight="400" />
-    <font
-        android:font="@font/manrope_medium"
-        android:fontWeight="500" />
-    <font
-        android:font="@font/manrope_semibold"
-        android:fontWeight="600" />
-    <font
-        android:font="@font/manrope_bold"
-        android:fontWeight="700" />
-    <font
-        android:font="@font/manrope_extrabold"
-        android:fontWeight="800" />
-</font-family>
\ No newline at end of file
diff --git a/app/src/main/res/font/manrope_bold.ttf b/app/src/main/res/font/manrope_bold.ttf
deleted file mode 100644
index db03274e4..000000000
Binary files a/app/src/main/res/font/manrope_bold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_extrabold.ttf b/app/src/main/res/font/manrope_extrabold.ttf
deleted file mode 100644
index 85012307d..000000000
Binary files a/app/src/main/res/font/manrope_extrabold.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_extralight.ttf b/app/src/main/res/font/manrope_extralight.ttf
deleted file mode 100644
index 6ab6b5f5a..000000000
Binary files a/app/src/main/res/font/manrope_extralight.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_light.ttf b/app/src/main/res/font/manrope_light.ttf
deleted file mode 100644
index ae71630f5..000000000
Binary files a/app/src/main/res/font/manrope_light.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_medium.ttf b/app/src/main/res/font/manrope_medium.ttf
deleted file mode 100644
index 22badeb9f..000000000
Binary files a/app/src/main/res/font/manrope_medium.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_regular.ttf b/app/src/main/res/font/manrope_regular.ttf
deleted file mode 100644
index 7cf09bf80..000000000
Binary files a/app/src/main/res/font/manrope_regular.ttf and /dev/null differ
diff --git a/app/src/main/res/font/manrope_semibold.ttf b/app/src/main/res/font/manrope_semibold.ttf
deleted file mode 100644
index c3a676851..000000000
Binary files a/app/src/main/res/font/manrope_semibold.ttf and /dev/null differ
diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml
new file mode 100644
index 000000000..9b51c1852
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_album.xml
@@ -0,0 +1,137 @@
+<?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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="16dp"
+                android:transitionName="@string/transition_album_art"
+                app:cardCornerRadius="24dp"
+                app:cardElevation="8dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/image"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+
+            </com.google.android.material.card.MaterialCardView>
+
+        </LinearLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:fillViewport="true"
+            android:overScrollMode="never">
+
+            <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:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/artistImage"
+                        android:layout_width="52dp"
+                        android:layout_height="52dp"
+                        android:layout_marginStart="8dp"
+                        android:layout_weight="0"
+                        app:civ_border="false"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="bottom"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="16dp">
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxLines="2"
+                            android:textAppearance="@style/TextViewHeadline6"
+                            android:textStyle="bold"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album name" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumText"
+                            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:paddingTop="4dp"
+                            android:scrollHorizontally="true"
+                            android:singleLine="true"
+                            android:textAppearance="@style/TextViewSubtitle2"
+                            android:textColor="?android:attr/textColorSecondary"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album details name" />
+
+                    </LinearLayout>
+
+                </LinearLayout>
+
+                <include layout="@layout/activity_album_content" />
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+</LinearLayout>
+
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 0213d957d..3caaef6e4 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
@@ -1,43 +1,43 @@
 <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:background="?attr/colorSurface"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
+    android:layout_height="match_parent">
 
     <LinearLayout
         android:layout_width="match_parent"
         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>
+
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             app:title="@string/action_tag_editor" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="match_parent"
+            android:orientation="horizontal">
 
             <com.google.android.material.card.MaterialCardView
                 android:id="@+id/imageContainer"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_margin="16dp"
+                android:layout_weight="1"
                 android:transitionName="@string/transition_album_art"
                 app:cardCornerRadius="24dp"
-                app:cardElevation="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
+                app:cardElevation="8dp">
 
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/editorImage"
@@ -58,16 +58,13 @@
 
             <androidx.core.widget.NestedScrollView
                 android:id="@+id/content"
-                android:layout_width="0dp"
+                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:overScrollMode="@integer/overScrollMode"
-                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/imageContainer"
-                app:layout_constraintTop_toTopOf="parent">
+                android:layout_weight="1"
+                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
                 <LinearLayout
+                    android:id="@+id/editables"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical"
@@ -149,7 +146,7 @@
                         android:layout_height="52dp" />
                 </LinearLayout>
             </androidx.core.widget.NestedScrollView>
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
     </LinearLayout>
 
     <com.google.android.material.button.MaterialButton
@@ -165,7 +162,7 @@
         android:paddingBottom="12dp"
         android:text="@string/save"
         app:cornerRadius="25dp"
-        app:icon="@drawable/ic_save"
+        app:icon="@drawable/ic_save_white_24dp"
         app:iconGravity="textStart"
         tools:backgroundTint="@color/md_red_400" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml
new file mode 100644
index 000000000..1bb443f9d
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -0,0 +1,117 @@
+<?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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="16dp"
+                android:transitionName="@string/transition_artist_image"
+                app:cardCornerRadius="24dp"
+                app:cardElevation="8dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/artistImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerCrop"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+
+            </com.google.android.material.card.MaterialCardView>
+        </LinearLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:overScrollMode="never">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/background"
+                    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"
+                        android:padding="16dp">
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/artistTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxLines="2"
+                            android:textAppearance="@style/TextViewHeadline6"
+                            android:textStyle="bold"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Title" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/text"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="4dp"
+                            android:textAppearance="@style/TextViewSubtitle2"
+                            android:textColor="?android:attr/textColorSecondary"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Title" />
+
+                    </LinearLayout>
+
+                    <include layout="@layout/activity_artist_content" />
+                </LinearLayout>
+
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/status_bar_padding" />
+
+            </LinearLayout>
+        </androidx.core.widget.NestedScrollView>
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout-land/activity_drive_mode.xml b/app/src/main/res/layout-land/activity_drive_mode.xml
deleted file mode 100644
index 90f895cef..000000000
--- a/app/src/main/res/layout-land/activity_drive_mode.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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"
-    android:orientation="vertical">
-
-
-    <code.name.monkey.retromusic.views.StatusBarView
-        android:id="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shadow_up_down"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/close"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:backgroundTint="@color/semi_transparent"
-        android:padding="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:srcCompat="@drawable/ic_close" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/songFavourite"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:backgroundTint="@color/semi_transparent"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:srcCompat="@drawable/ic_favorite_border" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/playPauseButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        android:src="@drawable/ic_pause"
-        app:layout_constraintBottom_toBottomOf="@id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toTopOf="@+id/previousButton" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/nextButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/previousButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/repeatButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/repeatButton"
-        app:srcCompat="@drawable/ic_skip_previous" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/repeatButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/progressSlider"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:layout_editor_absoluteY="240dp" />
-
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/shuffleButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle" />
-
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/songFavourite">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="@color/md_white_1000"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="@color/md_grey_200"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="3dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        android:progressTint="@color/md_white_1000"
-        android:splitTrack="false"
-        android:thumb="@drawable/switch_thumb_material"
-        app:layout_constraintBottom_toTopOf="@id/songCurrentProgress"
-        app:layout_constraintEnd_toEndOf="@id/shuffleButton"
-        app:layout_constraintStart_toStartOf="@id/repeatButton"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:singleLine="true"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
-        app:layout_constraintStart_toStartOf="@id/repeatButton"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:singleLine="true"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
-        app:layout_constraintEnd_toEndOf="@id/shuffleButton"
-        tools:text="@tools:sample/date/hhmmss" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_lock_screen.xml b/app/src/main/res/layout-land/activity_lock_screen.xml
deleted file mode 100644
index b36873a8c..000000000
--- a/app/src/main/res/layout-land/activity_lock_screen.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout 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.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_blurred_album_art"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#80000000"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                android:id="@+id/albumCoverContainer"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent">
-
-                <com.google.android.material.card.MaterialCardView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_margin="16dp"
-                    app:cardCornerRadius="@dimen/m3_card_corner_radius"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent">
-
-                    <androidx.appcompat.widget.AppCompatImageView
-                        android:id="@+id/image"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:scaleType="centerCrop"
-                        tools:ignore="ContentDescription,UnusedAttribute"
-                        tools:srcCompat="@tools:sample/backgrounds/scenic" />
-
-                    <com.google.android.material.textview.MaterialTextView
-                        android:id="@+id/slide"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center_horizontal|bottom"
-                        android:elevation="3dp"
-                        android:fitsSystemWindows="true"
-                        android:gravity="center"
-                        android:padding="16dp"
-                        android:text="@string/swipe_to_unlock"
-                        android:textColor="?android:attr/textColorPrimary" />
-                </com.google.android.material.card.MaterialCardView>
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                tools:ignore="UselessParent">
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playback_controls_fragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_lock_screen_playback_controls" />
-
-            </LinearLayout>
-
-        </androidx.appcompat.widget.LinearLayoutCompat>
-
-    </LinearLayout>
-</RelativeLayout>
diff --git a/app/src/main/res/layout-land/activity_song_tag_editor.xml b/app/src/main/res/layout-land/activity_song_tag_editor.xml
deleted file mode 100644
index d19eea69c..000000000
--- a/app/src/main/res/layout-land/activity_song_tag_editor.xml
+++ /dev/null
@@ -1,323 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fitsSystemWindows="false"
-        android:orientation="vertical">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/action_tag_editor" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/imageContainer"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_gravity="center"
-                android:layout_marginHorizontal="16dp"
-                android:layout_marginVertical="40dp"
-                android:transitionName="@string/transition_album_art"
-                app:cardCornerRadius="@dimen/m3_card_large_radius"
-                app:cardElevation="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/editorImage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <androidx.core.widget.NestedScrollView
-                android:id="@+id/content"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:overScrollMode="@integer/overScrollMode"
-                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/imageContainer"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/songTextContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:hintEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/songText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/song"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1" />
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/albumTextContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/albumText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:hint="@string/album"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1" />
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/artistContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/artistText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:hint="@string/artist"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/albumArtistContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
-
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/albumArtistText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:hint="@string/album_artist"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/composerContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/songComposerText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:hint="@string/composer"
-                            android:inputType="text|textCapWords"
-                            android:maxLines="1" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:baselineAligned="false"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/genreContainer"
-                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:layout_weight="1"
-                            app:hintEnabled="true">
-
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/genreText"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:gravity="center_vertical"
-                                android:hint="@string/genre"
-                                android:maxLines="1" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/yearContainer"
-                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_weight="1"
-                            app:hintEnabled="true">
-
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/yearText"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:gravity="center_vertical"
-                                android:hint="@string/year"
-                                android:inputType="text|number"
-                                android:maxLines="1" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:baselineAligned="false"
-                        android:orientation="horizontal">
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/trackNumberContainer"
-                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp"
-                            android:layout_weight="1"
-                            app:hintEnabled="true">
-
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/trackNumberText"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:gravity="center_vertical"
-                                android:hint="@string/track_hint"
-                                android:inputType="text|number"
-                                android:maxLines="1" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/discNumberContainer"
-                            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_weight="1"
-                            app:hintEnabled="true">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/discNumberText"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:layout_gravity="center"
-                                android:gravity="center_vertical"
-                                android:hint="@string/disc_hint"
-                                android:inputType="text|number"
-                                android:maxLines="1" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-                    </LinearLayout>
-
-                    <com.google.android.material.textfield.TextInputLayout
-                        android:id="@+id/lyricsContainer"
-                        style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        app:hintEnabled="true">
-
-
-                        <com.google.android.material.textfield.TextInputEditText
-                            android:id="@+id/lyricsText"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:gravity="center_vertical"
-                            android:hint="@string/lyrics"
-                            android:inputType="textMultiLine"
-                            android:maxLines="15" />
-
-                    </com.google.android.material.textfield.TextInputLayout>
-
-                    <Space
-                        android:layout_width="match_parent"
-                        android:layout_height="52dp" />
-                </LinearLayout>
-            </androidx.core.widget.NestedScrollView>
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/saveTags"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:gravity="center"
-        android:paddingStart="32dp"
-        android:paddingTop="12dp"
-        android:paddingEnd="32dp"
-        android:paddingBottom="12dp"
-        android:text="@string/save"
-        app:cornerRadius="25dp"
-        app:icon="@drawable/ic_save"
-        app:iconGravity="textStart"
-        tools:backgroundTint="@color/md_red_400" />
-
-    <ProgressBar
-        android:id="@+id/progressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:visibility="gone" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
-
diff --git a/app/src/main/res/layout-land/fragment_adaptive_player.xml b/app/src/main/res/layout-land/fragment_adaptive_player.xml
deleted file mode 100644
index 651d26d58..000000000
--- a/app/src/main/res/layout-land/fragment_adaptive_player.xml
+++ /dev/null
@@ -1,74 +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:background="?colorSurface"
-    android:clickable="true"
-    android:focusable="true">
-
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/status_bar" />
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:contentInsetLeft="0dp"
-            app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-            app:subtitleTextAppearance="@style/TextViewCaption"
-            app:titleMargin="0dp"
-            app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/TextViewSubtitle1"
-            tools:subtitle="@tools:sample/full_names"
-            tools:title="@tools:sample/full_names" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <FrameLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1">
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_album_full_card_cover" />
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/cover_lyrics"
-                    android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:elevation="20dp" />
-            </FrameLayout>
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playbackControlsFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
-
-        </LinearLayout>
-
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_album_details.xml b/app/src/main/res/layout-land/fragment_album_details.xml
deleted file mode 100644
index f51fe717a..000000000
--- a/app/src/main/res/layout-land/fragment_album_details.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical"
-    android:transitionGroup="true"
-    android:transitionName="@string/transition_album_art">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/albumCoverContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="@dimen/mini_player_height"
-        app:cardCornerRadius="@dimen/m3_card_large_radius"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:descendantFocusability="beforeDescendants"
-        android:fillViewport="true"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/albumCoverContainer"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <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:gravity="center_vertical"
-                android:orientation="horizontal">
-
-                <code.name.monkey.retromusic.views.RetroShapeableImageView
-                    android:id="@+id/artistImage"
-                    android:layout_width="52dp"
-                    android:layout_height="52dp"
-                    android:layout_marginStart="8dp"
-                    android:scaleType="centerCrop"
-                    app:retroCornerSize="26dp"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="1"
-                    android:orientation="vertical"
-                    android:paddingStart="12dp"
-                    android:paddingEnd="12dp"
-                    android:paddingBottom="8dp">
-
-                    <code.name.monkey.retromusic.views.BaselineGridTextView
-                        android:id="@+id/albumTitle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:maxLines="2"
-                        android:textAppearance="@style/TextViewHeadline5"
-                        android:textStyle="bold"
-                        app:lineHeightHint="28sp"
-                        tools:ignore="MissingPrefix"
-                        tools:text="Album name" />
-
-                    <code.name.monkey.retromusic.views.BaselineGridTextView
-                        android:id="@+id/albumText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:ellipsize="end"
-                        android:paddingTop="4dp"
-                        android:singleLine="true"
-                        android:textAppearance="@style/TextViewCaption"
-                        android:textColor="?android:attr/textColorSecondary"
-                        app:lineHeightHint="24sp"
-                        tools:ignore="MissingPrefix"
-                        tools:text="Album details name" />
-                </LinearLayout>
-            </LinearLayout>
-
-            <include
-                android:id="@+id/fragment_album_content"
-                layout="@layout/fragment_album_content" />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
-
diff --git a/app/src/main/res/layout-land/fragment_artist_details.xml b/app/src/main/res/layout-land/fragment_artist_details.xml
deleted file mode 100644
index 38458b1ab..000000000
--- a/app/src/main/res/layout-land/fragment_artist_details.xml
+++ /dev/null
@@ -1,99 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_arrow_back" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/artistCoverContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="@dimen/mini_player_height"
-        android:transitionName="@string/transition_artist_image"
-        app:cardCornerRadius="@dimen/m3_card_large_radius"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/content"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="16dp"
-        android:layout_weight="1"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/artistCoverContainer"
-        app:layout_constraintTop_toBottomOf="@id/toolbar">
-
-        <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"
-                android:padding="16dp">
-
-                <code.name.monkey.retromusic.views.BaselineGridTextView
-                    android:id="@+id/artistTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:maxLines="2"
-                    android:textAppearance="@style/TextViewHeadline5"
-                    android:textColor="?android:attr/textColorPrimary"
-                    android:textStyle="bold"
-                    tools:ignore="MissingPrefix"
-                    tools:text="Title" />
-
-                <code.name.monkey.retromusic.views.BaselineGridTextView
-                    android:id="@+id/text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="4dp"
-                    android:textAppearance="@style/TextViewCaption"
-                    android:textColor="?android:attr/textColorSecondary"
-                    app:lineHeightHint="24sp"
-                    tools:ignore="MissingPrefix"
-                    tools:text="Title" />
-
-            </LinearLayout>
-
-            <include
-                android:id="@+id/fragment_artist_content"
-                layout="@layout/fragment_artist_content" />
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml
new file mode 100644
index 000000000..9bf582511
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_banner_home.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+        app:behavior_overlapTop="72dp"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="228dp"
+                app:cardCornerRadius="24dp"
+                app:cardUseCompatPadding="true">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/toolbarContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_scrollFlags="scroll|enterAlways"
+                        app:shapeAppearance="@style/ToolbarCornerCardView">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?attr/colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:background="@drawable/shadow_up"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/userImage"
+                        android:layout_width="42dp"
+                        android:layout_height="42dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginBottom="8dp"
+                        app:civ_border="false"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        tools:srcCompat="@tools:sample/avatars" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:ellipsize="end"
+                        android:text="@string/welcome"
+                        android:textColor="@color/md_white_1000"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toTopOf="@+id/userImage" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/titleWelcome"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:padding="0dp"
+                        android:textAppearance="@style/TextViewHeadline5"
+                        android:textColor="@color/md_white_1000"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toBottomOf="@+id/text"
+                        tools:text="@string/app_name" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <include layout="@layout/home_content" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_blur.xml b/app/src/main/res/layout-land/fragment_blur.xml
index 3c14baf8a..53b138bc3 100644
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@@ -11,8 +11,14 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        app:srcCompat="@color/black_color" />
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/md_black_1000"
+        android:visibility="gone" />
 
     <View
         android:layout_width="match_parent"
@@ -43,7 +49,7 @@
                 android:layout_height="match_parent"
                 android:layout_gravity="center_horizontal">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -56,20 +62,25 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1" />
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
-                    android:layout_height="48dp"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0" >
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:layout_height="48dp"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_card_blur_player.xml b/app/src/main/res/layout-land/fragment_card_blur_player.xml
new file mode 100644
index 000000000..801afc7aa
--- /dev/null
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@@ -0,0 +1,89 @@
+<?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:clickable="true"
+    android:focusable="true">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/colorBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/shadow_up_strong" />
+
+    <include layout="@layout/shadow_statusbar_toolbar" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        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>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+        </FrameLayout>
+
+        <FrameLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="64dp"
+            android:layout_marginEnd="64dp"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_card_cover" />
+        </FrameLayout>
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp">
+
+        <fragment
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            tools:layout="@layout/fragment_card_blur_player_playback_controls" />
+    </FrameLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_card_player.xml b/app/src/main/res/layout-land/fragment_card_player.xml
index d4294d937..a4fad57fa 100644
--- a/app/src/main/res/layout-land/fragment_card_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_player.xml
@@ -13,53 +13,68 @@
         android:layout_height="match_parent"
         android:background="?attr/colorSurface" />
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
-    <FrameLayout
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <include layout="@layout/shadow_statusbar_toolbar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <code.name.monkey.retromusic.views.StatusBarView
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/status_bar_padding" />
+            android:layout_weight="0">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-        </LinearLayout>
-    </FrameLayout>
+                android:navigationIcon="@drawable/ic_close_white_24dp"
+                app:navigationIcon="@drawable/ic_close_white_24dp" />
+        </FrameLayout>
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="64dp"
-        android:layout_marginEnd="64dp"
-        android:layout_marginBottom="8dp"
-        app:cardCornerRadius="8dp"
-        app:cardUseCompatPadding="true">
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+        <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_card_player_playback_controls" />
-    </com.google.android.material.card.MaterialCardView>
+            android:layout_marginStart="64dp"
+            android:layout_marginEnd="64dp"
+            android:layout_marginBottom="8dp"
+            android:layout_weight="0"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <fragment
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_card_player_playback_controls" />
+            </FrameLayout>
+
+        </androidx.cardview.widget.CardView>
+    </LinearLayout>
+
+    <include layout="@layout/shadow_statusbar_toolbar" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_circle_player.xml b/app/src/main/res/layout-land/fragment_circle_player.xml
deleted file mode 100644
index d8c7dd01f..000000000
--- a/app/src/main/res/layout-land/fragment_circle_player.xml
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface" />
-
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-        tools:layout_editor_absoluteY="24dp" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:padding="10dp"
-        app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
-        app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
-        app:layout_constraintTop_toTopOf="@id/volumeSeekBar">
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/album_cover"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/album_cover_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0.5"
-            android:scaleType="centerCrop" />
-    </FrameLayout>
-
-    <me.tankery.lib.circularseekbar.CircularSeekBar
-        android:id="@+id/volumeSeekBar"
-        android:layout_width="wrap_content"
-        android:layout_height="300dp"
-        app:cs_circle_stroke_width="4dp"
-        app:cs_end_angle="60"
-        app:cs_move_outside_circle="true"
-        app:cs_pointer_color="@color/md_grey_200"
-        app:cs_pointer_halo_width="0dp"
-        app:cs_pointer_stroke_width="20dp"
-        app:cs_start_angle="120"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="@id/guideline"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerToolbar"
-        tools:progress="50" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:backgroundTint="?attr/colorSurface"
-        app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
-        app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
-        app:layout_constraintTop_toTopOf="@id/volumeSeekBar" />
-
-    <ImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        app:tint="@color/md_green_500" />
-
-    <ImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        app:tint="@color/md_green_500" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/volume"
-        android:textAppearance="@style/TextViewSubtitle2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="@+id/volumeSeekBar"
-        app:layout_constraintStart_toStartOf="@+id/volumeSeekBar" />
-
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        app:layout_constraintTop_toBottomOf="@+id/playerToolbar">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLines="1"
-            android:textAppearance="@style/TextViewHeadline4"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewBody1"
-        app:layout_constraintBottom_toTopOf="@id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/songInfo"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toBottomOf="@id/text"
-        tools:ignore="RtlHardcoded,UnusedAttribute" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center_vertical|end"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/progressSlider"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_marginStart="16dp"
-        android:gravity="center_vertical|start"
-        android:paddingStart="8dp"
-        android:paddingEnd="0dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@id/progressSlider"
-        app:layout_constraintEnd_toStartOf="@id/progressSlider"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:paddingBottom="12dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/guideline"
-        tools:text="@tools:sample/lorem" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_color_player.xml b/app/src/main/res/layout-land/fragment_color_player.xml
index d79d3ae9b..ba453b825 100644
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@@ -2,9 +2,10 @@
 <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:id="@+id/anti_clickable"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?colorSurface">
+    android:background="?android:attr/windowBackground">
 
     <View
         android:id="@+id/colorGradientBackground"
@@ -13,12 +14,18 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -29,12 +36,24 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                <com.google.android.material.card.MaterialCardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_album_cover" />
+                    android:layout_margin="12dp"
+                    app:cardCornerRadius="8dp"
+                    app:cardElevation="8dp"
+                    app:cardPreventCornerOverlap="false"
+                    app:cardUseCompatPadding="true">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/playerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[10]" />
+
+                </com.google.android.material.card.MaterialCardView>
+
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
@@ -42,23 +61,32 @@
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_player_playback_controls" />
-
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="1">
+
+                    <fragment
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:layout="@layout/fragment_player_playback_controls" />
+                </FrameLayout>
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
 
-</FrameLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_flat_player.xml b/app/src/main/res/layout-land/fragment_flat_player.xml
index 6cd52e1d6..2067ef20c 100644
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@@ -4,11 +4,15 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
@@ -16,12 +20,18 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -32,7 +42,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -40,20 +50,25 @@
                     tools:layout="@layout/fragment_album_flat_cover" />
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
 
-                <androidx.fragment.app.FragmentContainerView
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
+
+                <fragment
                     android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index c18e49710..7b41e1722 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -11,51 +11,122 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<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="match_parent"
-    android:fitsSystemWindows="true">
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true" />
+        tools:ignore="UnusedAttribute">
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        android:transitionGroup="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/contentContainer"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:transitionGroup="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
-            <code.name.monkey.retromusic.views.HomeImageLayout
-                android:id="@+id/imageLayout"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways">
 
-            <include
-                android:id="@+id/home_content"
-                layout="@layout/home_content"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/imageLayout" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/toolbar_height"
+                    android:background="?colorSurface"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:popupTheme="?toolbarPopupTheme"
+                    app:title="@string/search_hint"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    tools:ignore="UnusedAttribute" />
+            </com.google.android.material.card.MaterialCardView>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </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_material.xml b/app/src/main/res/layout-land/fragment_material.xml
index 31085532c..17db73aa7 100644
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@@ -14,15 +14,6 @@
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <View
-        android:id="@+id/colorGradientBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -44,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -62,7 +53,7 @@
                     android:layout_height="match_parent"
                     android:layout_weight="1">
 
-                    <androidx.fragment.app.FragmentContainerView
+                    <fragment
                         android:id="@+id/playbackControlsFragment"
                         android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
                         android:layout_width="match_parent"
@@ -78,10 +69,9 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                 </FrameLayout>
             </LinearLayout>
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_md3_player.xml b/app/src/main/res/layout-land/fragment_md3_player.xml
deleted file mode 100644
index ca5b63f95..000000000
--- a/app/src/main/res/layout-land/fragment_md3_player.xml
+++ /dev/null
@@ -1,64 +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:background="?attr/colorSurface"
-    android:clickable="true"
-    android:focusable="true">
-
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include layout="@layout/status_bar" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal">
-
-            <code.name.monkey.retromusic.views.HeightFitSquareLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playerAlbumCoverFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    tools:layout="@layout/fragment_album_cover" />
-            </code.name.monkey.retromusic.views.HeightFitSquareLayout>
-
-            <LinearLayout
-                android:id="@+id/controlsContainer"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
-
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.md3.MD3PlaybackControlsFragment"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="bottom"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_md3_player_playback_controls" />
-
-            </LinearLayout>
-        </LinearLayout>
-    </LinearLayout>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/fragment_plain_player.xml b/app/src/main/res/layout-land/fragment_plain_player.xml
index 1b09c212d..9f27d9fc1 100644
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@@ -4,18 +4,28 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -26,7 +36,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -43,7 +53,6 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0"
-                    android:clickable="false"
                     android:orientation="vertical"
                     android:paddingStart="16dp"
                     android:paddingTop="8dp"
@@ -52,11 +61,11 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/title"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:clickable="true"
                         android:ellipsize="marquee"
                         android:focusable="true"
+                        android:focusableInTouchMode="true"
                         android:freezesText="true"
                         android:marqueeRepeatLimit="marquee_forever"
                         android:scrollHorizontally="true"
@@ -68,31 +77,38 @@
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/text"
-                        android:layout_width="wrap_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:clickable="true"
                         android:ellipsize="end"
-                        android:focusable="true"
                         android:maxLines="1"
                         android:paddingTop="8dp"
                         tools:text="Text" />
                 </LinearLayout>
 
-                <androidx.fragment.app.FragmentContainerView
-                    android:id="@+id/playbackControlsFragment"
-                    android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    tools:layout="@layout/fragment_plain_controls_fragment" />
+                    android:layout_weight="1">
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                    <fragment
+                        android:id="@+id/playbackControlsFragment"
+                        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        tools:layout="@layout/fragment_plain_controls_fragment" />
+                </FrameLayout>
+
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
             </LinearLayout>
 
         </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_player.xml b/app/src/main/res/layout-land/fragment_player.xml
index 89db5dc00..cdd43d54d 100755
--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@@ -4,22 +4,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <com.jetradarmobile.snowfall.SnowfallView
-        android:id="@+id/snowfall_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:snowflakeSpeedMax="6"
-        app:snowflakeSpeedMin="2"
-        app:snowflakesNum="75" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
@@ -44,7 +41,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -53,12 +50,12 @@
             </code.name.monkey.retromusic.views.HeightFitSquareLayout>
 
             <LinearLayout
-                android:id="@+id/controlsContainer"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
 
                 <FrameLayout
+                    android:id="@+id/toolbar_container"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_weight="0">
@@ -66,12 +63,11 @@
                     <com.google.android.material.appbar.MaterialToolbar
                         android:id="@+id/playerToolbar"
                         style="@style/Toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                 </FrameLayout>
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout-land/fragment_simple_player.xml b/app/src/main/res/layout-land/fragment_simple_player.xml
index 478da9ee3..b0fd5f00b 100644
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@@ -4,11 +4,23 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/gradient_background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
     <LinearLayout
@@ -16,7 +28,12 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -27,7 +44,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playerAlbumCoverFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                     android:layout_width="match_parent"
@@ -42,7 +59,7 @@
                 android:orientation="vertical"
                 android:paddingTop="8dp">
 
-                <androidx.fragment.app.FragmentContainerView
+                <fragment
                     android:id="@+id/playbackControlsFragment"
                     android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
                     android:layout_width="match_parent"
@@ -50,13 +67,17 @@
                     android:layout_weight="1"
                     tools:layout="@layout/fragment_simple_controls_fragment" />
 
-                <com.google.android.material.appbar.MaterialToolbar
-                    android:id="@+id/playerToolbar"
-                    style="@style/Toolbar"
+                <FrameLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_weight="0"
-                    app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+                    android:layout_weight="0">
+
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/playerToolbar"
+                        style="@style/Toolbar"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+                </FrameLayout>
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout-land/fragment_user_info.xml b/app/src/main/res/layout-land/fragment_user_info.xml
deleted file mode 100644
index 05adb87f8..000000000
--- a/app/src/main/res/layout-land/fragment_user_info.xml
+++ /dev/null
@@ -1,101 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/profile"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        android:paddingBottom="@dimen/mini_player_height">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/bannerImage"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="banner_image"
-            app:layout_constraintBottom_toTopOf="@+id/nameContainer"
-            app:layout_constraintDimensionRatio="21:10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/circleImageView"
-            app:srcCompat="@drawable/material_design_default" />
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/userImage"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_gravity="center"
-            android:layout_marginStart="16dp"
-            android:layout_marginBottom="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="user_image"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:retroCornerSize="36dp"
-            app:srcCompat="@drawable/ic_person_flat" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/nameContainer"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginHorizontal="16dp"
-            app:hintAnimationEnabled="true"
-            app:hintEnabled="true"
-            app:layout_constraintBottom_toBottomOf="@+id/userImage"
-            app:layout_constraintEnd_toStartOf="@+id/next"
-            app:layout_constraintStart_toEndOf="@id/userImage"
-            app:layout_constraintTop_toTopOf="@id/userImage">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="name"
-                android:hint="@string/my_name"
-                android:importantForAutofill="yes"
-                android:inputType="textPersonName|textCapWords|text"
-                android:textAppearance="@style/TextViewSubtitle1"
-                tools:text="@tools:sample/full_names" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.floatingactionbutton.FloatingActionButton
-            android:id="@+id/next"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_margin="16dp"
-            android:gravity="center"
-            android:src="@drawable/ic_save"
-            android:text="@string/save"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/pager_item.xml b/app/src/main/res/layout-land/pager_item.xml
new file mode 100644
index 000000000..e11370d3b
--- /dev/null
+++ b/app/src/main/res/layout-land/pager_item.xml
@@ -0,0 +1,61 @@
+<?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:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/imageContainer"
+        android:layout_width="match_parent"
+        android:layout_height="156dp"
+        app:cardCornerRadius="16dp"
+        app:cardUseCompatPadding="true">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            tools:src="@tools:sample/avatars"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playSongs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="12dp"
+            android:background="@drawable/color_circle_gradient"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp"
+        tools:ignore="MissingPrefix"
+        tools:text="@tools:sample/lorem/random" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
+        tools:ignore="MissingPrefix"
+        tools:text="@tools:sample/lorem/random" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/sliding_music_panel_layout.xml b/app/src/main/res/layout-land/sliding_music_panel_layout.xml
deleted file mode 100644
index 4d6074066..000000000
--- a/app/src/main/res/layout-land/sliding_music_panel_layout.xml
+++ /dev/null
@@ -1,58 +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/mainContent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <code.name.monkey.retromusic.views.TintedNavigationRailView
-            android:id="@+id/navigationView"
-            style="@style/Widget.Material3.NavigationRailView"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:itemHorizontalTranslationEnabled="false"
-            app:menu="@menu/bottom_navigation_main"
-            tools:viewBindingType="com.google.android.material.navigation.NavigationBarView" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/fragment_container"
-            android:name="androidx.navigation.fragment.NavHostFragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorSurface"
-            app:defaultNavHost="true"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/fragment_home" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/slidingPanel"
-        style="@style/BottomSheetStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:behavior_hideable="true"
-        app:behavior_peekHeight="@dimen/mini_player_height"
-        app:enableEdgeToEdge="true"
-        app:gestureInsetBottomIgnored="true"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="visible">
-
-        <FrameLayout
-            android:id="@+id/playerFragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <fragment
-            android:id="@+id/miniPlayerFragment"
-            android:name="code.name.monkey.retromusic.fragments.other.MiniPlayerFragment"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/mini_player_height"
-            tools:layout="@layout/fragment_mini_player" />
-
-    </FrameLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp-land/activity_settings.xml b/app/src/main/res/layout-sw600dp-land/activity_settings.xml
new file mode 100644
index 000000000..bb5a7e8ec
--- /dev/null
+++ b/app/src/main/res/layout-sw600dp-land/activity_settings.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <androidx.core.widget.NestedScrollView
+        android:id="@+id/background"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <FrameLayout
+                android:id="@+id/contentFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="2" />
+
+            <FrameLayout
+                android:id="@+id/detailContentFrame"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:liftOnScroll="true">
+
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:layout_collapseMode="pin"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+            tools:title="@string/action_settings" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
diff --git a/app/src/main/res/layout-sw600dp/item_list.xml b/app/src/main/res/layout-sw600dp/item_list.xml
deleted file mode 100644
index 32d06cece..000000000
--- a/app/src/main/res/layout-sw600dp/item_list.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:layout_marginStart="1dp"
-    android:layout_marginEnd="1dp"
-    android:layout_marginBottom="1dp"
-    android:background="?rectSelector"
-    android:clickable="true"
-    android:focusable="true"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:paddingHorizontal="64dp"
-    tools:ignore="MissingPrefix">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/drag_view"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_vertical|start"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_drag_vertical"
-        app:tint="?attr/colorControlNormal"
-        tools:ignore="ContentDescription"
-        tools:visibility="visible" />
-
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        app:cardCornerRadius="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/drag_view"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/imageText"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:maxLines="1"
-            android:minHeight="40dp"
-            android:textAppearance="@style/TextViewSubtitle2"
-            android:visibility="gone"
-            tools:text="100"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/imageTextContainer"
-        app:layout_constraintEnd_toStartOf="@id/text"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toTopOf="@id/imageTextContainer"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewCaption"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toStartOf="@id/text2"
-        app:layout_constraintStart_toEndOf="@id/title"
-        app:layout_constraintTop_toTopOf="@id/title"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewCaption"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/text"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintStart_toEndOf="@id/text"
-        app:layout_constraintTop_toTopOf="@id/text"
-        tools:text="@tools:sample/full_names" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/colorControlNormal" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/item_list_big.xml b/app/src/main/res/layout-sw600dp/item_list_big.xml
deleted file mode 100644
index 7843e3c5e..000000000
--- a/app/src/main/res/layout-sw600dp/item_list_big.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:layout_marginStart="1dp"
-    android:layout_marginEnd="1dp"
-    android:layout_marginBottom="1dp"
-    android:background="?rectSelector"
-    android:clickable="true"
-    android:focusable="true"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    android:paddingHorizontal="64dp"
-    tools:ignore="MissingPrefix">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/drag_view"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_gravity="center_vertical|start"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_drag_vertical"
-        app:tint="?attr/colorControlNormal"
-        tools:ignore="ContentDescription"
-        tools:visibility="visible" />
-
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        app:cardCornerRadius="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/drag_view"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/imageText"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:maxLines="1"
-            android:minHeight="40dp"
-            android:textAppearance="@style/TextViewSubtitle2"
-            android:visibility="gone"
-            tools:text="100"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toBottomOf="@id/imageTextContainer"
-        app:layout_constraintEnd_toStartOf="@id/text"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toTopOf="@id/imageTextContainer"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintEnd_toStartOf="@id/text2"
-        app:layout_constraintStart_toEndOf="@id/title"
-        app:layout_constraintTop_toTopOf="@id/title"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@id/text"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintStart_toEndOf="@id/text"
-        app:layout_constraintTop_toTopOf="@id/text"
-        tools:text="@tools:sample/full_names" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/colorControlNormal" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/item_queue.xml b/app/src/main/res/layout-sw600dp/item_queue.xml
deleted file mode 100644
index 148b5d56a..000000000
--- a/app/src/main/res/layout-sw600dp/item_queue.xml
+++ /dev/null
@@ -1,136 +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:background="?rectSelector"
-    android:clickable="true"
-    android:focusable="true">
-
-    <FrameLayout
-        android:id="@+id/dummy_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="1dp"
-            android:layout_marginEnd="1dp"
-            android:layout_marginBottom="1dp"
-            android:background="?rectSelector"
-            android:minHeight="?attr/listPreferredItemHeight"
-            android:orientation="horizontal"
-            tools:ignore="MissingPrefix">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/drag_view"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_gravity="center_vertical|start"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_drag_vertical"
-                app:tint="?attr/colorControlNormal"
-                tools:ignore="ContentDescription"
-                tools:visibility="visible" />
-
-            <FrameLayout
-                android:id="@+id/imageContainer"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginStart="16dp"
-                app:cardCornerRadius="8dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/drag_view"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/image"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:scaleType="centerCrop"
-                    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.Small"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic"
-                    tools:visibility="visible" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/imageText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:maxLines="1"
-                    android:minWidth="36dp"
-                    android:minHeight="40dp"
-                    android:textAppearance="@style/TextViewSubtitle1"
-                    android:visibility="gone"
-                    tools:text="100"
-                    tools:visibility="visible" />
-            </FrameLayout>
-
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="6dp"
-                android:textAppearance="@style/TextViewBody2"
-                android:textColor="?android:attr/textColorPrimary"
-                app:layout_constraintBottom_toBottomOf="@id/imageContainer"
-                app:layout_constraintEnd_toStartOf="@id/text"
-                app:layout_constraintStart_toEndOf="@id/imageContainer"
-                app:layout_constraintTop_toTopOf="@id/imageContainer"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintBottom_toBottomOf="@id/title"
-                app:layout_constraintEnd_toStartOf="@id/text2"
-                app:layout_constraintStart_toEndOf="@id/title"
-                app:layout_constraintTop_toTopOf="@id/title"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text2"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintBottom_toBottomOf="@id/text"
-                app:layout_constraintEnd_toStartOf="@id/menu"
-                app:layout_constraintStart_toEndOf="@id/text"
-                app:layout_constraintTop_toTopOf="@id/text"
-                tools:text="@tools:sample/full_names" />
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/menu"
-                style="@style/OverFlowButton"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="0"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:tint="?attr/colorControlNormal" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </FrameLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v31/layout_notification_collapsed.xml b/app/src/main/res/layout-v31/layout_notification_collapsed.xml
deleted file mode 100644
index b87f6b18f..000000000
--- a/app/src/main/res/layout-v31/layout_notification_collapsed.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="@color/md_red_500"
-    tools:ignore="ContentDescription">
-
-    <RelativeLayout
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_alignBottom="@+id/content"
-        android:layout_alignParentEnd="true">
-
-        <ImageView
-            android:id="@+id/largeIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_alignParentEnd="true"
-            android:adjustViewBounds="true"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:layout_toStartOf="@id/actions"
-        android:orientation="vertical"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="8dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.RetroMusic.Notification"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.RetroMusic.Notification.Title"
-            tools:text="@tools:sample/lorem/random" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/actions"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@id/content"
-        android:layout_alignBottom="@id/content"
-        android:layout_alignParentEnd="true"
-        android:layout_gravity="bottom"
-        android:layout_marginEnd="48dp"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/action_prev"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:background="@drawable/notification_selector"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_previous"
-            tools:tint="?colorOnPrimary" />
-
-        <ImageButton
-            android:id="@+id/action_play_pause"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:background="@drawable/notification_selector"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_pause"
-            tools:tint="?colorOnPrimary" />
-
-        <ImageButton
-            android:id="@+id/action_next"
-            android:layout_width="38dp"
-            android:layout_height="38dp"
-            android:background="@drawable/notification_selector"
-            android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_next"
-            tools:tint="?colorOnPrimary" />
-
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v31/layout_notification_expanded.xml b/app/src/main/res/layout-v31/layout_notification_expanded.xml
deleted file mode 100644
index cfa1e5205..000000000
--- a/app/src/main/res/layout-v31/layout_notification_expanded.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="@color/md_red_500">
-
-    <RelativeLayout
-        android:id="@+id/image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true">
-
-        <ImageView
-            android:id="@+id/largeIcon"
-            android:layout_width="@dimen/notification_big_image_size"
-            android:layout_height="@dimen/notification_big_image_size"
-            android:layout_alignParentEnd="true"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-
-    </RelativeLayout>
-
-    <LinearLayout
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_alignParentStart="true"
-        android:orientation="vertical"
-        android:paddingStart="0dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="144dp">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingStart="16dp"
-            android:paddingEnd="0dp"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.RetroMusic.Notification"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <TextView
-            android:id="@+id/subtitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:lines="1"
-            android:paddingStart="16dp"
-            android:paddingEnd="0dp"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.RetroMusic.Notification.Title"
-            tools:text="@tools:sample/lorem/random" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_marginTop="16dp"
-            android:orientation="horizontal">
-
-            <ImageButton
-                android:id="@+id/action_prev"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:background="@drawable/notification_selector"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_previous"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageButton
-                android:id="@+id/action_play_pause"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:background="@drawable/notification_selector"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_pause_white_48dp"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageButton
-                android:id="@+id/action_next"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:background="@drawable/notification_selector"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_next"
-                tools:tint="?colorOnPrimary" />
-
-            <ImageButton
-                android:id="@+id/action_quit"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:background="@drawable/notification_selector"
-                android:scaleType="centerInside"
-                tools:src="@drawable/ic_close"
-                tools:tint="?colorOnPrimary" />
-        </LinearLayout>
-    </LinearLayout>
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml
new file mode 100644
index 000000000..d31547b4c
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@@ -0,0 +1,147 @@
+<?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"
+    android:transitionName="@string/transition_album_art">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/artistImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[12]" />
+
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="320dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="128dp"
+        android:layout_marginEnd="128dp"
+        android:background="?attr/colorSurface"
+        android:fillViewport="true"
+        android:overScrollMode="never"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            app:cardElevation="8dp"
+            app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+            <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">
+
+                    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                        android:layout_width="256dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0">
+
+                        <com.google.android.material.card.MaterialCardView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="8dp"
+                            app:cardCornerRadius="8dp"
+                            app:cardElevation="4dp"
+                            app:cardUseCompatPadding="true">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/image"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:scaleType="centerCrop"
+                                tools:srcCompat="@tools:sample/backgrounds/scenic[13]" />
+                        </com.google.android.material.card.MaterialCardView>
+                    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:padding="16dp">
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxLines="2"
+                            android:textAppearance="@style/TextViewHeadline3"
+                            android:textStyle="bold"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album name" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumText"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:paddingTop="4dp"
+                            android:textAppearance="@style/TextViewHeadline6"
+                            android:textColor="?android:attr/textColorSecondary"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album details" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <include layout="@layout/activity_album_content" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.core.widget.NestedScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="72dp"
+        android:background="@drawable/shadow_down_strong" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
new file mode 100644
index 000000000..8607d1ca8
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
@@ -0,0 +1,120 @@
+<?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">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/artistImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:transitionName="@string/transition_artist_image"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="400dp"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="parallax" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="128dp"
+        android:layout_marginEnd="128dp"
+        android:fillViewport="true"
+        android:overScrollMode="never"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
+            app:cardElevation="8dp"
+            app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+            <LinearLayout
+                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"
+                    android:padding="24dp">
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/artistTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="2"
+                        android:textAppearance="@style/TextViewHeadline4"
+                        android:textStyle="bold"
+                        tools:ignore="MissingPrefix"
+                        tools:text="Title" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        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:paddingTop="4dp"
+                        android:scrollHorizontally="true"
+                        android:singleLine="true"
+                        android:textAppearance="@style/TextViewHeadline6"
+                        android:textColor="?android:attr/textColorSecondary"
+                        tools:ignore="MissingPrefix"
+                        tools:text="Title" />
+
+                </LinearLayout>
+
+
+                <include layout="@layout/activity_artist_content" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.core.widget.NestedScrollView>
+</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
new file mode 100644
index 000000000..2610bdd12
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_banner_home.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                app:contentScrim="@android:color/transparent"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed"
+                app:statusBarScrim="@color/md_black_1000"
+                app:titleEnabled="false">
+
+                <FrameLayout
+                    android:id="@+id/imageContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="258dp"
+                    app:layout_collapseMode="parallax">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:background="@color/md_red_400"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="24dp"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/shadow_up_full_theme"
+                        android:backgroundTint="?colorPrimary" />
+                </FrameLayout>
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_collapseMode="pin"
+                    app:layout_scrollFlags="scroll|enterAlways">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <include layout="@layout/status_bar" />
+                    </FrameLayout>
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/toolbarContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="6dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_collapseMode="pin"
+                        app:layout_scrollFlags="scroll|enterAlways">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+                    </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:behavior_overlapTop="52dp"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                app:cardBackgroundColor="?colorPrimary"
+                app:cardElevation="8dp"
+                app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+                <include layout="@layout/home_content" />
+            </com.google.android.material.card.MaterialCardView>
+        </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_blur.xml b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
new file mode 100644
index 000000000..8bd1733ac
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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"
+    android:clickable="true"
+    android:focusable="true">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/colorBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/md_black_1000"
+        android:visibility="gone" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_up" />
+
+
+    <LinearLayout
+        android:id="@+id/playerContent"
+        android:layout_width="400dp"
+        android:layout_height="0dp"
+        android:layout_above="@id/playerToolbar"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:id="@+id/album_cover_container"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_weight="0">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.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="match_parent"
+            android:layout_weight="1"
+            tools:background="@color/md_white_1000">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+    </LinearLayout>
+
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/playerToolbar"
+        style="@style/Toolbar"
+        android:layout_height="48dp"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 000000000..5b3016d38
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_home.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
+    android:background="?attr/colorSurface"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        tools:ignore="UnusedAttribute">
+
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/toolbar_height"
+                    android:background="?colorSurface"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:popupTheme="?toolbarPopupTheme"
+                    app:title="@string/search_hint"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    tools:ignore="UnusedAttribute" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </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_player.xml b/app/src/main/res/layout-xlarge-land/fragment_player.xml
new file mode 100644
index 000000000..2fd31c58b
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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:clickable="true"
+    android:focusable="true">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
+    <View
+        android:id="@+id/colorGradientBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/shadow_statusbar_toolbar" />
+
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+
+        <FrameLayout
+            android:id="@+id/statusBarContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/statusBarContainer"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+
+        <LinearLayout
+            android:id="@+id/albumCoverContainer"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:orientation="horizontal"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/playerToolbar">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <fragment
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.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>
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+        </LinearLayout>
+
+        <fragment
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/albumCoverContainer"
+            tools:layout="@layout/fragment_player_playback_controls" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
new file mode 100755
index 000000000..be83c8147
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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:id="@+id/playback_controls"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_vertical"
+    android:orientation="vertical"
+    tools:ignore="MissingPrefix">
+
+    <com.google.android.material.textview.MaterialTextView
+        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:marqueeRepeatLimit="marquee_forever"
+        android:paddingStart="24dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="24dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="@style/TextViewHeadline3"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem/random" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="24dp"
+        android:paddingEnd="24dp"
+        android:textAppearance="@style/TextViewHeadline5"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        tools:text="@tools:sample/lorem/random" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/previousButton"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="24dp"
+        android:background="?attr/roundSelector"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
+        app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/playPauseButton"
+        android:layout_width="96dp"
+        android:layout_height="96dp"
+        android:layout_centerInParent="true"
+        android:layout_marginStart="8dp"
+        android:layout_marginTop="8dp"
+        android:background="@drawable/color_circle_gradient"
+        android:elevation="4dp"
+        android:padding="12dp"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+        app:layout_constraintStart_toEndOf="@id/previousButton"
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        app:srcCompat="@drawable/ic_play_arrow_white_32dp"
+        tools:tint="@color/md_black_1000" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/nextButton"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="8dp"
+        android:background="?attr/roundSelector"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
+        app:layout_constraintStart_toEndOf="@id/playPauseButton"
+        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
+        app:srcCompat="@drawable/ic_skip_next_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="0dp"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
+        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
+        app:layout_constraintEnd_toStartOf="@+id/repeatButton"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toEndOf="@+id/nextButton"
+        app:layout_constraintTop_toTopOf="@+id/playPauseButton">
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            android:thumb="@drawable/switch_thumb_material"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+    </RelativeLayout>
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/repeatButton"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:background="?attr/roundSelector"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toBottomOf="@+id/progressContainer"
+        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
+        app:layout_constraintStart_toEndOf="@+id/progressContainer"
+        app:layout_constraintTop_toTopOf="@+id/progressContainer"
+        app:srcCompat="@drawable/ic_repeat_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/shuffleButton"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="24dp"
+        android:background="?attr/roundSelector"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toBottomOf="@+id/repeatButton"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/repeatButton"
+        app:layout_constraintTop_toTopOf="@+id/repeatButton"
+        app:srcCompat="@drawable/ic_shuffle_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+
+    <FrameLayout
+        android:id="@+id/volumeFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        tools:backgroundTint="@color/md_red_400"
+        tools:layout_height="52dp" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge-land/pager_item.xml b/app/src/main/res/layout-xlarge-land/pager_item.xml
new file mode 100644
index 000000000..82ed46ad9
--- /dev/null
+++ b/app/src/main/res/layout-xlarge-land/pager_item.xml
@@ -0,0 +1,61 @@
+<?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:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/imageContainer"
+        android:layout_width="match_parent"
+        android:layout_height="256dp"
+        app:cardCornerRadius="16dp"
+        app:cardUseCompatPadding="true">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playSongs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="12dp"
+            android:background="@drawable/color_circle_gradient"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_about_content.xml b/app/src/main/res/layout-xlarge/activity_about_content.xml
new file mode 100644
index 000000000..b03e6dfdb
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/activity_about_content.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
+  xmlns:grid="http://schemas.android.com/apk/res-auto"
+  android:layout_width="match_parent"
+  android:layout_height="wrap_content"
+  android:padding="8dp"
+  grid:alignmentMode="alignBounds">
+
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_marginEnd="4dp"
+    android:orientation="vertical"
+    grid:layout_column="0"
+    grid:layout_columnWeight="1"
+    grid:layout_row="0">
+
+    <include layout="@layout/card_retro_info"/>
+
+    <include layout="@layout/card_credit"/>
+  </LinearLayout>
+
+  <LinearLayout
+    android:layout_width="0dp"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="4dp"
+    android:orientation="vertical"
+    grid:layout_column="1"
+    grid:layout_columnWeight="1"
+    grid:layout_row="0">
+
+    <include layout="@layout/card_social"/>
+
+    <include layout="@layout/card_other"/>
+
+  </LinearLayout>
+</androidx.gridlayout.widget.GridLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml
new file mode 100644
index 000000000..23ecc5eac
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@@ -0,0 +1,158 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:transitionName="@string/transition_album_art">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/artistImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[15]" />
+
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="320dp"
+                android:layout_height="wrap_content" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp"
+        android:background="?attr/colorSurface"
+        android:fillViewport="true"
+        android:overScrollMode="never"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            app:cardElevation="8dp"
+            app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+            <LinearLayout
+                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:baselineAligned="false"
+                    android:orientation="horizontal">
+
+                    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                        android:layout_width="196dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0">
+
+                        <com.google.android.material.card.MaterialCardView
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_margin="8dp"
+                            app:cardCornerRadius="8dp"
+                            app:cardElevation="4dp"
+                            app:cardUseCompatPadding="true">
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/image"
+                                android:layout_width="match_parent"
+                                android:layout_height="match_parent"
+                                android:scaleType="centerCrop"
+                                tools:srcCompat="@tools:sample/backgrounds/scenic[14]" />
+                        </com.google.android.material.card.MaterialCardView>
+                    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:orientation="vertical"
+                        android:paddingStart="16dp"
+                        android:paddingEnd="16dp">
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumTitle"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:maxLines="2"
+                            android:textAppearance="@style/TextViewHeadline4"
+                            android:textStyle="bold"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album name" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:id="@+id/albumText"
+                            style="@style/TextViewHeadline6"
+                            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:textColor="?android:attr/textColorSecondary"
+                            android:marqueeRepeatLimit="marquee_forever"
+                            android:paddingTop="4dp"
+                            android:scrollHorizontally="true"
+                            android:singleLine="true"
+                            tools:ignore="MissingPrefix"
+                            tools:text="Album details" />
+
+                    </LinearLayout>
+                </LinearLayout>
+
+                <include layout="@layout/activity_album_content" />
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.core.widget.NestedScrollView>
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="72dp"
+        android:background="@drawable/shadow_down_strong" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml
new file mode 100644
index 000000000..07ddf7df1
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -0,0 +1,116 @@
+<?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">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/artistImage"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop"
+        android:transitionName="@string/transition_artist_image"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.CollapsingToolbarLayout
+            android:id="@+id/collapsingToolbarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            app:layout_scrollFlags="scroll|exitUntilCollapsed"
+            app:titleEnabled="false">
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="parallax" />
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_collapseMode="pin">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+        </com.google.android.material.appbar.CollapsingToolbarLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="fill_vertical"
+        android:layout_marginStart="96dp"
+        android:layout_marginEnd="96dp"
+        android:fillViewport="true"
+        android:overScrollMode="never"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/contentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="6dp"
+            android:background="?attr/colorSurface"
+            app:cardElevation="8dp"
+            app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:elevation="@dimen/card_elevation"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    android:padding="24dp">
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/artistTitle"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:maxLines="2"
+                        android:textAppearance="@style/TextViewHeadline4"
+                        android:textStyle="bold"
+                        tools:ignore="MissingPrefix"
+                        tools:text="Title" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/text"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:paddingTop="4dp"
+                        android:textAppearance="@style/TextViewHeadline6"
+                        android:textColor="?android:attr/textColorSecondary"
+                        tools:ignore="MissingPrefix"
+                        tools:text="Title" />
+
+                </LinearLayout>
+
+
+                <include layout="@layout/activity_artist_content" />
+
+            </LinearLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml
new file mode 100644
index 000000000..e47ac8b15
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/activity_user_info.xml
@@ -0,0 +1,158 @@
+<?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"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+            app:title="@string/profile"
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="128dp"
+        android:layout_marginEnd="128dp"
+        android:orientation="vertical"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true">
+
+                <FrameLayout
+                    android:id="@+id/imageContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="228dp"
+                        android:scaleType="centerCrop"
+                        app:srcCompat="@drawable/material_design_default" />
+
+                    <View
+                        android:id="@+id/bannerSelect"
+                        android:layout_width="match_parent"
+                        android:layout_height="228dp"
+                        android:background="@color/twenty_percent_black_overlay" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="center"
+                        android:background="?roundSelector"
+                        android:padding="16dp"
+                        app:srcCompat="@drawable/ic_add_photo_white_24dp"
+                        app:tint="@color/md_white_1000" />
+
+                    <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/userImage"
+                            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_add_photo_white_24dp"
+                            app:tint="?iconColor" />
+                    </FrameLayout>
+
+                </FrameLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/nameContainer"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                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:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/bioContainer"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                app:hintEnabled="true">
+
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/bio"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@null"
+                    android:hint="@string/bio"
+                    android:inputType="textPersonName|textCapWords|text"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
+                    android:visibility="gone" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/next"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_margin="16dp"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/save"
+        app:icon="@drawable/ic_save_white_24dp"
+        app:iconGravity="textStart" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
new file mode 100644
index 000000000..a75d2aed7
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_album_card_cover.xml
@@ -0,0 +1,31 @@
+<?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">
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/player_album_art_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="4dp"
+        app:cardPreventCornerOverlap="false"
+        app:cardUseCompatPadding="true">
+
+        <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"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[2]" />
+
+        <View
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@drawable/shadow_up_edited" />
+    </androidx.cardview.widget.CardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_banner_home.xml b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
new file mode 100644
index 000000000..3d89afc3d
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_banner_home.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@android:color/transparent"
+                app:contentScrim="@android:color/transparent"
+                app:layout_scrollFlags="scroll|exitUntilCollapsed"
+                app:statusBarScrim="@color/md_black_1000"
+                app:titleEnabled="false">
+
+                <FrameLayout
+                    android:id="@+id/imageContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="228dp"
+                    app:layout_collapseMode="parallax">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:background="@color/md_red_400"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="24dp"
+                        android:layout_gravity="bottom"
+                        android:background="@drawable/shadow_up_full_theme"
+                        android:backgroundTint="?colorPrimary" />
+                </FrameLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical"
+                    app:layout_collapseMode="pin"
+                    app:layout_scrollFlags="scroll|enterAlways">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <include layout="@layout/status_bar" />
+                    </FrameLayout>
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/toolbarContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="8dp"
+                        app:cardElevation="6dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_collapseMode="pin"
+                        app:layout_scrollFlags="scroll|enterAlways">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+                    </com.google.android.material.card.MaterialCardView>
+                </LinearLayout>
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:behavior_overlapTop="52dp"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <com.google.android.material.card.MaterialCardView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                app:cardBackgroundColor="?colorPrimary"
+                app:cardElevation="8dp"
+                app:shapeAppearanceOverlay="@style/TopCornerCardView">
+
+                <include layout="@layout/home_content" />
+            </com.google.android.material.card.MaterialCardView>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_blur.xml b/app/src/main/res/layout-xlarge/fragment_blur.xml
new file mode 100644
index 000000000..8a971f5be
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@@ -0,0 +1,83 @@
+<?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:clickable="true"
+    android:focusable="true">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/colorBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:scaleType="centerCrop" />
+
+    <View
+        android:id="@+id/mask"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@color/md_black_1000"
+        android:visibility="gone" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_up" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="64dp"
+        android:layout_marginEnd="64dp"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            tools:background="@color/md_white_1000">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_height="48dp"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_home.xml b/app/src/main/res/layout-xlarge/fragment_home.xml
new file mode 100644
index 000000000..898c57931
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_home.xml
@@ -0,0 +1,134 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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:id="@+id/main_fragment_content"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        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">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/toolbar_height"
+                    android:background="?colorSurface"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:popupTheme="?toolbarPopupTheme"
+                    app:title="@string/search_hint"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    tools:ignore="UnusedAttribute" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+            android:layout_weight="1"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_mini_player.xml b/app/src/main/res/layout-xlarge/fragment_mini_player.xml
new file mode 100644
index 000000000..06d428146
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_mini_player.xml
@@ -0,0 +1,106 @@
+<?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:id="@+id/miniPlayerContent"
+    android:layout_width="match_parent"
+    android:layout_height="48dp"
+    android:background="?android:attr/background"
+    android:clickable="true"
+    android:focusable="false"
+    android:transitionName="@string/transition_mini_player"
+    tools:ignore="UnusedAttribute">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/miniPlayerImage"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="16dp"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
+            app:tint="?colorOnSurface"
+            tools:ignore="ContentDescription"
+            tools:tint="?colorOnSurface" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/miniPlayerTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            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/TextViewNormal"
+            android:textColor="?colorOnSurface"
+            tools:text="Song name and details" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/actionPrevious"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+            app:tint="?colorOnSurface"
+            tools:tint="@color/black_color" />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/miniPlayerPlayPauseButton"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:scaleType="center"
+            app:srcCompat="@drawable/ic_pause_white_24dp"
+            app:tint="?colorOnSurface"
+            tools:ignore="ContentDescription"
+            tools:tint="?colorOnSurface" />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/actionNext"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:layout_marginEnd="16dp"
+            android:background="?roundSelector"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_skip_next_white_24dp"
+            app:tint="?colorOnSurface"
+            tools:tint="?colorOnSurface" />
+
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/actionPlayingQueue"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_playlist_play_white_24dp"
+            app:tint="?colorOnSurface"
+            tools:tint="?colorOnSurface" />
+
+    </LinearLayout>
+
+    <ProgressBar
+        android:id="@+id/progressBar"
+        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
+        android:layout_height="3dp"
+        android:progress="20" />
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/fragment_player.xml b/app/src/main/res/layout-xlarge/fragment_player.xml
new file mode 100644
index 000000000..720ab992c
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@@ -0,0 +1,75 @@
+<?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:clickable="true"
+    android:focusable="true">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
+    <View
+        android:id="@+id/colorGradientBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <include layout="@layout/shadow_statusbar_toolbar" />
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:id="@+id/album_cover_container"
+            android:layout_width="520dp"
+            android:layout_height="wrap_content">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="520dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/item_artist.xml b/app/src/main/res/layout-xlarge/item_artist.xml
new file mode 100644
index 000000000..13b057c4c
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/item_artist.xml
@@ -0,0 +1,34 @@
+<?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="156dp"
+    android:layout_height="wrap_content"
+    android:layout_margin="8dp"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <code.name.monkey.retromusic.views.CircularImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:civ_border="false"
+            tools:src="@tools:sample/avatars" />
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingTop="12dp"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?attr/colorOnPrimary"
+        tools:text="Name" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/item_image.xml b/app/src/main/res/layout-xlarge/item_image.xml
new file mode 100644
index 000000000..c941ee09f
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/item_image.xml
@@ -0,0 +1,35 @@
+<?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="wrap_content"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.WidthFitSquareCardView
+        android:layout_width="156dp"
+        android:layout_height="match_parent"
+        android:layout_margin="8dp"
+        android:orientation="vertical"
+        app:cardCornerRadius="6dp"
+        app:cardElevation="4dp"
+        app:cardPreventCornerOverlap="true">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[17]" />
+    </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:padding="10dp"
+        android:textAppearance="@style/TextViewNormal"
+        tools:text="Song title" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/pager_item.xml b/app/src/main/res/layout-xlarge/pager_item.xml
new file mode 100644
index 000000000..4b3876165
--- /dev/null
+++ b/app/src/main/res/layout-xlarge/pager_item.xml
@@ -0,0 +1,61 @@
+<?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:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/imageContainer"
+        android:layout_width="match_parent"
+        android:layout_height="196dp"
+        app:cardCornerRadius="16dp"
+        app:cardUseCompatPadding="true">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            tools:src="@tools:sample/avatars"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playSongs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="12dp"
+            android:background="@drawable/color_circle_gradient"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/abs_playlists.xml b/app/src/main/res/layout/abs_playlists.xml
index ee11757cd..ead07cc6c 100644
--- a/app/src/main/res/layout/abs_playlists.xml
+++ b/app/src/main/res/layout/abs_playlists.xml
@@ -1,64 +1,165 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.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="wrap_content"
     android:orientation="vertical"
     android:paddingBottom="12dp">
 
-    <com.google.android.material.button.MaterialButton
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/history"
-        style="@style/HomeActionButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/history"
-        app:icon="@drawable/ic_history"
+        android:layout_marginTop="24dp"
         app:layout_constraintEnd_toStartOf="@+id/lastAdded"
         app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.button.MaterialButton
+        <code.name.monkey.retromusic.views.ColorIconsImageView
+            android:id="@+id/v1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/home_icon_padding"
+            app:iconBackgroundColor="@color/md_blue_500"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_access_time_white_24dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:text="@string/history"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/v1"
+            tools:text="@tools:sample/lorem" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/lastAdded"
-        style="@style/HomeActionButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:text="@string/last_added"
-        app:icon="@drawable/ic_library_add"
-        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/topPlayed"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/history"
-        app:layout_constraintTop_toTopOf="@+id/history" />
+        app:layout_constraintTop_toTopOf="@+id/history">
 
-    <com.google.android.material.button.MaterialButton
+        <code.name.monkey.retromusic.views.ColorIconsImageView
+            android:id="@+id/v2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/home_icon_padding"
+            app:iconBackgroundColor="@color/md_red_500"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_library_add_white_24dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/materialTextView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:text="@string/last_added"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/v2"
+            tools:text="@tools:sample/lorem" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/topPlayed"
-        style="@style/HomeActionButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:text="@string/my_top_tracks"
-        app:icon="@drawable/ic_trending_up"
+        android:orientation="vertical"
         app:layout_constraintEnd_toStartOf="@+id/actionShuffle"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="@+id/history"
-        app:layout_constraintTop_toBottomOf="@+id/history" />
+        app:layout_constraintStart_toEndOf="@+id/lastAdded"
+        app:layout_constraintTop_toTopOf="@+id/lastAdded">
 
-    <com.google.android.material.button.MaterialButton
+        <code.name.monkey.retromusic.views.ColorIconsImageView
+            android:id="@+id/v3"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/home_icon_padding"
+            app:iconBackgroundColor="@color/md_deep_purple_500"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_trending_up_white_24dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:text="@string/my_top_tracks"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/v3"
+            tools:text="@tools:sample/lorem" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/actionShuffle"
-        style="@style/HomeActionButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:text="@string/shuffle"
-        app:icon="@drawable/ic_shuffle"
-        app:layout_constraintEnd_toEndOf="@+id/lastAdded"
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/topPlayed"
-        app:layout_constraintTop_toBottomOf="@+id/lastAdded" />
+        app:layout_constraintTop_toTopOf="@+id/topPlayed">
 
+        <code.name.monkey.retromusic.views.ColorIconsImageView
+            android:id="@+id/v4"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:padding="@dimen/home_icon_padding"
+            app:iconBackgroundColor="@color/md_green_500"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_shuffle_white_24dp" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:paddingTop="8dp"
+            android:text="@string/shuffle"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/v4"
+            tools:text="@tools:sample/lorem" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/shortcuts"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="history,lastAdded,topPlayed,actionShuffle" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
new file mode 100644
index 000000000..2b5310d20
--- /dev/null
+++ b/app/src/main/res/layout/activity_about.xml
@@ -0,0 +1,46 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.StatusBarView
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="?attr/colorSurface"
+        tools:ignore="UnusedAttribute" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:liftOnScroll="true">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                app:title="@string/action_about"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <include layout="@layout/activity_about_content" />
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_about_content.xml b/app/src/main/res/layout/activity_about_content.xml
new file mode 100644
index 000000000..2d1346f5f
--- /dev/null
+++ b/app/src/main/res/layout/activity_about_content.xml
@@ -0,0 +1,15 @@
+<?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:orientation="vertical">
+
+    <include layout="@layout/card_credit" />
+
+    <include layout="@layout/card_retro_info" />
+
+    <include layout="@layout/card_social" />
+
+    <include layout="@layout/card_other" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
new file mode 100755
index 000000000..e30dd78ea
--- /dev/null
+++ b/app/src/main/res/layout/activity_album.xml
@@ -0,0 +1,138 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:liftOnScroll="true">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+
+                android:orientation="vertical">
+
+                <code.name.monkey.retromusic.views.WidthFitSquareCardView
+                    android:id="@+id/albumCoverContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:transitionName="@string/transition_album_art"
+                    app:cardCornerRadius="24dp"
+                    app:cardElevation="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+
+                </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/artistImage"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_weight="0"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/albumCoverContainer"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
+
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/albumTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:maxLines="3"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/artistImage"
+                    app:layout_constraintTop_toTopOf="@id/artistImage"
+                    tools:ignore="MissingPrefix"
+                    tools:text="@tools:sample/lorem/random" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/albumText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:singleLine="true"
+                    android:textAppearance="@style/TextViewSubtitle2"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/artistImage"
+                    app:layout_constraintTop_toBottomOf="@id/albumTitle"
+                    tools:ignore="MissingPrefix"
+                    tools:text="@tools:sample/lorem/random" />
+
+
+                <include
+                    layout="@layout/activity_album_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/albumText" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_content.xml b/app/src/main/res/layout/activity_album_content.xml
similarity index 67%
rename from app/src/main/res/layout/fragment_album_content.xml
rename to app/src/main/res/layout/activity_album_content.xml
index 67144ea19..e89994d51 100644
--- a/app/src/main/res/layout/fragment_album_content.xml
+++ b/app/src/main/res/layout/activity_album_content.xml
@@ -1,24 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.insets.InsetsConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/mini_player_height">
+    android:orientation="vertical">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="4dp"
-        android:paddingVertical="10dp"
+        android:layout_marginStart="@dimen/button_margin_horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/button_margin_horizontal"
+        android:layout_marginBottom="8dp"
         android:text="@string/action_play_all"
-        android:textAppearance="@style/TextViewButton"
-        android:textColor="?android:attr/textColorPrimary"
-        app:icon="@drawable/ic_play_arrow"
+        app:icon="@drawable/ic_play_arrow_white_24dp"
         app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -26,15 +23,14 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.Material3.Button.Icon"
         android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
-        android:paddingVertical="10dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/button_margin_horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="@dimen/button_margin_horizontal"
+        android:layout_marginBottom="8dp"
         android:text="@string/shuffle"
-        android:textAppearance="@style/TextViewButton"
-        app:icon="@drawable/ic_shuffle"
+        app:icon="@drawable/ic_shuffle_white_24dp"
         app:layout_constraintBottom_toBottomOf="@+id/playAction"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -44,13 +40,10 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songTitle"
+        style="@style/SubTitleTextAppearance"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:padding="16dp"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/playAction" />
@@ -60,22 +53,15 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
-        android:overScrollMode="@integer/overScrollMode"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/songTitle"
-        tools:listitem="@layout/item_song"/>
+        tools:listitem="@layout/item_song" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/moreTitle"
         style="@style/SubTitleTextAppearance"
         android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -89,12 +75,9 @@
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
         android:visibility="gone"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/moreTitle"
-        app:spanCount="3"
-        tools:itemCount="3"
         tools:listitem="@layout/item_album_card"
         tools:visibility="visible" />
 
@@ -104,4 +87,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/moreRecyclerView" />
-</code.name.monkey.retromusic.views.insets.InsetsConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 b09649182..2789d7aa2 100755
--- a/app/src/main/res/layout/activity_album_tag_editor.xml
+++ b/app/src/main/res/layout/activity_album_tag_editor.xml
@@ -1,25 +1,33 @@
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:fitsSystemWindows="true"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
-    android:transitionGroup="true">
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             app:title="@string/action_tag_editor" />
 
     </com.google.android.material.appbar.AppBarLayout>
@@ -28,10 +36,10 @@
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:overScrollMode="@integer/overScrollMode"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <LinearLayout
+            android:id="@+id/editables"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
@@ -42,7 +50,7 @@
                 android:layout_height="wrap_content"
                 android:layout_margin="16dp"
                 android:transitionName="@string/transition_album_art"
-                app:cardCornerRadius="@dimen/m3_card_large_radius"
+                app:cardCornerRadius="24dp"
                 app:cardElevation="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -71,6 +79,7 @@
                     android:id="@+id/albumText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@null"
                     android:hint="@string/album"
                     android:inputType="text|textCapWords"
                     android:maxLines="1" />
@@ -90,6 +99,7 @@
                     android:id="@+id/albumArtistText"
                     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" />
@@ -109,6 +119,7 @@
                     android:id="@+id/genreTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@null"
                     android:hint="@string/genre"
                     android:inputType="text|textCapWords"
                     android:maxLines="1" />
@@ -128,6 +139,7 @@
                     android:id="@+id/yearTitle"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:background="@null"
                     android:hint="@string/year"
                     android:inputType="text|number"
                     android:maxLines="1" />
@@ -146,7 +158,7 @@
                 android:paddingBottom="12dp"
                 android:text="@string/save"
                 app:cornerRadius="25dp"
-                app:icon="@drawable/ic_save"
+                app:icon="@drawable/ic_save_white_24dp"
                 app:iconGravity="textStart"
                 tools:backgroundTint="@color/md_red_400" />
 
@@ -155,4 +167,4 @@
                 android:layout_height="52dp" />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_artist_content.xml b/app/src/main/res/layout/activity_artist_content.xml
similarity index 52%
rename from app/src/main/res/layout/fragment_artist_content.xml
rename to app/src/main/res/layout/activity_artist_content.xml
index 8ee8f6a34..adabb1d51 100644
--- a/app/src/main/res/layout/fragment_artist_content.xml
+++ b/app/src/main/res/layout/activity_artist_content.xml
@@ -1,25 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<code.name.monkey.retromusic.views.insets.InsetsConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.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"
-    android:orientation="vertical"
-    android:paddingBottom="@dimen/mini_player_height">
+    android:orientation="vertical">
+
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.Material3.Button.OutlinedButton"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="4dp"
-        android:paddingVertical="10dp"
+        android:layout_marginStart="@dimen/button_margin_horizontal"
+        android:layout_marginEnd="@dimen/button_margin_horizontal"
         android:text="@string/action_play_all"
-        android:textAppearance="@style/TextViewButton"
-        android:textColor="?android:attr/textColorPrimary"
-        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_play_arrow"
+        app:icon="@drawable/ic_play_arrow_white_24dp"
         app:layout_constraintEnd_toStartOf="@+id/shuffleAction"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,78 +22,69 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.Material3.Button.Icon"
         android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
-        android:paddingVertical="10dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/button_margin_horizontal"
+        android:layout_marginEnd="@dimen/button_margin_horizontal"
         android:text="@string/shuffle"
-        android:textAppearance="@style/TextViewButton"
-        app:icon="@drawable/ic_shuffle"
+        app:icon="@drawable/ic_shuffle_white_24dp"
         app:layout_constraintBottom_toBottomOf="@+id/playAction"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/playAction"
         app:layout_constraintTop_toTopOf="@+id/playAction" />
 
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/biographyTitle"
+        style="@style/SubTitleTextAppearance"
+        android:text="@string/biography"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/playAction"
+        tools:visibility="visible" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/biographyText"
+        style="@style/TextAppearance.MaterialComponents.Body1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:ellipsize="end"
+        android:lineSpacingExtra="5dp"
+        android:maxLines="4"
+        android:padding="16dp"
+        android:visibility="gone"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/biographyTitle"
+        tools:text="@string/bug_report_summary"
+        tools:visibility="visible" />
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/albumTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
+        style="@style/SubTitleTextAppearance"
         android:text="@string/albums"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playAction" />
+        app:layout_constraintTop_toBottomOf="@id/biographyText" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/albumRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
-        android:overScrollMode="@integer/overScrollMode"
-        app:barrierDirection="bottom"
-        app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/albumTitle"
         tools:itemCount="3"
+        tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
         tools:listitem="@layout/item_album_card"
         tools:spanCount="3" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/songTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
+        style="@style/SubTitleTextAppearance"
         android:text="@string/songs"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@id/song_sort_order"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/albumRecyclerView" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/song_sort_order"
-        style="@style/Widget.Material3.Button.IconButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:background="?roundSelector"
-        app:icon="@drawable/ic_sort"
-        app:iconSize="24dp"
-        app:iconTint="?colorControlNormal"
-        app:layout_constraintBottom_toBottomOf="@+id/songTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/songTitle"
-        app:layout_constraintTop_toTopOf="@id/songTitle" />
-
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
@@ -113,4 +99,4 @@
         android:layout_height="72dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/recyclerView" />
-</code.name.monkey.retromusic.views.insets.InsetsConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
new file mode 100755
index 000000000..d25f0b8fa
--- /dev/null
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -0,0 +1,121 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:liftOnScroll="true">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+            </FrameLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:overScrollMode="never"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <code.name.monkey.retromusic.views.WidthFitSquareCardView
+                    android:id="@+id/albumCoverContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:transitionName="@string/transition_artist_image"
+                    app:cardCornerRadius="24dp"
+                    app:cardElevation="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/artistImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
+
+                </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/artistTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:maxLines="2"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/albumCoverContainer"
+                    tools:ignore="MissingPrefix"
+                    tools:text="Title" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:textAppearance="@style/TextViewSubtitle2"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/artistTitle"
+                    tools:ignore="MissingPrefix"
+                    tools:text="Title" />
+
+                <include
+                    layout="@layout/activity_artist_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="16dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/text" />
+
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index a43ab0115..0f34dd971 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -1,59 +1,74 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:fitsSystemWindows="true">
+    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
+    <code.name.monkey.retromusic.views.StatusBarView
+        android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        android:layout_height="0dp"
+        android:background="?attr/colorSurface"
+        tools:ignore="UnusedAttribute" />
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+        <com.google.android.material.appbar.AppBarLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/report_bug"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+            app:liftOnScroll="true">
 
-    </com.google.android.material.appbar.AppBarLayout>
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                app:title="@string/report_bug"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
 
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+        </com.google.android.material.appbar.AppBarLayout>
 
-        <LinearLayout
+        <androidx.core.widget.NestedScrollView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:clipToPadding="false"
-            android:orientation="vertical">
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-            <include
-                android:id="@+id/card_device_info"
-                layout="@layout/bug_report_card_device_info"
+            <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                android:clipToPadding="false"
+                android:orientation="vertical">
 
-            <Space
-                android:layout_width="match_parent"
-                android:layout_height="56dp"
-                android:layout_margin="16dp" />
+                <include
+                    layout="@layout/bug_report_card_report"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="8dp" />
 
-        </LinearLayout>
+                <include
+                    layout="@layout/bug_report_card_device_info"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content" />
 
-    </androidx.core.widget.NestedScrollView>
+                <Space
+                    android:layout_width="match_parent"
+                    android:layout_height="56dp"
+                    android:layout_margin="16dp" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/sendFab"
-        style="@style/Fab"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        app:srcCompat="@drawable/ic_open_in_browser" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            </LinearLayout>
+
+        </androidx.core.widget.NestedScrollView>
+
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/sendFab"
+            style="@style/Fab"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="16dp"
+            app:srcCompat="@drawable/ic_send_white_24dp" />
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml
new file mode 100644
index 000000000..768ae337b
--- /dev/null
+++ b/app/src/main/res/layout/activity_donation.xml
@@ -0,0 +1,79 @@
+<?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/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:liftOnScroll="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:layout_collapseMode="pin"
+            app:title="@string/support_development"
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+            tools:ignore="UnusedAttribute" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/donation"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:padding="16dp"
+                android:text="@string/donation_header"
+                android:textAppearance="@style/TextViewSubtitle2"
+                android:textColor="?attr/colorAccent" />
+
+            <LinearLayout
+                android:id="@+id/progressContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:orientation="vertical"
+                android:padding="12dp">
+
+                <ProgressBar
+                    android:id="@+id/progress"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:indeterminate="true" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:gravity="start"
+                    android:paddingLeft="16dp"
+                    android:text="@string/loading_products"
+                    android:textAppearance="@style/TextViewCaption"
+                    tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+            </LinearLayout>
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingStart="6dp"
+                android:paddingEnd="6dp"
+                android:scrollbarStyle="outsideOverlay" />
+
+        </LinearLayout>
+    </androidx.core.widget.NestedScrollView>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml
deleted file mode 100644
index 0ef554144..000000000
--- a/app/src/main/res/layout/activity_drive_mode.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-<androidx.constraintlayout.widget.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"
-    android:orientation="vertical">
-
-    <code.name.monkey.retromusic.views.StatusBarView
-        android:id="@+id/status_bar"
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:background="?attr/colorSurface"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/avatars" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shadow_up_down"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/close"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:backgroundTint="@color/semi_transparent"
-        android:padding="8dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:srcCompat="@drawable/ic_close" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:backgroundTint="@color/semi_transparent"
-        android:padding="8dp"
-        app:layout_constraintEnd_toStartOf="@id/songFavourite"
-        app:layout_constraintStart_toEndOf="@id/close"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:srcCompat="@drawable/ic_car" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/songFavourite"
-        android:layout_width="52dp"
-        android:layout_height="52dp"
-        android:layout_margin="16dp"
-        android:background="@drawable/color_circle_gradient"
-        android:backgroundTint="@color/semi_transparent"
-        android:padding="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:srcCompat="@drawable/ic_favorite_border" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/playPauseButton"
-        android:layout_width="112dp"
-        android:layout_height="112dp"
-        android:layout_marginBottom="42dp"
-        android:background="?roundSelector"
-        android:src="@drawable/ic_pause"
-        app:layout_constraintBottom_toTopOf="@+id/repeatButton"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/nextButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/previousButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/repeatButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginBottom="32dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/image"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:srcCompat="@drawable/ic_repeat" />
-
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/shuffleButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:background="?roundSelector"
-        app:layout_constraintBottom_toBottomOf="@+id/repeatButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/repeatButton"
-        app:srcCompat="@drawable/ic_shuffle" />
-
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/close">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTitle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:maxLines="3"
-            android:textAppearance="@style/TextViewHeadline4"
-            android:textColor="@color/md_white_1000"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:gravity="center"
-            android:maxLines="3"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="@color/md_grey_200"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="3dp"
-        style="@style/Widget.Retro.Slider"
-        app:layout_constraintBottom_toTopOf="@id/songCurrentProgress"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:singleLine="true"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:singleLine="true"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/playPauseButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="@tools:sample/date/hhmmss" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_error_handler.xml b/app/src/main/res/layout/activity_error_handler.xml
new file mode 100644
index 000000000..bc7843b1b
--- /dev/null
+++ b/app/src/main/res/layout/activity_error_handler.xml
@@ -0,0 +1 @@
+<?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:layout_width="match_parent"
    android:layout_height="match_parent"
    android:orientation="vertical">

    <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">

        <com.google.android.material.appbar.MaterialToolbar
            android:id="@+id/toolbar"
            style="@style/Toolbar"
            app:layout_collapseMode="pin"
            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal">


            <com.google.android.material.textview.MaterialTextView
                android:id="@+id/title"
                style="@style/BigTitleTextAppearanceToolbar"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_gravity="center"
                android:gravity="center"
                android:text="@string/error"
                android:textStyle="bold"
                tools:ignore="MissingPrefix" />


        </com.google.android.material.appbar.MaterialToolbar>


    </com.google.android.material.appbar.AppBarLayout>

    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:orientation="vertical"
        android:padding="16dp"
        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

        <androidx.appcompat.widget.AppCompatImageView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:paddingBottom="16dp"
            app:srcCompat="@drawable/ic_bug_report_white_24dp"
            app:tint="@color/md_grey_800" />

        <com.google.android.material.textview.MaterialTextView
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:text="@string/bug_report_summary"
            app:lineHeight="24sp" />

        <ScrollView
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_marginTop="12dp"
            android:layout_weight="1">

            <com.google.android.material.textview.MaterialTextView
                android:id="@+id/showCrashError"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:background="@color/md_grey_400"
                android:padding="16dp"
                android:text="@string/error" />
        </ScrollView>

        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_gravity="end|bottom"
            android:layout_weight="0"
            android:gravity="center">

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/sendCrashLog"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_margin="8dp"
                app:cardBackgroundColor="@color/md_blue_A200"
                app:cardCornerRadius="6dp"
                app:cardUseCompatPadding="true">

                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:gravity="center"
                    android:paddingStart="20dp"
                    android:paddingTop="12dp"
                    android:paddingEnd="20dp"
                    android:paddingBottom="12dp"
                    android:text="@string/send_crash_log"
                    android:textColor="@color/md_white_1000" />
            </com.google.android.material.card.MaterialCardView>

            <com.google.android.material.card.MaterialCardView
                android:id="@+id/clearAppData"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:layout_margin="8dp"
                app:cardBackgroundColor="@color/md_blue_A200"
                app:cardCornerRadius="6dp"
                app:cardUseCompatPadding="true">

                <TextView
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:gravity="center"
                    android:paddingStart="20dp"
                    android:paddingTop="12dp"
                    android:paddingEnd="20dp"
                    android:paddingBottom="12dp"
                    android:text="@string/clear_app_data"
                    android:textColor="@color/md_white_1000" />
            </com.google.android.material.card.MaterialCardView>
        </LinearLayout>
    </LinearLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_license.xml b/app/src/main/res/layout/activity_license.xml
index 5e5159686..d56a3837c 100644
--- a/app/src/main/res/layout/activity_license.xml
+++ b/app/src/main/res/layout/activity_license.xml
@@ -1,42 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
-
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:fitsSystemWindows="true">
+    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+    <code.name.monkey.retromusic.views.StatusBarView
+        android:id="@+id/status_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        android:layout_height="0dp"
+        android:background="?attr/colorSurface"
+        tools:ignore="UnusedAttribute" />
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_collapseMode="pin"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/licenses"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+        android:background="?attr/colorSurface">
 
-        <code.name.monkey.retromusic.views.LollipopFixedWebView
-            android:id="@+id/license"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true"
-            android:scrollbars="none"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            android:background="?colorPrimary"
+            app:liftOnScroll="true">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                app:title="@string/licenses"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+                tools:ignore="UnusedAttribute" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <code.name.monkey.retromusic.views.LollipopFixedWebView
+                android:id="@+id/license"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/activity_lock_screen.xml b/app/src/main/res/layout/activity_lock_screen.xml
index faf44a477..f4f0872ae 100644
--- a/app/src/main/res/layout/activity_lock_screen.xml
+++ b/app/src/main/res/layout/activity_lock_screen.xml
@@ -1,77 +1,63 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/iv_blurred_album_art"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop" />
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="#80000000"
+        android:layout_weight="1"
+        android:gravity="center_vertical"
         android:orientation="vertical"
-        android:paddingTop="24dp">
+        tools:ignore="UselessParent">
 
-        <FrameLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <include layout="@layout/status_bar" />
-        </FrameLayout>
-
-        <code.name.monkey.retromusic.views.WidthFitSquareCardView
-            android:id="@+id/albumCoverContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="16dp"
-            android:transitionName="@string/transition_album_art"
-            app:cardCornerRadius="24dp"
-            app:cardElevation="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/image"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
-
-        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
-
-
-        <LinearLayout
+        <fragment
+            android:id="@+id/playback_controls_fragment"
+            android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenPlayerControlsFragment"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:gravity="center_vertical"
-            android:orientation="vertical"
-            tools:ignore="UselessParent">
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playback_controls_fragment"
-                android:name="code.name.monkey.retromusic.fragments.player.lockscreen.LockScreenControlsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_lock_screen_playback_controls" />
-        </LinearLayout>
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/slide"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:fitsSystemWindows="true"
-            android:gravity="center"
-            android:padding="16dp"
-            android:text="@string/swipe_to_unlock"
-            android:textColor="?android:attr/textColorPrimary" />
+            tools:layout="@layout/fragment_lock_screen_playback_controls" />
     </LinearLayout>
-</RelativeLayout>
+
+    <code.name.monkey.retromusic.views.WidthFitSquareCardView
+        android:id="@+id/albumCoverContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:transitionName="@string/transition_album_art"
+        app:cardCornerRadius="24dp"
+        app:cardElevation="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
+
+    </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/slide"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:gravity="center"
+        android:padding="16dp"
+        android:text="@string/swipe_to_unlock"
+        android:textColor="?android:attr/textColorPrimary" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_lyrics.xml b/app/src/main/res/layout/activity_lyrics.xml
new file mode 100644
index 000000000..7dd50c996
--- /dev/null
+++ b/app/src/main/res/layout/activity_lyrics.xml
@@ -0,0 +1,66 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:transitionName="@string/transition_lyrics">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:contentInsetLeft="0dp"
+            app:contentInsetStart="0dp"
+            app:contentInsetStartWithNavigation="0dp"
+            app:layout_scrollFlags="scroll|enterAlways"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+            app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+            app:titleMargin="0dp"
+            app:titleMarginStart="0dp"
+            app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead"
+            tools:subtitle="@tools:sample/full_names"
+            tools:title="@tools:sample/full_names" />
+
+        <com.google.android.material.tabs.TabLayout
+            android:id="@+id/tabs"
+            style="@style/TabLayoutStyle"
+            android:background="@android:color/transparent"
+            app:tabTextAppearance="@style/TabTextAppearance">
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/synced_lyrics" />
+
+            <com.google.android.material.tabs.TabItem
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/normal_lyrics" />
+        </com.google.android.material.tabs.TabLayout>
+    </com.google.android.material.appbar.AppBarLayout>
+
+
+    <androidx.viewpager.widget.ViewPager
+        android:id="@+id/viewPager"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/fab"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:text="@string/edit"
+        app:icon="@drawable/ic_edit_white_24dp" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ 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
new file mode 100644
index 000000000..1d249e3e9
--- /dev/null
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/fragment_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent" />
diff --git a/app/src/main/res/layout/activity_permission.xml b/app/src/main/res/layout/activity_permission.xml
deleted file mode 100644
index d25afeb41..000000000
--- a/app/src/main/res/layout/activity_permission.xml
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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"
-    android:fitsSystemWindows="true">
-
-    <code.name.monkey.retromusic.views.BaselineGridTextView
-        android:id="@+id/appNameText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:padding="32dp"
-        android:text="@string/app_name"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:lineHeightHint="32sp" />
-
-    <View
-        android:id="@+id/divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:background="?attr/dividerHorizontal"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appNameText" />
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:fillViewport="true"
-        app:layout_constraintBottom_toTopOf="@+id/finish"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="@integer/permission_orientation">
-
-            <code.name.monkey.retromusic.views.PermissionItem
-                android:id="@+id/storage_permission"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="@integer/permission_layout_weight"
-                app:permissionButtonTitle="@string/grant_access"
-                app:permissionIcon="@drawable/ic_sd_storage"
-                app:permissionTitle="@string/permission_title"
-                app:permissionTitleNumber="1"
-                app:permissionTitleSubTitle="@string/permission_summary" />
-
-            <code.name.monkey.retromusic.views.PermissionItem
-                android:id="@+id/bluetooth_permission"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="@integer/permission_layout_weight"
-                android:visibility="gone"
-                app:permissionButtonTitle="@string/grant_access"
-                app:permissionIcon="@drawable/ic_bluetooth_connect"
-                app:permissionTitle="@string/bluetooth_title"
-                app:permissionTitleNumber="2"
-                app:permissionTitleSubTitle="@string/bluetooth_summary"
-                tools:visibility="visible" />
-
-            <code.name.monkey.retromusic.views.PermissionItem
-                android:id="@+id/audio_permission"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="@integer/permission_layout_weight"
-                android:visibility="gone"
-                app:permissionButtonTitle="@string/grant_access"
-                app:permissionIcon="@drawable/ic_phonelink_ring"
-                app:permissionTitle="@string/ringtone_title"
-                app:permissionTitleNumber="3"
-                app:permissionTitleSubTitle="@string/ringtone_summary"
-                tools:visibility="visible" />
-        </LinearLayout>
-    </ScrollView>
-
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/finish"
-        style="@style/Widget.Material3.Button"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:paddingVertical="12dp"
-        android:text="@string/lets_go"
-        android:textAppearance="@style/TextViewButton"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml b/app/src/main/res/layout/activity_playing_queue.xml
old mode 100644
new mode 100755
similarity index 53%
rename from app/src/main/res/layout-sw600dp/fragment_playing_queue.xml
rename to app/src/main/res/layout/activity_playing_queue.xml
index b7e28dae5..e1e76c65d
--- a/app/src/main/res/layout-sw600dp/fragment_playing_queue.xml
+++ b/app/src/main/res/layout/activity_playing_queue.xml
@@ -4,6 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/colorSurface"
     android:orientation="vertical"
     tools:ignore="UnusedAttribute">
 
@@ -18,23 +19,53 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <code.name.monkey.retromusic.views.TopAppBarLayout
+        <com.google.android.material.appbar.AppBarLayout
             android:id="@+id/appBarLayout"
-            style="?appBarLayoutStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:fitsSystemWindows="true" />
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
 
-        <androidx.recyclerview.widget.RecyclerView
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:id="@+id/collapsingToolbarLayout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/queue"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+                    tools:ignore="UnusedAttribute" />
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/playerQueueSubHeader"
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:gravity="center_vertical"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:text="@string/up_next"
+                android:textAppearance="@style/TextViewBody2" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
             android:id="@+id/recyclerView"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:overScrollMode="@integer/overScrollMode"
+            android:layoutAnimation="@anim/layout_animation_fall_down"
             android:paddingBottom="96dp"
             android:scrollbars="none"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-            tools:listitem="@layout/item_queue" />
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@android:id/empty"
@@ -55,7 +86,8 @@
             android:layout_margin="16dp"
             android:text="@string/clear_playing_queue"
             android:textAppearance="@style/TextViewHeadline6"
-            app:icon="@drawable/ic_clear_all" />
+            app:icon="@drawable/ic_clear_all_black_24dp" />
+
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_playlist_detail.xml b/app/src/main/res/layout/activity_playlist_detail.xml
new file mode 100644
index 000000000..2ea2b31f1
--- /dev/null
+++ b/app/src/main/res/layout/activity_playlist_detail.xml
@@ -0,0 +1,87 @@
+<?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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+                <ViewStub
+                    android:id="@+id/cab_stub"
+                    android:layout_width="match_parent"
+                    android:layout_height="48dp" />
+
+            </FrameLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="false"
+            android:scrollbars="none"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+        <LinearLayout
+            android:id="@android:id/empty"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/emptyEmoji"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:text="@string/empty_text_emoji"
+                android:textAppearance="@style/TextViewHeadline3" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/emptyText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/no_songs"
+                android:textAppearance="@style/TextViewHeadline5"
+                android:textColor="?android:attr/textColorSecondary"
+                tools:visibility="visible" />
+        </LinearLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml
new file mode 100644
index 000000000..36942ae4c
--- /dev/null
+++ b/app/src/main/res/layout/activity_pro_version.xml
@@ -0,0 +1,200 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout 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"
+    tools:ignore="UnusedAttribute">
+
+    <FrameLayout
+        android:id="@+id/status_bar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_below="@+id/status_bar_container"
+        android:layout_alignParentStart="true">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
+
+            <com.google.android.material.appbar.CollapsingToolbarLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                app:layout_scrollFlags="scroll|enterAlways"
+                app:titleEnabled="false">
+
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:layout_collapseMode="pin"
+                    app:title="@string/retro_music_pro"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+                    tools:ignore="UnusedAttribute" />
+
+            </com.google.android.material.appbar.CollapsingToolbarLayout>
+        </com.google.android.material.appbar.AppBarLayout>
+
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_margin="4dp"
+                app:cardCornerRadius="8dp"
+                app:cardElevation="0dp"
+                app:cardUseCompatPadding="true"
+                app:strokeWidth="1.5dp">
+
+                <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:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            app:srcCompat="@drawable/ic_theme_palette_white_24dp"
+                            app:tint="?colorOnSurface" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            android:text="@string/now_playing_themes"
+                            android:textAppearance="@style/TextViewSubtitle1" />
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            app:srcCompat="@drawable/ic_view_carousel_black_24dp"
+                            app:tint="?colorOnSurface" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            android:text="@string/carousal_effect_on_now_playing_screen"
+                            android:textAppearance="@style/TextViewSubtitle1" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            app:srcCompat="@drawable/ic_rounded_corner"
+                            app:tint="?colorOnSurface" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            android:text="@string/window_corner_edges"
+                            android:textAppearance="@style/TextViewSubtitle1" />
+                    </LinearLayout>
+
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:gravity="center_vertical"
+                        android:orientation="horizontal">
+
+                        <androidx.appcompat.widget.AppCompatImageView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            app:srcCompat="@drawable/ic_favorite_white_24dp"
+                            app:tint="?colorOnSurface" />
+
+                        <com.google.android.material.textview.MaterialTextView
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:padding="16dp"
+                            android:text="@string/support_development"
+                            android:textAppearance="@style/TextViewSubtitle1" />
+                    </LinearLayout>
+
+
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <LinearLayout
+                android:id="@+id/actions"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@id/content"
+                android:orientation="horizontal">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/restoreButton"
+                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:layout_weight="1"
+                    android:paddingTop="14dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/restore"
+                    android:textAllCaps="false"
+                    android:textColor="?colorOnBackground"
+                    app:strokeWidth="2dp" />
+
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/purchaseButton"
+                    style="@style/Widget.MaterialComponents.Button"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    android:layout_weight="1"
+                    android:paddingTop="14dp"
+                    android:paddingBottom="14dp"
+                    android:text="@string/purchase"
+                    android:textAllCaps="false" />
+
+            </LinearLayout>
+        </RelativeLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_restore.xml b/app/src/main/res/layout/activity_restore.xml
deleted file mode 100644
index 8e3d5f561..000000000
--- a/app/src/main/res/layout/activity_restore.xml
+++ /dev/null
@@ -1,77 +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:orientation="vertical"
-    android:padding="16dp">
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/backupNameContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginVertical="8dp"
-        android:hint="@string/label_file_name">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/backupName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:enabled="false" />
-    </com.google.android.material.textfield.TextInputLayout>
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/materialTextView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/choose_restore_title" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/check_settings"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        android:minHeight="48dp"
-        android:text="@string/action_settings" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/check_playlists"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="@string/playlists" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/check_user_images"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="@string/user_images_description" />
-
-    <com.google.android.material.checkbox.MaterialCheckBox
-        android:id="@+id/check_artist_images"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:minHeight="48dp"
-        android:text="@string/custom_artist_images" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="end">
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/cancel_button"
-            style="@style/Widget.Material3.Button.OutlinedButton"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:text="@string/action_cancel" />
-
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/restore_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:text="@string/restore" />
-    </LinearLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/activity_search.xml
old mode 100644
new mode 100755
similarity index 50%
rename from app/src/main/res/layout/fragment_search.xml
rename to app/src/main/res/layout/activity_search.xml
index 4a928ce4f..22cd7b2cf
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:transitionName="search"
+    android:background="?attr/colorSurface"
     android:fitsSystemWindows="true"
     android:orientation="vertical">
 
@@ -12,31 +12,47 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        android:fitsSystemWindows="true"
+        app:elevation="0dp"
+        app:liftOnScroll="true">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/searchContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal">
+            android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+            android:layout_marginTop="@dimen/toolbar_margin_vertical"
+            android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+            android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+            app:cardBackgroundColor="?colorSurface"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true"
+            app:layout_scrollFlags="scroll|enterAlways">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical">
 
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/back"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="12dp"
+                    app:srcCompat="@drawable/ic_keyboard_backspace_black_24dp"
+                    app:tint="?colorOnSurface" />
+
+
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/searchView"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
+                    android:layout_height="@dimen/toolbar_height"
                     android:layout_weight="1"
                     android:background="@null"
                     android:hint="@string/action_search"
                     android:inputType="text|textAutoComplete"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
                     android:textAppearance="@style/TextViewSubtitle1">
 
                     <requestFocus />
@@ -51,10 +67,11 @@
                         android:id="@+id/voiceSearch"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+
                         android:background="?roundSelector"
                         android:padding="12dp"
-                        app:srcCompat="@drawable/ic_mic"
-                        app:tint="?attr/colorControlNormal"
+                        app:srcCompat="@drawable/ic_mic_white_24dp"
+                        app:tint="?colorOnSurface"
                         tools:visibility="visible" />
 
                     <androidx.appcompat.widget.AppCompatImageView
@@ -64,83 +81,14 @@
                         android:background="?roundSelector"
                         android:padding="12dp"
                         android:visibility="gone"
-                        app:srcCompat="@drawable/ic_close"
-                        app:tint="?attr/colorControlNormal"
+                        app:srcCompat="@drawable/ic_close_white_24dp"
+                        app:tint="?colorOnSurface"
                         tools:visibility="visible" />
                 </FrameLayout>
             </LinearLayout>
-        </com.google.android.material.appbar.MaterialToolbar>
-        <HorizontalScrollView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="5dp"
-            android:scrollbars="none"
-            android:overScrollMode="@integer/overScrollMode">
-
-            <com.google.android.material.chip.ChipGroup
-                android:id="@+id/searchFilterGroup"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:singleLine="true"
-                app:singleSelection="true">
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_audio"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/songs" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_artists"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/artists" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_albums"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/albums" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_album_artists"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/album_artist" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_genres"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/genres" />
-
-                <com.google.android.material.chip.Chip
-                    android:id="@+id/chip_playlists"
-                    style="@style/SearchChipStyle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/playlists" />
-            </com.google.android.material.chip.ChipGroup>
-
-        </HorizontalScrollView>
+        </com.google.android.material.card.MaterialCardView>
     </com.google.android.material.appbar.AppBarLayout>
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:scrollbarStyle="outsideOverlay"
-        android:scrollbars="vertical"
-        android:paddingBottom="@dimen/mini_player_height"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@android:id/empty"
         android:layout_width="wrap_content"
@@ -152,15 +100,22 @@
         android:visibility="gone"
         tools:visibility="visible" />
 
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:clipToPadding="false"
+        android:scrollbarStyle="outsideOverlay"
+        android:scrollbars="vertical"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
     <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
         android:id="@+id/keyboardPopup"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="62dp"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
         android:text="@string/keyboard"
         android:textAppearance="@style/TextViewHeadline6"
-        app:icon="@drawable/ic_keyboard" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+        app:icon="@drawable/ic_keyboard_white_24dp" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
new file mode 100755
index 000000000..d707a2520
--- /dev/null
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -0,0 +1,48 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.StatusBarView
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        tools:ignore="UnusedAttribute" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <FrameLayout
+                android:id="@+id/contentFrame"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </androidx.core.widget.NestedScrollView>
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:liftOnScroll="true">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+                tools:title="@string/action_settings" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
+
diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml
deleted file mode 100644
index d3854ea23..000000000
--- a/app/src/main/res/layout/activity_share_instagram.xml
+++ /dev/null
@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<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/content"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:id="@+id/mainContent"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/instagram_story_background"
-        android:gravity="center"
-        android:minHeight="1080dp"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/appIcon"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                app:layout_constraintStart_toStartOf="@+id/imageContainerCard"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@mipmap/ic_launcher_round" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/appName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:text="@string/retro_music_player"
-                android:textColor="@color/md_white_1000"
-                app:layout_constraintBottom_toBottomOf="@id/appIcon"
-                app:layout_constraintStart_toEndOf="@id/appIcon"
-                app:layout_constraintTop_toTopOf="@id/appIcon" />
-
-            <code.name.monkey.retromusic.views.WidthFitSquareCardView
-                android:id="@+id/imageContainerCard"
-                android:layout_width="290dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
-                app:cardCornerRadius="16dp"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/appIcon">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:src="@tools:sample/avatars" />
-            </code.name.monkey.retromusic.views.WidthFitSquareCardView>
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/shareTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                android:gravity="center"
-                android:textAppearance="@style/TextViewHeadline6"
-                android:textColor="@color/md_white_1000"
-                android:textStyle="bold"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintEnd_toEndOf="@+id/imageContainerCard"
-                app:layout_constraintStart_toStartOf="@+id/imageContainerCard"
-                app:layout_constraintTop_toBottomOf="@id/imageContainerCard"
-                tools:text="@tools:sample/full_names" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/shareText"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textAppearance="@style/TextViewSubtitle1"
-                android:textColor="@color/md_grey_400"
-                android:textStyle="bold"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintEnd_toEndOf="@+id/imageContainerCard"
-                app:layout_constraintStart_toStartOf="@+id/imageContainerCard"
-                app:layout_constraintTop_toBottomOf="@id/shareTitle"
-                tools:text="@tools:sample/full_names" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </LinearLayout>
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/shareButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_margin="16dp"
-        android:paddingStart="24dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="24dp"
-        android:paddingBottom="14dp"
-        android:text="@string/share_to_stories"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/mainContent" />
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:elevation="0dp"
-        app:elevation="0dp">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/social_stories"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-    </com.google.android.material.appbar.AppBarLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
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 d28c583bc..c8d6a7e1a 100755
--- a/app/src/main/res/layout/activity_song_tag_editor.xml
+++ b/app/src/main/res/layout/activity_song_tag_editor.xml
@@ -3,7 +3,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     android:focusable="true"
     android:focusableInTouchMode="true">
 
@@ -11,59 +10,37 @@
         android:id="@+id/appBarLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
+        android:background="@android:color/transparent"
+        android:elevation="0dp"
+        app:elevation="0dp"
         app:liftOnScroll="true">
 
         <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
+            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
             app:title="@string/action_tag_editor"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+            tools:ignore="UnusedAttribute" />
     </com.google.android.material.appbar.AppBarLayout>
 
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:overScrollMode="@integer/overScrollMode"
         app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
         <LinearLayout
+            android:id="@+id/editables"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:padding="16dp">
 
-            <code.name.monkey.retromusic.views.WidthFitSquareCardView
-                android:id="@+id/imageContainer"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="32dp"
-                android:transitionName="@string/transition_album_art"
-                app:cardCornerRadius="@dimen/m3_card_large_radius"
-                app:cardElevation="8dp"
-                app:cardUseCompatPadding="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/editorImage"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
-
-            </code.name.monkey.retromusic.views.WidthFitSquareCardView>
-
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/songTextContainer"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:hintEnabled="true">
+                android:layout_height="wrap_content">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/songText"
@@ -71,7 +48,8 @@
                     android:layout_height="wrap_content"
                     android:hint="@string/song"
                     android:inputType="text|textCapWords"
-                    android:maxLines="1" />
+                    android:maxLines="1"
+                    tools:text="@string/song" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
@@ -156,7 +134,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false"
                 android:orientation="horizontal">
 
                 <com.google.android.material.textfield.TextInputLayout
@@ -168,6 +145,7 @@
                     android:layout_weight="1"
                     app:hintEnabled="true">
 
+
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/genreText"
                         android:layout_width="match_parent"
@@ -190,6 +168,7 @@
                     android:layout_weight="1"
                     app:hintEnabled="true">
 
+
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/yearText"
                         android:layout_width="match_parent"
@@ -203,56 +182,26 @@
                 </com.google.android.material.textfield.TextInputLayout>
             </LinearLayout>
 
-            <LinearLayout
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/trackNumberContainer"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:baselineAligned="false"
-                android:orientation="horizontal">
+                android:layout_marginTop="8dp"
+                app:hintEnabled="true">
 
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/trackNumberContainer"
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/trackNumberText"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
-                    android:layout_weight="1"
-                    app:hintEnabled="true">
+                    android:layout_gravity="center"
+                    android:gravity="center_vertical"
+                    android:hint="@string/track_hint"
+                    android:inputType="text|number"
+                    android:maxLines="1" />
 
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/trackNumberText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center_vertical"
-                        android:hint="@string/track_hint"
-                        android:inputType="text|number"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-
-                <com.google.android.material.textfield.TextInputLayout
-                    android:id="@+id/discNumberContainer"
-                    style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:layout_weight="1"
-                    app:hintEnabled="true">
-
-                    <com.google.android.material.textfield.TextInputEditText
-                        android:id="@+id/discNumberText"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center_vertical"
-                        android:hint="@string/disc_hint"
-                        android:inputType="text|number"
-                        android:maxLines="1" />
-
-                </com.google.android.material.textfield.TextInputLayout>
-            </LinearLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/lyricsContainer"
@@ -270,8 +219,7 @@
                     android:layout_gravity="center"
                     android:gravity="center_vertical"
                     android:hint="@string/lyrics"
-                    android:inputType="textMultiLine"
-                    android:maxLines="15" />
+                    android:inputType="textMultiLine" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
@@ -294,7 +242,7 @@
         android:paddingBottom="12dp"
         android:text="@string/save"
         app:cornerRadius="25dp"
-        app:icon="@drawable/ic_save"
+        app:icon="@drawable/ic_save_white_24dp"
         app:iconGravity="textStart" />
 
     <ProgressBar
diff --git a/app/src/main/res/layout/activity_user_info.xml b/app/src/main/res/layout/activity_user_info.xml
new file mode 100644
index 000000000..a082ac746
--- /dev/null
+++ b/app/src/main/res/layout/activity_user_info.xml
@@ -0,0 +1,152 @@
+<?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:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/transparent"
+        app:liftOnScroll="true">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            style="@style/Toolbar"
+            app:title="@string/profile"
+            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/imageContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginEnd="16dp"
+                app:cardCornerRadius="12dp"
+                app:cardUseCompatPadding="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="156dp"
+                        android:scaleType="centerCrop"
+                        app:srcCompat="@drawable/material_design_default" />
+
+                    <View
+                        android:id="@+id/bannerSelect"
+                        android:layout_width="match_parent"
+                        android:layout_height="156dp"
+                        android:background="@color/twenty_percent_black_overlay" />
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="end"
+                        android:background="?roundSelector"
+                        android:padding="16dp"
+                        app:srcCompat="@drawable/ic_add_photo_white_24dp" />
+
+
+                </FrameLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <FrameLayout
+                android:id="@+id/userImageContainer"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="bottom|center_horizontal"
+                android:layout_marginStart="16dp"
+                android:elevation="8dp"
+                android:transitionName="@string/transition_user_image"
+                app:layout_constraintBottom_toBottomOf="@id/imageContainer"
+                app:layout_constraintStart_toStartOf="@+id/imageContainer"
+                app:layout_constraintTop_toBottomOf="@id/imageContainer">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="72dp"
+                    android:layout_height="72dp"
+                    android:layout_gravity="center"
+                    android:scaleType="centerCrop"
+                    app:civ_border="true"
+                    app:civ_border_color="?android:colorBackground"
+                    app:civ_border_width="2dp"
+                    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"
+                    app:tint="?attr/colorControlNormal"
+                    android:src="@drawable/ic_add_photo_white_24dp" />
+            </FrameLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/nameContainer"
+                style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="16dp"
+                app:hintAnimationEnabled="true"
+                app:hintEnabled="true"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/userImageContainer">
+
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:autofillHints="name"
+                    android:hint="@string/my_name"
+                    android:importantForAutofill="yes"
+                    android:inputType="textPersonName|textCapWords|text"
+                    android:textAppearance="@style/TextViewSubtitle1"
+                    tools:text="@tools:sample/full_names" />
+            </com.google.android.material.textfield.TextInputLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+
+    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+        android:id="@+id/next"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_margin="16dp"
+        android:gravity="center"
+        android:text="@string/save"
+        app:icon="@drawable/ic_save_white_24dp"
+        app:iconGravity="textStart" />
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_whats_new.xml b/app/src/main/res/layout/activity_whats_new.xml
new file mode 100644
index 000000000..e441a7937
--- /dev/null
+++ b/app/src/main/res/layout/activity_whats_new.xml
@@ -0,0 +1,56 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <code.name.monkey.retromusic.views.StatusBarView
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:background="?attr/colorSurface"
+        tools:ignore="UnusedAttribute" />
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/toolbar"
+                style="@style/Toolbar"
+                app:layout_collapseMode="pin"
+                app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                app:title="@string/whats_new"
+                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
+
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="fill_vertical"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <code.name.monkey.retromusic.views.LollipopFixedWebView
+                android:id="@+id/webView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:scrollbars="none"
+                app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/app_widget_big.xml b/app/src/main/res/layout/app_widget_big.xml
index 5980da4e6..75ba63e6c 100755
--- a/app/src/main/res/layout/app_widget_big.xml
+++ b/app/src/main/res/layout/app_widget_big.xml
@@ -2,7 +2,8 @@
 <RelativeLayout 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:layout_height="match_parent"
+    android:background="@android:color/black">
 
     <ImageView
         android:id="@+id/image"
@@ -29,7 +30,7 @@
             android:background="@drawable/widget_selector_dark"
             android:padding="22dp"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_previous"
+            tools:src="@drawable/ic_skip_previous_white_24dp"
             tools:tint="@color/ate_primary_text_dark" />
 
         <ImageButton
@@ -51,7 +52,7 @@
             android:background="@drawable/widget_selector_dark"
             android:padding="22dp"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_next"
+            tools:src="@drawable/ic_skip_next_white_24dp"
             tools:tint="@color/ate_primary_text_dark" />
 
 
diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml
index c9378b0d9..d0eea3498 100755
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@@ -1,95 +1,98 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
-    android:layout_gravity="center"
-    android:background="@drawable/card"
-    android:backgroundTint="?attr/colorSurface"
-    android:orientation="horizontal"
-    android:theme="@style/Theme.AppWidget">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="@dimen/app_widget_card_image_size"
-        android:layout_height="@dimen/app_widget_card_image_size"
-        android:scaleType="centerInside"
-        tools:ignore="ContentDescription"
-        tools:src="@drawable/default_audio_art" />
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/media_titles"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewBody1"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="Title" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:gravity="center_vertical"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewCaption"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:text="Text" />
-
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/media_actions"
-        android:layout_width="@dimen/app_widget_card_buttons_width"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="4dp"
-        android:focusable="true"
-        android:gravity="center"
-        android:layoutDirection="ltr"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@drawable/card"
         android:orientation="horizontal">
 
-        <ImageButton
-            android:id="@+id/button_prev"
+        <ImageView
+            android:id="@+id/image"
+            android:layout_width="@dimen/app_widget_card_image_size"
+            android:layout_height="@dimen/app_widget_card_image_size"
+            android:scaleType="centerInside"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/default_album_art" />
+
+        <LinearLayout
+            android:id="@+id/media_titles"
             android:layout_width="0dp"
             android:layout_height="match_parent"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
             android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_previous"
-            tools:tint="@color/ate_secondary_text_light" />
+            android:gravity="center"
+            android:orientation="vertical">
 
-        <ImageButton
-            android:id="@+id/button_toggle_play_pause"
-            android:layout_width="0dp"
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewBody1"
+                android:textColor="@color/ate_primary_text_light"
+                tools:text="Title" />
+
+            <TextView
+                android:id="@+id/text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewCaption"
+                android:textColor="@color/ate_secondary_text_light"
+                tools:text="Text" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/media_actions"
+            android:layout_width="@dimen/app_widget_card_buttons_width"
             android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow"
-            tools:tint="@color/ate_secondary_text_light" />
+            android:layout_gravity="center_vertical"
+            android:layout_margin="4dp"
+            android:focusable="true"
+            android:gravity="center"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal">
 
-        <ImageButton
-            android:id="@+id/button_next"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:background="@drawable/widget_selector_light"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_next"
-            tools:tint="@color/ate_secondary_text_light" />
+            <ImageButton
+                android:id="@+id/button_prev"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/widget_selector_light"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_skip_previous_white_24dp"
+                tools:tint="@color/ate_secondary_text_light" />
 
+            <ImageButton
+                android:id="@+id/button_toggle_play_pause"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/widget_selector_light"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_play_arrow_white_24dp"
+                tools:tint="@color/ate_secondary_text_light" />
+
+            <ImageButton
+                android:id="@+id/button_next"
+                android:layout_width="0dp"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                android:background="@drawable/widget_selector_light"
+                tools:ignore="ContentDescription"
+                tools:src="@drawable/ic_skip_next_white_24dp"
+                tools:tint="@color/ate_secondary_text_light" />
+
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/app_widget_circle.xml b/app/src/main/res/layout/app_widget_circle.xml
deleted file mode 100644
index 9569f525f..000000000
--- a/app/src/main/res/layout/app_widget_circle.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:theme="@style/Theme.Material3.DynamicColors.DayNight">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:adjustViewBounds="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/default_audio_art"
-        tools:src="@tools:sample/backgrounds/scenic[0]" />
-
-    <ImageButton
-        android:id="@+id/button_toggle_favorite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/image"
-        android:layout_alignEnd="@+id/image"
-        android:layout_margin="4dp"
-        android:background="@drawable/circle_widget_background"
-        android:backgroundTint="?attr/colorSurface"
-        android:clickable="false"
-        android:padding="14dp"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_favorite_border" />
-
-    <ImageButton
-        android:id="@+id/button_toggle_play_pause"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignStart="@+id/image"
-        android:layout_alignBottom="@+id/image"
-        android:layout_margin="4dp"
-        android:background="@drawable/widget_button_background"
-        android:backgroundTint="?attr/colorSurface"
-        android:clickable="false"
-        android:padding="18dp"
-        android:scaleType="centerInside"
-        android:src="@drawable/ic_play_arrow" />
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml
index f88b7d9a5..d4a3efd6e 100755
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -4,9 +4,8 @@
     android:id="@+id/content"
     android:layout_width="match_parent"
     android:layout_height="@dimen/app_widget_classic_height"
-    android:background="?attr/colorSurface"
+    android:background="@color/md_black_1000"
     android:orientation="horizontal"
-    android:theme="@style/Theme.AppWidget"
     tools:ignore="ContentDescription">
 
     <ImageView
@@ -37,7 +36,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_skip_previous"
+                tools:src="@drawable/ic_skip_previous_white_24dp"
                 tools:tint="@color/ate_secondary_text_dark" />
 
             <ImageButton
@@ -55,7 +54,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_skip_next"
+                tools:src="@drawable/ic_skip_next_white_24dp"
                 tools:tint="@color/ate_secondary_text_dark" />
 
         </LinearLayout>
@@ -78,7 +77,7 @@
                 android:gravity="center_vertical"
                 android:singleLine="true"
                 android:textAppearance="@style/TextViewSubtitle1"
-                android:textColor="?android:attr/textColorPrimary"
+                android:textColor="@color/ate_primary_text_dark"
                 tools:text="Title" />
 
             <TextView
@@ -89,7 +88,7 @@
                 android:paddingTop="4dp"
                 android:singleLine="true"
                 android:textAppearance="@style/TextViewNormal"
-                android:textColor="?android:attr/textColorSecondary"
+                android:textColor="@color/ate_secondary_text_dark"
                 tools:text="Text" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/app_widget_md3.xml b/app/src/main/res/layout/app_widget_md3.xml
deleted file mode 100644
index 61531a675..000000000
--- a/app/src/main/res/layout/app_widget_md3.xml
+++ /dev/null
@@ -1,101 +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/content"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/app_widget_md3_height"
-    android:background="@drawable/app_widget_background"
-    android:backgroundTint="?attr/colorSurface"
-    android:orientation="horizontal"
-    android:theme="@style/Theme.AppWidget"
-    tools:ignore="ContentDescription">
-
-    <ImageView
-        android:id="@+id/image"
-        android:layout_width="@dimen/app_widget_md3_image_size"
-        android:layout_height="@dimen/app_widget_md3_image_size"
-        android:layout_gravity="center_vertical"
-        android:layout_margin="10dp"
-        android:background="@drawable/app_widget_background"
-        android:scaleType="centerCrop"
-        tools:src="@tools:sample/backgrounds/scenic[6]" />
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="bottom"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="8dp">
-
-            <ImageButton
-                android:id="@+id/button_prev"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_skip_previous"
-                tools:tint="@color/ate_secondary_text_dark" />
-
-            <ImageButton
-                android:id="@+id/button_toggle_play_pause"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_play_arrow_white_32dp"
-                tools:tint="@color/ate_secondary_text_dark" />
-
-            <ImageButton
-                android:id="@+id/button_next"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector"
-                tools:src="@drawable/ic_skip_next"
-                tools:tint="@color/ate_secondary_text_dark" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_titles"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_above="@+id/media_actions"
-            android:layout_alignParentTop="true"
-            android:orientation="vertical"
-            android:paddingStart="8dp"
-            android:paddingTop="4dp"
-            android:paddingEnd="8dp">
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle1"
-                android:textColor="?android:attr/textColorPrimary"
-                tools:text="Title" />
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:paddingTop="4dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewNormal"
-                android:textColor="?android:attr/textColorSecondary"
-                tools:text="Text" />
-        </LinearLayout>
-    </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget_small.xml b/app/src/main/res/layout/app_widget_small.xml
index 9e2de1594..c1a115bb5 100755
--- a/app/src/main/res/layout/app_widget_small.xml
+++ b/app/src/main/res/layout/app_widget_small.xml
@@ -4,11 +4,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/card"
-    android:backgroundTint="?attr/colorSurface"
     android:columnCount="2"
     android:gravity="top"
-    android:rowCount="3"
-    android:theme="@style/Theme.AppWidget">
+    android:rowCount="3">
 
     <ImageView
         android:id="@+id/image"
@@ -16,7 +14,7 @@
         android:layout_height="@dimen/app_widget_small_image_size"
         android:scaleType="centerInside"
         tools:ignore="ContentDescription"
-        tools:src="@drawable/default_audio_art" />
+        tools:src="@drawable/default_album_art" />
 
     <LinearLayout
         android:id="@+id/media_actions"
@@ -33,7 +31,7 @@
             android:layout_weight="1"
             android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_previous"
+            tools:src="@drawable/ic_skip_previous_white_24dp"
             tools:tint="@color/ate_secondary_text_light" />
 
         <ImageButton
@@ -43,7 +41,7 @@
             android:layout_weight="1"
             android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_play_arrow"
+            tools:src="@drawable/ic_play_arrow_white_24dp"
             tools:tint="@color/ate_secondary_text_light" />
 
         <ImageButton
@@ -53,12 +51,13 @@
             android:layout_weight="1"
             android:background="@drawable/widget_selector_light"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_next"
+            tools:src="@drawable/ic_skip_next_white_24dp"
             tools:tint="@color/ate_secondary_text_light" />
 
     </LinearLayout>
 
     <LinearLayout
+        android:id="@+id/separator"
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_columnSpan="2"
@@ -83,7 +82,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody2"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/ate_primary_text_light"
             tools:text="Title" />
 
         <TextView
@@ -95,7 +94,7 @@
             android:paddingRight="4dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody1"
-            android:textColor="?android:attr/textColorPrimary"
+            android:textColor="@color/ate_secondary_text_light"
             tools:ignore="HardcodedText"
             tools:text="•" />
 
@@ -106,7 +105,7 @@
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textAppearance="@style/TextViewBody1"
-            android:textColor="?android:attr/textColorSecondary"
+            android:textColor="@color/ate_secondary_text_light"
             tools:text="Text" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/app_widget_text.xml b/app/src/main/res/layout/app_widget_text.xml
index d02bb7768..f62a0eb62 100644
--- a/app/src/main/res/layout/app_widget_text.xml
+++ b/app/src/main/res/layout/app_widget_text.xml
@@ -64,7 +64,7 @@
             android:layout_weight="1"
             android:background="@drawable/widget_selector"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_previous"
+            tools:src="@drawable/ic_skip_previous_white_24dp"
             tools:tint="@color/ate_secondary_text_dark" />
 
         <ImageButton
@@ -84,7 +84,7 @@
             android:layout_weight="1"
             android:background="@drawable/widget_selector"
             tools:ignore="ContentDescription"
-            tools:src="@drawable/ic_skip_next"
+            tools:src="@drawable/ic_skip_next_white_24dp"
             tools:tint="@color/ate_secondary_text_dark" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/banner_image_layout.xml b/app/src/main/res/layout/banner_image_layout.xml
deleted file mode 100644
index 23b32d5d4..000000000
--- a/app/src/main/res/layout/banner_image_layout.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<androidx.constraintlayout.widget.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="wrap_content">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="16dp"
-        app:cardCornerRadius="40dp"
-        app:layout_constraintDimensionRatio="21:10"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/bannerImage"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:scaleType="centerCrop"
-                app:layout_collapseMode="parallax"
-                tools:ignore="ContentDescription"
-                tools:srcCompat="@tools:sample/backgrounds/scenic" />
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="52dp"
-                android:background="@drawable/shadow_up"
-                app:layout_constraintBottom_toBottomOf="parent" />
-
-            <code.name.monkey.retromusic.views.RetroShapeableImageView
-                android:id="@+id/userImage"
-                android:layout_width="42dp"
-                android:layout_height="42dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginBottom="8dp"
-                android:scaleType="centerCrop"
-                android:transitionName="user_image"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:retroCornerSize="21dp"
-                tools:srcCompat="@tools:sample/avatars" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:ellipsize="end"
-                android:text="@string/welcome"
-                android:textColor="@color/md_white_1000"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toTopOf="@+id/userImage" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/titleWelcome"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:padding="0dp"
-                android:textAppearance="@style/TextViewHeadline6"
-                android:textColor="@color/md_white_1000"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="@+id/userImage"
-                app:layout_constraintStart_toEndOf="@+id/userImage"
-                app:layout_constraintTop_toBottomOf="@+id/text"
-                tools:text="@string/app_name" />
-
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bread_crumb.xml b/app/src/main/res/layout/bread_crumb.xml
index e22bfae2e..86d12987b 100644
--- a/app/src/main/res/layout/bread_crumb.xml
+++ b/app/src/main/res/layout/bread_crumb.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?rectSelector"
+    android:foreground="?rectSelector"
     android:gravity="center_vertical|start"
     android:minHeight="@dimen/tab_height"
     android:orientation="horizontal"
@@ -15,8 +15,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingEnd="8dp"
-        android:textAllCaps="false"
-        android:textAppearance="@style/TextViewNormal"
+        android:textAllCaps="true"
         android:textColor="#fff"
         tools:ignore="RtlSymmetry,UnusedAttribute"
         tools:text="Storage"
@@ -27,8 +26,8 @@
         android:layout_height="24dp"
         android:scaleType="fitXY"
         android:visibility="gone"
-        app:srcCompat="@drawable/ic_keyboard_arrow_right"
-        tools:tint="?android:attr/colorControlNormal"
+        app:srcCompat="@drawable/ic_keyboard_arrow_right_white_24dp"
+        tools:tint="#000"
         tools:visibility="visible" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bug_report_card_device_info.xml b/app/src/main/res/layout/bug_report_card_device_info.xml
index 743e11aaa..5ac4f7285 100644
--- a/app/src/main/res/layout/bug_report_card_device_info.xml
+++ b/app/src/main/res/layout/bug_report_card_device_info.xml
@@ -2,7 +2,6 @@
 <com.google.android.material.card.MaterialCardView 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"
-    style="@style/MaterialCardViewStroke"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:cardCornerRadius="8dp"
@@ -31,7 +30,8 @@
             android:background="?rectSelector"
             android:lineSpacingExtra="8dp"
             android:padding="16dp"
-            android:textAppearance="@style/TextViewBody1"
+            android:textAppearance="@style/TextAppearance.MaterialComponents.Body1"
+            android:textColor="?android:textColorSecondary"
             tools:text="@tools:sample/lorem/random" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/bug_report_card_report.xml b/app/src/main/res/layout/bug_report_card_report.xml
new file mode 100644
index 000000000..f49878e66
--- /dev/null
+++ b/app/src/main/res/layout/bug_report_card_report.xml
@@ -0,0 +1,189 @@
+<?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="match_parent"
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/md_listitem_height"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/optionUseAccount"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:checked="true"
+            android:gravity="start|center_vertical"
+            android:minHeight="@dimen/md_listitem_height" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="56dp"
+            android:layout_marginLeft="56dp"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8dp"
+                android:text="@string/bug_report_use_account"
+                android:textAppearance="@style/TextViewSubtitle1" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8dp"
+                android:text="@string/your_account_data_is_only_used_for_authentication"
+                android:textAppearance="@style/TextViewCaption" />
+        </LinearLayout>
+
+    </FrameLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:paddingStart="72dp"
+        android:paddingLeft="72dp"
+        android:paddingEnd="16dp"
+        android:paddingRight="16dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:text="@string/bug_report_issue"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?android:textColorSecondary" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/inputLayoutTitle"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/inputTitle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/title"
+                android:inputType="textCapSentences"
+                android:singleLine="true" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/inputLayoutDescription"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/inputDescription"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="top"
+                android:hint="@string/description"
+                android:inputType="textMultiLine"
+                android:minLines="3" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp"
+            android:text="@string/login"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?android:textColorSecondary" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/inputLayoutUsername"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/inputUsername"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/username"
+                android:inputType="textNoSuggestions"
+                android:singleLine="true" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/inputLayoutPassword"
+            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/inputPassword"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:hint="@string/password"
+                android:imeOptions="actionSend"
+                android:inputType="textPassword" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_vertical"
+        android:minHeight="@dimen/md_listitem_height"
+        android:orientation="horizontal"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <com.google.android.material.radiobutton.MaterialRadioButton
+            android:id="@+id/optionAnonymous"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="start|center_vertical"
+            android:minHeight="@dimen/md_listitem_height" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="56dp"
+            android:layout_marginLeft="56dp"
+            android:orientation="vertical"
+            android:paddingTop="8dp"
+            android:paddingBottom="8dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8dp"
+                android:text="@string/bug_report_manual"
+                android:textAppearance="@style/TextViewSubtitle1" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:lineSpacingExtra="8dp"
+                android:text="@string/you_will_be_forwarded_to_the_issue_tracker_website"
+                android:textAppearance="@style/TextViewCaption" />
+        </LinearLayout>
+    </FrameLayout>
+</LinearLayout>
\ 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
new file mode 100644
index 000000000..dcee47ea5
--- /dev/null
+++ b/app/src/main/res/layout/card_credit.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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"
+    app:cardCornerRadius="8dp"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
+            android:id="@+id/sb1"
+            style="@style/SubTitleTextAppearance"
+            android:text="@string/credit_title"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorAccent"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <androidx.recyclerview.widget.RecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/sb1" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_other.xml b/app/src/main/res/layout/card_other.xml
new file mode 100644
index 000000000..d0ad56613
--- /dev/null
+++ b/app/src/main/res/layout/card_other.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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"
+    app:cardCornerRadius="8dp"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
+            android:id="@+id/sb4"
+            style="@style/SubTitleTextAppearance"
+            android:text="@string/others"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorAccent"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/changelog"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sb4"
+            app:listItemSummary="@string/changelog_summary"
+            app:listItemTitle="@string/changelog" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/openSource"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/changelog"
+            app:listItemSummary="@string/pref_summary_open_source_licences"
+            app:listItemTitle="@string/pref_title_open_source_licences" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/version"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/openSource"
+            app:listItemSummary="@string/pref_summary_open_source_licences"
+            app:listItemTitle="@string/version" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/madeText"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:padding="16dp"
+            android:text="@string/made_with_love"
+            android:textAppearance="@style/TextViewBody1"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/version" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_retro_info.xml b/app/src/main/res/layout/card_retro_info.xml
index b1d259c47..76e02f983 100644
--- a/app/src/main/res/layout/card_retro_info.xml
+++ b/app/src/main/res/layout/card_retro_info.xml
@@ -1,98 +1,120 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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">
+    app:cardBackgroundColor="?colorSurface"
+    app:cardCornerRadius="8dp"
+    app:cardUseCompatPadding="true">
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/version"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:listItemIcon="@drawable/ic_info_outline"
-        app:listItemSummary="@string/pref_summary_open_source_licences"
-        app:listItemTitle="@string/version" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/changelog"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/version"
-        app:listItemIcon="@drawable/ic_file_edit"
-        app:listItemSummary="@string/changelog_summary"
-        app:listItemTitle="@string/changelog"/>
+        <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
+            android:id="@+id/sb2"
+            style="@style/SubTitleTextAppearance"
+            android:text="@string/support_development"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorAccent"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/appGithub"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/changelog"
-        app:listItemIcon="@drawable/ic_github_circle"
-        app:listItemSummary="@string/git_hub_summary"
-        app:listItemTitle="@string/git_hub" />
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/appGithub"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sb2"
+            app:listItemIcon="@drawable/ic_github_circle_white_24dp"
+            app:listItemSummary="@string/git_hub_summary"
+            app:listItemTitle="@string/git_hub" />
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/appTranslation"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appGithub"
-        app:listItemIcon="@drawable/ic_flag"
-        app:listItemSummary="@string/translate_community"
-        app:listItemTitle="@string/translate" />
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/appTranslation"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appGithub"
+            app:listItemIcon="@drawable/ic_flag_white_24dp"
+            app:listItemSummary="@string/translate_community"
+            app:listItemTitle="@string/translate" />
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/bugReportLink"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/appTranslation"
-        app:listItemIcon="@drawable/ic_bug_report"
-        app:listItemSummary="@string/bug_report_summary"
-        app:listItemTitle="@string/report_bug" />
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/faqLink"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/bugReportLink"
-        app:listItemIcon="@drawable/ic_help"
-        app:listItemSummary="@string/help_summary"
-        app:listItemTitle="@string/faq"/>
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/appRate"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appTranslation"
+            app:listItemIcon="@drawable/ic_star_white_24dp"
+            app:listItemSummary="@string/rate_on_google_play_summary"
+            app:listItemTitle="@string/rate_app" />
 
-    <code.name.monkey.retromusic.views.ListItemView
-        android:id="@+id/openSource"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/faqLink"
-        app:listItemIcon="@drawable/ic_license"
-        app:listItemSummary="@string/pref_summary_open_source_licences"
-        app:listItemTitle="@string/pref_title_open_source_licences"/>
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/donateLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appRate"
+            app:listItemIcon="@drawable/ic_card_giftcard_white_24dp"
+            app:listItemSummary="@string/donate_summary"
+            app:listItemTitle="@string/donate" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/bugReportLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/donateLink"
+            app:listItemIcon="@drawable/ic_bug_report_white_24dp"
+            app:listItemSummary="@string/bug_report_summary"
+            app:listItemTitle="@string/report_bug" />
+
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/appShare"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/bugReportLink"
+            app:listItemIcon="@drawable/ic_share_white_24dp"
+            app:listItemTitle="@string/action_share" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/faqLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/appShare"
+            app:listItemIcon="@drawable/ic_help_white_24dp"
+            app:listItemTitle="@string/faq" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_social.xml b/app/src/main/res/layout/card_social.xml
new file mode 100644
index 000000000..9ccb08814
--- /dev/null
+++ b/app/src/main/res/layout/card_social.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.card.MaterialCardView 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"
+    app:cardCornerRadius="8dp"
+    app:cardUseCompatPadding="true">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <code.name.monkey.appthemehelper.common.views.ATEAccentTextView
+            android:id="@+id/sb3"
+            style="@style/SubTitleTextAppearance"
+            android:text="@string/social"
+            android:textAppearance="@style/TextViewOverline"
+            android:textColor="?colorAccent"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/pinterestLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/sb3"
+            app:listItemIcon="@drawable/ic_pinterest_white_24dp"
+            app:listItemSummary="@string/pinterest_page_summary"
+            app:listItemTitle="@string/pinterest_page" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/instagramLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/pinterestLink"
+            app:listItemIcon="@drawable/ic_instagram_white_24dp"
+            app:listItemSummary="@string/instagram_page_summary"
+            app:listItemTitle="@string/instagram_page" />
+
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/twitterLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/instagramLink"
+            app:listItemIcon="@drawable/ic_twitter_white_24dp"
+            app:listItemSummary="@string/twitter_page_summary"
+            app:listItemTitle="@string/twitter_page" />
+
+        <code.name.monkey.retromusic.views.ListItemView
+            android:id="@+id/telegramLink"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/twitterLink"
+            app:listItemIcon="@drawable/ic_telegram_white"
+            app:listItemSummary="@string/telegram_group_summary"
+            app:listItemTitle="@string/telegram_group" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/collapsing_appbar_layout.xml b/app/src/main/res/layout/collapsing_appbar_layout.xml
deleted file mode 100644
index 9c47c4f3e..000000000
--- a/app/src/main/res/layout/collapsing_appbar_layout.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.CollapsingToolbarLayout 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/collapsingToolbarLayout"
-    style="?attr/collapsingToolbarLayoutLargeStyle"
-    android:layout_width="match_parent"
-    android:layout_height="?attr/collapsingToolbarLayoutLargeSize"
-    app:collapsedTitleTextAppearance="@style/TextViewHeadline6"
-    app:expandedTitleMarginBottom="24dp"
-    app:expandedTitleMarginEnd="24dp"
-    app:expandedTitleMarginStart="24dp"
-    app:expandedTitleTextAppearance="@style/TextViewHeadline4"
-    app:layout_scrollFlags="scroll|exitUntilCollapsed|snap|enterAlwaysCollapsed">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/toolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?actionBarSize"
-        app:layout_collapseMode="pin"
-        app:navigationIcon="@drawable/ic_search"
-        app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
-        tools:title="@string/songs" />
-</com.google.android.material.appbar.CollapsingToolbarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_file_details.xml b/app/src/main/res/layout/dialog_file_details.xml
index b69f14313..a64ad9eb3 100644
--- a/app/src/main/res/layout/dialog_file_details.xml
+++ b/app/src/main/res/layout/dialog_file_details.xml
@@ -11,7 +11,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="16dp"
-        android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewNormal"
         android:textColor="?android:attr/textColorPrimary"
@@ -39,18 +38,6 @@
         android:textColor="?android:attr/textColorPrimary"
         android:textSize="16sp" />
 
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/dateModified"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="16dp"
-        android:paddingTop="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textSize="16sp" />
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/fileFormat"
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/dialog_playback_speed.xml b/app/src/main/res/layout/dialog_playback_speed.xml
deleted file mode 100644
index 227251cec..000000000
--- a/app/src/main/res/layout/dialog_playback_speed.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<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"
-    android:paddingHorizontal="16dp"
-    android:paddingVertical="16dp">
-
-    <TextView
-        android:id="@+id/playback_speed_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="3"
-        android:text="@string/playback_speed"
-        android:textAppearance="@style/TextViewBody1" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/playback_speed_slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="3"
-        android:stepSize="0.05"
-        android:valueFrom="0.25"
-        android:valueTo="4.00"
-        app:labelBehavior="gone"
-        app:tickVisible="false" />
-
-    <TextView
-        android:id="@+id/speed_value"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:textAppearance="@style/TextViewBody1"
-        tools:text="1.00" />
-
-    <TextView
-        android:id="@+id/playback_pitch_title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_weight="3"
-        android:text="@string/playback_pitch"
-        android:textAppearance="@style/TextViewBody1" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/playback_pitch_slider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="3"
-        android:stepSize="0.05"
-        android:valueFrom="0.50"
-        android:valueTo="2.00"
-        app:labelBehavior="gone"
-        app:tickVisible="false" />
-
-    <TextView
-        android:id="@+id/pitch_value"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="1"
-        android:gravity="center"
-        android:textAppearance="@style/TextViewBody1"
-        tools:text="1.00" />
-</LinearLayout>
diff --git a/app/src/main/res/layout/dialog_playlist.xml b/app/src/main/res/layout/dialog_playlist.xml
index b1deabcdf..5810be9c4 100644
--- a/app/src/main/res/layout/dialog_playlist.xml
+++ b/app/src/main/res/layout/dialog_playlist.xml
@@ -6,6 +6,7 @@
     android:orientation="vertical"
     android:padding="16dp">
 
+
     <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/actionNewPlaylistContainer"
         style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
diff --git a/app/src/main/res/layout/dialog_sleep_timer.xml b/app/src/main/res/layout/dialog_sleep_timer.xml
index b7a829d79..8d4fe4da7 100644
--- a/app/src/main/res/layout/dialog_sleep_timer.xml
+++ b/app/src/main/res/layout/dialog_sleep_timer.xml
@@ -10,27 +10,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginStart="8dp"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="16dp"
         android:textAppearance="@style/TextViewHeadline6" />
 
+
     <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/seekBar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:maxHeight="3dp"
-        android:paddingVertical="@dimen/seekbar_padding"
+        android:paddingTop="12dp"
+        android:progressDrawable="@drawable/color_progress_seek"
         android:splitTrack="false"
+        android:thumb="@drawable/switch_thumb_material"
         tools:progress="20" />
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/shouldFinishLastSong"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_gravity="center"
         android:text="@string/finish_last_song"
         android:textAppearance="@style/TextViewSubtitle1" />
 
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
deleted file mode 100644
index c3bdc64a0..000000000
--- a/app/src/main/res/layout/fragment_about.xml
+++ /dev/null
@@ -1,13 +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"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:overScrollMode="@integer/overScrollMode"
-    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-    <include
-        android:id="@+id/about_content"
-        layout="@layout/fragment_about_content" />
-</androidx.core.widget.NestedScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about_content.xml b/app/src/main/res/layout/fragment_about_content.xml
deleted file mode 100644
index 38b4d3c48..000000000
--- a/app/src/main/res/layout/fragment_about_content.xml
+++ /dev/null
@@ -1,12 +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:orientation="vertical"
-    android:paddingBottom="@dimen/mini_player_height">
-
-    <include
-        android:id="@+id/card_retro_info"
-        layout="@layout/card_retro_info" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player.xml b/app/src/main/res/layout/fragment_adaptive_player.xml
index bb9143bd6..0c290604c 100644
--- a/app/src/main/res/layout/fragment_adaptive_player.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player.xml
@@ -3,10 +3,12 @@
     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:background="?colorSurface"
-    android:clickable="true"
-    android:focusable="true">
+    android:layout_height="match_parent">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
@@ -22,52 +24,89 @@
             <include layout="@layout/status_bar" />
         </FrameLayout>
 
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
+        <FrameLayout
+            android:id="@+id/toolbar_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            app:contentInsetLeft="0dp"
-            app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-            app:subtitleTextAppearance="@style/TextViewCaption"
-            app:titleMargin="0dp"
-            app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/TextViewSubtitle1"
-            tools:subtitle="@tools:sample/full_names"
-            tools:title="@tools:sample/full_names" />
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:contentInsetLeft="0dp"
+                app:contentInsetStart="0dp"
+                app:contentInsetStartWithNavigation="0dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                app:titleMargin="0dp"
+                app:titleMarginStart="0dp"
+                app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </FrameLayout>
 
         <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1">
 
-            <androidx.fragment.app.FragmentContainerView
+            <fragment
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_card_cover" />
 
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
+            <FrameLayout
+                android:id="@+id/player_lyrics"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_gravity="center"
-                android:elevation="20dp" />
+                android:alpha="0"
+                android:clipToPadding="false"
+                android:elevation="20dp"
+                android:padding="16dp"
+                android:visibility="gone"
+                tools:visibility="visible">
+
+                <TextView
+                    android:id="@+id/player_lyrics_line1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:shadowColor="@color/md_black_1000"
+                    android:shadowRadius="4"
+                    android:textAlignment="center"
+                    android:textColor="@color/md_white_1000"
+                    android:textSize="22sp"
+                    android:visibility="gone" />
+
+                <TextView
+                    android:id="@+id/player_lyrics_line2"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:shadowColor="@color/md_black_1000"
+                    android:shadowRadius="4"
+                    android:textAlignment="center"
+                    android:textColor="@color/md_white_1000"
+                    android:textSize="22sp" />
+
+            </FrameLayout>
+
         </FrameLayout>
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            tools:layout="@layout/fragment_adaptive_player_playback_controls" />
+            android:layout_weight="0">
 
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.adaptive.AdaptivePlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_adaptive_player_playback_controls" />
+        </FrameLayout>
     </LinearLayout>
+
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
index d758dbdca..56a066fb4 100644
--- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
@@ -1,152 +1,156 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/playbackControls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="vertical"
+    tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
 
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent" />
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_slider_height"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="40dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="2dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        android:layout_marginBottom="8dp"
+        android:layout_weight="1"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        tools:ignore="ContentDescription,UnusedAttribute">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:paddingHorizontal="8dp"
-        app:layout_constraintBottom_toTopOf="@id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
-        tools:backgroundTint="@color/md_red_400"
-        tools:layout_height="52dp" />
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_album_card_cover.xml b/app/src/main/res/layout/fragment_album_card_cover.xml
index bc7bd97c6..f3e714191 100644
--- a/app/src/main/res/layout/fragment_album_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_card_cover.xml
@@ -1,23 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:id="@+id/player_album_art_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        app:cardCornerRadius="@dimen/m3_card_medium_radius"
-        app:cardElevation="4dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:cardCornerRadius="12dp"
+        app:cardElevation="4dp">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
@@ -32,4 +29,4 @@
             android:layout_height="wrap_content"
             android:background="@drawable/shadow_up_edited" />
     </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_carousel_cover.xml b/app/src/main/res/layout/fragment_album_carousel_cover.xml
index 85787d81b..fe9b40c78 100644
--- a/app/src/main/res/layout/fragment_album_carousel_cover.xml
+++ b/app/src/main/res/layout/fragment_album_carousel_cover.xml
@@ -11,23 +11,22 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+
+<code.name.monkey.retromusic.views.WidthFitSquareLayout 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_height="wrap_content"
+    android:layout_gravity="center">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="8dp"
+        android:id="@+id/player_album_art_frame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center"
         app:cardCornerRadius="8dp"
-        app:cardElevation="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/player_image"
@@ -35,7 +34,7 @@
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
             tools:ignore="ContentDescription,UnusedAttribute"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+            tools:srcCompat="@tools:sample/backgrounds/scenic[3]" />
 
     </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_circle_cover.xml b/app/src/main/res/layout/fragment_album_circle_cover.xml
index 151807595..1c33abfdb 100644
--- a/app/src/main/res/layout/fragment_album_circle_cover.xml
+++ b/app/src/main/res/layout/fragment_album_circle_cover.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:padding="@dimen/padding_album_cover">
+    android:layout_height="match_parent">
 
-    <com.google.android.material.imageview.ShapeableImageView
-        android:id="@+id/player_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:shapeAppearance="@style/ShapeAppearance.Material3.Circle"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription,UnusedAttribute"
-        tools:srcCompat="@tools:sample/backgrounds/scenic[4]" />
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <code.name.monkey.retromusic.views.CircularImageView
+            android:id="@+id/player_image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            app:civ_border="false"
+            app:civ_shadow="false"
+            tools:ignore="ContentDescription,UnusedAttribute"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[4]" />
+
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_cover.xml b/app/src/main/res/layout/fragment_album_cover.xml
index 185487c56..41fd91038 100644
--- a/app/src/main/res/layout/fragment_album_cover.xml
+++ b/app/src/main/res/layout/fragment_album_cover.xml
@@ -1,28 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_height="match_parent"
+    android:layout_gravity="center">
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="16dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/player_image"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/player_album_art_frame"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:ignore="ContentDescription,UnusedAttribute"
-            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+            android:layout_margin="16dp"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="6dp">
 
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <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"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+
+        </com.google.android.material.card.MaterialCardView>
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_details.xml b/app/src/main/res/layout/fragment_album_details.xml
index c36a4405b..326dc773b 100644
--- a/app/src/main/res/layout/fragment_album_details.xml
+++ b/app/src/main/res/layout/fragment_album_details.xml
@@ -1,120 +1,151 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
+    android:orientation="vertical"
+    tools:ignore="UnusedAttribute">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
+        android:layout_height="wrap_content">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back" />
+            app:liftOnScroll="true">
 
-    </com.google.android.material.appbar.AppBarLayout>
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    style="@style/Toolbar"
+                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" />
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/albumCoverContainer"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                app:cardCornerRadius="@dimen/m3_card_large_radius"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/image"
+                <ViewStub
+                    android:id="@+id/cab_stub"
                     android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:scaleType="centerCrop"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+                    android:layout_height="48dp" />
+            </FrameLayout>
 
-            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
 
-            <code.name.monkey.retromusic.views.RetroShapeableImageView
-                android:id="@+id/artistImage"
-                android:layout_width="52dp"
-                android:layout_height="52dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                android:scaleType="centerCrop"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/albumCoverContainer"
-                app:retroCornerSize="26dp"
-                tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-            <code.name.monkey.retromusic.views.BaselineGridTextView
-                android:id="@+id/albumTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:maxLines="3"
-                android:textAppearance="@style/TextViewHeadline6"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/artistImage"
-                app:layout_constraintTop_toTopOf="@id/artistImage"
-                tools:ignore="MissingPrefix"
-                tools:text="@tools:sample/full_names" />
-
-            <code.name.monkey.retromusic.views.BaselineGridTextView
-                android:id="@+id/albumText"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constrainedWidth="true"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/artistImage"
-                app:layout_constraintTop_toBottomOf="@id/albumTitle"
-                app:lineHeightHint="24sp"
-                tools:ignore="MissingPrefix"
-                tools:text="@tools:sample/full_names" />
-
-            <include
-                android:id="@+id/fragment_album_content"
-                layout="@layout/fragment_album_content"
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/albumText" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+                android:orientation="vertical">
+
+                <code.name.monkey.retromusic.views.WidthFitSquareCardView
+                    android:id="@+id/albumCoverContainer"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="16dp"
+                    android:transitionName="@string/transition_album_art"
+                    app:cardCornerRadius="24dp"
+                    app:cardElevation="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/image"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[5]" />
+
+                </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/artistImage"
+                    android:layout_width="52dp"
+                    android:layout_height="52dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_weight="0"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/albumCoverContainer"
+                    tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
+
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/albumTitle"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:maxLines="3"
+                    android:textAppearance="@style/TextViewHeadline6"
+                    android:textStyle="bold"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/artistImage"
+                    app:layout_constraintTop_toTopOf="@id/artistImage"
+                    tools:ignore="MissingPrefix"
+                    tools:text="@tools:sample/lorem/random" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/albumText"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:singleLine="true"
+                    android:textAppearance="@style/TextViewSubtitle2"
+                    android:textColor="?android:attr/textColorSecondary"
+                    app:layout_constrainedWidth="true"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@id/artistImage"
+                    app:layout_constraintTop_toBottomOf="@id/albumTitle"
+                    tools:ignore="MissingPrefix"
+                    tools:text="@tools:sample/lorem/random" />
+
+
+                <include
+                    layout="@layout/activity_album_content"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/albumText" />
+
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_flat_cover.xml b/app/src/main/res/layout/fragment_album_flat_cover.xml
index c0125a0d4..1e9be1b21 100644
--- a/app/src/main/res/layout/fragment_album_flat_cover.xml
+++ b/app/src/main/res/layout/fragment_album_flat_cover.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<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="wrap_content"
-    android:padding="@dimen/padding_album_cover">
+    android:layout_height="wrap_content">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/player_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription,UnusedAttribute"
-        tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="12dp">
+
+        <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"
+            tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_full_card_cover.xml b/app/src/main/res/layout/fragment_album_full_card_cover.xml
index 438b762b9..f3deeb40f 100644
--- a/app/src/main/res/layout/fragment_album_full_card_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_card_cover.xml
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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">
 
     <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="16dp"
-        app:cardCornerRadius="@dimen/m3_card_medium_radius"
-        app:cardElevation="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        app:cardCornerRadius="8dp"
+        app:cardUseCompatPadding="true">
 
-        <androidx.appcompat.widget.AppCompatImageView
+        <ImageView
             android:id="@+id/player_image"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -24,4 +19,4 @@
             tools:ignore="ContentDescription,UnusedAttribute"
             tools:srcCompat="@tools:sample/backgrounds/scenic" />
     </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_full_cover.xml b/app/src/main/res/layout/fragment_album_full_cover.xml
index 19fe46dfe..b2a3bf57b 100644
--- a/app/src/main/res/layout/fragment_album_full_cover.xml
+++ b/app/src/main/res/layout/fragment_album_full_cover.xml
@@ -1,20 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<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">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/player_image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         tools:ignore="ContentDescription,UnusedAttribute"
         tools:srcCompat="@tools:sample/backgrounds/scenic[7]" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_album_material_cover.xml b/app/src/main/res/layout/fragment_album_material_cover.xml
new file mode 100644
index 000000000..83d8946db
--- /dev/null
+++ b/app/src/main/res/layout/fragment_album_material_cover.xml
@@ -0,0 +1,30 @@
+<?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_gravity="center">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/player_album_art_frame"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_margin="16dp"
+        app:cardCornerRadius="8dp">
+
+        <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"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[8]" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+    </com.google.android.material.card.MaterialCardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_artist_details.xml b/app/src/main/res/layout/fragment_artist_details.xml
deleted file mode 100644
index 26cce597f..000000000
--- a/app/src/main/res/layout/fragment_artist_details.xml
+++ /dev/null
@@ -1,103 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/artistCoverContainer"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="8dp"
-                android:layout_marginEnd="16dp"
-                app:cardCornerRadius="@dimen/m3_card_large_radius"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <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"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic[0]" />
-
-            </com.google.android.material.card.MaterialCardView>
-
-            <code.name.monkey.retromusic.views.BaselineGridTextView
-                android:id="@+id/artistTitle"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="16dp"
-                android:maxLines="2"
-                android:textAppearance="@style/TextViewHeadline6"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/artistCoverContainer"
-                tools:text="@tools:sample/full_names" />
-
-            <code.name.monkey.retromusic.views.BaselineGridTextView
-                android:id="@+id/text"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/artistTitle"
-                tools:text="@tools:sample/full_names" />
-
-            <include
-                android:id="@+id/fragment_artist_content"
-                layout="@layout/fragment_artist_content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/text" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_backup.xml b/app/src/main/res/layout/fragment_backup.xml
deleted file mode 100644
index 5bcb9b3e2..000000000
--- a/app/src/main/res/layout/fragment_backup.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout 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="match_parent">
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/create_backup"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="4dp"
-        android:paddingVertical="10dp"
-        android:text="@string/create_new_backup"
-        android:textAppearance="@style/TextViewButton"
-        android:textColor="?android:attr/textColorPrimary"
-        app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_backup"
-        app:iconGravity="start"
-        app:layout_constraintEnd_toStartOf="@+id/restore_backup"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/restore_backup"
-        style="@style/Widget.Material3.Button.Icon"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="16dp"
-        android:paddingVertical="10dp"
-        android:text="@string/restore"
-        android:textAppearance="@style/TextViewButton"
-        app:icon="@drawable/ic_restore"
-        app:iconGravity="start"
-        app:layout_constraintBottom_toBottomOf="@+id/create_backup"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/create_backup"
-        app:layout_constraintTop_toTopOf="@+id/create_backup" />
-
-    <TextView
-        android:id="@+id/backup_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="16dp"
-        android:text="@string/backup_title"
-        app:layout_constraintLeft_toLeftOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/create_backup" />
-
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/backup_recyclerview"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/backup_title" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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
new file mode 100644
index 000000000..0522153dd
--- /dev/null
+++ b/app/src/main/res/layout/fragment_banner_home.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+<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="match_parent"
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.core.widget.NestedScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/bannerContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/imageContainer"
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                app:cardCornerRadius="24dp"
+                app:cardUseCompatPadding="true"
+                app:layout_constraintDimensionRatio="16:9"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
+
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:id="@+id/bannerImage"
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:scaleType="centerCrop"
+                        app:layout_collapseMode="parallax"
+                        tools:ignore="ContentDescription"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[9]" />
+
+
+                    <com.google.android.material.card.MaterialCardView
+                        android:id="@+id/toolbarContainer"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                        android:layout_marginTop="8dp"
+                        android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                        app:cardBackgroundColor="@android:color/transparent"
+                        app:cardCornerRadius="8dp"
+                        app:cardUseCompatPadding="true"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_scrollFlags="scroll|enterAlways"
+                        app:shapeAppearance="@style/ToolbarCornerCardView">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            android:background="?attr/colorSurface"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+                    </com.google.android.material.card.MaterialCardView>
+
+                    <View
+                        android:layout_width="match_parent"
+                        android:layout_height="52dp"
+                        android:background="@drawable/shadow_up"
+                        app:layout_constraintBottom_toBottomOf="parent" />
+
+                    <code.name.monkey.retromusic.views.CircularImageView
+                        android:id="@+id/userImage"
+                        android:layout_width="42dp"
+                        android:layout_height="42dp"
+                        android:layout_marginStart="16dp"
+                        android:layout_marginBottom="8dp"
+                        app:civ_border="false"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        tools:srcCompat="@tools:sample/avatars" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/text"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:ellipsize="end"
+                        android:text="@string/welcome"
+                        android:textColor="@color/md_white_1000"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toTopOf="@+id/userImage" />
+
+                    <com.google.android.material.textview.MaterialTextView
+                        android:id="@+id/titleWelcome"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="16dp"
+                        android:padding="0dp"
+                        android:textAppearance="@style/TextViewHeadline5"
+                        android:textColor="@color/md_white_1000"
+                        android:textStyle="bold"
+                        app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                        app:layout_constraintStart_toEndOf="@+id/userImage"
+                        app:layout_constraintTop_toBottomOf="@+id/text"
+                        tools:text="@string/app_name" />
+
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </com.google.android.material.card.MaterialCardView>
+
+            <include
+                layout="@layout/home_content"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/imageContainer" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blur.xml b/app/src/main/res/layout/fragment_blur.xml
index d0b92400f..0007814e9 100644
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -9,69 +9,70 @@
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/colorBackground"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@color/black_color" />
+        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_blur_theme"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:background="@drawable/shadow_up_full_theme" />
 
-
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
+    <View
+        android:id="@+id/mask"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="wrap_content" />
 
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
-
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
-
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            tools:background="@color/md_white_1000">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.blur.BlurPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_height="48dp"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 2d358cbc5..27e207043 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -15,188 +15,202 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        android:splitTrack="false"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="1.5dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?colorOnSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?colorOnSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/titleContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:clickable="true"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingHorizontal="16dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        tools:text="@tools:sample/lorem" />
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+
+        <com.google.android.material.textview.MaterialTextView
+            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:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:clickable="true"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewBody1"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/lorem" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="end"
         android:gravity="center"
         android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:paddingBottom="8dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewBody2"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        tools:text="@tools:sample/lorem/random" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
diff --git a/app/src/main/res/layout/fragment_card_blur_player.xml b/app/src/main/res/layout/fragment_card_blur_player.xml
index 01faf9e04..badc784e2 100644
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@@ -4,7 +4,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
@@ -12,9 +11,7 @@
         android:id="@+id/colorBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        android:scaleType="centerCrop"
-        app:srcCompat="@color/black_color" />
+        android:scaleType="centerCrop" />
 
     <View
         android:id="@+id/mask"
@@ -25,83 +22,69 @@
     <include layout="@layout/shadow_statusbar_toolbar" />
 
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <include layout="@layout/status_bar" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:freezesText="true"
-            android:paddingHorizontal="24dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem" />
+            android:orientation="vertical">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:freezesText="true"
-            android:paddingHorizontal="24dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewBody1"
-            android:textColor="?android:attr/textColorPrimary"
-            tools:text="@tools:sample/lorem" />
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <include layout="@layout/status_bar" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="0">
+
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/playerToolbar"
+                    style="@style/Toolbar"
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:contentInsetLeft="0dp"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
+                    app:titleMargin="0dp"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/TextAppearance.AppCompat.Subhead" />
+            </FrameLayout>
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_weight="1">
+
+                <fragment
+                    android:id="@+id/playerAlbumCoverFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    tools:layout="@layout/fragment_album_card_cover" />
+            </FrameLayout>
+
+        </LinearLayout>
 
         <FrameLayout
-            android:id="@+id/cardContainer"
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom">
 
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/playerAlbumCoverFragment"
-                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                tools:layout="@layout/fragment_album_full_card_cover" />
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="center"
-                tools:layout="@layout/fragment_cover_lyrics" />
-
-            <androidx.fragment.app.FragmentContainerView
+            <fragment
                 android:id="@+id/playbackControlsFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.cardblur.CardBlurPlaybackControlsFragment"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
+                android:layout_height="match_parent"
                 tools:layout="@layout/fragment_card_blur_player_playback_controls" />
         </FrameLayout>
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-    </LinearLayout>
+    </FrameLayout>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
index 3976d43c6..8fce1b37c 100644
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@@ -1,76 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
     android:paddingBottom="32dp">
 
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp" />
-
-    <include
-        android:id="@+id/media_button"
-        layout="@layout/media_button" />
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        android:layout_gravity="bottom"
+        android:orientation="vertical"
+        tools:ignore="MissingPrefix">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songCurrentProgress"
-            android:layout_width="wrap_content"
+        <FrameLayout
+            android:id="@+id/volumeFragmentContainer"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="1"
             android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:textStyle="bold"
-            tools:text="22.00" />
+            android:paddingEnd="8dp" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songTotalTime"
-            android:layout_width="wrap_content"
+        <include layout="@layout/media_button" />
+
+        <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="wrap_content"
-            android:layout_weight="0"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:textStyle="bold"
-            tools:text="22.00" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
+
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/songCurrentProgress"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:textAppearance="@style/TextViewOverline"
+                android:textStyle="bold"
+                tools:text="22.00" />
+
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/songTotalTime"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="0"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:textAppearance="@style/TextViewOverline"
+                android:textStyle="bold"
+                tools:text="22.00" />
+        </LinearLayout>
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:maxHeight="2dp"
+            android:paddingStart="20dp"
+            android:paddingEnd="20dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:progressTint="@color/md_white_1000"
+            android:splitTrack="false"
+            android:thumbTint="@color/md_white_1000"
+            tools:progress="20" />
+
     </LinearLayout>
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
-        android:progressDrawable="@drawable/color_progress_seek"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="8dp"
-        android:textSize="12sp"
-        tools:text="@tools:sample/lorem/random" />
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_player.xml b/app/src/main/res/layout/fragment_card_player.xml
index 3800ed991..aa799fe51 100644
--- a/app/src/main/res/layout/fragment_card_player.xml
+++ b/app/src/main/res/layout/fragment_card_player.xml
@@ -12,60 +12,64 @@
         android:layout_height="match_parent"
         android:background="?attr/colorSurface" />
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center"
-        android:elevation="20dp" />
-
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <FrameLayout
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <include layout="@layout/shadow_statusbar_toolbar" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-        <LinearLayout
-            android:layout_width="wrap_content"
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:id="@+id/toolbar_container"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <code.name.monkey.retromusic.views.StatusBarView
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/status_bar_padding" />
+            android:layout_weight="0">
 
             <com.google.android.material.appbar.MaterialToolbar
                 android:id="@+id/playerToolbar"
                 style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@android:color/transparent"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-        </LinearLayout>
-    </FrameLayout>
+                android:navigationIcon="@drawable/ic_close_white_24dp"
+                app:navigationIcon="@drawable/ic_close_white_24dp" />
+        </FrameLayout>
 
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_margin="8dp"
-        app:cardCornerRadius="8dp">
+        <Space
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+        <com.google.android.material.card.MaterialCardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            tools:layout="@layout/fragment_card_player_playback_controls" />
-    </com.google.android.material.card.MaterialCardView>
+            android:layout_margin="8dp"
+            android:layout_weight="0"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
+
+            <FrameLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
+                <fragment
+                    android:id="@+id/playbackControlsFragment"
+                    android:name="code.name.monkey.retromusic.fragments.player.card.CardPlaybackControlsFragment"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    tools:layout="@layout/fragment_card_player_playback_controls" />
+            </FrameLayout>
+        </com.google.android.material.card.MaterialCardView>
+    </LinearLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index 71c28a3be..fb54bcb74 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -2,6 +2,7 @@
 <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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
@@ -9,7 +10,7 @@
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <LinearLayout
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
         android:background="@color/twenty_percent_black_overlay">
@@ -18,38 +19,37 @@
             android:id="@+id/songCurrentProgress"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:gravity="center_vertical|start"
-            android:paddingStart="8dp"
-            android:paddingEnd="0dp"
+            android:layout_alignParentLeft="true"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
             android:singleLine="true"
             android:textColor="?colorOnSecondary"
             android:textSize="12sp"
-            tools:text="@tools:sample/date/hhmmss" />
-
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/MusicProgressSlider"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            android:layout_weight="1" />
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
-            android:gravity="center_vertical|end"
+            android:layout_alignParentRight="true"
+            android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
             android:textColor="?colorOnSecondary"
             android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="@tools:sample/date/hhmmss" />
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
 
-    </LinearLayout>
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/MusicProgressSlider"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            tools:ignore="RtlHardcoded,UnusedAttribute" />
 
-    <include
-        android:id="@+id/media_button"
-        layout="@layout/media_button" />
+    </RelativeLayout>
+
+    <include layout="@layout/media_button" />
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
@@ -68,6 +68,7 @@
         android:orientation="horizontal"
         tools:ignore="UnusedAttribute">
 
+
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
             android:layout_width="wrap_content"
@@ -75,7 +76,7 @@
             android:layout_gravity="center_vertical"
             android:padding="16dp"
             android:scaleType="centerCrop"
-            app:srcCompat="@drawable/ic_play_circle_filled"
+            app:srcCompat="@drawable/ic_play_circle_filled_white_24dp"
             app:tint="?colorAccent" />
 
         <LinearLayout
@@ -84,18 +85,17 @@
             android:layout_marginTop="12dp"
             android:layout_marginBottom="12dp"
             android:layout_weight="1.0"
-            android:clickable="false"
             android:orientation="vertical"
             android:paddingStart="0dp"
             android:paddingEnd="16dp">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/title"
-                android:layout_width="match_parent"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:clickable="true"
                 android:ellipsize="marquee"
                 android:focusable="true"
+                android:focusableInTouchMode="true"
                 android:freezesText="true"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:scrollHorizontally="true"
@@ -108,26 +108,15 @@
                 android:id="@+id/text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:clickable="true"
                 android:ellipsize="marquee"
                 android:focusable="true"
+                android:focusableInTouchMode="true"
                 android:freezesText="true"
                 android:marqueeRepeatLimit="marquee_forever"
                 android:scrollHorizontally="true"
                 android:singleLine="true"
                 android:textStyle="bold"
                 tools:text="@tools:sample/lorem/random" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/songInfo"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingTop="4dp"
-                android:textSize="12sp"
-                tools:text="@tools:sample/lorem/random" />
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_circle_player.xml b/app/src/main/res/layout/fragment_circle_player.xml
deleted file mode 100644
index 8cb7803e2..000000000
--- a/app/src/main/res/layout/fragment_circle_player.xml
+++ /dev/null
@@ -1,220 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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"
-    android:background="?colorSurface"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical">
-
-    <include layout="@layout/status_bar" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-        tools:layout_editor_absoluteY="24dp" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playerToolbar"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody1"
-        app:layout_constraintBottom_toTopOf="@+id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/lorem/random" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:padding="10dp"
-        app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
-        app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
-        app:layout_constraintTop_toTopOf="@id/volumeSeekBar">
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/album_cover"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic[6]" />
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/album_cover_overlay"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:alpha="0.5"
-            android:scaleType="centerCrop" />
-    </FrameLayout>
-
-    <me.tankery.lib.circularseekbar.CircularSeekBar
-        android:id="@+id/volumeSeekBar"
-        android:layout_width="wrap_content"
-        android:layout_height="300dp"
-        app:cs_circle_stroke_width="4dp"
-        app:cs_end_angle="60"
-        app:cs_move_outside_circle="true"
-        app:cs_pointer_color="@color/md_grey_200"
-        app:cs_pointer_halo_width="0dp"
-        app:cs_pointer_stroke_width="20dp"
-        app:cs_start_angle="120"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:progress="50" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:src="@drawable/ic_pause"
-        app:backgroundTint="?attr/colorSurface"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="@id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="@id/volumeSeekBar"
-        app:layout_constraintStart_toStartOf="@id/volumeSeekBar"
-        app:layout_constraintTop_toTopOf="@id/volumeSeekBar"
-        tools:tint="@color/md_black_1000" />
-
-    <ImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:tint="@color/md_white_1000" />
-
-    <ImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:tint="@color/md_white_1000" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/materialTextView3"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/volume"
-        android:textAppearance="@style/TextViewSubtitle2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/volumeSeekBar" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        style="@style/Widget.Retro.Slider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toBottomOf="@+id/volumeSeekBar" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|start|end"
-        android:paddingStart="16dp"
-        android:paddingEnd="0dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical|end"
-        android:paddingStart="0dp"
-        android:paddingEnd="16dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="16dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_classic_player.xml b/app/src/main/res/layout/fragment_classic_player.xml
deleted file mode 100644
index d88a2f85c..000000000
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ /dev/null
@@ -1,129 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/playerContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            app:layout_constraintDimensionRatio="1:1"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/fragment_album_cover" />
-
-        <LinearLayout
-            android:id="@+id/toolbarContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/shadow_down_strong"
-            android:orientation="vertical"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <code.name.monkey.retromusic.views.StatusBarView
-                android:id="@+id/status_bar"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/status_bar_padding" />
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/playerToolbar"
-                style="@style/Toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-        </LinearLayout>
-
-        <include
-            android:id="@+id/playerControlsContainer"
-            layout="@layout/fragment_classic_controls"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:elevation="24dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/playerQueueSheet"
-        style="@style/BottomSheetStyle"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shapeAppearanceOverlay="@style/TopCornerCardView"
-        app:behavior_hideable="false"
-        app:cardElevation="24dp"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:peekHeight="0dp">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clickable="false"
-            android:orientation="vertical">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:layout_marginTop="16dp"
-                android:clickable="true"
-                android:ellipsize="marquee"
-                android:focusable="true"
-                android:freezesText="true"
-                android:marqueeRepeatLimit="marquee_forever"
-                android:scrollHorizontally="true"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewHeadline6"
-                android:textColor="?android:attr/textColorPrimary"
-                android:textStyle="bold"
-                tools:text="@tools:sample/lorem[5]" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginHorizontal="16dp"
-                android:clickable="true"
-                android:ellipsize="end"
-                android:focusable="true"
-                android:maxLines="1"
-                android:textAppearance="@style/TextViewBody1"
-                android:textColor="?android:attr/textColorSecondary"
-                tools:text="@tools:sample/full_names[0]" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/player_queue_sub_header"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/listPreferredItemHeightSmall"
-                android:gravity="center_vertical"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:text="@string/up_next"
-                android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-                android:textColor="?android:attr/textColorSecondary" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/recyclerView"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:overScrollMode="@integer/overScrollMode"
-                tools:listitem="@layout/item_list" />
-        </LinearLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_color_player.xml b/app/src/main/res/layout/fragment_color_player.xml
index 1f9dbdb6d..4db23c9ac 100644
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -11,47 +11,68 @@
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="4dp"
+            app:cardPreventCornerOverlap="false"
+            app:cardUseCompatPadding="true">
+
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/playerImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                tools:ignore="ContentDescription,UnusedAttribute"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[10]" />
+
+        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.color.ColorPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_color_player_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
index 6118d2b6f..67018ae0c 100644
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@@ -2,72 +2,80 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="04:22" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="2dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
 
     <LinearLayout
         android:id="@+id/titleContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:clickable="false"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider">
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
+            android:focusableInTouchMode="true"
             android:freezesText="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
@@ -81,9 +89,10 @@
             tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
+
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="end"
@@ -91,103 +100,101 @@
         android:maxLines="1"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody1"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
+        android:textAppearance="@style/TextViewBody2"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/titleContainer"
         tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
+
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
diff --git a/app/src/main/res/layout/fragment_cover_lyrics.xml b/app/src/main/res/layout/fragment_cover_lyrics.xml
deleted file mode 100644
index b90205a95..000000000
--- a/app/src/main/res/layout/fragment_cover_lyrics.xml
+++ /dev/null
@@ -1,41 +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:id="@+id/playerLyrics"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
-    android:alpha="0"
-    android:background="@drawable/lyrics_mask"
-    android:clipToPadding="false"
-    android:elevation="20dp"
-    android:padding="16dp"
-    android:visibility="gone"
-    tools:alpha="1"
-    tools:visibility="visible">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/player_lyrics_line1"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:shadowColor="@color/md_black_1000"
-        android:shadowRadius="10"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="@color/md_white_1000"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/player_lyrics_line2"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:gravity="center"
-        android:shadowColor="@color/md_black_1000"
-        android:shadowRadius="10"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="@color/md_white_1000"
-        tools:text="@tools:sample/full_names[5]" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml
index 232573e8d..5f079a87f 100644
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@@ -4,10 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -18,40 +22,40 @@
             android:layout_height="wrap_content"
             android:layout_weight="1">
 
-            <androidx.fragment.app.FragmentContainerView
+            <fragment
                 android:id="@+id/playerAlbumCoverFragment"
                 android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 tools:layout="@layout/fragment_album_full_cover" />
-
-
-            <androidx.fragment.app.FragmentContainerView
-                android:id="@+id/cover_lyrics"
-                android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_gravity="bottom"
-                android:layout_marginBottom="20dp"
-                android:elevation="20dp" />
         </FrameLayout>
 
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playbackControlsFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_weight="0"
-            tools:layout="@layout/fragment_gradient_controls" />
+            android:layout_weight="0">
 
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:layout_weight="0"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_gravity="bottom"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+
+        </FrameLayout>
     </LinearLayout>
 
     <include layout="@layout/shadow_statusbar_toolbar" />
diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml
index 6359d8c53..f43eb8f61 100644
--- a/app/src/main/res/layout/fragment_fit_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml
@@ -1,79 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/progressContainer"
+    <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay"
-        app:layout_constraintTop_toTopOf="parent">
-
+        android:background="@color/twenty_percent_black_overlay">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songCurrentProgress"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
-            android:paddingStart="8dp"
-            android:paddingEnd="0dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/date/hhmmss" />
-
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            style="@style/MusicProgressSlider"
-            android:layout_width="0dp"
-            android:layout_height="match_parent"
-            app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-            app:layout_constraintStart_toEndOf="@id/songCurrentProgress" />
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingEnd="8dp"
-            android:paddingStart="0dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="@tools:sample/date/hhmmss" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/MusicProgressSlider"
+            android:layout_height="match_parent"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            tools:ignore="RtlHardcoded,UnusedAttribute" />
+
+    </RelativeLayout>
 
     <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:clickable="false"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+        android:layout_weight="0"
+        android:gravity="center"
+        android:orientation="vertical"
+        android:padding="8dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
+            android:focusableInTouchMode="true"
             android:freezesText="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
@@ -84,120 +75,23 @@
             android:textAppearance="@style/TextViewHeadline6"
             android:textStyle="bold"
             tools:text="@tools:sample/lorem/random" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:ellipsize="end"
+            android:gravity="center"
+            android:maxLines="1"
+            android:paddingStart="16dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="16dp"
+            android:textAppearance="@style/TextViewBody2"
+            tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="8dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewBody1"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginBottom="8dp"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+    <include layout="@layout/media_button" />
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
@@ -205,8 +99,5 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:background="@color/md_red_400"
-        tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:paddingEnd="8dp" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_flat_player.xml b/app/src/main/res/layout/fragment_flat_player.xml
index 0b3a5a1c7..a5399de84 100644
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@@ -1,58 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
     <View
-        android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:background="?attr/colorSurface" />
+
+    <View
+        android:id="@+id/colorGradientBackground"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/status_bar"
-        tools:layout="@layout/fragment_album_flat_cover" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_flat_player_playback_controls" />
-
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_flat_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.flat.FlatPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_flat_player_playback_controls" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout> 
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index 977cc3f5a..db4ad45aa 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -2,75 +2,60 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <androidx.appcompat.widget.AppCompatSeekBar
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        android:paddingVertical="@dimen/seekbar_padding"
-        android:progressDrawable="@drawable/color_progress_seek"
-        android:splitTrack="false"
-        android:thumb="@drawable/switch_square"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_container_height"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@color/md_red_500"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:padding="4dp"
-        android:textAllCaps="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        tools:text="@tools:sample/full_names" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:splitTrack="false"
+            android:thumb="@drawable/switch_square"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
+
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
@@ -80,6 +65,7 @@
         android:layout_marginEnd="16dp"
         android:background="@color/md_red_500"
         android:ellipsize="end"
+        android:fontFeatureSettings="smcp"
         android:letterSpacing="0.1"
         android:maxLines="1"
         android:padding="4dp"
@@ -92,14 +78,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        tools:text="@tools:sample/full_names" />
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        tools:text="@tools:sample/lorem/random" />
 
     <LinearLayout
         android:id="@+id/titleContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:clickable="false"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
         app:layout_constraintEnd_toEndOf="parent"
@@ -114,9 +99,9 @@
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
             android:background="@color/md_red_500"
-            android:clickable="true"
             android:ellipsize="marquee"
             android:focusable="true"
+            android:focusableInTouchMode="true"
             android:fontFeatureSettings="smcp"
             android:freezesText="true"
             android:gravity="center"
@@ -127,7 +112,7 @@
             android:singleLine="true"
             android:textAllCaps="true"
             android:textStyle="bold"
-            tools:text="@tools:sample/full_names" />
+            tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 
 
@@ -152,10 +137,11 @@
             android:layout_height="52dp"
             android:layout_centerVertical="true"
             android:background="?colorAccent"
+            android:foreground="?attr/rectSelector"
             android:padding="12dp"
             android:scaleType="fitCenter"
             tools:ignore="MissingPrefix"
-            tools:src="@drawable/ic_pause" />
+            tools:src="@drawable/ic_pause_white_24dp" />
 
         <LinearLayout
             android:layout_width="wrap_content"
@@ -171,7 +157,7 @@
                 android:background="?attr/roundSelector"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_repeat"
+                app:srcCompat="@drawable/ic_repeat_white_24dp"
                 tools:ignore="MissingPrefix" />
 
             <androidx.appcompat.widget.AppCompatImageButton
@@ -181,7 +167,7 @@
                 android:background="?attr/roundSelector"
                 android:padding="22dp"
                 android:scaleType="fitCenter"
-                app:srcCompat="@drawable/ic_shuffle"
+                app:srcCompat="@drawable/ic_shuffle_white_24dp"
                 tools:ignore="MissingPrefix" />
         </LinearLayout>
 
@@ -197,4 +183,4 @@
         app:layout_constraintBottom_toBottomOf="parent"
         tools:backgroundTint="@color/md_red_400"
         tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_folder.xml b/app/src/main/res/layout/fragment_folder.xml
index f4b2e78c7..3a9c9ba39 100644
--- a/app/src/main/res/layout/fragment_folder.xml
+++ b/app/src/main/res/layout/fragment_folder.xml
@@ -1,65 +1,122 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
+    android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
+    <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/coordinatorLayout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+        android:background="?attr/colorSurface">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:liftOnScroll="true"
-        style="?appBarLayoutStyle"
-        android:fitsSystemWindows="true">
-
-        <code.name.monkey.retromusic.views.BreadCrumbLayout
-            android:id="@+id/breadCrumbs"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/tab_height"
-            android:paddingStart="60dp"
-            android:paddingEnd="8dp"
-            app:layout_collapseMode="pin" />
-    </code.name.monkey.retromusic.views.TopAppBarLayout>
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyEmoji"
-            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/empty_text_emoji"
-            android:textAppearance="@style/TextViewHeadline3" />
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyText"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_scrollFlags="scroll|enterAlways">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="vertical">
+
+                    <FrameLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content">
+
+                        <com.google.android.material.appbar.MaterialToolbar
+                            android:id="@+id/toolbar"
+                            android:layout_width="match_parent"
+                            android:layout_height="@dimen/toolbar_height"
+                            app:contentInsetStart="0dp"
+                            app:contentInsetStartWithNavigation="0dp"
+                            app:popupTheme="?toolbarPopupTheme"
+                            app:title="@string/search_hint"
+                            app:titleMarginStart="0dp"
+                            app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                            tools:ignore="UnusedAttribute" />
+
+                        <ViewStub
+                            android:id="@+id/cab_stub"
+                            android:layout_width="match_parent"
+                            android:layout_height="48dp" />
+                    </FrameLayout>
+
+                    <code.name.monkey.retromusic.views.BreadCrumbLayout
+                        android:id="@+id/breadCrumbs"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/tab_height"
+                        android:paddingStart="60dp"
+                        android:paddingEnd="8dp"
+                        app:layout_collapseMode="pin" />
+                </LinearLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+            android:id="@+id/recyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:clipToPadding="false"
+            android:layoutAnimation="@anim/layout_animation_fall_down"
+            android:scrollbars="none"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+        <LinearLayout
+            android:id="@android:id/empty"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/nothing_to_see"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:visibility="visible" />
-    </LinearLayout>
+            android:gravity="center"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/emptyEmoji"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:text="@string/empty_text_emoji"
+                android:textAppearance="@style/TextViewHeadline3" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/emptyText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/nothing_to_see"
+                android:textAppearance="@style/TextViewHeadline5"
+                android:textColor="?android:attr/textColorSecondary"
+                tools:visibility="visible" />
+        </LinearLayout>
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_full.xml b/app/src/main/res/layout/fragment_full.xml
index 85389f556..45c308758 100644
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
@@ -7,129 +7,151 @@
     android:clickable="true"
     android:focusable="true">
 
-    <include layout="@layout/status_bar" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         tools:layout="@layout/fragment_album_full_cover" />
 
     <View
-        android:id="@+id/mask"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/shadow_up_full_theme"
-        android:backgroundTint="@color/md_red_500"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:background="#90000000" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_default="wrap"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:layout="@layout/fragment_full_player_controls" />
 
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shadow_down_full_theme"
-        app:layout_constraintBottom_toBottomOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/status_bar" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingBottom="24dp"
-        app:contentInsetEndWithActions="0dp"
-        app:contentInsetStart="0dp"
-        app:contentInsetStartWithNavigation="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down"
-        app:titleMargin="0dp"
-        app:titleMargins="0dp">
+        android:layout_gravity="bottom"
+        android:orientation="vertical">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <fragment
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.full.FullPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            tools:layout="@layout/fragment_full_player_controls" />
+
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/toolbar_container"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/nextSongLabel"
-                android:layout_width="0dp"
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/nextSongLabel"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:alpha="0.75"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:maxLines="1"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:text="@string/next_song"
+                    android:textColor="@color/md_white_1000"
+                    app:layout_constraintEnd_toStartOf="@+id/artistImage"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/nextSong"
+                    style="@style/TextAppearance.MaterialComponents.Subtitle1"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="marquee"
+                    android:gravity="center"
+                    android:marqueeRepeatLimit="marquee_forever"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:singleLine="true"
+                    android:textColor="@color/md_white_1000"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toStartOf="@+id/artistImage"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/nextSongLabel"
+                    tools:text="@string/for_you" />
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/artistImage"
+                    android:layout_width="36dp"
+                    android:layout_height="36dp"
+                    android:layout_gravity="end"
+                    android:layout_marginEnd="8dp"
+                    android:elevation="10dp"
+                    app:civ_border="false"
+                    app:civ_shadow="false"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/default_artist_art" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </com.google.android.material.appbar.MaterialToolbar>
+
+        <FrameLayout
+            android:id="@+id/player_lyrics"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:alpha="0"
+            android:clipToPadding="false"
+            android:elevation="20dp"
+            android:padding="16dp"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <TextView
+                android:id="@+id/player_lyrics_line1"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:alpha="0.75"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:maxLines="1"
-                android:paddingHorizontal="8dp"
-                android:text="@string/next_song"
-                android:textAppearance="@style/TextViewSubtitle2"
+                android:layout_gravity="center_vertical"
+                android:shadowColor="@color/md_black_1000"
+                android:shadowRadius="4"
+                android:textAlignment="center"
                 android:textColor="@color/md_white_1000"
-                app:layout_constraintEnd_toStartOf="@+id/artistImage"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:text="@tools:sample/lorem/random" />
+                android:textSize="22sp"
+                android:visibility="gone" />
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/nextSong"
-                android:layout_width="0dp"
+            <TextView
+                android:id="@+id/player_lyrics_line2"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:ellipsize="end"
-                android:gravity="center"
-                android:paddingHorizontal="8dp"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewSubtitle1"
+                android:layout_gravity="center_vertical"
+                android:shadowColor="@color/md_black_1000"
+                android:shadowRadius="4"
+                android:textAlignment="center"
                 android:textColor="@color/md_white_1000"
-                android:textStyle="bold"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/artistImage"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/nextSongLabel"
-                tools:text="@tools:sample/lorem/random" />
+                android:textSize="22sp" />
 
-            <com.google.android.material.imageview.ShapeableImageView
-                android:id="@+id/artistImage"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:layout_gravity="end"
-                android:layout_marginEnd="8dp"
-                android:elevation="10dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:shapeAppearance="@style/ShapeAppearance.Material3.Circle"
-                app:srcCompat="@drawable/default_artist_art" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </FrameLayout>
 
-    </com.google.android.material.appbar.MaterialToolbar>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        android:elevation="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index f5b4f017e..090b4c88b 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -1,232 +1,217 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/player_footer_frame"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     tools:background="@color/md_grey_800">
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/playerMenu"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/titleContainer"
-        app:srcCompat="@drawable/ic_more_vert" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/progressSlider"
-        app:layout_constraintEnd_toStartOf="@+id/playerMenu"
-        app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        app:layout_constraintTop_toTopOf="parent">
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/playerMenu"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/roundSelector"
+            android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:srcCompat="@drawable/ic_more_vert_white_24dp" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:clickable="true"
             android:ellipsize="marquee"
-            android:focusable="true"
             android:gravity="center"
             android:marqueeRepeatLimit="marquee_forever"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
             android:singleLine="true"
             android:textAppearance="@style/TextViewHeadline6"
             android:textColor="@color/md_white_1000"
             android:textStyle="bold"
+            app:layout_constraintEnd_toStartOf="@+id/songFavourite"
+            app:layout_constraintStart_toEndOf="@+id/playerMenu"
+            app:layout_constraintTop_toTopOf="parent"
             tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
-            android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:alpha="0.75"
-            android:clickable="true"
             android:ellipsize="end"
-            android:focusable="true"
             android:gravity="center"
             android:maxLines="1"
-            android:paddingTop="6dp"
+            android:paddingStart="8dp"
+            android:paddingTop="12dp"
+            android:paddingEnd="8dp"
             android:textColor="@color/md_white_1000"
-            app:layout_constraintBottom_toTopOf="@+id/progressSlider"
-            app:layout_constraintEnd_toStartOf="@+id/playerMenu"
-            app:layout_constraintStart_toEndOf="@+id/songFavourite"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/songFavourite"
+            app:layout_constraintStart_toEndOf="@+id/playerMenu"
             app:layout_constraintTop_toBottomOf="@+id/title"
-            tools:layout_editor_absoluteX="48dp"
-            tools:text="@tools:sample/lorem/random" />
+            tools:text="@string/for_you" />
 
-    </LinearLayout>
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/songFavourite"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="?attr/roundSelector"
+            android:padding="12dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="0.0"
+            app:srcCompat="@drawable/ic_favorite_border_white_24dp" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/songFavourite"
-        android:layout_width="wrap_content"
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_slider_height"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:fontFeatureSettings="onum"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="@color/md_white_1000"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:00" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:fontFeatureSettings="onum"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="@color/md_white_1000"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:00" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/titleContainer"
-        app:srcCompat="@drawable/ic_favorite_border" />
+        android:layoutDirection="ltr"
+        android:minHeight="96dp"
+        tools:ignore="ContentDescription,UnusedAttribute">
 
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerVertical="true"
+            android:layout_marginEnd="8dp"
+            android:layout_toStartOf="@+id/playPauseButton"
+            android:layout_toLeftOf="@+id/playPauseButton"
+            android:background="?attr/roundSelector"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+            tools:ignore="MissingPrefix" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerVertical="true"
+            android:layout_marginStart="8dp"
+            android:layout_toEndOf="@+id/playPauseButton"
+            android:layout_toRightOf="@+id/playPauseButton"
+            android:background="?attr/roundSelector"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_skip_next_white_24dp"
+            tools:ignore="MissingPrefix" />
 
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toBottomOf="@id/titleContainer"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:background="?attr/roundSelector"
+            android:padding="12dp"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_repeat_white_24dp"
+            tools:ignore="MissingPrefix" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="?attr/roundSelector"
+            android:padding="12dp"
+            android:scaleType="fitCenter"
+            app:srcCompat="@drawable/ic_shuffle_white_24dp"
+            tools:ignore="MissingPrefix" />
 
+        <com.google.android.material.floatingactionbutton.FloatingActionButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="@drawable/line_button"
+            android:foreground="?attr/roundSelector"
+            android:padding="20dp"
+            android:scaleType="fitCenter"
+            app:backgroundTint="@color/md_grey_200"
+            app:borderWidth="0dp"
+            app:elevation="0dp"
+            app:fabCustomSize="68dp"
+            app:fabSize="auto"
+            app:maxImageSize="32dp"
+            app:pressedTranslationZ="12dp"
+            tools:ignore="MissingPrefix"
+            tools:src="@drawable/ic_pause_white_24dp" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="?attr/roundSelector"
-        app:fabCustomSize="64dp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toTopOf="@id/songInfo"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
-        tools:background="@color/md_red_400"
-        tools:layout_height="52dp" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="16dp"
-        android:textColor="@color/md_white_1000"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_weight="0" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gradient_controls.xml b/app/src/main/res/layout/fragment_gradient_controls.xml
deleted file mode 100644
index 422b93e38..000000000
--- a/app/src/main/res/layout/fragment_gradient_controls.xml
+++ /dev/null
@@ -1,195 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:orientation="vertical">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/playerMenu"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/titleContainer"
-        app:srcCompat="@drawable/ic_more_vert"
-        tools:tint="@color/md_black_1000" />
-
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/progressSlider"
-        app:layout_constraintEnd_toStartOf="@+id/playerMenu"
-        app:layout_constraintStart_toEndOf="@+id/songFavourite"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="@color/md_white_1000"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random"
-            tools:textColor="@color/md_black_1000" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:alpha="0.75"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:gravity="center"
-            android:maxLines="1"
-            android:paddingTop="6dp"
-            android:textColor="@color/md_white_1000"
-            app:layout_constraintBottom_toTopOf="@+id/progressSlider"
-            app:layout_constraintEnd_toStartOf="@+id/playerMenu"
-            app:layout_constraintStart_toEndOf="@+id/songFavourite"
-            app:layout_constraintTop_toBottomOf="@+id/title"
-            tools:layout_editor_absoluteX="48dp"
-            tools:text="@tools:sample/lorem/random"
-            tools:textColor="@color/md_black_1000" />
-
-    </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/songFavourite"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/titleContainer"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/titleContainer"
-        app:srcCompat="@drawable/ic_favorite_border"
-        tools:tint="@color/md_black_1000" />
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        style="@style/Widget.Retro.Slider"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toBottomOf="@id/titleContainer"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        app:srcCompat="@drawable/ic_pause_sharp_white_64dp"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toTopOf="@id/songInfo"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
-        tools:background="@color/md_red_400"
-        tools:layout_height="52dp" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:paddingBottom="16dp"
-        android:textColor="@color/md_white_1000"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        tools:text="@tools:sample/lorem/random"
-        tools:textColor="@color/md_black_1000" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gradient_player.xml b/app/src/main/res/layout/fragment_gradient_player.xml
deleted file mode 100644
index fc8e9c5f1..000000000
--- a/app/src/main/res/layout/fragment_gradient_player.xml
+++ /dev/null
@@ -1,164 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="?attr/colorSurface"
-    android:clickable="true"
-    android:focusable="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/colorBackground"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:paddingBottom="48dp">
-
-        <include android:id="@+id/status_bar_layout" layout="@layout/status_bar" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/playerAlbumCoverFragment"
-            android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constrainedHeight="true"
-            app:layout_constraintBottom_toTopOf="@id/playbackControlsFragment"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:layout="@layout/fragment_album_full_cover" />
-
-        <View
-            android:id="@+id/mask"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="@drawable/shadow_up_full_theme"
-            app:layout_constraintBottom_toBottomOf="@id/playerAlbumCoverFragment"
-            app:layout_constraintEnd_toEndOf="@id/playerAlbumCoverFragment"
-            app:layout_constraintStart_toStartOf="@id/playerAlbumCoverFragment"
-            app:layout_constraintTop_toTopOf="@id/playerAlbumCoverFragment" />
-
-        <include
-            android:id="@+id/playbackControlsFragment"
-            layout="@layout/fragment_gradient_controls"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:layout_constrainedHeight="true"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment" />
-
-        <androidx.fragment.app.FragmentContainerView
-            android:id="@+id/cover_lyrics"
-            android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:elevation="20dp"
-            app:layout_constraintBottom_toBottomOf="@+id/playerAlbumCoverFragment"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            android:layout_marginBottom="16dp"
-            tools:layout="@layout/fragment_cover_lyrics" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/playerQueueSheet"
-        style="@style/BottomSheetStyle"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:behavior_hideable="false"
-        app:gestureInsetBottomIgnored="true"
-        app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
-
-        <LinearLayout
-            android:id="@+id/container"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:background="@color/twenty_percent_black_overlay"
-            app:layout_constrainedHeight="true"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintWidth_default="spread"
-            tools:background="@color/md_red_500">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/queueIcon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:padding="14dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/nextSongLabel"
-                app:layout_constraintStart_toStartOf="parent"
-                app:srcCompat="@drawable/ic_queue_music" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/nextSong"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:ellipsize="end"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:textAppearance="@style/TextViewSubtitle1"
-                app:layout_constraintBottom_toBottomOf="@id/queueIcon"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHeight_default="wrap"
-                app:layout_constraintStart_toEndOf="@id/queueIcon"
-                app:layout_constraintTop_toTopOf="@id/queueIcon" />
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/repeatButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/roundSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="14dp"
-                android:scaleType="fitCenter"
-                app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-                app:layout_constraintEnd_toStartOf="@+id/previousButton"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/previousButton"
-                app:srcCompat="@drawable/ic_repeat"
-                tools:ignore="MissingPrefix"
-                tools:tint="@color/md_black_1000" />
-
-            <androidx.appcompat.widget.AppCompatImageButton
-                android:id="@+id/shuffleButton"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="?attr/roundSelector"
-                android:clickable="true"
-                android:focusable="true"
-                android:padding="14dp"
-                android:scaleType="fitCenter"
-                app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/nextButton"
-                app:layout_constraintTop_toTopOf="@+id/nextButton"
-                app:srcCompat="@drawable/ic_shuffle"
-                tools:ignore="MissingPrefix"
-                tools:tint="@color/md_black_1000" />
-
-        </LinearLayout>
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recyclerView"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:background="?attr/colorSurface"
-            android:overScrollMode="@integer/overScrollMode"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/container"
-            tools:listitem="@layout/item_list" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 0bd02c9cd..ee7beef49 100755
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -11,51 +11,119 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<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="match_parent"
-    android:fitsSystemWindows="true">
+    android:background="?attr/colorSurface"
+    android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true" />
+        android:layout_height="wrap_content">
 
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:descendantFocusability="beforeDescendants"
-        android:focusableInTouchMode="true"
-        android:overScrollMode="@integer/overScrollMode"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+        android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/contentContainer"
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:transitionGroup="true">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
 
-            <code.name.monkey.retromusic.views.HomeImageLayout
-                android:id="@+id/imageLayout"
-                android:layout_width="0dp"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardBackgroundColor="?colorSurface"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_collapseMode="pin"
+                app:layout_scrollFlags="scroll|enterAlways">
 
-            <include
-                android:id="@+id/home_content"
-                layout="@layout/home_content"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/imageLayout" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
+                <com.google.android.material.appbar.MaterialToolbar
+                    android:id="@+id/toolbar"
+                    android:layout_width="match_parent"
+                    android:layout_height="@dimen/toolbar_height"
+                    android:background="?colorSurface"
+                    app:contentInsetStart="0dp"
+                    app:contentInsetStartWithNavigation="0dp"
+                    app:popupTheme="?toolbarPopupTheme"
+                    app:title="@string/search_hint"
+                    app:titleMarginStart="0dp"
+                    app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                    tools:ignore="UnusedAttribute" />
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
 
-    </androidx.core.widget.NestedScrollView>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+        <androidx.core.widget.NestedScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <code.name.monkey.retromusic.views.CircularImageView
+                    android:id="@+id/userImage"
+                    android:layout_width="42dp"
+                    android:layout_height="42dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginTop="16dp"
+                    android:layout_marginBottom="8dp"
+                    app:civ_border="false"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    tools:srcCompat="@tools:sample/avatars" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:ellipsize="end"
+                    android:text="@string/welcome"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toTopOf="@+id/userImage"
+                    tools:text="@tools:sample/lorem" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/titleWelcome"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="16dp"
+                    android:padding="0dp"
+                    android:textAppearance="@style/TextViewHeadline5"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:textStyle="bold"
+                    app:layout_constraintBottom_toBottomOf="@+id/userImage"
+                    app:layout_constraintStart_toEndOf="@+id/userImage"
+                    app:layout_constraintTop_toBottomOf="@+id/text"
+                    tools:text="@tools:sample/lorem" />
+
+                <include
+                    layout="@layout/home_content"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/titleWelcome" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+        </androidx.core.widget.NestedScrollView>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_home_player.xml b/app/src/main/res/layout/fragment_home_player.xml
deleted file mode 100644
index 92fa82230..000000000
--- a/app/src/main/res/layout/fragment_home_player.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingHorizontal="16dp"
-        android:shadowColor="@color/md_black_1000"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
-        android:textAppearance="@style/TextViewHeadline2"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="@tools:sample/date/hhmm"
-        tools:textColor="@color/md_black_1000" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:paddingHorizontal="16dp"
-        android:shadowColor="@color/md_black_1000"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toTopOf="@id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="@tools:sample/full_names"
-        tools:textColor="@color/md_black_1000" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:alpha="0.75"
-        android:gravity="end"
-        android:paddingHorizontal="16dp"
-        android:paddingBottom="16dp"
-        android:shadowColor="@color/md_black_1000"
-        android:shadowDx="1"
-        android:shadowDy="1"
-        android:shadowRadius="2"
-        android:textAppearance="@style/TextViewSubtitle1"
-        android:textColor="@color/md_white_1000"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:text="@tools:sample/full_names"
-        tools:textColor="@color/md_black_1000" />
-
-    <View
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@drawable/shadow_down_strong"
-        app:layout_constraintBottom_toBottomOf="@id/toolbarContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/toolbarContainer" />
-
-    <LinearLayout
-        android:id="@+id/toolbarContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <code.name.monkey.retromusic.views.StatusBarView
-            android:id="@+id/status_bar"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/status_bar_padding" />
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/playerToolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-                app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-    </LinearLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 67663cbe3..e9a787143 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -1,52 +1,91 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<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:id="@+id/mainContent"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?colorSurface"
+    android:orientation="vertical">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:liftOnScroll="true">
+        android:elevation="0dp"
+        tools:ignore="UnusedAttribute">
 
-        <FrameLayout
+        <include layout="@layout/status_bar" />
+
+    </FrameLayout>
+
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <com.google.android.material.appbar.AppBarLayout
+            android:id="@+id/appBarLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways">
+            android:background="@android:color/transparent"
+            android:elevation="0dp"
+            app:elevation="0dp"
+            app:liftOnScroll="true">
 
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
+            <com.google.android.material.card.MaterialCardView
+                android:id="@+id/toolbarContainer"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?attr/colorSurface"
-                app:navigationIcon="@drawable/ic_search"
-                app:popupTheme="?attr/toolbarPopupTheme"
-                app:title="@null"
-                tools:ignore="UnusedAttribute">
+                android:layout_marginStart="@dimen/toolbar_margin_horizontal"
+                android:layout_marginTop="@dimen/toolbar_margin_vertical"
+                android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
+                android:layout_marginBottom="@dimen/toolbar_margin_vertical"
+                app:cardCornerRadius="8dp"
+                app:cardUseCompatPadding="true"
+                app:layout_scrollFlags="scroll|enterAlways">
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/appNameText"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:textAppearance="@style/TextViewHeadline6"
-                    android:textStyle="bold" />
-            </androidx.appcompat.widget.Toolbar>
+                <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content">
 
-            <ViewStub
-                android:id="@+id/cab_stub"
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/toolbar_height" />
-        </FrameLayout>
-    </com.google.android.material.appbar.AppBarLayout>
+                    <com.google.android.material.appbar.MaterialToolbar
+                        android:id="@+id/toolbar"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/toolbar_height"
+                        android:background="?colorSurface"
+                        app:contentInsetStart="0dp"
+                        app:contentInsetStartWithNavigation="0dp"
+                        app:popupTheme="?attr/toolbarPopupTheme"
+                        app:title="@string/search_hint"
+                        app:titleMarginStart="0dp"
+                        app:titleTextAppearance="@style/ToolbarTextAppearanceSearch"
+                        app:titleTextColor="?android:attr/textColorSecondary"
+                        tools:ignore="UnusedAttribute" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+                    <ViewStub
+                        android:id="@+id/cab_stub"
+                        android:layout_width="match_parent"
+                        android:layout_height="@dimen/toolbar_height" />
+                </FrameLayout>
+            </com.google.android.material.card.MaterialCardView>
+        </com.google.android.material.appbar.AppBarLayout>
+
+        <FrameLayout
+            android:id="@+id/fragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
+
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 377c55700..75aed24ee 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -2,87 +2,90 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_vertical"
     android:orientation="vertical"
+    android:paddingTop="8dp"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        app:thumbRadius="@dimen/slider_thumb_radius"
-        app:trackHeight="@dimen/slider_track_height"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/text"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider">
+        app:layout_constraintTop_toTopOf="parent">
 
         <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
             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:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-    </LinearLayout>
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="2dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
+
+    <com.google.android.material.textview.MaterialTextView
+        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:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:scrollHorizontally="true"
+        android:singleLine="true"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toTopOf="@+id/text"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        tools:text="@tools:sample/lorem/random" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
@@ -96,91 +99,108 @@
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody1"
         android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        tools:text="@tools:sample/lorem/random" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:layout_editor_absoluteX="178dp"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
-        tools:background="@color/md_red_400"
+        tools:backgroundTint="@color/md_red_400"
         tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_lyrics.xml b/app/src/main/res/layout/fragment_lyrics.xml
index d60cbf51b..403ed542c 100644
--- a/app/src/main/res/layout/fragment_lyrics.xml
+++ b/app/src/main/res/layout/fragment_lyrics.xml
@@ -1,92 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:paddingBottom="@dimen/mini_player_height">
+    android:layout_height="wrap_content"
+    android:fadingEdge="vertical"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/offlineLyrics"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="0dp"
-        app:contentInsetLeft="0dp"
-        app:contentInsetStart="0dp"
-        app:contentInsetStartWithNavigation="0dp"
-        app:fabAlignmentMode="end"
-        app:hideOnScroll="true"
-        app:titleMargin="0dp"
-        app:titleMarginStart="0dp"
-        tools:backgroundTint="@color/md_red_400">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorSurface"
-            android:gravity="start"
-            app:contentInsetLeft="0dp"
-            app:contentInsetStart="0dp"
-            app:contentInsetStartWithNavigation="0dp"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/lyrics"
-            app:titleMargin="0dp"
-            app:titleMarginStart="0dp"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="?attr/actionBarSize">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical">
-
-            <TextView
-                android:id="@+id/normalLyrics"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/normal_lyrics_padding"
-                android:textIsSelectable="true"
-                android:textSize="@dimen/lyrics_text_size"
-                tools:text="@tools:sample/lorem[100]" />
-        </ScrollView>
-
-        <code.name.monkey.retromusic.lyrics.LrcView
-            android:id="@+id/lyricsView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-            app:lrcLabel="@string/no_lyrics_found"
-            app:lrcNormalTextSize="24sp"
-            app:lrcPadding="24dp"
-            app:lrcTextGravity="left"
-            app:lrcTextSize="28sp" />
-
-        <TextView
-            android:id="@+id/noLyricsFound"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/no_lyrics_found"
-            android:textSize="24sp"
-            android:visibility="gone" />
-    </FrameLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/edit_button"
-        style="@style/Widget.Material3.FloatingActionButton.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:srcCompat="@drawable/ic_edit" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+        android:gravity="start"
+        android:lineSpacingExtra="3dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="128dp"
+        android:text="@string/no_lyrics_found"
+        android:textAppearance="@style/TextViewBody1"
+        android:textColor="?android:attr/textColorPrimary" />
+</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_recycler.xml b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
similarity index 51%
rename from app/src/main/res/layout/fragment_main_recycler.xml
rename to app/src/main/res/layout/fragment_main_activity_recycler_view.xml
index 32bfec63f..3294e976e 100644
--- a/app/src/main/res/layout/fragment_main_recycler.xml
+++ b/app/src/main/res/layout/fragment_main_activity_recycler_view.xml
@@ -1,30 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
+    android:layout_height="match_parent">
 
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
-        android:scrollbars="none"
-        android:transitionGroup="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:listitem="@layout/item_list" />
-
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
+    <com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView
+        android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/CenteredCheckBoxTheme" />
+        android:clipToPadding="false"
+        android:layoutAnimation="@anim/layout_animation_fall_down"
+        android:scrollbars="none"
+        app:layout_dodgeInsetEdges="bottom" />
 
     <LinearLayout
         android:id="@android:id/empty"
@@ -54,14 +43,4 @@
             android:textColor="?android:attr/textColorSecondary"
             tools:visibility="visible" />
     </LinearLayout>
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/shuffle_button"
-        style="@style/Widget.Material3.FloatingActionButton.Primary"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginHorizontal="16dp"
-        android:contentDescription="@string/shuffle"
-        app:srcCompat="@drawable/ic_shuffle" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml
new file mode 100644
index 000000000..1bacac0e1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_main_options.xml
@@ -0,0 +1,43 @@
+<?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"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    tools:ignore="MissingPrefix">
+
+    <code.name.monkey.retromusic.views.OptionMenuItemView
+        android:id="@+id/actionLibrary"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp"
+        app:optionIcon="@drawable/ic_library_music_white_24dp"
+        app:optionTitle="@string/library" />
+
+    <code.name.monkey.retromusic.views.OptionMenuItemView
+        android:id="@+id/actionFolders"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp"
+        app:optionIcon="@drawable/ic_folder_white_24dp"
+        app:optionTitle="@string/folders" />
+
+    <code.name.monkey.retromusic.views.OptionMenuItemView
+        android:id="@+id/actionSettings"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp"
+        app:optionIcon="@drawable/ic_settings_white_24dp"
+        app:optionTitle="@string/action_settings" />
+
+    <code.name.monkey.retromusic.views.OptionMenuItemView
+        android:id="@+id/actionRate"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="2dp"
+        app:optionIcon="@drawable/ic_star_white_24dp"
+        app:optionTitle="@string/rate_app" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml
index 6cffcbfdc..63ae35a5e 100644
--- a/app/src/main/res/layout/fragment_main_settings.xml
+++ b/app/src/main/res/layout/fragment_main_settings.xml
@@ -1,24 +1,99 @@
 <?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:id="@+id/scrollView"
+    android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:overScrollMode="@integer/overScrollMode">
+    android:layout_height="match_parent"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
 
     <LinearLayout
-        android:id="@+id/container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:paddingBottom="@dimen/mini_player_height">
+        android:orientation="vertical">
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/buyProContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="4dp"
+            app:cardCornerRadius="8dp"
+            app:cardElevation="0dp"
+            app:cardUseCompatPadding="true"
+            app:strokeWidth="1.5dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="4dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/diamondIcon"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="16dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="12dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:srcCompat="@drawable/ic_diamond_stone_white_24dp"
+                    app:tint="?colorOnSecondary" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="16dp"
+                    android:paddingEnd="16dp"
+                    android:text="@string/retro_music_pro"
+                    android:textAppearance="@style/TextViewSubtitle1"
+                    android:textStyle="bold"
+                    app:layout_constraintTop_toBottomOf="@id/diamondIcon" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:paddingStart="16dp"
+                    android:paddingTop="4dp"
+                    android:paddingEnd="16dp"
+                    android:paddingBottom="12dp"
+                    android:text="@string/pro_summary"
+                    app:layout_constraintTop_toBottomOf="@id/title" />
+
+                <View
+                    android:id="@+id/divider"
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginStart="16dp"
+                    android:layout_marginEnd="16dp"
+                    android:background="?attr/dividerHorizontal"
+                    app:layout_constraintTop_toBottomOf="@id/text" />
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/buyPremium"
+                    style="@style/Widget.MaterialComponents.Button.UnelevatedButton"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:gravity="start|center_vertical"
+                    android:text="@string/buy_now"
+                    android:textAllCaps="false"
+                    android:textColor="?colorAccent"
+                    android:textStyle="bold"
+                    app:backgroundTint="?attr/colorSurface"
+                    app:layout_constraintBottom_toBottomOf="parent"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@id/divider" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+        </com.google.android.material.card.MaterialCardView>
 
         <code.name.monkey.retromusic.views.SettingListItemView
             android:id="@+id/generalSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_palette"
+            app:settingListItemIcon="@drawable/ic_theme_palette_white_24dp"
             app:settingListItemIconColor="@color/md_blue_A400"
             app:settingListItemText="@string/general_settings_summary"
             app:settingListItemTitle="@string/general_settings_title" />
@@ -27,7 +102,7 @@
             android:id="@+id/nowPlayingSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_play_circle_filled"
+            app:settingListItemIcon="@drawable/ic_play_circle_filled_white_24dp"
             app:settingListItemIconColor="@color/md_red_A400"
             app:settingListItemText="@string/now_playing_summary"
             app:settingListItemTitle="@string/now_playing" />
@@ -36,7 +111,7 @@
             android:id="@+id/audioSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_volume_up"
+            app:settingListItemIcon="@drawable/ic_volume_up_white_24dp"
             app:settingListItemIconColor="@color/md_deep_purple_A400"
             app:settingListItemText="@string/audio_settings_summary"
             app:settingListItemTitle="@string/pref_header_audio" />
@@ -45,7 +120,7 @@
             android:id="@+id/personalizeSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_hdr_strong"
+            app:settingListItemIcon="@drawable/ic_hdr_strong_white_24dp"
             app:settingListItemIconColor="@color/md_teal_A400"
             app:settingListItemText="@string/personalize_settings_summary"
             app:settingListItemTitle="@string/personalize" />
@@ -55,7 +130,7 @@
             android:id="@+id/imageSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_image"
+            app:settingListItemIcon="@drawable/ic_image_white_24dp"
             app:settingListItemIconColor="@color/md_deep_orange_A400"
             app:settingListItemText="@string/image_settings_summary"
             app:settingListItemTitle="@string/pref_header_images" />
@@ -64,7 +139,7 @@
             android:id="@+id/notificationSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_notifications_active"
+            app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp"
             app:settingListItemIconColor="@color/md_yellow_A400"
             app:settingListItemText="@string/notification_settings_summary"
             app:settingListItemTitle="@string/notification" />
@@ -73,25 +148,17 @@
             android:id="@+id/otherSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_testing"
+            app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp"
             app:settingListItemIconColor="@color/md_indigo_A400"
             app:settingListItemText="@string/other_settings_summary"
             app:settingListItemTitle="@string/others" />
 
-        <code.name.monkey.retromusic.views.SettingListItemView
-            android:id="@+id/backup_restore_settings"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_restore"
-            app:settingListItemIconColor="@color/md_cyan_400"
-            app:settingListItemText="@string/backup_restore_settings_summary"
-            app:settingListItemTitle="@string/backup_restore_title" />
 
         <code.name.monkey.retromusic.views.SettingListItemView
             android:id="@+id/aboutSettings"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:settingListItemIcon="@drawable/ic_info_outline"
+            app:settingListItemIcon="@drawable/ic_info_outline_white_24dp"
             app:settingListItemIconColor="@color/md_light_green_A400"
             app:settingListItemText="@string/about_settings_summary"
             app:settingListItemTitle="@string/action_about" />
diff --git a/app/src/main/res/layout/fragment_material.xml b/app/src/main/res/layout/fragment_material.xml
index 1660cea4b..cbc33a35d 100644
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@@ -1,56 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
     <View
-        android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:background="?attr/colorSurface" />
 
-    <include layout="@layout/status_bar" />
+    <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+        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>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.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="match_parent"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.material.MaterialControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_material_playback_controls" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_gravity="bottom"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index 4eab6b494..ae2e426f3 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -2,81 +2,100 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/progress_slider_height"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/titleContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        tools:text="@tools:sample/lorem/random" />
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+
+        <com.google.android.material.textview.MaterialTextView
+            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:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:ellipsize="end"
@@ -85,104 +104,98 @@
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody1"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
         tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous_outline"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        app:srcCompat="@drawable/ic_pause_outline"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next_outline"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:background="?attr/roundSelector"
+            app:srcCompat="@drawable/ic_pause_white_64dp"
+            tools:tint="@color/md_black_1000" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
diff --git a/app/src/main/res/layout/fragment_md3_player.xml b/app/src/main/res/layout/fragment_md3_player.xml
deleted file mode 100644
index 87fdcbece..000000000
--- a/app/src/main/res/layout/fragment_md3_player.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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"
-    android:background="?attr/colorSurface"
-    android:clickable="true"
-    android:focusable="true">
-
-    <include layout="@layout/shadow_statusbar_toolbar" />
-
-    <include layout="@layout/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.45"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.md3.MD3PlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_md3_player_playback_controls" />
-
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml b/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
deleted file mode 100644
index 99fd4e8d8..000000000
--- a/app/src/main/res/layout/fragment_md3_player_playback_controls.xml
+++ /dev/null
@@ -1,213 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    tools:ignore="MissingPrefix">
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <LinearLayout
-        android:id="@+id/text_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseCard"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider">
-
-        <com.google.android.material.textview.MaterialTextView
-            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:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingHorizontal="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorPrimary"
-            android:textStyle="bold"
-            tools:text="@tools:sample/lorem/random" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:ellipsize="marquee"
-            android:focusable="true"
-            android:focusableInTouchMode="true"
-            android:freezesText="true"
-            android:gravity="center"
-            android:marqueeRepeatLimit="marquee_forever"
-            android:paddingHorizontal="16dp"
-            android:scrollHorizontally="true"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewSubtitle2"
-            android:textColor="?android:attr/textColorSecondary"
-            app:layout_constrainedWidth="true"
-            tools:text="@tools:sample/full_names" />
-    </LinearLayout>
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:paddingHorizontal="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playPauseCard"
-        tools:text="@tools:sample/full_names" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseCard"
-        app:layout_constraintEnd_toStartOf="@id/playPauseCard"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseCard"
-        app:srcCompat="@drawable/ic_skip_previous_outline"
-        tools:backgroundTint="?colorPrimaryDark"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/playPauseCard"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:cardBackgroundColor="?colorSecondary"
-        app:cardCornerRadius="40dp"
-        app:layout_constraintBottom_toTopOf="@id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_container"
-        tools:tint="@color/md_black_1000">
-
-        <ImageButton
-            android:id="@+id/playPauseButton"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/transparent"
-            android:padding="28dp"
-            app:srcCompat="@drawable/ic_pause_outline_small"
-            tools:tint="@color/md_black_1000" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="@null"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseCard"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseCard"
-        app:layout_constraintTop_toTopOf="@+id/playPauseCard"
-        app:srcCompat="@drawable/ic_skip_next_outline"
-        tools:backgroundTint="?colorPrimaryDark"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <ImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:background="@null"
-        android:padding="16dp"
-        android:paddingVertical="16dp"
-        android:src="@drawable/ic_shuffle"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <ImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="16dp"
-        android:background="@null"
-        android:padding="16dp"
-        android:paddingVertical="16dp"
-        android:src="@drawable/ic_repeat"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintHorizontal_chainStyle="spread_inside"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:background="@color/md_red_400"
-        tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 9962b68e0..43ff8e32c 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -1,98 +1,109 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/miniPlayerContent"
     android:layout_width="match_parent"
-    android:layout_height="56dp"
+    android:layout_height="48dp"
+    android:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
-    android:orientation="horizontal"
-    android:paddingStart="8dp"
-    android:paddingEnd="0dp">
+    tools:ignore="UnusedAttribute">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingStart="0dp"
+        android:paddingEnd="8dp">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="8dp"
-        app:cardCornerRadius="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/drag_view"
-        app:layout_constraintTop_toTopOf="parent">
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
+            android:id="@+id/miniPlayerImage"
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_gravity="center_vertical"
+            android:layout_margin="16dp"
+            android:scaleType="centerCrop"
+            app:srcCompat="@drawable/ic_keyboard_arrow_up_24dp"
+            app:tint="?attr/colorControlNormal"
+            tools:ignore="ContentDescription" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/miniPlayerTitle"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            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/TextViewNormal"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="@tools:sample/lorem/random" />
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/actionPrevious"
             android:layout_width="40dp"
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
+            android:background="?roundSelector"
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+            app:tint="?attr/colorControlNormal" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/miniPlayerTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        android:layout_weight="1"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:freezesText="true"
-        android:gravity="start"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorPrimary"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/actionPrevious"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:background="?roundSelector"
-        android:padding="6dp"
-        app:srcCompat="@drawable/ic_skip_previous"
-        app:tint="?attr/colorControlNormal" />
-
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical">
-
-        <com.google.android.material.progressindicator.CircularProgressIndicator
-            android:id="@+id/progressBar"
+        <FrameLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:trackCornerRadius="16dp"
-            tools:progress="10" />
+            android:layout_gravity="center_vertical">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/miniPlayerPlayPauseButton"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:background="?roundSelector"
+                android:scaleType="center"
+                app:srcCompat="@drawable/ic_pause_white_24dp"
+                app:tint="?attr/colorControlNormal"
+                tools:ignore="ContentDescription" />
+
+            <ProgressBar
+                android:id="@+id/progressBar"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="44dp"
+                android:layout_height="44dp"
+                android:layout_gravity="center"
+                android:indeterminate="false"
+                android:progressDrawable="@drawable/circle_progress"
+                android:rotation="270"
+                tools:progress="80" />
+        </FrameLayout>
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/miniPlayerPlayPauseButton"
+            android:id="@+id/actionNext"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_gravity="center"
+            android:layout_gravity="center_vertical"
             android:background="?roundSelector"
-            android:scaleType="center"
-            app:srcCompat="@drawable/ic_pause"
-            app:tint="?attr/colorControlNormal"
-            tools:ignore="ContentDescription" />
-    </FrameLayout>
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_skip_next_white_24dp"
+            app:tint="?attr/colorControlNormal" />
 
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/actionNext"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_gravity="center_vertical"
-        android:background="?roundSelector"
-        android:padding="6dp"
-        app:srcCompat="@drawable/ic_skip_next"
-        app:tint="?attr/colorControlNormal" />
-</LinearLayout>
\ No newline at end of file
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/actionPlayingQueue"
+            android:layout_width="40dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center_vertical"
+            android:background="?roundSelector"
+            android:padding="6dp"
+            app:srcCompat="@drawable/ic_playlist_play_white_24dp"
+            app:tint="?attr/colorControlNormal" />
+
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_classic_controls.xml b/app/src/main/res/layout/fragment_peak_control_player.xml
similarity index 58%
rename from app/src/main/res/layout/fragment_classic_controls.xml
rename to app/src/main/res/layout/fragment_peak_control_player.xml
index 149092d5c..7680a6e4f 100644
--- a/app/src/main/res/layout/fragment_classic_controls.xml
+++ b/app/src/main/res/layout/fragment_peak_control_player.xml
@@ -1,19 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
 <androidx.constraintlayout.widget.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"
-    android:gravity="center_vertical"
-    android:orientation="vertical"
-    android:paddingBottom="8dp"
-    tools:ignore="MissingPrefix">
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <RelativeLayout
         android:id="@+id/progressContainer"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/progress_container_height"
-        android:background="@color/twenty_percent_black_overlay"
+        android:layout_height="@dimen/progress_slider_height"
+        android:layout_marginTop="16dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -23,97 +35,106 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
-            android:textColor="?colorOnSecondary"
+            android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="@tools:sample/date/hhmmss" />
+            tools:text="00:22" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
-            android:textColor="?colorOnSecondary"
+            android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
             tools:ignore="RtlHardcoded,RtlSymmetry"
-            tools:text="@tools:sample/date/hhmmss" />
+            tools:text="00:22" />
 
         <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/progressSlider"
-            style="@style/MusicProgressSlider"
-            android:layout_height="match_parent"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
             android:layout_toLeftOf="@id/songTotalTime"
             android:layout_toRightOf="@id/songCurrentProgress"
-            android:paddingVertical="@dimen/seekbar_padding"
-            tools:ignore="RtlHardcoded,UnusedAttribute" />
-
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
     </RelativeLayout>
 
-
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/playPauseButton"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        android:layout_centerVertical="true"
         android:background="?attr/roundSelector"
-        android:padding="16dp"
+        android:padding="8dp"
         android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
+        app:layout_constraintEnd_toStartOf="@+id/nextButton"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
+        app:layout_constraintStart_toEndOf="@+id/previousButton"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        app:srcCompat="@drawable/ic_pause_white_24dp"
         tools:tint="@color/md_black_1000" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/previousButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
         android:background="?attr/roundSelector"
         android:padding="16dp"
         android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
         app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
         app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
+        app:layout_constraintStart_toEndOf="@+id/repeatButton"
         app:layout_constraintTop_toBottomOf="@+id/progressContainer"
-        app:srcCompat="@drawable/ic_pause"
+        app:srcCompat="@drawable/ic_skip_previous_white_24dp"
+        tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/nextButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
         android:background="?attr/roundSelector"
         android:padding="16dp"
         android:scaleType="fitCenter"
         app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
         app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        app:srcCompat="@drawable/ic_skip_next_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/repeatButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="16dp"
+        android:background="?attr/roundSelector"
+        android:padding="16dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        app:srcCompat="@drawable/ic_repeat_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
@@ -121,38 +142,28 @@
         android:id="@+id/shuffleButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginEnd="16dp"
         android:background="?attr/roundSelector"
         android:padding="16dp"
         android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        app:srcCompat="@drawable/ic_shuffle_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="2"
-        android:paddingHorizontal="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
-        tools:text="@tools:sample/lorem/random" />
-
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        tools:background="@color/md_red_400"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/playPauseButton"
+        tools:backgroundTint="@color/md_red_400"
         tools:layout_height="52dp" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_peak_player.xml b/app/src/main/res/layout/fragment_peak_player.xml
new file mode 100644
index 000000000..afda28a5f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_peak_player.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<androidx.constraintlayout.widget.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="wrap_content"
+    android:clickable="true"
+    android:focusable="true"
+    android:orientation="vertical">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorSurface"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <FrameLayout
+            android:id="@+id/toolbarContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_gravity="bottom"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            android:id="@+id/imageContainer"
+            android:layout_width="72dp"
+            android:layout_height="72dp"
+            android:layout_marginStart="16dp"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/toolbarContainer">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/playerImage"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                tools:src="@tools:sample/avatars" />
+        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
+
+        <LinearLayout
+            android:id="@+id/titleContainer"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toTopOf="@+id/text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageContainer"
+            app:layout_constraintTop_toBottomOf="@+id/toolbarContainer">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginEnd="8dp"
+                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/TextViewSubtitle1"
+                tools:text="@tools:sample/lorem/random" />
+        </LinearLayout>
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:textAppearance="@style/TextViewBody2"
+            android:textColor="?android:attr/textColorSecondary"
+            app:layout_constraintBottom_toBottomOf="@+id/imageContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/imageContainer"
+            app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+            tools:text="@tools:sample/lorem/random" />
+
+        <FrameLayout
+            android:id="@+id/playbackControlsFragmentContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toBottomOf="@+id/imageContainer">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.peak.PeakPlayerControlFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_peak_control_player" />
+        </FrameLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_peek_album_cover.xml b/app/src/main/res/layout/fragment_peek_album_cover.xml
deleted file mode 100644
index c0863e579..000000000
--- a/app/src/main/res/layout/fragment_peek_album_cover.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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">
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="8dp"
-        app:cardElevation="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <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"
-            tools:srcCompat="@tools:sample/backgrounds/scenic" />
-
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_peek_control_player.xml b/app/src/main/res/layout/fragment_peek_control_player.xml
deleted file mode 100644
index aa6f0a69e..000000000
--- a/app/src/main/res/layout/fragment_peek_control_player.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:orientation="vertical">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginTop="16dp"
-        android:background="?attr/roundSelector"
-        android:padding="8dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        app:srcCompat="@drawable/ic_pause"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginStart="16dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_marginEnd="16dp"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-    <FrameLayout
-        android:id="@+id/volumeFragmentContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playPauseButton"
-        tools:backgroundTint="@color/md_red_400"
-        tools:layout_height="52dp" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_peek_player.xml b/app/src/main/res/layout/fragment_peek_player.xml
deleted file mode 100644
index aa9a00ce6..000000000
--- a/app/src/main/res/layout/fragment_peek_player.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:clickable="true"
-    android:focusable="true"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
-        android:layout_marginStart="16dp"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerToolbar" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintTop_toBottomOf="@+id/playerToolbar"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/lorem" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/playerAlbumCoverFragment"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.peek.PeekPlayerControlFragment"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_peek_control_player" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
index e325641cd..e0e89871a 100644
--- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
@@ -7,150 +7,154 @@
     android:gravity="center_vertical"
     android:orientation="vertical">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        style="@style/Widget.Retro.Slider"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="center"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintTop_toTopOf="parent">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="2dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        tools:backgroundTint="@color/md_green_500"
-        tools:srcCompat="@drawable/ic_play_arrow_white_32dp" />
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
-
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:paddingHorizontal="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/playPauseButton"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         tools:backgroundTint="@color/md_red_400"
         tools:layout_height="52dp" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/volumeFragmentContainer"
-        tools:text="@tools:sample/lorem/random" />
-</androidx.constraintlayout.widget.ConstraintLayout>
-
-
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_plain_player.xml b/app/src/main/res/layout/fragment_plain_player.xml
index 6264dc442..d0a66c0a4 100644
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@@ -1,80 +1,102 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include layout="@layout/status_bar" />
-
     <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:clickable="false"
-        android:orientation="vertical"
-        android:padding="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
+
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textStyle="bold"
-            tools:ignore="MissingPrefix"
-            tools:text="Title" />
+            android:layout_weight="0"
+            android:orientation="vertical"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                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/TextViewHeadline6"
+                android:textStyle="bold"
+                tools:ignore="MissingPrefix"
+                tools:text="Title" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:paddingTop="8dp"
+                android:textColor="?colorOnBackground"
+                tools:text="Text" />
+        </LinearLayout>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:clickable="true"
-            android:ellipsize="end"
-            android:focusable="true"
-            android:maxLines="1"
-            android:paddingTop="8dp"
-            tools:text="Text" />
+            android:layout_height="wrap_content">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_plain_controls_fragment" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
     </LinearLayout>
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/titleContainer" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.plain.PlainPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 3cc950014..3ff916703 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -1,78 +1,76 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface" />
+
     <View
         android:id="@+id/colorGradientBackground"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        android:layout_height="match_parent" />
 
-    <com.jetradarmobile.snowfall.SnowfallView
-        android:id="@+id/snowfall_view"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:snowflakeSpeedMax="6"
-        app:snowflakeSpeedMin="2"
-        app:snowflakesNum="75" />
 
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <FrameLayout
-        android:id="@+id/statusBarContainer"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-        <include layout="@layout/status_bar" />
-    </FrameLayout>
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
+            <include layout="@layout/status_bar" />
+        </FrameLayout>
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/statusBarContainer" />
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:id="@+id/playerAlbumCoverContainer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
 
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.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>
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
 
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.normal.PlayerPlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_player_playback_controls" />
+        </FrameLayout>
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:title="@null"
-        tools:menu="@menu/menu_player" />
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:layout_gravity="bottom"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player_album_cover.xml b/app/src/main/res/layout/fragment_player_album_cover.xml
index 761120825..d018d8fee 100644
--- a/app/src/main/res/layout/fragment_player_album_cover.xml
+++ b/app/src/main/res/layout/fragment_player_album_cover.xml
@@ -1,46 +1,10 @@
 <?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">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:overScrollMode="@integer/overScrollMode">
-
-    </androidx.viewpager.widget.ViewPager>
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/cover_lyrics"
-        android:name="code.name.monkey.retromusic.fragments.player.CoverLyricsFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_vertical" />
-
-    <com.bosphere.fadingedgelayout.FadingEdgeLayout
-        android:id="@+id/fading_edge_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:fel_edge="top|bottom"
-        app:fel_size_bottom="100dp"
-        app:fel_size_top="100dp">
-
-        <code.name.monkey.retromusic.lyrics.CoverLrcView
-            android:id="@+id/lyricsView"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="16dp"
-            android:visibility="gone"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-            app:lrcLabel="@string/no_lyrics_found"
-            app:lrcNormalTextSize="28sp"
-            app:lrcPadding="24dp"
-            app:lrcTextGravity="center"
-            app:lrcTextSize="32sp"
-            app:lrcTimelineColor="@color/transparent"
-            tools:visibility="visible" />
-    </com.bosphere.fadingedgelayout.FadingEdgeLayout>
+        android:layout_height="match_parent" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index 13194a9ab..0580891e3 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -2,184 +2,204 @@
 <androidx.constraintlayout.widget.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:id="@+id/playback_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_vertical"
     android:orientation="vertical"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/progressSlider"
-        tools:text="@tools:sample/date/hhmmss" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/progressSlider"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
-        app:layout_constraintEnd_toStartOf="@id/songTotalTime"
-        app:layout_constraintStart_toEndOf="@id/songCurrentProgress"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="RtlHardcoded,UnusedAttribute"
-        tools:progress="20" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songTotalTime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:gravity="end"
-        android:minWidth="40dp"
-        android:singleLine="true"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="@+id/progressSlider"
+    <RelativeLayout
+        android:id="@+id/progressContainer"
+        android:layout_width="match_parent"
+        android:layout_height="28dp"
+        android:paddingStart="12dp"
+        android:paddingEnd="12dp"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/date/hhmmss" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
+        <androidx.appcompat.widget.AppCompatSeekBar
+            android:id="@+id/progressSlider"
+            style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@id/songTotalTime"
+            android:layout_toRightOf="@id/songCurrentProgress"
+            android:maxHeight="3dp"
+            android:progressDrawable="@drawable/color_progress_seek"
+            android:splitTrack="false"
+            android:thumb="@drawable/switch_thumb_material"
+            tools:ignore="RtlHardcoded,UnusedAttribute"
+            tools:progress="20" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|right|end"
+            android:paddingRight="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif-medium"
+            android:gravity="center_vertical|left|end"
+            android:paddingLeft="8dp"
+            android:singleLine="true"
+            android:textColor="?android:attr/textColorSecondary"
+            android:textSize="12sp"
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="00:22" />
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/titleContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingHorizontal="16dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/progressSlider"
-        tools:text="@tools:sample/lorem/random" />
+        app:layout_constraintTop_toBottomOf="@+id/progressContainer">
+
+        <com.google.android.material.textview.MaterialTextView
+            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:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="?android:attr/textColorPrimary"
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:freezesText="true"
+        android:layout_gravity="center"
+        android:ellipsize="end"
         android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingHorizontal="16dp"
-        android:paddingVertical="8dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
+        android:maxLines="1"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewBody1"
         android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/full_names" />
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
-        android:layout_width="wrap_content"
+
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="2"
-        android:paddingHorizontal="16dp"
-        android:paddingBottom="8dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
+        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/full_names" />
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        app:srcCompat="@drawable/ic_pause"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
diff --git a/app/src/main/res/layout/fragment_playing_queue.xml b/app/src/main/res/layout/fragment_playing_queue.xml
deleted file mode 100644
index 6bbd9141c..000000000
--- a/app/src/main/res/layout/fragment_playing_queue.xml
+++ /dev/null
@@ -1,47 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="96dp"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:listitem="@layout/item_queue" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/empty"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?colorOnSecondary"
-        android:visibility="gone"
-        tools:visibility="visible" />
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/clearQueue"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:text="@string/clear_playing_queue"
-        android:textAppearance="@style/TextViewHeadline6"
-        app:icon="@drawable/ic_clear_all" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_playlist_detail.xml b/app/src/main/res/layout/fragment_playlist_detail.xml
deleted file mode 100644
index 40a545dc6..000000000
--- a/app/src/main/res/layout/fragment_playlist_detail.xml
+++ /dev/null
@@ -1,75 +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/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_scrollFlags="scroll|enterAlways"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:layoutAnimation="@anim/layout_anim_fade"
-        android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyEmoji"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/empty_text_emoji"
-            android:textAppearance="@style/TextViewHeadline3" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/no_songs"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/progressIndicator"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:indeterminate="true" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_playlist_detail_new.xml b/app/src/main/res/layout/fragment_playlist_detail_new.xml
deleted file mode 100644
index 1d2003ee4..000000000
--- a/app/src/main/res/layout/fragment_playlist_detail_new.xml
+++ /dev/null
@@ -1,154 +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/container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:transitionGroup="true">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingAppBarLayout"
-            style="?attr/collapsingToolbarLayoutLargeStyle"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:expandedTitleTextColor="@color/transparent"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="?actionBarSize"
-                android:paddingBottom="16dp"
-                android:paddingHorizontal="16dp">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/image"
-                    android:layout_width="0dp"
-                    android:layout_height="0dp"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toStartOf="@+id/title"
-                    app:layout_constraintHorizontal_chainStyle="spread_inside"
-                    app:layout_constraintHorizontal_weight="0.4"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:shapeAppearanceOverlay="?shapeAppearanceCornerExtraLarge"
-                    tools:src="@tools:sample/avatars[0]" />
-
-                <TextView
-                    android:id="@+id/title"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:textAppearance="?textAppearanceDisplaySmall"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_weight="0.6"
-                    app:layout_constraintStart_toEndOf="@+id/image"
-                    app:layout_constraintTop_toTopOf="@+id/image"
-                    tools:text="Playlist" />
-
-                <TextView
-                    android:id="@+id/subtitle"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    app:layout_constraintStart_toStartOf="@+id/title"
-                    app:layout_constraintTop_toBottomOf="@+id/title"
-                    tools:text="Playlist" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/play_button"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:padding="16dp"
-                    app:icon="@drawable/ic_play_arrow"
-                    app:layout_constraintEnd_toStartOf="@+id/shuffle_button"
-                    app:layout_constraintStart_toStartOf="@+id/subtitle"
-                    app:layout_constraintTop_toBottomOf="@+id/subtitle" />
-
-                <com.google.android.material.button.MaterialButton
-                    android:id="@+id/shuffle_button"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginHorizontal="16dp"
-                    android:backgroundTint="?colorTertiaryContainer"
-                    android:padding="16dp"
-                    app:icon="@drawable/ic_shuffle"
-                    app:layout_constraintBottom_toBottomOf="@+id/play_button"
-                    app:layout_constraintDimensionRatio="1:1"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@+id/play_button" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
-            <com.google.android.material.appbar.MaterialToolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?actionBarSize"
-                app:layout_collapseMode="pin"
-                app:navigationIcon="@drawable/ic_arrow_back"
-                app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:clipToPadding="false"
-        android:layoutAnimation="@anim/layout_anim_fade"
-        android:overScrollMode="@integer/overScrollMode"
-        android:paddingBottom="@dimen/mini_player_height"
-        android:scrollbars="none"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:listitem="@layout/item_song" />
-
-    <LinearLayout
-        android:id="@android:id/empty"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:orientation="vertical"
-        android:visibility="gone"
-        tools:visibility="visible">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyEmoji"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:text="@string/empty_text_emoji"
-            android:textAppearance="@style/TextViewHeadline3" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/emptyText"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/no_songs"
-            android:textAppearance="@style/TextViewHeadline5"
-            android:textColor="?android:attr/textColorSecondary"
-            tools:visibility="visible" />
-
-    </LinearLayout>
-
-    <com.google.android.material.progressindicator.CircularProgressIndicator
-        android:id="@+id/progressIndicator"
-        android:layout_width="100dp"
-        android:layout_height="100dp"
-        android:layout_gravity="center"
-        android:gravity="center"
-        android:indeterminate="true" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
deleted file mode 100644
index 7c1b8e54a..000000000
--- a/app/src/main/res/layout/fragment_settings.xml
+++ /dev/null
@@ -1,25 +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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/contentFrame"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        app:defaultNavHost="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        app:navGraph="@navigation/settings_graph" />
-
-    <code.name.monkey.retromusic.views.TopAppBarLayout
-        android:id="@+id/appBarLayout"
-        style="?appBarLayoutStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true"
-        android:theme="@style/CenteredCheckBoxTheme" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
index 7084daedd..9ed6694a6 100644
--- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
@@ -6,58 +6,38 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
+    <LinearLayout
+        android:id="@+id/titleContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="marquee"
-        android:focusable="true"
-        android:freezesText="true"
-        android:gravity="center"
-        android:marqueeRepeatLimit="marquee_forever"
-        android:paddingHorizontal="16dp"
-        android:scrollHorizontally="true"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textStyle="bold"
         app:layout_constraintBottom_toTopOf="@+id/text"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/lorem/random" />
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            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:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:scrollHorizontally="true"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:ellipsize="end"
-        android:gravity="center"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constraintBottom_toTopOf="@+id/songCurrentProgress"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songCurrentProgress"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle2"
-        app:layout_constraintBottom_toTopOf="@+id/songInfo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="22.00/ 33.00" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/songInfo"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
@@ -66,91 +46,113 @@
         android:maxLines="1"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
-        android:textColor="?android:attr/textColorSecondary"
-        android:textSize="12sp"
-        app:layout_constraintBottom_toTopOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/songCurrentProgress"
+        android:textAppearance="@style/TextViewBody2"
+        app:layout_constraintBottom_toTopOf="@+id/songCurrentProgress"
+        app:layout_constraintTop_toBottomOf="@+id/titleContainer"
+        tools:layout_editor_absoluteX="16dp"
         tools:text="@tools:sample/lorem/random" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/songCurrentProgress"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        android:gravity="center"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:textAppearance="@style/TextViewSubtitle2"
+        app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
+        app:layout_constraintTop_toBottomOf="@+id/text"
+        tools:layout_editor_absoluteX="16dp"
+        tools:text="22.00/ 33.00" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/previousButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
+    <RelativeLayout
+        android:id="@+id/playerMediaControllerContainer"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
+        android:layoutDirection="ltr"
+        android:paddingStart="4dp"
+        android:paddingEnd="4dp"
         app:layout_constraintBottom_toTopOf="@+id/volumeFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toBottomOf="@+id/songInfo"
-        tools:backgroundTint="@color/md_green_500"
-        tools:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+        app:layout_constraintTop_toBottomOf="@+id/songCurrentProgress"
+        tools:ignore="ContentDescription,UnusedAttribute"
+        tools:showIn="@layout/fragment_player_playback_controls">
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/nextButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/previousButton"
+            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" />
 
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/nextButton"
+            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" />
 
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/repeatButton"
+            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" />
 
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/shuffleButton"
+            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" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playPauseButton"
+            android:layout_width="52dp"
+            android:layout_height="52dp"
+            android:layout_centerInParent="true"
+            android:background="@drawable/color_circle_gradient"
+            android:elevation="4dp"
+            android:padding="16dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+    </RelativeLayout>
 
     <FrameLayout
         android:id="@+id/volumeFragmentContainer"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:paddingStart="8dp"
diff --git a/app/src/main/res/layout/fragment_simple_player.xml b/app/src/main/res/layout/fragment_simple_player.xml
index 67442b8ff..d0bfe301c 100644
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@@ -1,49 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:background="?attr/colorSurface"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="?attr/colorSurface"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <include layout="@layout/shadow_statusbar_toolbar" />
 
-    <include
-        layout="@layout/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playerAlbumCoverFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHeight_percent="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/status_bar" />
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playerAlbumCoverFragment"
-        tools:layout="@layout/fragment_player_playback_controls" />
-
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/playbackControlsFragment"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        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>
+
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <fragment
+                android:id="@+id/playerAlbumCoverFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                tools:layout="@layout/fragment_album_cover" />
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_weight="1">
+
+            <fragment
+                android:id="@+id/playbackControlsFragment"
+                android:name="code.name.monkey.retromusic.fragments.player.simple.SimplePlaybackControlsFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                tools:layout="@layout/fragment_simple_controls_fragment" />
+        </FrameLayout>
+
+        <FrameLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="0">
+
+            <com.google.android.material.appbar.MaterialToolbar
+                android:id="@+id/playerToolbar"
+                style="@style/Toolbar"
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+        </FrameLayout>
+    </LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_synced.xml b/app/src/main/res/layout/fragment_synced.xml
new file mode 100644
index 000000000..01637ca04
--- /dev/null
+++ b/app/src/main/res/layout/fragment_synced.xml
@@ -0,0 +1,13 @@
+<?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="match_parent"
+    android:orientation="vertical"
+    app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
+
+    <code.name.monkey.retromusic.lyrics.LrcView
+        android:id="@+id/lyricsView"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml
index 2a05a2c61..4296f2478 100644
--- a/app/src/main/res/layout/fragment_tiny_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_tiny_controls_fragment.xml
@@ -17,24 +17,24 @@
         android:visibility="gone" />
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
+        android:id="@+id/playerRepeatButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/roundSelector"
         android:padding="16dp"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/ic_repeat"
+        app:srcCompat="@drawable/ic_repeat_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
     <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/shuffleButton"
+        android:id="@+id/playerShuffleButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="?attr/roundSelector"
         android:padding="16dp"
         android:scaleType="fitCenter"
-        app:srcCompat="@drawable/ic_shuffle"
+        app:srcCompat="@drawable/ic_shuffle_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index 1a49d06f2..c3faccc26 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -7,7 +7,7 @@
     android:clickable="true"
     android:focusable="true">
 
-    <androidx.fragment.app.FragmentContainerView
+    <fragment
         android:id="@+id/playerAlbumCoverFragment"
         android:name="code.name.monkey.retromusic.fragments.player.PlayerAlbumCoverFragment"
         android:layout_width="wrap_content"
@@ -34,63 +34,62 @@
         android:progressDrawable="@drawable/progress_drawable_vertical"
         android:secondaryProgress="100" />
 
-    <include layout="@layout/status_bar" />
+    <FrameLayout
+        android:id="@+id/status_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <include layout="@layout/status_bar" />
+    </FrameLayout>
+
 
     <code.name.monkey.retromusic.views.VerticalTextView
         android:id="@+id/playerSongTotalTime"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
+        android:padding="16dp"
         android:textAppearance="@style/TextViewHeadline3"
         android:textStyle="bold"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragmentContainer"
-        app:layout_constraintEnd_toStartOf="@+id/songInfo"
-        app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:layout_constraintVertical_bias="0"
-        tools:ignore="MissingPrefix"
-        tools:text="@tools:sample/date/hhmm" />
-
-    <code.name.monkey.retromusic.views.VerticalTextView
-        android:id="@+id/songInfo"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:paddingEnd="16dp"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toTopOf="@+id/playbackControlsFragment"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
-        app:layout_constraintVertical_bias="0"
-        tools:ignore="MissingPrefix"
-        tools:text="@tools:sample/lorem" />
+        tools:ignore="MissingPrefix" />
 
-    <com.google.android.material.appbar.MaterialToolbar
-        android:id="@+id/playerToolbar"
-        style="@style/Toolbar"
+    <FrameLayout
+        android:id="@+id/toolbarContainer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_keyboard_arrow_down" />
+        app:layout_constraintStart_toStartOf="parent">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/playbackControlsFragment"
-        android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/playerToolbar"
+            style="@style/Toolbar"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/playbackControlsFragmentContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        app:layout_constraintBottom_toTopOf="@id/playerToolbar"
-        app:layout_constraintEnd_toEndOf="parent"
-        tools:layout="@layout/fragment_tiny_controls_fragment" />
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
+        app:layout_constraintEnd_toEndOf="parent">
+
+        <fragment
+            android:id="@+id/playbackControlsFragment"
+            android:name="code.name.monkey.retromusic.fragments.player.tiny.TinyPlaybackControlsFragment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:layout="@layout/fragment_tiny_controls_fragment" />
+
+    </LinearLayout>
 
     <code.name.monkey.retromusic.views.VerticalTextView
         android:id="@+id/title"
@@ -106,8 +105,6 @@
         android:singleLine="true"
         android:textAppearance="@style/TextViewHeadline3"
         android:textStyle="bold"
-        app:layout_constrainedHeight="true"
-        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
@@ -119,15 +116,12 @@
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:ellipsize="end"
-        android:fadingEdge="horizontal"
         android:gravity="start"
         android:maxLines="2"
         android:paddingStart="16dp"
         android:paddingEnd="16dp"
         android:rotation="0"
         android:textAppearance="@style/TextViewHeadline6"
-        app:layout_constrainedHeight="true"
-        app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toTopOf="@id/toolbarContainer"
         app:layout_constraintStart_toEndOf="@+id/title"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
diff --git a/app/src/main/res/layout/fragment_user_info.xml b/app/src/main/res/layout/fragment_user_info.xml
deleted file mode 100644
index ebfc9902d..000000000
--- a/app/src/main/res/layout/fragment_user_info.xml
+++ /dev/null
@@ -1,99 +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:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:orientation="vertical">
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fitsSystemWindows="true">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:id="@+id/toolbar"
-            style="@style/Toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:navigationIcon="@drawable/ic_arrow_back"
-            app:title="@string/profile"
-            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/bannerImage"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_margin="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="banner_image"
-            app:layout_constraintDimensionRatio="21:10"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:shapeAppearanceOverlay="@style/circleImageView"
-            app:srcCompat="@drawable/material_design_default" />
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/userImage"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
-            android:layout_gravity="center"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:scaleType="centerCrop"
-            android:transitionName="user_image"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/bannerImage"
-            app:retroCornerSize="36dp"
-            app:srcCompat="@drawable/ic_person_flat" />
-
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/nameContainer"
-            style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            app:hintAnimationEnabled="true"
-            app:hintEnabled="true"
-            app:layout_constraintBottom_toBottomOf="@+id/userImage"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@id/userImage"
-            app:layout_constraintTop_toTopOf="@id/userImage">
-
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/name"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:autofillHints="name"
-                android:hint="@string/my_name"
-                android:importantForAutofill="yes"
-                android:inputType="textPersonName|textCapWords|text"
-                android:textAppearance="@style/TextViewSubtitle1"
-                tools:text="@tools:sample/full_names" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-    <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:fitsSystemWindows="false"
-        android:src="@drawable/ic_save"
-        android:text="@string/save" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_volume.xml b/app/src/main/res/layout/fragment_volume.xml
index 43bb3e71b..0e621caba 100755
--- a/app/src/main/res/layout/fragment_volume.xml
+++ b/app/src/main/res/layout/fragment_volume.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/viewGroup"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp">
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp" >
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/volumeDown"
@@ -14,28 +16,22 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="?roundSelector"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/volumeSeekBar"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_volume_down"
+        android:padding="8dp"
+        app:srcCompat="@drawable/ic_volume_down_white_24dp"
         app:tint="?attr/colorControlNormal" />
 
-    <com.google.android.material.slider.Slider
+    <androidx.appcompat.widget.AppCompatSeekBar
         android:id="@+id/volumeSeekBar"
-        android:layout_width="0dp"
+        style="@style/Widget.MaterialProgressBar.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_weight="1"
+        android:max="100"
         android:maxHeight="2dp"
-        style="@style/Widget.Retro.Slider"
         android:progressDrawable="@drawable/color_progress_seek"
-        app:layout_constraintBottom_toBottomOf="@+id/volumeDown"
-        app:layout_constraintEnd_toStartOf="@+id/volumeUp"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/volumeDown"
-        app:layout_constraintTop_toTopOf="@+id/volumeDown" />
+        tools:progress="20"
+        tools:progressTint="?attr/colorControlNormal" />
+
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/volumeUp"
@@ -43,12 +39,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="0"
         android:background="?roundSelector"
-        android:padding="12dp"
-        app:layout_constraintBottom_toBottomOf="@+id/volumeSeekBar"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/volumeSeekBar"
-        app:layout_constraintTop_toTopOf="@+id/volumeSeekBar"
-        app:srcCompat="@drawable/ic_volume_up"
+        android:padding="8dp"
+        app:srcCompat="@drawable/ic_volume_up_white_24dp"
         app:tint="?attr/colorControlNormal" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_whats_new.xml b/app/src/main/res/layout/fragment_whats_new.xml
deleted file mode 100644
index afb6fca00..000000000
--- a/app/src/main/res/layout/fragment_whats_new.xml
+++ /dev/null
@@ -1,32 +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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    android:paddingTop="8dp">
-
-    <androidx.core.widget.NestedScrollView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-        <code.name.monkey.retromusic.views.LollipopFixedWebView
-            android:id="@+id/webView"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:scrollbars="none"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
-
-    </androidx.core.widget.NestedScrollView>
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/tgFab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="16dp"
-        android:text="@string/view_on_telegram"
-        app:icon="@drawable/ic_telegram_white" />
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/home_content.xml b/app/src/main/res/layout/home_content.xml
index 606aacd86..f3af50ea7 100644
--- a/app/src/main/res/layout/home_content.xml
+++ b/app/src/main/res/layout/home_content.xml
@@ -12,37 +12,64 @@
   ~ See the GNU General Public License for more details.
   -->
 <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="match_parent"
+    android:background="?attr/colorSurface"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:orientation="vertical">
 
-    <include
-        android:id="@+id/abs_playlists"
-        layout="@layout/abs_playlists" />
+    <include layout="@layout/abs_playlists" />
 
-    <LinearLayout
+    <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <include
-            android:id="@+id/suggestions"
-            layout="@layout/item_suggestions" />
-
-        <code.name.monkey.retromusic.views.insets.InsetsRecyclerView
-            android:id="@+id/recyclerView"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:nestedScrollingEnabled="false"
-            android:overScrollMode="@integer/overScrollMode"
-            android:paddingBottom="@dimen/mini_player_height"
-            tools:itemCount="10"
-            tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
-            tools:listitem="@layout/item_album_card"
-            tools:spanCount="3" />
-    </LinearLayout>
+            android:orientation="vertical">
+
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/recyclerView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:nestedScrollingEnabled="false"
+                tools:visibility="gone" />
+
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="112dp" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/emptyContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="24dp"
+            android:gravity="center_horizontal"
+            android:orientation="vertical"
+            android:visibility="gone"
+            tools:visibility="visible">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:layout_width="96dp"
+                android:layout_height="96dp"
+                app:srcCompat="@drawable/ic_play_arrow_white_64dp"
+                app:tint="?attr/colorControlNormal" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/emptyText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/start_play_music"
+                android:textAppearance="@style/TextViewNormal"
+                android:textColor="?android:attr/textColorPrimary" />
+        </LinearLayout>
+    </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/image.xml b/app/src/main/res/layout/image.xml
index c6af22877..6dc2d8d19 100644
--- a/app/src/main/res/layout/image.xml
+++ b/app/src/main/res/layout/image.xml
@@ -4,7 +4,6 @@
     android:id="@+id/imageContainer"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:foreground="?attr/rectSelector"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -32,5 +31,6 @@
         android:padding="12dp"
         android:textAppearance="@style/TextViewSubtitle1"
         android:textColor="@color/md_white_1000"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@tools:sample/lorem/random" />
+
 </code.name.monkey.retromusic.views.WidthFitSquareLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml
index 7b1b4cd8c..537ee4b4f 100644
--- a/app/src/main/res/layout/item_album_card.xml
+++ b/app/src/main/res/layout/item_album_card.xml
@@ -1,50 +1,38 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
+<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:id="@+id/imageContainer"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:background="?attr/rectSelector"
-    android:orientation="vertical"
-    android:padding="4dp"
-    app:cardCornerRadius="@dimen/m3_card_corner_radius"
-    app:layout_constraintDimensionRatio="3:4"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
+    android:orientation="vertical">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="112dp"
+        android:layout_height="156dp"
+        app:cardCornerRadius="8dp"
+        app:cardElevation="4dp"
+        app:cardUseCompatPadding="true">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
-            android:layout_width="156dp"
-            android:layout_height="156dp"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            app:layout_constraintBottom_toTopOf="@+id/title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/default_album_art"
             tools:src="@tools:sample/avatars" />
+    </com.google.android.material.card.MaterialCardView>
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:padding="8dp"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewBody1"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="MissingPrefix"
-            tools:text="@tools:sample/full_names" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="12dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?android:attr/textColorPrimary"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist.xml b/app/src/main/res/layout/item_artist.xml
index 8ec97715b..94ad88767 100644
--- a/app/src/main/res/layout/item_artist.xml
+++ b/app/src/main/res/layout/item_artist.xml
@@ -1,23 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="156dp"
+    android:layout_width="106dp"
     android:layout_height="wrap_content"
     android:layout_margin="8dp"
-    android:background="?attr/rectSelector"
     android:orientation="vertical">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
-        android:id="@+id/image"
-        android:layout_width="156dp"
-        android:layout_height="156dp"
-        android:background="@android:color/transparent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:retroCornerSize="72dp"
-        tools:src="@tools:sample/avatars" />
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <code.name.monkey.retromusic.views.CircularImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="@android:color/transparent"
+            app:civ_border="false"
+            tools:src="@tools:sample/avatars" />
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
@@ -25,12 +26,8 @@
         android:layout_height="wrap_content"
         android:ellipsize="end"
         android:gravity="center"
-        android:maxLines="2"
+        android:maxLines="1"
         android:paddingTop="12dp"
-        android:textAppearance="@style/TextViewBody1"
         android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/image"
-        tools:text="@tools:sample/full_names" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        tools:text="Name" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist_card.xml b/app/src/main/res/layout/item_artist_card.xml
deleted file mode 100644
index dc7bf38ef..000000000
--- a/app/src/main/res/layout/item_artist_card.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2020 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-<com.google.android.material.card.MaterialCardView 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="128dp"
-    android:layout_height="128dp"
-    android:layout_margin="4dp"
-    app:cardCornerRadius="@dimen/m3_card_corner_radius">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/paletteColorContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/artist_card_gradient_effect"
-        tools:backgroundTint="@color/md_red_500">
-
-        <code.name.monkey.retromusic.views.RetroShapeableImageView
-            android:id="@+id/image"
-            android:layout_width="42dp"
-            android:layout_height="42dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            app:civ_border_width="0dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:retroCornerSize="21dp"
-            app:srcCompat="@drawable/default_album_art"
-            tools:src="@tools:sample/avatars" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="8dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:textStyle="bold"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="@+id/image"
-            app:layout_constraintTop_toBottomOf="@+id/image"
-            tools:text="@tools:sample/full_names" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_artist_square.xml b/app/src/main/res/layout/item_artist_square.xml
index 26525f09a..480286803 100644
--- a/app/src/main/res/layout/item_artist_square.xml
+++ b/app/src/main/res/layout/item_artist_square.xml
@@ -2,35 +2,28 @@
 <com.google.android.material.card.MaterialCardView 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/imageContainerCard"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_margin="8dp"
-    android:background="?attr/rectSelector"
-    app:cardCornerRadius="@dimen/m3_card_corner_radius">
+    app:cardCornerRadius="6dp"
+    app:cardElevation="4dp"
+    app:cardUseCompatPadding="true">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
-            android:layout_width="156dp"
+            android:layout_width="112dp"
             android:layout_height="156dp"
             android:scaleType="centerCrop"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
             tools:src="@tools:sample/avatars" />
 
         <FrameLayout
             android:id="@+id/paletteColorContainer"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/image">
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/title"
@@ -38,8 +31,9 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="1"
+                android:padding="8dp"
                 android:textAppearance="@style/TextViewNormal"
                 tools:text="@string/home" />
         </FrameLayout>
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 </com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_card.xml b/app/src/main/res/layout/item_card.xml
index dd6bf1a54..70cd95c12 100644
--- a/app/src/main/res/layout/item_card.xml
+++ b/app/src/main/res/layout/item_card.xml
@@ -1,79 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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_margin="1dp"
-    android:background="?attr/rectSelector"
-    android:clickable="true"
-    android:focusable="true">
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardUseCompatPadding="true"
+    tools:ignore="MissingPrefix">
 
-    <com.google.android.material.card.MaterialCardView
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        tools:ignore="MissingPrefix">
+        android:layout_height="match_parent"
+        android:background="?rectSelector"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UnusedAttribute,UselessParent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            tools:ignore="UnusedAttribute,UselessParent">
+            android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/image"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="ContentDescription"
                 tools:src="@tools:sample/avatars" />
 
-            <LinearLayout
-                android:id="@+id/titleContainer"
-                android:layout_width="0dp"
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:padding="12dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:padding="12dp"
-                app:layout_constraintEnd_toStartOf="@id/menu"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/image">
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textStyle="bold"
+                tools:text="@string/bug_report_summary" />
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextViewSubtitle1"
-                    android:textStyle="bold"
-                    tools:text="@tools:sample/full_names" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="4dp"
+                android:singleLine="true"
+                tools:text="@string/bug_report_summary" />
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="4dp"
-                    android:singleLine="true"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/menu"
-                style="@style/OverFlowButton"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="0"
-                app:layout_constraintBottom_toBottomOf="@id/titleContainer"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/titleContainer"
-                app:layout_constraintTop_toTopOf="@id/titleContainer"
-                app:tint="?attr/colorControlNormal" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
+        </LinearLayout>
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_card_color.xml b/app/src/main/res/layout/item_card_color.xml
index a7c240da4..6a83f4532 100644
--- a/app/src/main/res/layout/item_card_color.xml
+++ b/app/src/main/res/layout/item_card_color.xml
@@ -1,77 +1,60 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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_margin="1dp"
-    android:background="?attr/rectSelector"
-    android:clickable="true"
-    android:focusable="true">
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardUseCompatPadding="true"
+    tools:ignore="MissingPrefix">
 
-    <com.google.android.material.card.MaterialCardView
+    <LinearLayout
+        android:id="@+id/paletteColorContainer"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        tools:ignore="MissingPrefix">
+        android:layout_height="match_parent"
+        android:background="?rectSelector"
+        android:gravity="center"
+        android:orientation="vertical"
+        tools:ignore="UnusedAttribute,UselessParent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/paletteColorContainer"
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/image"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:scaleType="centerCrop"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 tools:ignore="ContentDescription"
                 tools:src="@tools:sample/avatars" />
 
-            <LinearLayout
-                android:id="@+id/titleContainer"
-                android:layout_width="0dp"
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:padding="12dp">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:padding="12dp"
-                app:layout_constraintEnd_toStartOf="@id/menu"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/image">
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textStyle="bold"
+                tools:text="@string/bug_report_summary" />
 
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:singleLine="true"
-                    android:textAppearance="@style/TextViewSubtitle1"
-                    android:textStyle="bold"
-                    tools:text="@tools:sample/full_names" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="4dp"
-                    android:singleLine="true"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/menu"
-                style="@style/OverFlowButton"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="0"
-                app:layout_constraintBottom_toBottomOf="@id/titleContainer"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@id/titleContainer"
-                app:layout_constraintTop_toTopOf="@id/titleContainer"
-                app:tint="?attr/colorControlNormal" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="4dp"
+                android:singleLine="true"
+                tools:text="@string/bug_report_summary" />
+        </LinearLayout>
+    </LinearLayout>
+</com.google.android.material.card.MaterialCardView>
diff --git a/app/src/main/res/layout/item_contributor.xml b/app/src/main/res/layout/item_contributor.xml
index d7ba88328..cb5fb3ab5 100644
--- a/app/src/main/res/layout/item_contributor.xml
+++ b/app/src/main/res/layout/item_contributor.xml
@@ -17,7 +17,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
+    android:background="?selectableItemBackground"
     android:gravity="center_vertical"
     android:minHeight="64dp"
     android:orientation="horizontal"
@@ -25,23 +25,21 @@
     android:paddingEnd="12dp"
     tools:ignore="PrivateResource">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <code.name.monkey.retromusic.views.CircularImageView
         android:id="@+id/icon"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:scaleType="centerCrop"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         app:civ_border="false"
         app:civ_shadow="false"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:retroCornerSize="21dp"
-        app:srcCompat="@drawable/ic_account"
-        tools:srcCompat="@tools:sample/backgrounds/scenic" />
+        app:srcCompat="@drawable/ic_person_flat"
+        tools:srcCompat="@tools:sample/backgrounds/scenic[20]" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:textAppearance="@style/TextViewSubtitle1"
@@ -50,15 +48,13 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@+id/icon"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@tools:sample/lorem" />
 
     <code.name.monkey.retromusic.views.BaselineGridTextView
         android:id="@+id/text"
-        android:layout_width="0dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
-        android:ellipsize="end"
-        android:maxLines="1"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="@+id/icon"
@@ -66,6 +62,6 @@
         app:layout_constraintHorizontal_bias="0"
         app:layout_constraintStart_toEndOf="@id/icon"
         app:lineHeightHint="24sp"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/lorem" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_contributor_header.xml b/app/src/main/res/layout/item_contributor_header.xml
index 964ba980a..c68d2d02b 100644
--- a/app/src/main/res/layout/item_contributor_header.xml
+++ b/app/src/main/res/layout/item_contributor_header.xml
@@ -11,51 +11,53 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="?rectSelector"
+    android:background="?selectableItemBackground"
     android:gravity="center_horizontal"
     android:minHeight="@dimen/md_listitem_height"
     android:orientation="vertical"
     android:paddingBottom="24dp"
     tools:ignore="PrivateResource">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
+    <code.name.monkey.retromusic.views.CircularImageView
         android:id="@+id/icon"
         android:layout_width="72dp"
         android:layout_height="72dp"
         android:layout_margin="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:retroCornerSize="36dp"
-        app:srcCompat="@drawable/ic_account"
+        app:civ_border="false"
+        app:civ_shadow="false"
+        app:srcCompat="@drawable/ic_person_flat"
         tools:srcCompat="@tools:sample/backgrounds/scenic[20]" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:gravity="center"
-        android:textAppearance="@style/TextViewHeadline5"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/icon"
-        tools:text="@tools:sample/full_names" />
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp">
 
-    <code.name.monkey.retromusic.views.BaselineGridTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        app:lineHeightHint="24sp"
-        tools:text="@tools:sample/full_names" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:textAppearance="@style/TextViewHeadline5"
+            android:textStyle="bold"
+            tools:text="@tools:sample/full_names" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <code.name.monkey.retromusic.views.BaselineGridTextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"
+            app:lineHeightHint="24sp"
+            tools:text="@tools:sample/lorem/random" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml
new file mode 100644
index 000000000..26860dfde
--- /dev/null
+++ b/app/src/main/res/layout/item_donation_option.xml
@@ -0,0 +1,61 @@
+<?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">
+
+    <com.google.android.material.card.MaterialCardView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="8dp"
+        app:cardUseCompatPadding="true"
+        app:contentPadding="12dp">
+
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:gravity="center"
+            android:orientation="vertical">
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/itemPrice"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewBody2"
+                android:textStyle="bold"
+                tools:ignore="MissingPrefix" />
+
+            <code.name.monkey.retromusic.views.WidthFitSquareLayout
+                android:layout_width="36dp"
+                android:layout_height="36dp">
+
+                <androidx.appcompat.widget.AppCompatImageView
+                    android:id="@+id/itemImage"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:scaleType="centerInside"
+                    app:srcCompat="@drawable/ic_github_circle_white_24dp"
+                    app:tint="?colorOnBackground" />
+
+            </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/itemTitle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewBody2"
+                tools:text="Title" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/itemText"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textAppearance="@style/TextViewBody1"
+                tools:text="description" />
+        </LinearLayout>
+    </com.google.android.material.card.MaterialCardView>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_favourite_card.xml b/app/src/main/res/layout/item_favourite_card.xml
deleted file mode 100644
index 80c03f061..000000000
--- a/app/src/main/res/layout/item_favourite_card.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="?attr/rectSelector"
-    android:orientation="vertical">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageContainer"
-        android:layout_width="156dp"
-        android:layout_height="200dp"
-        android:layout_margin="8dp"
-        app:cardCornerRadius="12dp"
-        app:layout_constraintDimensionRatio="3:4"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            app:srcCompat="@drawable/default_album_art"
-            tools:src="@tools:sample/avatars" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom"
-            android:background="@drawable/shadow_up"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:padding="8dp"
-            android:textAppearance="@style/TextViewBody1"
-            android:textColor="@color/md_white_1000"
-            android:textStyle="bold"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageContainer"
-            tools:ignore="MissingPrefix"
-            tools:text="@tools:sample/full_names" />
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_genre.xml b/app/src/main/res/layout/item_genre.xml
deleted file mode 100644
index 2659cda3f..000000000
--- a/app/src/main/res/layout/item_genre.xml
+++ /dev/null
@@ -1,75 +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_margin="1dp"
-    android:background="?attr/rectSelector"
-    android:clickable="true"
-    android:focusable="true">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageContainerCard"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="5dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:orientation="vertical"
-            tools:ignore="UnusedAttribute,UselessParent">
-
-            <androidx.appcompat.widget.AppCompatImageView
-                android:id="@+id/image"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
-                android:layout_marginTop="24dp"
-                android:elevation="4dp"
-                android:rotation="30"
-                android:scaleType="centerCrop"
-                android:translationX="20dp"
-                android:translationY="10dp"
-                app:layout_constraintDimensionRatio="1:1"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                tools:ignore="ContentDescription"
-                tools:src="@tools:sample/avatars" />
-
-            <LinearLayout
-                android:id="@+id/titleContainer"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:gravity="center_vertical"
-                android:orientation="vertical"
-                android:paddingStart="8dp"
-                android:paddingTop="8dp"
-                android:paddingEnd="0dp"
-                app:layout_constraintEnd_toStartOf="@+id/image"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/title"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:maxLines="2"
-                    android:textAppearance="@style/TextViewSubtitle2"
-                    android:textStyle="bold"
-                    tools:text="@tools:sample/full_names" />
-
-                <com.google.android.material.textview.MaterialTextView
-                    android:id="@+id/text"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:paddingTop="4dp"
-                    android:singleLine="true"
-                    tools:text="@tools:sample/full_names" />
-            </LinearLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </com.google.android.material.card.MaterialCardView>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 1457d7ed4..636b8f0ba 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -1,74 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_margin="2dp"
-    android:background="?rectSelector"
+    android:layout_margin="4dp"
     android:clickable="true"
     android:focusable="true"
-    android:padding="4dp"
+    android:foreground="?rectSelector"
     tools:ignore="MissingPrefix">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:ignore="UnusedAttribute,UselessParent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
+        <code.name.monkey.retromusic.views.WidthFitSquareCardView
+            android:id="@+id/imageContainerCard"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:ignore="ContentDescription"
-            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
 
-    </com.google.android.material.card.MaterialCardView>
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                tools:ignore="ContentDescription"
+                tools:srcCompat="@tools:sample/backgrounds/scenic" />
+        </code.name.monkey.retromusic.views.WidthFitSquareCardView>
 
-    <LinearLayout
-        android:id="@+id/titleContainer"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:orientation="vertical"
-        android:padding="12dp"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/imageContainer">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewSubtitle1"
-            android:textStyle="bold"
-            tools:text="@tools:sample/full_names" />
+            android:gravity="center_vertical"
+            android:orientation="vertical"
+            android:paddingStart="12dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="12dp"
+            android:paddingBottom="8dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:paddingTop="4dp"
-            android:singleLine="true"
-            tools:text="@tools:sample/full_names" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textStyle="bold"
+                tools:text="@string/bug_report_summary" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="4dp"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColorSecondary"
+                tools:text="@string/bug_report_summary" />
+
+        </LinearLayout>
     </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="@id/titleContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/titleContainer"
-        app:layout_constraintTop_toTopOf="@id/titleContainer"
-        app:tint="?attr/colorControlNormal" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_grid_circle.xml b/app/src/main/res/layout/item_grid_circle.xml
index 2ccb0c7ba..21cfaa2aa 100644
--- a/app/src/main/res/layout/item_grid_circle.xml
+++ b/app/src/main/res/layout/item_grid_circle.xml
@@ -1,55 +1,65 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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_margin="2dp"
     android:background="?rectSelector"
-    android:padding="4dp"
     tools:ignore="MissingPrefix">
 
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
-        android:id="@+id/image"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:scaleType="centerCrop"
-        app:civ_border="false"
-        app:civ_shadow="false"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="ContentDescription"
-        tools:src="@tools:sample/avatars" />
-
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:gravity="center"
         android:orientation="vertical"
-        android:padding="12dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/image">
+        tools:ignore="UnusedAttribute,UselessParent">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
+        <code.name.monkey.retromusic.views.WidthFitSquareLayout
+            android:id="@+id/imageContainer"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="4dp">
+
+            <code.name.monkey.retromusic.views.CircularImageView
+                android:id="@+id/image"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                app:civ_border="false"
+                app:civ_shadow="false"
+                tools:ignore="ContentDescription"
+                tools:src="@tools:sample/avatars" />
+
+        </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:singleLine="true"
-            android:textAppearance="@style/TextViewSubtitle1"
-            android:textStyle="bold"
-            tools:text="@tools:sample/full_names" />
+            android:orientation="vertical"
+            android:paddingStart="4dp"
+            android:paddingTop="8dp"
+            android:paddingEnd="4dp"
+            android:paddingBottom="8dp">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:singleLine="true"
-            tools:text="@tools:sample/full_names" />
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="?android:attr/textColorPrimary"
+                android:textStyle="bold"
+                tools:text="@tools:sample/lorem" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/text"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingTop="2dp"
+                android:singleLine="true"
+                android:textColor="?android:attr/textColorSecondary"
+                tools:text="@tools:sample/lorem" />
+        </LinearLayout>
     </LinearLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/item_grid_genre.xml b/app/src/main/res/layout/item_grid_genre.xml
deleted file mode 100644
index 41771f35a..000000000
--- a/app/src/main/res/layout/item_grid_genre.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView 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="wrap_content"
-    android:layout_height="wrap_content"
-    app:cardCornerRadius="8dp"
-    app:cardUseCompatPadding="true">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
-        tools:text="@tools:sample/full_names" />
-
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_image.xml b/app/src/main/res/layout/item_image.xml
index e6cbd121c..f463a98ef 100644
--- a/app/src/main/res/layout/item_image.xml
+++ b/app/src/main/res/layout/item_image.xml
@@ -1,24 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
     android:orientation="vertical">
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageContainer"
-        android:layout_width="156dp"
-        android:layout_height="156dp"
+    <code.name.monkey.retromusic.views.WidthFitSquareCardView
+        android:layout_width="136dp"
+        android:layout_height="wrap_content"
         android:layout_margin="8dp"
         android:orientation="vertical"
-        app:cardBackgroundColor="@color/transparent"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardPreventCornerOverlap="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:cardCornerRadius="8dp"
+        app:cardPreventCornerOverlap="true">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
@@ -27,19 +21,17 @@
             android:scaleType="centerCrop"
             tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
 
-    </com.google.android.material.card.MaterialCardView>
+
+    </code.name.monkey.retromusic.views.WidthFitSquareCardView>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:ellipsize="end"
-        android:maxLines="2"
-        android:padding="12dp"
-        android:textAppearance="@style/TextViewBody1"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/imageContainer"
-        tools:text="@tools:sample/full_names" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:maxLines="1"
+        android:padding="8dp"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?android:attr/textColorSecondary"
+        tools:text="Song name" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_image_gradient.xml b/app/src/main/res/layout/item_image_gradient.xml
index 309cea05c..011541d80 100644
--- a/app/src/main/res/layout/item_image_gradient.xml
+++ b/app/src/main/res/layout/item_image_gradient.xml
@@ -1,26 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.card.MaterialCardView 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:clickable="true"
-    android:focusable="true"
-    tools:ignore="MissingPrefix">
+    android:orientation="vertical"
+    app:cardCornerRadius="8dp"
+    app:cardElevation="4dp"
+    app:cardUseCompatPadding="true">
 
-    <com.google.android.material.card.MaterialCardView
+    <code.name.monkey.retromusic.views.WidthFitSquareLayout
         android:id="@+id/imageContainer"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_margin="4dp"
-        android:orientation="vertical"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintDimensionRatio="1:1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/image"
@@ -31,25 +24,39 @@
             tools:ignore="ContentDescription"
             tools:src="@tools:sample/avatars" />
 
-        <View
-            android:id="@+id/mask"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:background="@drawable/shadow_up_home" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|center"
-            android:gravity="center"
-            android:maxLines="2"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="8dp"
-            android:textAppearance="@style/TextViewSubtitle1"
-            android:textColor="@color/md_white_1000"
-            tools:text="@tools:sample/full_names" />
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1" />
+
+            <View
+                android:id="@+id/mask"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:background="@drawable/shadow_up_home" />
+        </LinearLayout>
+    </code.name.monkey.retromusic.views.WidthFitSquareLayout>
+
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|center"
+        android:gravity="center"
+        android:maxLines="2"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="8dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textColor="@color/md_white_1000"
+        tools:text="@string/bug_report_summary" />
+
+
+</com.google.android.material.card.MaterialCardView>
\ 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 de5a0aa5a..d1f2226a1 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -1,111 +1,107 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_marginStart="1dp"
-    android:layout_marginEnd="1dp"
-    android:background="?rectSelector"
-    android:layout_marginVertical="2dp"
+    android:layout_marginStart="4dp"
+    android:layout_marginTop="2dp"
+    android:layout_marginEnd="4dp"
+    android:layout_marginBottom="2dp"
     android:clickable="true"
     android:focusable="true"
-    android:minHeight="?attr/listPreferredItemHeight"
+    android:foreground="?rectSelector"
+    android:gravity="center_vertical"
+    android:minHeight="64dp"
     android:orientation="horizontal"
     tools:ignore="MissingPrefix">
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/drag_view"
         android:layout_width="wrap_content"
-        android:layout_height="0dp"
+        android:layout_height="match_parent"
         android:layout_gravity="center_vertical|start"
         android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_drag_vertical"
+        app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
         app:tint="?attr/colorControlNormal"
         tools:ignore="ContentDescription"
         tools:visibility="visible" />
 
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
+    <FrameLayout
+        android:id="@+id/imageContainer"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        app:cardCornerRadius="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/drag_view"
-        app:layout_constraintTop_toTopOf="parent">
+        android:layout_height="match_parent"
+        android:layout_weight="0"
+        android:paddingStart="16dp"
+        android:paddingEnd="0dp">
 
-        <com.google.android.material.imageview.ShapeableImageView
-            android:id="@+id/image"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/imageTextContainer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            app:shapeAppearance="?shapeAppearanceCornerSmall"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
+            app:cardCornerRadius="6dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/image"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:scaleType="centerCrop"
+                tools:srcCompat="@tools:sample/backgrounds/scenic[16]" />
+
+            <com.google.android.material.textview.MaterialTextView
+                android:id="@+id/imageText"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:fontFeatureSettings="onum"
+                android:gravity="center"
+                android:maxLines="1"
+                android:minHeight="40dp"
+                android:textAppearance="@style/TextViewSubtitle2"
+                android:visibility="gone"
+                tools:text="1"
+                tools:visibility="visible" />
+        </com.google.android.material.card.MaterialCardView>
+    </FrameLayout>
+
+    <LinearLayout
+        android:id="@+id/title_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:layout_weight="1.0"
+        android:gravity="center_vertical"
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/imageText"
+            android:id="@+id/title"
             android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
             android:maxLines="1"
-            android:minHeight="40dp"
-            android:textAppearance="@style/TextViewSubtitle2"
-            android:visibility="gone"
-            tools:text="100"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
+            android:textAppearance="@style/TextViewSubtitle1"
+            android:textColor="?android:attr/textColorPrimary"
+            tools:text="Song name" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:layout_marginTop="4dp"
-        android:textAppearance="@style/TextViewCaption"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/full_names" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="Song artist name " />
+    </LinearLayout>
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu"
         style="@style/OverFlowButton"
         android:layout_gravity="center_vertical"
         android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
         app:tint="?attr/colorControlNormal" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_backup.xml b/app/src/main/res/layout/item_list_backup.xml
deleted file mode 100644
index 3cf09e0db..000000000
--- a/app/src/main/res/layout/item_list_backup.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.card.MaterialCardView 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_margin="8dp"
-    app:cardCornerRadius="8dp"
-    tools:ignore="MissingPrefix"
-    android:minHeight="?attr/listPreferredItemHeight">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_gravity="center">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:padding="8dp"
-            android:scaleType="centerCrop"
-            android:src="@drawable/ic_restore"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingHorizontal="16dp"
-            android:textAppearance="@style/TextViewSubtitle1"
-            android:textColor="?android:attr/textColorPrimary"
-            app:layout_constraintBottom_toTopOf="@+id/text"
-            app:layout_constraintEnd_toStartOf="@id/menu"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@id/image"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_chainStyle="packed"
-            tools:text="@tools:sample/full_names" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:paddingHorizontal="16dp"
-            android:textAppearance="@style/TextViewBody2"
-            android:textColor="?android:attr/textColorSecondary"
-            android:visibility="gone"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/menu"
-            app:layout_constraintHorizontal_bias="0.5"
-            app:layout_constraintStart_toEndOf="@id/image"
-            app:layout_constraintTop_toBottomOf="@+id/title"
-            tools:text="@tools:sample/full_names" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/menu"
-            style="@style/OverFlowButton"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="0"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:tint="?attr/colorControlNormal" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</com.google.android.material.card.MaterialCardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_big.xml b/app/src/main/res/layout/item_list_big.xml
deleted file mode 100644
index c99d5b703..000000000
--- a/app/src/main/res/layout/item_list_big.xml
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:layout_marginStart="1dp"
-    android:layout_marginEnd="1dp"
-    android:layout_marginBottom="1dp"
-    android:background="?rectSelector"
-    android:clickable="true"
-    android:focusable="true"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:orientation="horizontal"
-    tools:ignore="MissingPrefix">
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/imageTextContainer"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="16dp"
-        app:cardCornerRadius="6dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:srcCompat="@tools:sample/backgrounds/scenic"
-            tools:visibility="visible" />
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/imageText"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:maxLines="1"
-            android:minHeight="40dp"
-            android:textAppearance="@style/TextViewSubtitle2"
-            android:visibility="gone"
-            tools:text="100"
-            tools:visibility="visible" />
-    </com.google.android.material.card.MaterialCardView>
-
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewSubtitle1"
-        android:textColor="?android:attr/textColorPrimary"
-        app:layout_constraintBottom_toTopOf="@+id/text"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        tools:text="@tools:sample/full_names" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:paddingHorizontal="16dp"
-        android:textAppearance="@style/TextViewBody2"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@id/imageTextContainer"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:text="@tools:sample/full_names" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/menu"
-        style="@style/OverFlowButton"
-        android:layout_gravity="center_vertical"
-        android:layout_weight="0"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/colorControlNormal" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_storage.xml b/app/src/main/res/layout/item_list_no_image.xml
similarity index 61%
rename from app/src/main/res/layout/item_storage.xml
rename to app/src/main/res/layout/item_list_no_image.xml
index 28cbebf45..456015d06 100644
--- a/app/src/main/res/layout/item_storage.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@@ -17,37 +17,33 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
-    android:gravity="center_vertical"
-    android:minHeight="64dp"
-    android:orientation="horizontal"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    tools:ignore="PrivateResource">
+    android:foreground="?attr/rectSelector"
+    android:minHeight="72dp"
+    android:padding="16dp"
+    tools:ignore="UnusedAttribute">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:padding="10dp"
-        android:scaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_storage" />
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
+        android:singleLine="true"
         android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toEndOf="@+id/icon"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="Genre name" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:fontFeatureSettings="onum"
+        android:singleLine="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/title"
+        tools:text="Genre details" />
+
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_list_quick_actions.xml b/app/src/main/res/layout/item_list_quick_actions.xml
index 7f295fc3a..5e53b9f7d 100644
--- a/app/src/main/res/layout/item_list_quick_actions.xml
+++ b/app/src/main/res/layout/item_list_quick_actions.xml
@@ -16,34 +16,30 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:paddingHorizontal="16dp">
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp">
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/playAction"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="4dp"
         android:layout_marginEnd="4dp"
         android:layout_weight="1"
-        android:paddingVertical="10dp"
         android:text="@string/action_play_all"
-        android:textAppearance="@style/TextViewButton"
-        android:textColor="?android:attr/textColorPrimary"
         app:backgroundTint="?attr/colorSurface"
-        app:icon="@drawable/ic_play_arrow" />
+        app:icon="@drawable/ic_play_arrow_white_24dp" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/shuffleAction"
-        style="@style/Widget.Material3.Button.Icon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
+        android:layout_marginEnd="4dp"
         android:layout_weight="1"
-        android:paddingVertical="10dp"
         android:text="@string/shuffle"
-        android:textAppearance="@style/TextViewButton"
-        app:icon="@drawable/ic_shuffle" />
+        app:backgroundTint="?attr/colorSurface"
+        app:icon="@drawable/ic_shuffle_white_24dp" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_dialog_audio_fade.xml b/app/src/main/res/layout/item_option_menu.xml
similarity index 55%
rename from app/src/main/res/layout/preference_dialog_audio_fade.xml
rename to app/src/main/res/layout/item_option_menu.xml
index 2b0380148..6d21f31be 100644
--- a/app/src/main/res/layout/preference_dialog_audio_fade.xml
+++ b/app/src/main/res/layout/item_option_menu.xml
@@ -17,26 +17,30 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:paddingHorizontal="16dp"
-    android:paddingVertical="16dp">
+    android:gravity="center_vertical"
+    android:orientation="horizontal"
+    android:paddingStart="8dp"
+    android:paddingEnd="8dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toTopOf="parent">
 
-    <com.google.android.material.slider.Slider
-        android:id="@+id/slider"
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@+id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:padding="12dp"
+        app:tint="?attr/colorControlNormal"
+        tools:srcCompat="@drawable/ic_folder_white_24dp" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_weight="3"
-        android:stepSize="100"
-        android:valueFrom="0"
-        android:valueTo="1000"
-        app:labelBehavior="gone" />
-
-    <TextView
-        android:id="@+id/duration"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
         android:layout_weight="1"
-        android:gravity="center"
-        tools:Text="100ms" />
-</LinearLayout>
+        android:text="@string/folders"
+        android:textAppearance="@style/TextViewNormal"
+        android:textColor="?android:attr/textColorPrimary"
+        android:textSize="16sp" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_permission.xml b/app/src/main/res/layout/item_permission.xml
deleted file mode 100644
index 3179a2c1b..000000000
--- a/app/src/main/res/layout/item_permission.xml
+++ /dev/null
@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/number"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="4dp"
-        android:background="@drawable/color_circle_gradient"
-        android:gravity="center"
-        android:maxLines="3"
-        android:textAppearance="@style/TextViewButton"
-        app:layout_constraintBottom_toBottomOf="@id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/title"
-        tools:text="1" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem/random" />
-
-    <code.name.monkey.retromusic.views.BaselineGridTextView
-        android:id="@+id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:maxLines="2"
-        tools:text="@tools:sample/lorem/random" />
-
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/button"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:paddingVertical="12dp"
-        android:layout_marginTop="8dp"
-        android:textAppearance="@style/TextViewButton"
-        app:icon="@drawable/ic_history"
-        app:iconGravity="start"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@id/guideline_front_margin"
-        app:layout_constraintTop_toBottomOf="@id/summary"
-        tools:text="@tools:sample/full_names" />
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/checkImage"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="@+id/button"
-        app:layout_constraintEnd_toEndOf="@+id/button"
-        app:layout_constraintTop_toTopOf="@+id/button"
-        app:srcCompat="@drawable/ic_check_circle" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_front_margin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
index 22ebb08d6..3b9100038 100644
--- a/app/src/main/res/layout/item_queue.xml
+++ b/app/src/main/res/layout/item_queue.xml
@@ -3,123 +3,92 @@
     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:layout_height="wrap_content">
 
     <FrameLayout
         android:id="@+id/dummy_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <androidx.constraintlayout.widget.ConstraintLayout
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="1dp"
-            android:layout_marginEnd="1dp"
-            android:layout_marginBottom="1dp"
-            android:minHeight="?attr/listPreferredItemHeight"
+            android:clickable="true"
+            android:focusable="true"
+            android:foreground="?rectSelector"
+            android:gravity="center_vertical"
+            android:minHeight="64dp"
             android:orientation="horizontal"
             tools:ignore="MissingPrefix">
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/drag_view"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
+                android:layout_height="match_parent"
                 android:layout_gravity="center_vertical|start"
-                android:paddingHorizontal="8dp"
+                android:padding="8dp"
                 android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:srcCompat="@drawable/ic_drag_handle"
-                app:tint="?attr/colorControlNormal"
+                app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
+                app:tint="?colorOnBackground"
                 tools:ignore="ContentDescription"
                 tools:visibility="visible" />
 
-
-            <com.google.android.material.card.MaterialCardView
+            <FrameLayout
                 android:id="@+id/imageContainer"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:transitionGroup="true"
-                app:cardCornerRadius="4dp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/drag_view"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <com.google.android.material.imageview.ShapeableImageView
-                    android:id="@+id/image"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:scaleType="centerCrop"
-                    app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.ExtraSmall"
-                    tools:srcCompat="@tools:sample/backgrounds/scenic"
-                    tools:visibility="visible" />
+                android:layout_height="match_parent"
+                android:layout_weight="0">
 
                 <com.google.android.material.textview.MaterialTextView
                     android:id="@+id/imageText"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:fontFeatureSettings="onum"
                     android:gravity="center"
                     android:maxLines="1"
                     android:minWidth="36dp"
                     android:minHeight="40dp"
                     android:textAppearance="@style/TextViewSubtitle1"
                     android:visibility="gone"
-                    tools:text="100"
+                    tools:text="1"
                     tools:visibility="visible" />
-            </com.google.android.material.card.MaterialCardView>
 
+            </FrameLayout>
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/title"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:id="@+id/title_container"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewBody2"
-                android:textColor="?android:attr/textColorPrimary"
-                app:layout_constraintBottom_toTopOf="@+id/text"
-                app:layout_constraintEnd_toStartOf="@id/menu"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/imageContainer"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed"
-                tools:text="@tools:sample/full_names" />
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1.0"
+                android:orientation="vertical">
 
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/text"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:paddingHorizontal="16dp"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="?android:attr/textColorSecondary"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@id/menu"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@id/imageContainer"
-                app:layout_constraintTop_toBottomOf="@+id/title"
-                tools:text="@tools:sample/full_names" />
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/title"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    android:textAppearance="@style/TextViewSubtitle1"
+                    android:textSize="16sp"
+                    tools:text="Song name" />
+
+                <com.google.android.material.textview.MaterialTextView
+                    android:id="@+id/text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:maxLines="1"
+                    tools:text="Song details" />
+            </LinearLayout>
 
             <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/menu"
                 style="@style/OverFlowButton"
                 android:layout_gravity="center_vertical"
                 android:layout_weight="0"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                 app:tint="?attr/colorControlNormal" />
 
-        </androidx.constraintlayout.widget.ConstraintLayout>
+        </LinearLayout>
     </FrameLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_simple_text.xml b/app/src/main/res/layout/item_simple_text.xml
deleted file mode 100644
index daf36368d..000000000
--- a/app/src/main/res/layout/item_simple_text.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/title"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="16dp"
-    android:textAppearance="@style/TextViewBody1"
-    tools:text="@tools:sample/full_names" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index ef505a362..00ba56eff 100755
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -4,78 +4,64 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/item_song_height"
-    android:layout_marginVertical="2dp"
-    android:layout_marginHorizontal="2dp"
     android:background="?rectSelector"
     android:clickable="true"
     android:focusable="true"
     android:orientation="horizontal">
 
-    <com.google.android.material.card.MaterialCardView
+    <FrameLayout
         android:id="@+id/imageContainer"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginHorizontal="8dp"
-        android:scaleType="centerCrop"
-        app:cardCornerRadius="10dp"
-        app:layout_constraintDimensionRatio="1:1"
+        android:layout_height="match_parent"
+        android:layout_weight="0"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
 
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image"
-            android:layout_width="45dp"
-            android:layout_height="45dp"
-            android:layout_gravity="center_vertical"
-            android:gravity="center_vertical"
-            android:scaleType="centerCrop"
-            tools:ignore="ContentDescription"
-            tools:srcCompat="@tools:sample/backgrounds/scenic" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/imageText"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:fontFeatureSettings="onum"
+            android:gravity="center"
+            android:maxLines="1"
+            android:minHeight="40dp"
+            android:textAppearance="@style/TextViewNormal"
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="@tools:sample/date/hhmm" />
+    </FrameLayout>
 
-    </com.google.android.material.card.MaterialCardView>
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:layout_marginTop="12dp"
-        android:layout_marginHorizontal="8dp"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:textAppearance="@style/TextViewBody2"
-        app:layout_constraintEnd_toStartOf="@+id/menu"
+        android:maxLines="1"
+        android:textAppearance="@style/TextViewBody1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/time"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/imageContainer"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/lorem/random" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_weight="0"
-        android:layout_marginTop="4dp"
-        android:layout_marginHorizontal="8dp"
-        android:maxLines="1"
-        android:textAppearance="@style/TextViewCaption"
-        app:layout_constraintStart_toEndOf="@id/imageContainer"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="@tools:sample/full_names" />
-
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/time"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:layout_marginTop="4dp"
-        android:layout_marginHorizontal="8dp"
-        android:maxLines="1"
-        android:textAppearance="@style/TextViewCaption"
-        app:layout_constraintEnd_toStartOf="@id/menu"
-        app:layout_constraintTop_toBottomOf="@id/title"
+        android:fontFeatureSettings="onum"
+        android:padding="8dp"
+        android:textColor="?android:attr/textColorSecondary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/menu"
+        app:layout_constraintTop_toTopOf="parent"
         tools:text="@tools:sample/date/hhmm" />
 
+
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/menu"
         style="@style/OverFlowButton"
@@ -88,5 +74,4 @@
         app:layout_constraintTop_toTopOf="parent"
         app:tint="?attr/colorControlNormal"
         tools:visibility="visible" />
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_suggestions.xml b/app/src/main/res/layout/item_suggestions.xml
deleted file mode 100644
index c4580c025..000000000
--- a/app/src/main/res/layout/item_suggestions.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:padding="4dp">
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?rectSelector"
-        android:padding="16dp"
-        android:text="@string/suggestion_songs"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textStyle="bold"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <code.name.monkey.retromusic.views.AccentIcon
-        android:id="@+id/refresh_button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/card7"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        android:background="@drawable/round_selector"
-        app:srcCompat="@drawable/ic_refresh" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card1"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card2"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image4"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card2"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card3"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card1"
-        app:layout_constraintTop_toBottomOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image5"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card3"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card4"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card2"
-        app:layout_constraintTop_toBottomOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image6"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card4"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card5"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card3"
-        app:layout_constraintTop_toBottomOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image7"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card5"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card4"
-        app:layout_constraintTop_toBottomOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image8"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card6"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:clickable="true"
-        android:focusable="true"
-        app:cardBackgroundColor="?attr/colorSurface"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardElevation="0dp"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card7"
-        app:layout_constraintHorizontal_weight="4"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/title">
-
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/message"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:autoSizeTextType="uniform"
-            android:padding="8dp"
-            android:text="@string/new_music_mix"
-            android:textAppearance="@style/TextViewNormal"
-            android:textSize="32sp"
-            android:textStyle="bold"
-            app:autoSizeMaxTextSize="32sp"
-            app:autoSizeMinTextSize="24sp"
-            app:autoSizeStepGranularity="1sp" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card7"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card8"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card6"
-        app:layout_constraintTop_toTopOf="@id/card6">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image1"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card8"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_weight="4"
-        app:layout_constraintStart_toEndOf="@id/card7"
-        app:layout_constraintTop_toTopOf="@id/card7">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image2"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-
-    <com.google.android.material.card.MaterialCardView
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:cardCornerRadius="@dimen/m3_card_corner_radius"
-        app:cardUseCompatPadding="true"
-        app:layout_constraintDimensionRatio="1,1"
-        app:layout_constraintEnd_toStartOf="@id/card8"
-        app:layout_constraintHorizontal_weight="2"
-        app:layout_constraintStart_toEndOf="@id/card6"
-        app:layout_constraintTop_toBottomOf="@id/card7">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/image3"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scaleType="centerCrop"
-            tools:src="@tools:sample/avatars" />
-    </com.google.android.material.card.MaterialCardView>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_notification_collapsed.xml b/app/src/main/res/layout/layout_notification_collapsed.xml
index 2914e6773..7c021635b 100644
--- a/app/src/main/res/layout/layout_notification_collapsed.xml
+++ b/app/src/main/res/layout/layout_notification_collapsed.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     tools:background="@color/md_red_500"
@@ -107,7 +108,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_previous"
+            android:src="@drawable/ic_skip_previous_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
@@ -116,7 +117,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_pause"
+            android:src="@drawable/ic_pause_white_24dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
@@ -125,7 +126,7 @@
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
             android:scaleType="centerInside"
-            android:src="@drawable/ic_skip_next"
+            android:src="@drawable/ic_skip_next_round_white_32dp"
             tools:tint="?colorOnPrimary" />
 
         <ImageButton
@@ -137,6 +138,7 @@
             android:visibility="gone" />
 
         <ImageButton
+            android:id="@+id/fifth"
             android:layout_width="38dp"
             android:layout_height="38dp"
             android:background="@drawable/notification_selector"
diff --git a/app/src/main/res/layout/layout_notification_expanded.xml b/app/src/main/res/layout/layout_notification_expanded.xml
index da1540087..375337921 100644
--- a/app/src/main/res/layout/layout_notification_expanded.xml
+++ b/app/src/main/res/layout/layout_notification_expanded.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/background"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:background="@color/md_red_500">
+    android:layout_height="wrap_content">
 
     <RelativeLayout
         android:id="@+id/image"
@@ -98,7 +98,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_previous"
+                tools:src="@drawable/ic_skip_previous_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
@@ -116,7 +116,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_skip_next"
+                tools:src="@drawable/ic_skip_next_round_white_32dp"
                 tools:tint="?colorOnPrimary" />
 
             <ImageButton
@@ -125,7 +125,7 @@
                 android:layout_height="42dp"
                 android:background="@drawable/notification_selector"
                 android:scaleType="centerInside"
-                tools:src="@drawable/ic_close"
+                tools:src="@drawable/ic_close_white_24dp"
                 tools:tint="?colorOnPrimary" />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_item_color_view.xml b/app/src/main/res/layout/list_item_color_view.xml
deleted file mode 100644
index 44eb130fd..000000000
--- a/app/src/main/res/layout/list_item_color_view.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:ignore="PrivateResource">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="0dp"
-        android:paddingEnd="16dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:tint="?attr/colorControlNormal"
-        tools:srcCompat="@drawable/ic_telegram_white" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@android:id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@id/circle"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem" />
-
-    <code.name.monkey.retromusic.views.BaselineGridTextView
-        android:id="@android:id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:paddingStart="0dp"
-        android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@id/circle"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
-        tools:maxLines="2"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_front_margin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
-
-    <code.name.monkey.appthemehelper.common.prefs.BorderCircleView
-        android:id="@+id/circle"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_marginStart="8dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml
index f7ab4c2e2..454563c60 100644
--- a/app/src/main/res/layout/list_item_view.xml
+++ b/app/src/main/res/layout/list_item_view.xml
@@ -17,12 +17,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
+    android:background="?selectableItemBackground"
+    android:minHeight="72dp"
+    android:orientation="horizontal"
+    android:padding="16dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     tools:ignore="PrivateResource">
@@ -31,10 +29,8 @@
         android:id="@android:id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        app:layout_constraintBottom_toBottomOf="@android:id/title"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@android:id/title"
+        app:layout_constraintTop_toTopOf="parent"
         app:tint="?attr/colorControlNormal"
         tools:srcCompat="@drawable/ic_telegram_white" />
 
@@ -48,19 +44,18 @@
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/lorem" />
 
     <code.name.monkey.retromusic.views.BaselineGridTextView
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
+        app:lineHeightHint="24sp"
+        android:textColor="?android:attr/textColorSecondary"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
@@ -69,6 +64,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+        app:layout_constraintGuide_begin="52dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view_no_card.xml b/app/src/main/res/layout/list_item_view_no_card.xml
deleted file mode 100644
index f7ab4c2e2..000000000
--- a/app/src/main/res/layout/list_item_view_no_card.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<androidx.constraintlayout.widget.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="wrap_content"
-    android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
-    tools:ignore="PrivateResource">
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@android:id/icon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
-        app:layout_constraintBottom_toBottomOf="@android:id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@android:id/title"
-        app:tint="?attr/colorControlNormal"
-        tools:srcCompat="@drawable/ic_telegram_white" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@android:id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:textAppearance="@style/TextViewSubtitle1"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem/random" />
-
-    <code.name.monkey.retromusic.views.BaselineGridTextView
-        android:id="@android:id/summary"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
-        app:layout_constraintTop_toBottomOf="@android:id/title"
-        tools:maxLines="2"
-        tools:text="@tools:sample/lorem/random" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/guideline_front_margin"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view_no_title.xml b/app/src/main/res/layout/list_item_view_no_title.xml
index ff94c615d..ec15ebfe6 100644
--- a/app/src/main/res/layout/list_item_view_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_no_title.xml
@@ -18,16 +18,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
+    android:minHeight="72dp"
+    android:orientation="horizontal"
+    android:padding="16dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     tools:ignore="PrivateResource">
 
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@android:id/icon"
         android:layout_width="wrap_content"
@@ -49,13 +46,13 @@
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="@string/grid_size_1"
-        tools:text="@tools:sample/lorem/random" />
+        tools:text="@tools:sample/lorem" />
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/guideline_front_margin"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+        app:layout_constraintGuide_begin="52dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml
index 2dda3f488..351301387 100644
--- a/app/src/main/res/layout/list_item_view_seekbar.xml
+++ b/app/src/main/res/layout/list_item_view_seekbar.xml
@@ -12,23 +12,19 @@
   ~ See the GNU General Public License for more details.
   -->
 
-
 <androidx.constraintlayout.widget.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="wrap_content"
     android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
+    android:minHeight="72dp"
+    android:orientation="horizontal"
+    android:padding="16dp"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintStart_toStartOf="parent"
     tools:ignore="PrivateResource">
 
-
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@android:id/icon"
         android:layout_width="wrap_content"
@@ -54,13 +50,12 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
-        android:textAppearance="@style/TextViewNormal"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
+        app:lineHeightHint="24sp"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
@@ -69,7 +64,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+        app:layout_constraintGuide_begin="52dp" />
 
     <SeekBar
         android:id="@+id/seekbar"
@@ -80,10 +75,8 @@
         android:background="@null"
         android:clickable="false"
         android:focusable="false"
-        android:maxHeight="2dp"
         android:paddingStart="0dp"
         android:paddingEnd="0dp"
-        android:progressDrawable="@drawable/color_progress_seek"
         android:thumbOffset="2dp"
         app:layout_constraintEnd_toStartOf="@+id/seekbar_value"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index 255bb87b2..2b3383742 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -11,19 +11,16 @@
   ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
   ~ See the GNU General Public License for more details.
   -->
+
 <androidx.constraintlayout.widget.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="wrap_content"
     android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="16dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="16dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
+    android:minHeight="72dp"
+    android:orientation="horizontal"
+    android:padding="16dp"
     tools:ignore="PrivateResource">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -53,15 +50,14 @@
         android:id="@android:id/summary"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
         android:paddingStart="0dp"
         android:paddingEnd="16dp"
-        android:textAppearance="@style/TextViewNormal"
         android:textColor="?android:attr/textColorSecondary"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toStartOf="@android:id/checkbox"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
+        app:lineHeightHint="24sp"
         tools:maxLines="2"
         tools:text="@tools:sample/lorem/random" />
 
@@ -70,16 +66,15 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+        app:layout_constraintGuide_begin="52dp" />
 
     <code.name.monkey.appthemehelper.common.views.ATESwitch
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:showText="false"
+        android:background="@null"
         android:clickable="false"
         android:focusable="false"
-        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
diff --git a/app/src/main/res/layout/list_item_view_switch_no_title.xml b/app/src/main/res/layout/list_item_view_switch_no_title.xml
index e23e42a1b..14f47025d 100644
--- a/app/src/main/res/layout/list_item_view_switch_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_switch_no_title.xml
@@ -18,13 +18,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/rectSelector"
-    android:minHeight="?attr/listPreferredItemHeight"
-    android:paddingStart="?attr/listPreferredItemPaddingStart"
-    android:paddingTop="8dp"
-    android:paddingEnd="?attr/listPreferredItemPaddingEnd"
-    android:paddingBottom="8dp"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent"
+    android:orientation="horizontal"
+    android:padding="16dp"
     tools:ignore="PrivateResource">
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -58,14 +53,13 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        app:layout_constraintGuide_begin="@dimen/list_pref_guideline_begin" />
+        app:layout_constraintGuide_begin="52dp" />
 
     <code.name.monkey.appthemehelper.common.views.ATESwitch
         android:id="@android:id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:showText="false"
-        style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
+        android:background="@null"
         android:clickable="false"
         android:focusable="false"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml
index 958512785..142e5c887 100644
--- a/app/src/main/res/layout/list_setting_item_view.xml
+++ b/app/src/main/res/layout/list_setting_item_view.xml
@@ -12,63 +12,49 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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:layout_marginStart="2dp"
-    android:layout_marginEnd="2dp"
     android:background="?rectSelector"
     android:gravity="center_vertical"
+    android:layout_marginStart="4dp"
+    android:layout_marginEnd="4dp"
     android:orientation="horizontal">
 
     <code.name.monkey.retromusic.views.ColorIconsImageView
         android:id="@+id/icon"
-        android:layout_width="@dimen/adaptive_icon_size"
-        android:layout_height="@dimen/adaptive_icon_size"
-        android:layout_gravity="center"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
-        android:padding="@dimen/adaptive_icon_padding"
+        android:padding="10dp"
         app:iconBackgroundColor="@color/md_blue_A400"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@id/title"
-        app:srcCompat="@drawable/ic_palette" />
+        app:srcCompat="@drawable/ic_theme_palette_white_24dp" />
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:singleLine="true"
-        android:textAppearance="@style/TextViewSubtitle1"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/icon"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        android:padding="16dp"
+        android:orientation="vertical">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="2dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:ellipsize="marquee"
-        android:fadingEdge="horizontal"
-        android:maxLines="2"
-        android:textAppearance="@style/TextViewNormal"
-        android:textColor="?android:attr/textColorSecondary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/icon"
-        app:layout_constraintTop_toBottomOf="@id/title"
-        tools:text="@tools:sample/full_names" />
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            android:text="@string/general_settings_title"
+            android:textAppearance="@style/TextViewSubtitle1"
+            android:textStyle="bold" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/text"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:maxLines="4"
+            android:text="@string/general_settings_summary"
+            android:textColor="?android:attr/textColorSecondary" />
+    </LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/loading.xml b/app/src/main/res/layout/loading.xml
index b1757aa47..54c6d3c17 100644
--- a/app/src/main/res/layout/loading.xml
+++ b/app/src/main/res/layout/loading.xml
@@ -13,19 +13,16 @@
   -->
 
 <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:gravity="center_vertical"
     android:orientation="horizontal"
-    android:padding="14dp"
-    app:layout_gravity="center">
+    android:padding="14dp">
 
     <ProgressBar
-        style="@style/Widget.MaterialComponents.CircularProgressIndicator"
-        android:layout_width="wrap_content"
+        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
         android:indeterminate="true" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/media_button.xml b/app/src/main/res/layout/media_button.xml
index 59d89277e..a2c17c981 100644
--- a/app/src/main/res/layout/media_button.xml
+++ b/app/src/main/res/layout/media_button.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout 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"
@@ -8,66 +8,46 @@
     android:layoutDirection="ltr"
     android:paddingStart="4dp"
     android:paddingEnd="4dp"
-    android:clipToPadding="false">
-
-    <androidx.appcompat.widget.AppCompatImageButton
-        android:id="@+id/repeatButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:background="?attr/roundSelector"
-        android:padding="16dp"
-        android:scaleType="fitCenter"
-        app:layout_constraintBottom_toBottomOf="@+id/previousButton"
-        app:layout_constraintEnd_toStartOf="@+id/previousButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/previousButton"
-        app:srcCompat="@drawable/ic_repeat"
-        tools:ignore="MissingPrefix"
-        tools:tint="@color/md_black_1000" />
+    tools:ignore="ContentDescription,UnusedAttribute">
 
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/previousButton"
         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:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/playPauseButton"
-        app:layout_constraintStart_toEndOf="@+id/repeatButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_previous"
+        app:srcCompat="@drawable/ic_skip_previous_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/playPauseButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="?attr/roundSelector"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/nextButton"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/previousButton"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_pause_white_64dp"
-        tools:tint="@color/md_black_1000" />
-
     <androidx.appcompat.widget.AppCompatImageButton
         android:id="@+id/nextButton"
         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:layout_constraintBottom_toBottomOf="@+id/playPauseButton"
-        app:layout_constraintEnd_toStartOf="@+id/shuffleButton"
-        app:layout_constraintStart_toEndOf="@+id/playPauseButton"
-        app:layout_constraintTop_toTopOf="@+id/playPauseButton"
-        app:srcCompat="@drawable/ic_skip_next"
+        app:srcCompat="@drawable/ic_skip_next_white_24dp"
+        tools:ignore="MissingPrefix"
+        tools:tint="@color/md_black_1000" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/repeatButton"
+        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" />
 
@@ -75,15 +55,29 @@
         android:id="@+id/shuffleButton"
         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:layout_constraintBottom_toBottomOf="@+id/nextButton"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/nextButton"
-        app:layout_constraintTop_toTopOf="@+id/nextButton"
-        app:srcCompat="@drawable/ic_shuffle"
+        app:srcCompat="@drawable/ic_shuffle_white_24dp"
         tools:ignore="MissingPrefix"
         tools:tint="@color/md_black_1000" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+    <Space
+        android:id="@+id/dummy_fab"
+        android:layout_width="56dp"
+        android:layout_height="56dp"
+        android:layout_centerInParent="true" />
+
+    <androidx.appcompat.widget.AppCompatImageButton
+        android:id="@+id/playPauseButton"
+        android:layout_width="52dp"
+        android:layout_height="52dp"
+        android:layout_centerInParent="true"
+        android:background="@drawable/color_circle_gradient"
+        android:elevation="4dp"
+        android:padding="16dp"
+        app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/metal_section_recycler_view.xml b/app/src/main/res/layout/metal_section_recycler_view.xml
new file mode 100644
index 000000000..57771cc8a
--- /dev/null
+++ b/app/src/main/res/layout/metal_section_recycler_view.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.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="wrap_content"
+    android:orientation="vertical"
+    android:paddingBottom="12dp">
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:padding="16dp"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
+
+    <code.name.monkey.retromusic.views.MetalRecyclerViewPager
+        android:id="@+id/recyclerView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:nestedScrollingEnabled="false"
+        android:visibility="gone"
+        app:itemMargin="28dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/title"
+        tools:visibility="visible" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/number_roll_view.xml b/app/src/main/res/layout/number_roll_view.xml
deleted file mode 100644
index 6bf6370a1..000000000
--- a/app/src/main/res/layout/number_roll_view.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!-- Copyright 2016 The Chromium Authors. All rights reserved.
-     Use of this source code is governed by a BSD-style license that can be
-     found in the LICENSE file. -->
-<code.name.monkey.retromusic.views.NumberRollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/selection_mode_number"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent"
-    android:focusable="true"
-    android:focusableInTouchMode="true">
-
-    <TextView
-        android:id="@+id/up"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title" />
-
-    <TextView
-        android:id="@+id/down"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:singleLine="true"
-        android:textAppearance="@style/TextAppearance.Material3.ActionBar.Title" />
-</code.name.monkey.retromusic.views.NumberRollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/pager_item.xml b/app/src/main/res/layout/pager_item.xml
new file mode 100644
index 000000000..c04c8bb70
--- /dev/null
+++ b/app/src/main/res/layout/pager_item.xml
@@ -0,0 +1,62 @@
+<?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:id="@+id/root_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <com.google.android.material.card.MaterialCardView
+        android:id="@+id/imageContainer"
+        android:layout_width="match_parent"
+        android:layout_height="172dp"
+        android:layout_margin="8dp"
+        app:cardCornerRadius="16dp">
+
+        <androidx.appcompat.widget.AppCompatImageView
+            android:id="@+id/image"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="centerCrop"
+            tools:src="@tools:sample/avatars" />
+
+        <androidx.appcompat.widget.AppCompatImageButton
+            android:id="@+id/playSongs"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom|end"
+            android:layout_margin="12dp"
+            android:background="@drawable/color_circle_gradient"
+            android:backgroundTint="@color/eighty_percent_black_overlay"
+            android:padding="8dp"
+            app:srcCompat="@drawable/ic_play_arrow_white_32dp" />
+    </com.google.android.material.card.MaterialCardView>
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/text"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="16dp"
+        android:paddingTop="6dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp" 
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:paddingStart="16dp"
+        android:paddingEnd="8dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        android:textStyle="bold"
+        tools:ignore="MissingPrefix"
+        tools:text="My top tracks" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_category_title.xml b/app/src/main/res/layout/preference_category_title.xml
index cdbefb6fb..13e95047e 100644
--- a/app/src/main/res/layout/preference_category_title.xml
+++ b/app/src/main/res/layout/preference_category_title.xml
@@ -21,9 +21,9 @@
         android:id="@android:id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingStart="@dimen/pref_title_padding"
+        android:paddingStart="72dp"
         android:paddingTop="16dp"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewOverline"
-        tools:text="@tools:sample/full_names" />
+        tools:text="@string/about_settings_summary" />
 </LinearLayout>
\ 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
index c1d506c6c..41673f6d2 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -17,10 +17,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?attr/rectSelector"
     android:descendantFocusability="blocksDescendants"
     android:focusable="true"
-    android:minHeight="@dimen/md_listitem_height"
+    android:foreground="?rectSelector"
     android:orientation="horizontal"
     android:paddingStart="16dp"
     android:paddingEnd="0dp"
@@ -28,9 +27,8 @@
 
     <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox"
-        style="@style/Widget.Material3.CompoundButton.CheckBox"
         android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:background="@null"
         android:clickable="false"
         android:focusable="false"
@@ -43,7 +41,11 @@
         android:layout_weight="1"
         android:ellipsize="end"
         android:gravity="center_vertical"
-        android:paddingHorizontal="16dp"
+        android:minHeight="@dimen/md_listitem_height"
+        android:paddingStart="@dimen/md_listitem_control_margin"
+        android:paddingLeft="@dimen/md_listitem_control_margin"
+        android:paddingTop="@dimen/md_listitem_vertical_margin_choice"
+        android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
         android:singleLine="true"
         android:textAppearance="@style/TextViewNormal"
         android:textColor="?android:attr/textColorPrimary"
@@ -59,7 +61,7 @@
         android:focusable="false"
         android:padding="16dp"
         android:tintMode="src_in"
-        app:srcCompat="@drawable/ic_drag_vertical"
+        app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
         app:tint="?attr/colorControlNormal"
         tools:ignore="ContentDescription" />
 
diff --git a/app/src/main/res/layout/preference_now_playing_screen_item.xml b/app/src/main/res/layout/preference_now_playing_screen_item.xml
index fdf056de7..7ce569568 100644
--- a/app/src/main/res/layout/preference_now_playing_screen_item.xml
+++ b/app/src/main/res/layout/preference_now_playing_screen_item.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<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:layout_height="wrap_content"
     android:orientation="vertical"
     tools:ignore="ContentDescription">
 
@@ -13,20 +12,16 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"
-        android:padding="8dp"
+        android:padding="16dp"
         android:textAppearance="@style/TextViewHeadline6"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@tools:sample/full_names" />
+        tools:text="Card layout" />
+
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/image"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title"
-        tools:src="@tools:sample/backgrounds/scenic" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        android:layout_weight="1"
+        tools:src="@tools:sample/avatars" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/section_recycler_view.xml b/app/src/main/res/layout/section_recycler_view.xml
index 5840f9afc..69900e94b 100644
--- a/app/src/main/res/layout/section_recycler_view.xml
+++ b/app/src/main/res/layout/section_recycler_view.xml
@@ -2,49 +2,35 @@
 <androidx.constraintlayout.widget.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:id="@+id/recentArtistContainer"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/clickable_area"
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?attr/rectSelector"
-        android:clickable="true"
-        android:focusable="true"
-        android:orientation="horizontal"
+        android:padding="16dp"
+        android:textAppearance="@style/TextViewHeadline6"
+        android:textStyle="bold"
+        app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
+        app:layout_constraintTop_toTopOf="parent"
+        tools:text="@tools:sample/lorem" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/title"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:padding="16dp"
-            android:textAppearance="@style/TextViewHeadline6"
-            android:textStyle="bold"
-            tools:text="@tools:sample/full_names" />
-
-        <code.name.monkey.retromusic.views.AccentIcon
-            android:id="@+id/arrow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="16dp"
-            app:srcCompat="@drawable/ic_arrow_forward" />
-    </LinearLayout>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:nestedScrollingEnabled="false"
-        android:overScrollMode="@integer/overScrollMode"
+        android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/clickable_area"
+        app:layout_constraintTop_toBottomOf="@+id/title"
         tools:visibility="visible" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
index 8e16a74b8..d775dd7e4 100755
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -25,5 +25,5 @@
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/dummy_statusbar_actionbar"
         android:layout_alignBottom="@id/dummy_statusbar_actionbar"
-        android:background="@drawable/shadow_down_strong" />
+        android:background="@drawable/shadow_down" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/simple_appbar_layout.xml b/app/src/main/res/layout/simple_appbar_layout.xml
deleted file mode 100644
index 84f9231c8..000000000
--- a/app/src/main/res/layout/simple_appbar_layout.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.google.android.material.appbar.MaterialToolbar xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_scrollFlags="scroll|enterAlways"
-    app:navigationIcon="@drawable/ic_search"
-    app:popupTheme="?attr/toolbarPopupTheme"
-    app:titleCentered="true" />
\ No newline at end of file
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 b52f7ee1f..6bb77230d 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -6,27 +6,31 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/fragment_container"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+    <FrameLayout
+        android:id="@+id/mainContentFrame"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <View
+        android:id="@+id/dimBackground"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="?attr/colorSurface"
-        app:defaultNavHost="true"
-        app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
-        tools:layout="@layout/fragment_home" />
+        android:clickable="true"
+        android:focusable="true"
+        android:visibility="gone" />
 
-    <FrameLayout
+    <com.google.android.material.card.MaterialCardView
         android:id="@+id/slidingPanel"
-        style="@style/BottomSheetStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:behavior_hideable="true"
+        app:behavior_hideable="false"
         app:behavior_peekHeight="0dp"
-        app:enableEdgeToEdge="true"
-        app:gestureInsetBottomIgnored="true"
+        app:cardBackgroundColor="?attr/colorSurface"
+        app:cardCornerRadius="0dp"
+        app:cardUseCompatPadding="false"
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
-        tools:visibility="invisible">
+        app:strokeWidth="0dp">
+
 
         <FrameLayout
             android:id="@+id/playerFragmentContainer"
@@ -35,21 +39,27 @@
 
         <fragment
             android:id="@+id/miniPlayerFragment"
-            android:name="code.name.monkey.retromusic.fragments.other.MiniPlayerFragment"
+            android:name="code.name.monkey.retromusic.fragments.MiniPlayerFragment"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/mini_player_height"
+            android:layout_height="48dp"
             tools:layout="@layout/fragment_mini_player" />
 
-    </FrameLayout>
+    </com.google.android.material.card.MaterialCardView>
 
-    <code.name.monkey.retromusic.views.TintedBottomNavigationView
-        android:id="@+id/navigationView"
-        style="@style/Widget.Material3.BottomNavigationView"
+    <code.name.monkey.retromusic.views.BottomNavigationBarTinted
+        android:id="@+id/bottomNavigationView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:minHeight="@dimen/bottom_nav_height"
+        android:elevation="0dp"
+        android:visibility="gone"
         app:itemHorizontalTranslationEnabled="false"
+        app:itemIconTint="@drawable/bottom_navigation_item_colors"
+        app:itemTextAppearanceActive="@style/BottomSheetItemTextAppearanceActive"
+        app:itemTextAppearanceInactive="@style/BottomSheetItemTextAppearanceInactive"
+        app:itemTextColor="@drawable/bottom_navigation_item_colors"
+        app:labelVisibilityMode="labeled"
         app:menu="@menu/bottom_navigation_main"
-        tools:viewBindingType="com.google.android.material.navigation.NavigationBarView"/>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+        tools:layout_height="56dp" />
+
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/sub_header.xml b/app/src/main/res/layout/sub_header.xml
index 18e3dc581..0db3940db 100644
--- a/app/src/main/res/layout/sub_header.xml
+++ b/app/src/main/res/layout/sub_header.xml
@@ -2,13 +2,7 @@
 <com.google.android.material.textview.MaterialTextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/title"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    style="@style/SubTitleTextAppearance"
     android:layout_gravity="start"
-    android:layout_marginStart="@dimen/toolbar_margin_horizontal"
-    android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
     android:gravity="start"
-    android:paddingVertical="12dp"
-    android:textAppearance="@style/TextViewOverline"
-    android:textStyle="bold"
-    tools:text="@tools:sample/full_names" />
\ No newline at end of file
+    tools:text="Songs" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/user_image_layout.xml b/app/src/main/res/layout/user_image_layout.xml
deleted file mode 100644
index dec1dfdde..000000000
--- a/app/src/main/res/layout/user_image_layout.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
-    <code.name.monkey.retromusic.views.RetroShapeableImageView
-        android:id="@+id/userImage"
-        android:layout_width="42dp"
-        android:layout_height="42dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="8dp"
-        android:scaleType="centerCrop"
-        android:transitionName="user_image"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:retroCornerSize="21dp"
-        tools:srcCompat="@tools:sample/avatars" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/text"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:ellipsize="end"
-        android:text="@string/welcome"
-        app:layout_constraintStart_toEndOf="@+id/userImage"
-        app:layout_constraintTop_toTopOf="@+id/userImage"
-        tools:text="@tools:sample/lorem" />
-
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/titleWelcome"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:padding="0dp"
-        android:textAppearance="@style/TextViewHeadline6"
-        android:textColor="?android:attr/textColorPrimary"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/userImage"
-        app:layout_constraintStart_toEndOf="@+id/userImage"
-        app:layout_constraintTop_toBottomOf="@+id/text"
-        tools:text="@tools:sample/lorem" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ 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 8288aae47..e1b5e00be 100644
--- a/app/src/main/res/menu/bottom_navigation_main.xml
+++ b/app/src/main/res/menu/bottom_navigation_main.xml
@@ -4,28 +4,28 @@
     <item
         android:id="@+id/action_home"
         android:enabled="true"
-        android:icon="@drawable/ic_home"
+        android:icon="@drawable/toggle_home"
         android:title="@string/for_you" />
 
     <item
         android:id="@+id/action_song"
         android:enabled="true"
-        android:icon="@drawable/ic_audiotrack"
+        android:icon="@drawable/toggle_audiotrack"
         android:title="@string/songs" />
     <item
         android:id="@+id/action_album"
         android:enabled="true"
-        android:icon="@drawable/ic_album"
+        android:icon="@drawable/toggle_album"
         android:title="@string/albums" />
     <item
         android:id="@+id/action_artist"
         android:enabled="true"
-        android:icon="@drawable/ic_artist"
+        android:icon="@drawable/toggle_artist"
         android:title="@string/artists" />
     <item
         android:id="@+id/action_playlist"
         android:enabled="true"
-        android:icon="@drawable/ic_queue_music"
+        android:icon="@drawable/toggle_queue_music"
         android:title="@string/playlists" />
 
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_album_detail.xml b/app/src/main/res/menu/menu_album_detail.xml
index bd97edc06..622c2cdec 100644
--- a/app/src/main/res/menu/menu_album_detail.xml
+++ b/app/src/main/res/menu/menu_album_detail.xml
@@ -3,7 +3,7 @@
 
     <item
         android:id="@+id/action_sort_order"
-        android:icon="@drawable/ic_sort"
+        android:icon="@drawable/ic_sort_white_24dp"
         android:title="@string/sort_order"
         app:showAsAction="ifRoom">
         <menu>
@@ -42,7 +42,7 @@
 
     <item
         android:id="@+id/action_tag_editor"
-        android:icon="@drawable/ic_edit"
+        android:icon="@drawable/ic_edit_white_24dp"
         android:title="@string/action_tag_editor"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_artist_song_sort_order.xml b/app/src/main/res/menu/menu_artist_song_sort_order.xml
deleted file mode 100644
index 71bace116..000000000
--- a/app/src/main/res/menu/menu_artist_song_sort_order.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <group android:checkableBehavior="single">
-        <item
-            android:id="@+id/action_sort_order_title"
-            android:title="@string/sort_order_a_z" />
-        <item
-            android:id="@+id/action_sort_order_title_desc"
-            android:title="@string/sort_order_z_a" />
-        <item
-            android:id="@+id/action_sort_order_album"
-            android:title="@string/sort_order_album" />
-        <item
-            android:id="@+id/action_sort_order_year"
-            android:title="@string/sort_order_year" />
-        <item
-            android:id="@+id/action_sort_order_song_duration"
-            android:title="@string/song_duration" />
-    </group>
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_backup.xml b/app/src/main/res/menu/menu_backup.xml
deleted file mode 100644
index 760eab793..000000000
--- a/app/src/main/res/menu/menu_backup.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_delete"
-        android:icon="@drawable/ic_delete"
-        android:title="@string/action_delete"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/action_share"
-        android:icon="@drawable/ic_share"
-        android:title="@string/action_share"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/action_rename"
-        android:icon="@drawable/ic_edit"
-        android:title="@string/action_rename"
-        app:showAsAction="never" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
index 7288b1dd8..e6d0f67d6 100644
--- a/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
+++ b/app/src/main/res/menu/menu_cannot_delete_single_songs_playlist_songs_selection.xml
@@ -4,24 +4,24 @@
 
     <item
         android:id="@+id/action_play_next"
-        android:icon="@drawable/ic_redo"
+        android:icon="@drawable/ic_redo_white_24dp"
         android:title="@string/action_play_next"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
     <item
         android:id="@id/action_multi_select_adapter_check_all"
-        android:icon="@drawable/ic_select_all"
+        android:icon="@drawable/ic_select_all_white_24dp"
         android:title="@string/select_all"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_clear_history.xml b/app/src/main/res/menu/menu_clear_history.xml
deleted file mode 100644
index 5563e2d95..000000000
--- a/app/src/main/res/menu/menu_clear_history.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/action_clear_history"
-        android:title="@string/clear_history"
-        app:showAsAction="never"
-        android:visible="false"
-      />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_folders.xml b/app/src/main/res/menu/menu_folders.xml
new file mode 100644
index 000000000..e2e50174c
--- /dev/null
+++ b/app/src/main/res/menu/menu_folders.xml
@@ -0,0 +1,15 @@
+<?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_scan"
+        android:icon="@drawable/ic_scanner_white_24dp"
+        android:title="@string/scan_media"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_go_to_start_directory"
+        android:icon="@drawable/ic_bookmark_music_white_24dp"
+        android:title="@string/action_go_to_start_directory"
+        app:showAsAction="ifRoom" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
new file mode 100644
index 000000000..dd2b985cc
--- /dev/null
+++ b/app/src/main/res/menu/menu_item_cannot_delete_single_songs_playlist_song.xml
@@ -0,0 +1,44 @@
+<?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_play_next"
+        android:title="@string/action_play_next"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_add_to_current_playing"
+        android:title="@string/action_add_to_playing_queue"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_add_to_playlist"
+        android:title="@string/action_add_to_playlist"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_go_to_album"
+        android:title="@string/action_go_to_album"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_go_to_artist"
+        android:title="@string/action_go_to_artist"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_share"
+        android:title="@string/action_share"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_tag_editor"
+        android:title="@string/action_tag_editor"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_details"
+        android:title="@string/action_details"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_set_as_ringtone"
+        android:title="@string/action_set_as_ringtone"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_delete_from_device"
+        android:title="@string/action_delete_from_device"
+        app:showAsAction="never" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_directory.xml b/app/src/main/res/menu/menu_item_directory.xml
index a6f04a67e..01f67ba77 100644
--- a/app/src/main/res/menu/menu_item_directory.xml
+++ b/app/src/main/res/menu/menu_item_directory.xml
@@ -21,10 +21,6 @@
         android:id="@+id/action_scan"
         android:title="@string/action_scan"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/action_add_to_blacklist"
-        android:title="@string/action_add_to_blacklist"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_device"
         android:title="@string/action_delete_from_device"
diff --git a/app/src/main/res/menu/menu_item_smart_playlist.xml b/app/src/main/res/menu/menu_item_smart_playlist.xml
new file mode 100644
index 000000000..92d8ed725
--- /dev/null
+++ b/app/src/main/res/menu/menu_item_smart_playlist.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/action_play"
+        android:title="@string/action_play" />
+
+    <item
+        android:id="@+id/action_play_next"
+        android:title="@string/action_play_next" />
+
+    <item
+        android:id="@+id/action_add_to_current_playing"
+        android:title="@string/action_add_to_playing_queue" />
+
+    <item
+        android:id="@+id/action_add_to_playlist"
+        android:title="@string/action_add_to_playlist" />
+
+    <item
+        android:id="@+id/action_clear_playlist"
+        android:title="@string/action_clear_playlist" />
+
+    <item
+        android:id="@+id/action_save_playlist"
+        android:title="@string/save_playlist_title" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_item_song.xml b/app/src/main/res/menu/menu_item_song.xml
index ba9d491fd..dd2b985cc 100644
--- a/app/src/main/res/menu/menu_item_song.xml
+++ b/app/src/main/res/menu/menu_item_song.xml
@@ -37,10 +37,6 @@
         android:id="@+id/action_set_as_ringtone"
         android:title="@string/action_set_as_ringtone"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/action_add_to_blacklist"
-        android:title="@string/action_add_to_blacklist"
-        app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_device"
         android:title="@string/action_delete_from_device"
diff --git a/app/src/main/res/menu/menu_lyrics.xml b/app/src/main/res/menu/menu_lyrics.xml
deleted file mode 100644
index 116075329..000000000
--- a/app/src/main/res/menu/menu_lyrics.xml
+++ /dev/null
@@ -1,9 +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"
-        android:title="@string/action_search"
-        app:showAsAction="always" />
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 54aa74abc..6de1c3352 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -16,13 +16,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context=".DrawerActivity">
+
+
     <item
         android:id="@+id/action_grid_size"
-        android:icon="@drawable/ic_grid_size"
+        android:icon="@drawable/ic_grid_size_white_24dp"
         android:title="@string/action_grid_size"
         app:showAsAction="never">
         <menu>
-            <group android:checkableBehavior="single">
+            <group
+                android:id="@+id/group_grid_size"
+                android:checkableBehavior="single"
+                tools:ignore="HardcodedText">
                 <item
                     android:id="@+id/action_grid_size_1"
                     android:title="@string/grid_size_1" />
@@ -50,45 +55,13 @@
             </group>
         </menu>
     </item>
-    <item
-        android:id="@+id/action_layout_type"
-        android:icon="@drawable/ic_dashboard"
-        android:title="@string/grid_style_label"
-        app:showAsAction="never">
-        <menu>
-            <group android:checkableBehavior="single">
-                <item
-                    android:id="@+id/action_layout_normal"
-                    android:title="@string/normal" />
-                <item
-                    android:id="@+id/action_layout_card"
-                    android:title="@string/card" />
-                <item
-                    android:id="@+id/action_layout_colored_card"
-                    android:title="@string/card_color_style" />
-                <item
-                    android:id="@+id/action_layout_circular"
-                    android:title="@string/circular" />
-                <item
-                    android:id="@+id/action_layout_image"
-                    android:title="@string/image" />
-                <item
-                    android:id="@+id/action_layout_gradient_image"
-                    android:title="@string/image_gradient" />
-            </group>
-        </menu>
-    </item>
+
     <item
         android:id="@+id/action_sort_order"
-        android:icon="@drawable/ic_sort"
+        android:icon="@drawable/ic_sort_white_24dp"
         android:title="@string/action_sort_order"
         app:showAsAction="never">
         <menu></menu>
     </item>
-    <item
-        android:orderInCategory="10"
-        android:id="@+id/action_settings"
-        android:icon="@drawable/ic_settings"
-        android:title="@string/action_settings"
-        app:showAsAction="never" />
+
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_media_selection.xml b/app/src/main/res/menu/menu_media_selection.xml
index a24f2a8a7..59e0dc5d4 100644
--- a/app/src/main/res/menu/menu_media_selection.xml
+++ b/app/src/main/res/menu/menu_media_selection.xml
@@ -4,37 +4,31 @@
 
     <item
         android:id="@+id/action_play_next"
-        android:icon="@drawable/ic_redo"
+        android:icon="@drawable/ic_redo_white_24dp"
         android:title="@string/action_play_next"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
-    <item
-        android:id="@+id/action_share"
-        android:icon="@drawable/ic_share"
-        android:title="@string/action_share"
-        app:showAsAction="ifRoom" />
-
     <item
         android:id="@+id/action_delete_from_device"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/action_delete_from_device"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@id/action_multi_select_adapter_check_all"
-        android:icon="@drawable/ic_select_all"
+        android:icon="@drawable/ic_select_all_white_24dp"
         android:title="@string/select_all"
         app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_player.xml b/app/src/main/res/menu/menu_player.xml
index f5a9b8e04..4d2f83b0b 100755
--- a/app/src/main/res/menu/menu_player.xml
+++ b/app/src/main/res/menu/menu_player.xml
@@ -1,47 +1,23 @@
 <?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_sleep_timer"
-        android:icon="@drawable/ic_sleep_timer"
-        android:orderInCategory="0"
-        android:title="@string/action_sleep_timer"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/action_toggle_lyrics"
-        android:checkable="true"
-        android:icon="@drawable/sld_lyrics"
-        android:orderInCategory="1"
-        android:title="@string/lyrics"
-        app:showAsAction="always" />
+
     <item
         android:id="@+id/action_toggle_favorite"
-        android:checkable="true"
-        android:icon="@drawable/ic_favorite"
-        android:orderInCategory="2"
+        android:icon="@drawable/ic_favorite_border_white_24dp"
+        android:orderInCategory="1"
         android:title="@string/favorites"
-        app:showAsAction="always" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/now_playing"
-        android:icon="@drawable/ic_queue_music"
-        android:orderInCategory="3"
+        android:icon="@drawable/ic_playlist_play_white_24dp"
+        android:orderInCategory="2"
         android:title="@string/now_playing_queue"
-        app:showAsAction="always" />
-    <item
-        android:id="@+id/action_playback_speed"
-        android:icon="@drawable/ic_playback_speed"
-        android:orderInCategory="4"
-        android:title="@string/playback_speed"
-        android:visible="@bool/isMarshmallow"/>
-    <item
-        android:id="@+id/action_go_to_drive_mode"
-        android:icon="@drawable/ic_car"
-        android:orderInCategory="4"
-        android:title="@string/drive_mode" />
+        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_go_to_album"
-        android:icon="@drawable/ic_album"
-        android:orderInCategory="4"
+        android:icon="@drawable/ic_album_white_24dp"
+        android:orderInCategory="3"
         android:title="@string/action_go_to_album" />
     <item
         android:id="@+id/action_go_to_artist"
@@ -78,16 +54,17 @@
         android:orderInCategory="10"
         android:title="@string/action_details" />
     <item
-        android:id="@+id/action_go_to_lyrics"
+        android:id="@+id/action_sleep_timer"
         android:orderInCategory="11"
-        android:title="@string/action_go_to_lyrics" />
+        android:title="@string/action_sleep_timer"
+        app:showAsAction="never" />
     <item
         android:id="@+id/action_equalizer"
-        android:orderInCategory="13"
+        android:orderInCategory="12"
         android:title="@string/equalizer"
         app:showAsAction="never" />
     <item
         android:id="@+id/action_delete_from_device"
-        android:orderInCategory="14"
+        android:orderInCategory="13"
         android:title="@string/action_delete_from_device" />
 </menu>
diff --git a/app/src/main/res/menu/menu_playlist_detail.xml b/app/src/main/res/menu/menu_playlist_detail.xml
index 070cad92d..88a3d7383 100644
--- a/app/src/main/res/menu/menu_playlist_detail.xml
+++ b/app/src/main/res/menu/menu_playlist_detail.xml
@@ -1,9 +1,10 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:icon="@drawable/ic_shuffle"
-        android:title="@string/action_shuffle_playlist"
         android:visible="false"
+        android:id="@+id/action_shuffle_playlist"
+        android:icon="@drawable/ic_shuffle_white_24dp"
+        android:title="@string/action_shuffle_playlist"
         app:showAsAction="ifRoom" />
     <item
         android:id="@+id/action_play"
diff --git a/app/src/main/res/menu/menu_playlists_selection.xml b/app/src/main/res/menu/menu_playlists_selection.xml
index f2e6baf61..fde5452b4 100644
--- a/app/src/main/res/menu/menu_playlists_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_selection.xml
@@ -4,37 +4,37 @@
 
     <item
         android:id="@+id/action_play_next"
-        android:icon="@drawable/ic_redo"
+        android:icon="@drawable/ic_redo_white_24dp"
         android:title="@string/action_play_next"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_save_playlist"
-        android:icon="@drawable/ic_save"
+        android:icon="@drawable/ic_save_white_24dp"
         android:title="@string/save_playlists_title"
         app:showAsAction="never" />
 
     <item
         android:id="@+id/action_delete_playlist"
-        android:icon="@drawable/ic_delete"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/delete_playlists_title"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@id/action_multi_select_adapter_check_all"
-        android:icon="@drawable/ic_select_all"
+        android:icon="@drawable/ic_select_all_white_24dp"
         android:title="@string/select_all"
         app:showAsAction="ifRoom" />
 
diff --git a/app/src/main/res/menu/menu_playlists_songs_selection.xml b/app/src/main/res/menu/menu_playlists_songs_selection.xml
index 9926863ee..20e6c8738 100644
--- a/app/src/main/res/menu/menu_playlists_songs_selection.xml
+++ b/app/src/main/res/menu/menu_playlists_songs_selection.xml
@@ -4,38 +4,26 @@
 
     <item
         android:id="@+id/action_play_next"
-        android:icon="@drawable/ic_redo"
+        android:icon="@drawable/ic_redo_white_24dp"
         android:title="@string/action_play_next"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_add_to_current_playing"
-        android:icon="@drawable/ic_library_add"
+        android:icon="@drawable/ic_library_add_white_24dp"
         android:title="@string/action_add_to_playing_queue"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_add_to_playlist"
-        android:icon="@drawable/ic_playlist_add"
+        android:icon="@drawable/ic_playlist_add_white_24dp"
         android:title="@string/action_add_to_playlist"
         app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_remove_from_playlist"
-        android:icon="@drawable/ic_playlist_remove"
+        android:icon="@drawable/ic_delete_white_24dp"
         android:title="@string/action_remove_from_playlist"
         app:showAsAction="ifRoom" />
 
-
-    <item
-        android:id="@+id/action_delete_from_device"
-        android:icon="@drawable/ic_delete"
-        android:title="@string/action_delete_from_device"
-        app:showAsAction="ifRoom" />
-
-    <item
-        android:id="@id/action_multi_select_adapter_check_all"
-        android:icon="@drawable/ic_select_all"
-        android:title="@string/select_all"
-        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/baseline_textview_attrs.xml b/app/src/main/res/menu/menu_search.xml
similarity index 64%
rename from app/src/main/res/values/baseline_textview_attrs.xml
rename to app/src/main/res/menu/menu_search.xml
index 5d70ed114..a6855ef2e 100644
--- a/app/src/main/res/values/baseline_textview_attrs.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -12,12 +12,11 @@
   ~ See the GNU General Public License for more details.
   -->
 
-<resources>
-    <declare-styleable name="BaselineGridTextView">
-        <attr name="lineHeightMultiplierHint" format="float" />
-        <attr name="lineHeightHint" />
-        <attr name="maxLinesByHeight" format="boolean" />
-        <attr name="android:textAppearance" />
-        <attr name="android:fontFamily" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
+<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"
+        app:showAsAction="always"
+        android:icon="@drawable/ic_mic_white_24dp"
+        android:title="@string/action_search" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/menu_smart_playlist_detail.xml b/app/src/main/res/menu/menu_smart_playlist_detail.xml
new file mode 100644
index 000000000..896e26bed
--- /dev/null
+++ b/app/src/main/res/menu/menu_smart_playlist_detail.xml
@@ -0,0 +1,30 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_shuffle_playlist"
+        android:icon="@drawable/ic_shuffle_white_24dp"
+        android:title="@string/action_shuffle_playlist"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+    <item
+        android:id="@+id/action_play"
+        android:title="@string/action_play"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_play_next"
+        android:title="@string/action_play_next"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_add_to_current_playing"
+        android:title="@string/action_add_to_playing_queue"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_add_to_playlist"
+        android:title="@string/action_add_to_playlist" />
+    <item
+        android:id="@+id/action_save_playlist"
+        android:title="@string/save_playlist_title"
+        app:showAsAction="never" />
+
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 1413a3145..036d09bc5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 1413a3145..036d09bc5 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index d0dd126ab..be1d6a643 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..912c27f24
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index aae38ee74..be1d6a643 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index db5c9b685..6c186bd49 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..129090fc2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index 839153abb..6c186bd49 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 07ce7fb5e..76da62704 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..c18aa6c84
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 4f155bef4..76da62704 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index cd6fa6a05..8eab4099a 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..4678e7020
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index 9a9e4687a..8eab4099a 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index c52d5e991..413e33c2d 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 000000000..02a7dc5e9
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index 66ca7e155..413e33c2d 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/navigation/library_graph.xml b/app/src/main/res/navigation/library_graph.xml
deleted file mode 100644
index 67b032002..000000000
--- a/app/src/main/res/navigation/library_graph.xml
+++ /dev/null
@@ -1,43 +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"
-    app:startDestination="@id/action_home">
-
-    <fragment
-        android:id="@+id/action_album"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_artist"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_song"
-        android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_genre"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_folder"
-        android:name="code.name.monkey.retromusic.fragments.folder.FoldersFragment"
-        tools:layout="@layout/fragment_folder" />
-
-    <fragment
-        android:id="@+id/action_home"
-        android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
-        android:label=""
-        tools:layout="@layout/fragment_home" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/main_graph.xml b/app/src/main/res/navigation/main_graph.xml
deleted file mode 100644
index d82f88fec..000000000
--- a/app/src/main/res/navigation/main_graph.xml
+++ /dev/null
@@ -1,129 +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"
-    app:startDestination="@id/action_home">
-
-    <fragment
-        android:id="@+id/genreDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenreDetailsFragment"
-        android:label="GenreDetailsFragment"
-        tools:layout="@layout/fragment_playlist_detail">
-        <argument
-            android:name="extra_genre"
-            app:argType="code.name.monkey.retromusic.model.Genre" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/playlistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistDetailsFragment"
-        android:label="PlaylistDetailsFragment"
-        tools:layout="@layout/fragment_playlist_detail">
-        <argument
-            android:name="extra_playlist_id"
-            app:argType="long" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/albumDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumDetailsFragment"
-        android:label="AlbumDetailsFragment"
-        tools:layout="@layout/fragment_album_details">
-        <argument
-            android:name="extra_album_id"
-            app:argType="long" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/artistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistDetailsFragment"
-        android:label="ArtistDetailsFragment"
-        tools:layout="@layout/fragment_artist_details">
-        <argument
-            android:name="extra_artist_id"
-            app:argType="long" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/albumArtistDetailsFragment"
-        android:name="code.name.monkey.retromusic.fragments.artists.AlbumArtistDetailsFragment"
-        android:label="AlbumArtistDetailsFragment"
-        tools:layout="@layout/fragment_artist_details">
-        <argument
-            android:name="extra_artist_name"
-            app:argType="string" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/libraryFragment"
-        android:name="code.name.monkey.retromusic.fragments.library.LibraryFragment"
-        android:label=""
-        tools:layout="@layout/fragment_library" />
-
-    <fragment
-        android:id="@+id/detailListFragment"
-        android:name="code.name.monkey.retromusic.fragments.other.DetailListFragment"
-        android:label="DetailListFragment">
-        <argument
-            android:name="type"
-            app:argType="integer" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/action_search"
-        android:name="code.name.monkey.retromusic.fragments.search.SearchFragment"
-        android:label="SearchFragment"
-        tools:layout="@layout/fragment_search" />
-
-    <fragment
-        android:id="@+id/settings_fragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.SettingsFragment" />
-
-    <fragment
-        android:id="@+id/action_album"
-        android:name="code.name.monkey.retromusic.fragments.albums.AlbumsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_artist"
-        android:name="code.name.monkey.retromusic.fragments.artists.ArtistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_song"
-        android:name="code.name.monkey.retromusic.fragments.songs.SongsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_genre"
-        android:name="code.name.monkey.retromusic.fragments.genres.GenresFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_playlist"
-        android:name="code.name.monkey.retromusic.fragments.playlists.PlaylistsFragment"
-        tools:layout="@layout/fragment_main_recycler" />
-
-    <fragment
-        android:id="@+id/action_folder"
-        android:name="code.name.monkey.retromusic.fragments.folder.FoldersFragment"
-        tools:layout="@layout/fragment_folder" />
-
-    <fragment
-        android:id="@+id/action_home"
-        android:name="code.name.monkey.retromusic.fragments.home.HomeFragment"
-        android:label=""
-        tools:layout="@layout/fragment_home" />
-
-    <fragment
-        android:id="@+id/user_info_fragment"
-        android:name="code.name.monkey.retromusic.fragments.other.UserInfoFragment" />
-
-    <fragment
-        android:id="@+id/playing_queue_fragment"
-        android:name="code.name.monkey.retromusic.fragments.queue.PlayingQueueFragment" />
-
-    <fragment
-        android:id="@+id/lyrics_fragment"
-        android:name="code.name.monkey.retromusic.fragments.lyrics.LyricsFragment" />
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/settings_graph.xml b/app/src/main/res/navigation/settings_graph.xml
deleted file mode 100644
index 70dffca0f..000000000
--- a/app/src/main/res/navigation/settings_graph.xml
+++ /dev/null
@@ -1,133 +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"
-    app:startDestination="@id/mainSettingsFragment">
-
-    <fragment
-        android:id="@+id/mainSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.MainSettingsFragment"
-        android:label="Settings"
-        tools:layout="@layout/fragment_main_settings">
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_themeSettingsFragment"
-            app:destination="@id/themeSettingsFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_imageSettingFragment"
-            app:destination="@id/imageSettingFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_nowPlayingSettingsFragment"
-            app:destination="@id/nowPlayingSettingsFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_audioSettings"
-            app:destination="@id/audioSettings"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_otherSettingsFragment"
-            app:destination="@id/otherSettingsFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_personalizeSettingsFragment"
-            app:destination="@id/personalizeSettingsFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_notificationSettingsFragment"
-            app:destination="@id/notificationSettingsFragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_aboutActivity"
-            app:destination="@id/aboutActivity"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:launchSingleTop="true"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-
-        <action
-            android:id="@+id/action_mainSettingsFragment_to_backupFragment"
-            app:destination="@id/backup_fragment"
-            app:enterAnim="@anim/retro_fragment_open_enter"
-            app:exitAnim="@anim/retro_fragment_open_exit"
-            app:launchSingleTop="true"
-            app:popEnterAnim="@anim/retro_fragment_close_enter"
-            app:popExitAnim="@anim/retro_fragment_close_exit" />
-    </fragment>
-
-    <fragment
-        android:id="@+id/audioSettings"
-        android:name="code.name.monkey.retromusic.fragments.settings.AudioSettings"
-        android:label="Audio" />
-
-    <fragment
-        android:id="@+id/imageSettingFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.ImageSettingFragment"
-        android:label="Image" />
-
-    <fragment
-        android:id="@+id/notificationSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.NotificationSettingsFragment"
-        android:label="Notification" />
-
-    <fragment
-        android:id="@+id/nowPlayingSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.NowPlayingSettingsFragment"
-        android:label="Now Playing" />
-
-    <fragment
-        android:id="@+id/otherSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.OtherSettingsFragment"
-        android:label="Other" />
-
-    <fragment
-        android:id="@+id/personalizeSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.PersonalizeSettingsFragment"
-        android:label="Personalize" />
-
-    <fragment
-        android:id="@+id/themeSettingsFragment"
-        android:name="code.name.monkey.retromusic.fragments.settings.ThemeSettingsFragment"
-        android:label="Look &amp; Feel" />
-
-    <fragment
-        android:id="@+id/aboutActivity"
-        android:name="code.name.monkey.retromusic.fragments.about.AboutFragment"
-        android:label="About" />
-
-    <fragment
-        android:id="@+id/backup_fragment"
-        android:name="code.name.monkey.retromusic.fragments.backup.BackupFragment"
-        android:label="About" />
-
-</navigation>
\ No newline at end of file
diff --git a/app/src/main/res/transition/grid_exit.xml b/app/src/main/res/transition/grid_exit.xml
new file mode 100644
index 000000000..06a436b71
--- /dev/null
+++ b/app/src/main/res/transition/grid_exit.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <changeImageTransform/>
+    <changeBounds/>
+    <changeTransform/>
+    <targets>
+        <target android:excludeId="@android:id/statusBarBackground" />
+        <target android:excludeId="@android:id/navigationBarBackground" />
+        <target android:excludeId="@id/toolbar" />
+        <target android:excludeId="@android:id/background" />
+    </targets>
+</transitionSet>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar/strings.xml
similarity index 60%
rename from app/src/main/res/values-ar-rSA/strings.xml
rename to app/src/main/res/values-ar/strings.xml
index 18995c82e..ef0ec1959 100644
--- a/app/src/main/res/values-ar-rSA/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,481 +1,303 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">حول %s</string>
-    <string name="about_settings_summary">الفريق، وسائل التواصل الاجتماعي</string>
+    <string name="you_have_to_select_at_least_one_category">عليك اختيار فئة واحدة على الأقل.</string>
+    <string name="small">ألبوم صغير</string>
     <string name="accent_color">اللون الأساسي</string>
-    <string name="accent_color_desc">لون تمييز المظهر ، يتم تعيينه إلى اللون الأرجواني</string>
+    <string name="accent_color_desc">لون النمط الافتراضي , الافتراضي هو ازرق</string>
     <string name="action_about">حول</string>
-    <string name="action_add_to_blacklist">إضافة إلى القائمة السوداء</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_cancel">إلغاء</string>
-    <string name="action_cast">ممثلين</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_cycle_repeat">وضع التكرار</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_edit">تعديل</string>
     <string name="action_go_to_album">إنتقل إلى الالبوم</string>
     <string name="action_go_to_artist">إنتقل إلى الفنان</string>
     <string name="action_go_to_genre">إنتقل إلى النوع</string>
-    <string name="action_go_to_lyrics">انتقل إلى كلمات الأغاني</string>
-    <string name="action_go_to_start_directory">انتقل إلى المجلد</string>
-    <string name="action_grant">منح</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_all">تشغيل الكل</string>
     <string name="action_play_next">تشغيل التالي</string>
-    <string name="action_play_pause">تشغيل/إيقاف</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_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="set">تعيين</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_sort_order">فرز</string>
-    <string name="action_tag_editor">محرر العلامة</string>
-    <string name="action_toggle_favorite">تبديل المفضلة</string>
-    <string name="action_toggle_shuffle">تفعيل وضع الخلط</string>
+    <string name="action_shuffle_playlist">تشغيل عشوائي قائمة التشغيل</string>
+    <string name="action_sleep_timer">مؤقت النوم</string>
+    <string name="action_sort_order">ترتيب الفرز</string>
+    <string name="action_tag_editor">محرر البطاقة</string>
     <string name="adaptive">متكيف</string>
     <string name="add_action">إضافة</string>
-    <string name="add_playlist_title">"إضافة إلى قائمة التشغيل"</string>
-    <string name="add_time_framed_lryics">أضف وقت كلمات الأغاني</string>
-    <string name="added_song_count_to_playlist">تم إضافة %1$d أغنية إلى %2$s</string>
-    <string name="added_title_to_playing_queue">"تمت الإضافة إلى قائمة الانتظار."</string>
-    <string name="added_x_titles_to_playing_queue">إضافة %1$d من العناوين إلى قائمة الانتظار.</string>
+    <string name="add_photo">إضافة صورة</string>
+    <string name="add_playlist_title">"إضافة الى قائمة التشغيل"</string>
+    <string name="added_title_to_playing_queue">"إضافة ١ من العناوين الى قائمة التشغيل الحالية"</string>
+    <string name="added_x_titles_to_playing_queue">إضافة %1$d من العناوين الى قائمة التشغيل الحالية</string>
     <string name="album">البوم</string>
-    <plurals name="albumSongs">
-        <item quantity="zero">الأغاني</item>
-        <item quantity="one">الأغاني</item>
-        <item quantity="two">الأغاني</item>
-        <item quantity="few">أغنية 
-
-أغاني</item>
-        <item quantity="many">الأغاني</item>
-        <item quantity="other">الاغاني</item>
-    </plurals>
-    <string name="album_artist">ألبوم الفنان</string>
+    <string name="album_artist">البوم الفنان</string>
+    <string name="album_or_artist_empty">العنوان او الفنان فارغ</string>
     <string name="albums">الألبومات</string>
-    <plurals name="albums">
-        <item quantity="zero">الألبومات</item>
-        <item quantity="one">الألبوم</item>
-        <item quantity="two">الألبومات</item>
-        <item quantity="few">الألبومات</item>
-        <item quantity="many">الألبومات</item>
-        <item quantity="other">الألبومات</item>
-    </plurals>
+    <!-- Android Auto -->
     <string name="always">دائما</string>
-    <string name="app_share">مرحبا القي نظرة على مشغل الموسيقى الرائع هذا في: https://play.google.com/store/apps/details?id=%s</string>
+    <string name="app_share">مرحبا القي نظرة على مشغل الموسيقى الرائع هذا في: 
+https://play.google.com/store/apps/details?id=%s</string>
+    <!-- App Shortcuts -->
     <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">ريترو ميوزك - كبير</string>
     <string name="app_widget_card_name">ريترو ميوزك - بطاقة</string>
     <string name="app_widget_classic_name">ريترو ميوزك - تقليدي</string>
-    <string name="app_widget_md3_name">تصميم ماتريال يو</string>
     <string name="app_widget_small_name">ريترو ميوزك - صغير</string>
-    <string name="app_widget_text_name">الحد الأدنى للنص</string>
+    <string name="app_widget_text_name">ريترو ميوزك - نص</string>
     <string name="artist">فنان</string>
     <string name="artists">فنانين</string>
-    <string name="audio_fade_duration">مدة تلاشي الصوت</string>
     <string name="audio_focus_denied">تم منع تركيز الصوت</string>
     <string name="audio_settings_summary">تغيير إعدادات الصوت وضبط عناصر التحكم في موازن الصوت</string>
-    <string name="auto">تلقائي</string>
-    <string name="backup_restore_settings_summary">النسخ الاحتياطي واستعادة الإعدادات الخاصة بك وقوائم التشغيل</string>
-    <string name="backup_restore_title"><![CDATA[النسخ الاحتياطي والاستعادة]]></string>
-    <string name="backup_title">النسخ الإحتياطية</string>
+    <string name="bass_boost">معزز Bass</string>
     <string name="biography">سيرة ذاتية</string>
     <string name="black_theme_name">أسود لامع</string>
     <string name="blacklist">القائمة السوداء</string>
-    <string name="bluetooth_summary">يحتاج التطبيق إلى إذن الأجهزة القريبة للتحقق من أجهزة بلوتوث</string>
-    <string name="bluetooth_title">الأجهزة القريبة</string>
     <string name="blur">ضبابي</string>
     <string name="blur_card">بطاقة ضبابية</string>
-    <string name="bug_report_failed">لم يمكن ارسال التقرير</string>
-    <string name="bug_report_failed_invalid_token">دخول غير مكتمل. الرجاء إبلاغ مطور التطبيق</string>
-    <string name="bug_report_failed_issues_not_available">المشاكل غير مفعلة للمستودعات المحددة.الرجاء إبلاغ مطور التطبيق</string>
-    <string name="bug_report_failed_unknown">حدث خطأ غير متوقع.الرجاء إبلاغ المطور</string>
-    <string name="bug_report_failed_wrong_credentials">اسم مستخدم او كلمة السر خاطئة</string>
-    <string name="bug_report_issue">مشكلة</string>
-    <string name="bug_report_manual">ارسال يدويا</string>
-    <string name="bug_report_no_description">الرجاء ادخال وصف الخطأ</string>
-    <string name="bug_report_no_password">الرجاء ادخال كلمة سر صالحة</string>
-    <string name="bug_report_no_title">الرجاء ادخال الخطأ هنا</string>
-    <string name="bug_report_no_username">الرجاء ادخال أسم مستخدم صالح</string>
-    <string name="bug_report_success">تم الإبلاغ عن الأخطاء</string>
-    <string name="bug_report_summary">حصل خطأ غير متوقع. نأسف لذالك, اذا تكرر معك الخطأ \"قم بمسح بيانات التطبيق\"او ارسل ايميل</string>
-    <string name="bug_report_use_account">ارسال بأستخدام حساب چيتهب</string>
-    <string name="buy_now">اشتري الآن</string>
+    <string name="pref_keep_screen_on_title">ابقاء الشاشة تعمل</string>
+    <string name="pref_keep_screen_on_summary">ضع في اعتبارك أن تمكين هذه الميزة قد يؤثر على عمر البطارية</string>
+    <string name="pref_blur_amount_title">مستوى الضبابية</string>
+    <string name="pref_blur_amount_summary">"مستوى ضبابية الثيم , كلما قل كلما كان افضل "</string>
+    <string name="retro_music_pro">Retro Music Pro</string>
     <string name="cancel_current_timer">إلغاء</string>
     <string name="card">بطاقة</string>
     <string name="card_color_style">بطاقة ملونة</string>
-    <string name="card_square">بطاقة مربعة</string>
+    <string name="card_circular_style">دائري</string>
+    <string name="image">صورة</string>
     <string name="card_style">بطاقة</string>
-    <string name="carousal_effect_on_now_playing_screen">التاثير الدائري على شاشة التشغيل الآن</string>
-    <string name="cascading">المتتالية</string>
+    <string name="cast">بث</string>
     <string name="changelog">سجل التغيرات</string>
-    <string name="changelog_summary">تحقق من الجديد</string>
-    <string name="choose_image">اختر صورة</string>
-    <string name="choose_restore_title">اختر ما تريد استعادته</string>
-    <string name="circle">دائرية</string>
-    <string name="circular">دائري</string>
-    <string name="classic">كلاسيكي</string>
+    <string name="changelog_summary">سجل التغيرات ثابت على قناة التيليجرام</string>
     <string name="clear_action">إزالة</string>
     <string name="clear_blacklist">إزالة القائمة السوداء</string>
-    <string name="clear_history">مسح السجل</string>
-    <string name="clear_playing_queue">مسح التسلسل</string>
+    <string name="clear_playlist_title">إزالة قائمة التشغيل</string>
+    <string name="clear_playlist_x"><![CDATA[\u0625\u0632\u0627\u0644\u0629 \u0645\u0646 \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\u0642\u064a\u0627\u0645 \u0628\u0630\u0644\u0643!]]></string>
+    <string name="close_notification">اغلاق</string>
     <string name="color">لون</string>
+    <string name="color_theme_name">لون</string>
     <string name="colors">الوان</string>
-    <string name="compact">مضغوط</string>
-    <string name="composer">المؤلف</string>
-    <string name="copied_device_info_to_clipboard">تم نسخ معلومات الجهاز للحافظة.</string>
-    <string name="could_not_create_playlist">تعذّر\u2019t إنشاء قائمة.</string>
-    <string name="could_not_download_album_cover">"تعذّر تحميل\u2019t غلاف الألبوم المطابق."</string>
+    <string name="could_not_create_playlist">\u0644\u0627\u064a\u0645\u0643\u0646 \u0625\u0646\u0634\u0627\u0621 \u0642\u0627\u0626\u0645\u0629 \u062a\u0634\u063a\u064a\u0644</string>
+    <string name="could_not_download_album_cover">"\u0644\u0627\u064a\u0645\u0643\u0646 \u062a\u0646\u0632\u064a\u0644 \u063a\u0644\u0627\u0641 \u0627\u0644\u0628\u0648\u0645 \u0645\u062a\u0637\u0627\u0628\u0642."</string>
     <string name="could_not_restore_purchase">لايمكن إسترجاع المشتريات</string>
     <string name="could_not_scan_files">لايمكن فحص الملفات %d</string>
     <string name="create_action">إنشاء</string>
-    <string name="create_new_backup">إنشاء</string>
     <string name="created_playlist_x">قائمة التشغيل الموجودة %1$s.</string>
     <string name="credit_title">الافراد والمساهمين</string>
     <string name="currently_listening_to_x_by_x">يستمع حالياً إلى %1$s لـ %2$s</string>
-    <string name="custom_artist_images">صور فنان مخصصة</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">مشاركة تقرير الأعطال</string>
-    <string name="dark_theme_name">مظلم</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_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="delete_song_title">حذف اغنية</string>
+    <string name="delete_songs_title">حذف الاغاني</string>
     <string name="deleted_x_songs">تم حذف %1$d الأغاني.</string>
-    <string name="deleting_songs">حذف الأغاني</string>
-    <string name="depth">العمق</string>
-    <string name="description">الوصف</string>
-    <string name="device_info">معلومات الجهاز</string>
-    <string name="dialog_message_set_ringtone">السمات لتطبيق ريترو ميوزك بتعديل اعدادات الصوت</string>
-    <string name="dialog_title_set_ringtone">ك نغمة رنين</string>
-    <string name="disc_hint">رقم القرص</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="done">تم</string>
-    <string name="drive_mode">وضع القيادة</string>
-    <string name="edit_fab">زر التعديل</string>
-    <string name="edit_normal_lyrics">تعديل كلمات الأغنية</string>
-    <string name="edit_synced_lyrics">كلمات الأغنية متزامنة</string>
+    <string name="download_from_last_fm">تنزيل من Last.fm</string>
+    <string name="edit_cover">تحرير الغلاف</string>
     <string name="empty">فارغ</string>
     <string name="equalizer">موازن الصوت</string>
-    <string name="error_create_backup">تعذر \u2019 انشاء نسخة</string>
-    <string name="error_delete_backup">تعذر \u2019 حذف نسخة</string>
-    <string name="error_empty_name">لا يمكن أن يكون اسمك فارغاً!</string>
-    <string name="error_load_failed">فشل في التحميل</string>
-    <string name="error_share_file">تعذر مشاركة الملف</string>
-    <string name="expanded">موسع</string>
     <string name="faq">التعليمات</string>
     <string name="favorites">المفضلات</string>
-    <string name="file_already_exists">الملف موجود مسبقا</string>
-    <string name="finish_last_song">إنهاء الأغنية الأخيرة</string>
-    <string name="fit">تناسق</string>
     <string name="flat">مسطح</string>
     <string name="folders">المجلدات</string>
-    <string name="follow_system">اتبع النظام</string>
     <string name="for_you">لأجلك</string>
-    <string name="free">مجاني</string>
     <string name="full">كامل</string>
-    <string name="full_card">بطاقة كاملة</string>
     <string name="general_settings_summary">تغيير سمات وألوان التطبيق</string>
     <string name="general_settings_title">المظهر و الحس</string>
     <string name="genre">فئة</string>
     <string name="genres">فئات</string>
     <string name="git_hub_summary">اجلب المشروع على GitHub</string>
-    <string name="gradient">متدرج</string>
-    <string name="grant_access">السماح بالوصول</string>
-    <string name="grid_size_1">١</string>
-    <string name="grid_size_2">٢</string>
-    <string name="grid_size_3">٣</string>
-    <string name="grid_size_4">٤</string>
-    <string name="grid_size_5">٥</string>
-    <string name="grid_size_6">٦</string>
-    <string name="grid_size_7">٧</string>
-    <string name="grid_size_8">٨</string>
-    <string name="grid_style_label">الشبكة والأسلوب</string>
-    <string name="help_summary">بحاجة للمزيد من المساعدة؟</string>
-    <string name="hinge">مفصل</string>
+    <string name="google_plus_community">انضم الى مجتمعنا في Google plus , حيث يمكنك طلب المساعدة او متابعة آخر تطورات تطبيق ريترو ميوزك</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_cleared">تم مسح السجل</string>
-    <string name="history_undo_button">تراجع</string>
     <string name="home">الشاشة الرئيسية</string>
-    <string name="horizontal_flip">تدوير عمودي</string>
-    <string name="image">صورة</string>
-    <string name="image_gradient">الصورة المتدرجة</string>
     <string name="image_settings_summary">تغيير إعدادات تنزيل صور الفنان</string>
-    <string name="import_label">إستيراد</string>
-    <string name="import_playlist">استيراد قائمة التشغيل</string>
-    <string name="import_playlist_message">يستورد جميع قوائم التشغيل المدرجة في متجر وسائط الأندرويد مع الأغاني ، إذا كانت قوائم التشغيل موجودة بالفعل ، سيتم دمج الأغاني.</string>
     <string name="inserted_x_songs_into_playlist_x">إدراج %1$d الأغاني في قائمة التشغيل %2$s.</string>
+    <string name="instagram_page">إنستقرام</string>
     <string name="instagram_page_summary">شارك إعداد Retro Music الخاص بك للعرض على إنستقرام</string>
-    <string name="keyboard">الكيبورد</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_last_modified">آخر تعديل</string>
-    <string name="label_more_from">المزيد من %s</string>
     <string name="label_sampling_rate">معدل العينات</string>
     <string name="label_track_length">الامتداد</string>
-    <string name="labeled">معنون</string>
     <string name="last_added">المضافة مؤخرا</string>
-    <string name="last_song">الاغنية الاخيرة</string>
-    <string name="lets_go">لنبدأ</string>
-    <string name="library_categories">فئات المكتبة الموسيقية</string>
+    <string name="lets_play_something">لنشغل بعض الموسيقى</string>
+    <string name="library">المكتبة</string>
     <string name="licenses">تراخيص</string>
     <string name="light_theme_name">أبيض صافي</string>
-    <string name="listeners_label">المستمعون</string>
     <string name="listing_files">قائمة الملفات</string>
     <string name="loading_products">تحميل المنتجات...</string>
-    <string name="login">تسجيل الدخول</string>
     <string name="lyrics">كلمات الاغنية</string>
-    <string name="made_with_love">صنع ب❤️في الهند</string>
     <string name="material">ماتيريال</string>
-    <string name="md_error_label">خطأ</string>
-    <string name="md_storage_perm_error">خطأ في الصلاحيات</string>
-    <string name="message_backup_create_success">تم إنشاء النسخة الاحتياطية بنجاح.</string>
-    <string name="message_limit_tabs">ما لا يزيد على 5 عناصر</string>
-    <string name="message_pro_feature">%s هي ميزة محترفة.</string>
-    <string name="message_restore_success">أكملت الاستعادة بنجاح.</string>
-    <string name="message_updated">محدث</string>
-    <string name="message_welcome"><![CDATA[مرحبا يا هذا! <br>مرحبا بك في %s]]></string>
     <string name="my_name">الأسم</string>
     <string name="my_top_tracks">الأكثر تشغيل</string>
     <string name="never">أبداً</string>
-    <string name="new_music_mix">مزيج موسيقي جديد</string>
+    <string name="new_banner_photo">صورة عرض جديدة</string>
     <string name="new_playlist_title">قائمة تشغيل جديدة</string>
+    <string name="new_profile_photo">صورة ملف شخصي جديدة</string>
     <string name="new_start_directory">%s هذا دليل البدء الجديد.</string>
-    <string name="next_song">الاغنية التالية</string>
     <string name="no_albums">لا توجد ألبومات</string>
     <string name="no_artists">لا يوجد مغنين</string>
     <string name="no_audio_ID">"قم بتشغيل أغنية أولاً ، ثم حاول مرة أخرى."</string>
-    <string name="no_backups_found">لم يتم العثور على نسخ احتياطي</string>
     <string name="no_equalizer">لم يتم العثور موازن الصوت</string>
     <string name="no_genres">لا يوجد تصنيفات</string>
     <string name="no_lyrics_found">لم يتم العثور على كلمات للاغنية</string>
-    <string name="no_playing_queue">لا توجد أغاني تشتغل</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="normal_lyrics">كلمات عادية</string>
+    <string name="normal_style">الافتراضي</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> غير مدرج في مخزن الوسائط]]></string>
-    <string name="not_recently_played">لم تشغّل مؤخراً</string>
     <string name="nothing_to_scan">لاشيء لفحصه.</string>
-    <string name="nothing_to_see">لاشيء لفحصه</string>
     <string name="notification">إشعارات</string>
     <string name="notification_settings_summary">تخصيص نمط الإشعارات</string>
     <string name="now_playing">تشغيل الان</string>
     <string name="now_playing_queue">تسلسل التشغيل الان</string>
-    <string name="now_playing_summary">تخصيص شاشة التشغيل الآن</string>
-    <string name="now_playing_themes">9+ من ثيمات التشغيل الان</string>
     <string name="only_on_wifi">فقط على الواي فاي</string>
-    <string name="other_settings_summary">اعدادات اختبارية متقدمة</string>
     <string name="others">آخر</string>
-    <string name="over_cover">فوق الغلاف</string>
-    <string name="password">كلمة السر</string>
     <string name="past_three_months">أخر 3 أشهر</string>
-    <string name="paste_lyrics_here">لصق كلمات الاغنية هنا</string>
-    <string name="paste_timeframe_lyrics_here">لصق كلمات الإطار الزمني هنا</string>
-    <string name="peek">نظرة خاطفة</string>
-    <string name="permission_bluetooth_denied">تم رفض إذن الأجهزة القريبة.</string>
     <string name="permission_external_storage_denied">تم رفض إذن الوصول إلى وحدة التخزين الخارجي.</string>
-    <string name="permission_summary">يحتاج التطبيق إلى إذن للوصول إلى وحدة تخزين جهازك لتشغيل الموسيقى</string>
-    <string name="permission_title">الوصول إلى التخزين</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="pinterest_page">بينتريست</string>
-    <string name="pinterest_page_summary">متابعة صفحة البينتريست لمشاهدة الهامات التصميم</string>
     <string name="plain">عادي</string>
-    <string name="playList_already_exits">قائمة التشغيل موجودة مسبقا</string>
-    <string name="playback_pitch">درجة الصوت</string>
-    <string name="playback_settings">إعدادات التشغيل</string>
-    <string name="playback_speed">سرعة التشغيل</string>
     <string name="playing_notification_description">اشعارات التشغيل توفر إجراءات للتشغيل / الإيقاف المؤقت إلخ.</string>
     <string name="playing_notification_name">تنبيهات التشغيل</string>
-    <string name="playlist_created_sucessfully">تم إنشاء %s بنجاح</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_blur_amount_summary">مستوى ضبابية الثيم , كلما قل كلما كان افضل </string>
-    <string name="pref_blur_amount_title">مستوى الضبابية</string>
-    <string name="pref_filter_song_summary">تصفية الأغاني حسب الطول</string>
-    <string name="pref_filter_song_title">فلترة المدة الزمنية للاغنية</string>
-    <string name="pref_header_advanced">متقدّم</string>
-    <string name="pref_header_album">شكل الأسلوب</string>
     <string name="pref_header_audio">الصوت</string>
-    <string name="pref_header_blacklist">القائمة السوداء</string>
-    <string name="pref_header_controls">التحكم</string>
     <string name="pref_header_general">الثيم</string>
     <string name="pref_header_images">الصور</string>
-    <string name="pref_header_library">المكتبة</string>
     <string name="pref_header_lockscreen">شاشة القفل</string>
-    <string name="pref_header_playlists"> قوائم التشغيل</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">ايقاف التشغيل عند مستوى الصوت 0 والتشغيل عند رفع الصوت.ويعمل حتى وانت خارج التطبيق سيتم تشغيل الموسيقى تلقائيا</string>
-    <string name="pref_keep_pause_on_zero_volume_title">ايقاف عند الصفر</string>
-    <string name="pref_keep_screen_on_summary">ضع في اعتبارك أن تمكين هذه الميزة قد يؤثر على عمر البطارية</string>
-    <string name="pref_keep_screen_on_title">ابقاء الشاشة تعمل</string>
-    <string name="pref_language_name">حدد اللغة</string>
-    <string name="pref_snow_fall_title">تأثير سقوط الثلوج</string>
+    <string name="pref_header_playlists">" قوائم التشغيل"</string>
     <string name="pref_summary_album_art_on_lockscreen">استخدم غلاف ألبوم الأغنية قيد التشغيل حاليًا كخلفية لشاشة القفل</string>
-    <string name="pref_summary_album_artists_only">إظهار ألبوم الفنان في فئة الفنانين</string>
     <string name="pref_summary_audio_ducking">خفض مستوى الصوت عند تشغيل صوت نظام أو تلقي إشعارات</string>
-    <string name="pref_summary_audio_fade">تلاشي الصوت عند الإيقاف المؤقت للأغنية أو تشغيلها</string>
-    <string name="pref_summary_blacklist">محتويات مجلدات القائمة السوداء يتم أخفائها من مكتبتك الموسيقية.</string>
-    <string name="pref_summary_bluetooth_playback">بدء التشغيل بمجرد توصيل جهاز بلوتوث</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_notification">"تلوين الإشعارات في غلاف الألبوم\u2019لون نشط"</string>
-    <string name="pref_summary_cross_fade">مدة التقاطع بين الأغاني</string>
-    <string name="pref_summary_desaturated_color">حسب إرشادات التصميم المادي في الوضع المظلم الألوان يجب أن تكون غير مشبعه</string>
-    <string name="pref_summary_expand_now_playing_panel">النقر على الإشعار سيظهر الآن مايتم تشغيله بدلاً من الشاشة الرئيسية لتطبيق</string>
-    <string name="pref_summary_extra_controls">اضافة المزيد من التحكم في المشغل المصغر</string>
-    <string name="pref_summary_extra_song_info">إظهار معلومات الأغنية الإضافية، مثل تنسيق الملف، معدل البت، والتواتر</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\u0627\u062a \u0628\u0644\u0648\u0646 \u063a\u0644\u0627\u0641 \u0627\u0644\u0623\u0644\u0628\u0648\u0645 \u0627\u0644\u0648\u0627\u0646 \u0646\u0627\u0628\u0636\u0629"</string>
+    <string name="pref_summary_dominant_color">سيتم اختيار اللون الأكثر انتشارًا من الألبوم أو غلاف الفنان</string>
     <string name="pref_summary_gapless_playback">"يمكن أن يسبب مشاكل في التشغيل على بعض الأجهزة."</string>
-    <string name="pref_summary_home_banner">تفعيل وضع البانر في الشاشة الرئيسية</string>
     <string name="pref_summary_ignore_media_store_artwork">يمكنك أن تزيد من جودة غلاف الألبوم ، لكنه يسبب بطئ في التحميل للصور. قم بتمكين هذا فقط إذا كنت تواجه مشاكل مع صور ألبومات منخفضة الدقة</string>
-    <string name="pref_summary_library_categories">تكوين وعرض وترتيب فئات المكتبة.</string>
     <string name="pref_summary_lock_screen">استخدم شاشة القفل المخصصة من ريترو ميوزك لتحكم بالتشغيل</string>
-    <string name="pref_summary_manage_audio_focus">تشغيل الصوت دائما في الخلفية بغض النظر عن أي شيء آخر يتم تشغيله</string>
     <string name="pref_summary_open_source_licences">الرخصة والتفاصيل للبرمجيات مفتوحة المصدر</string>
-    <string name="pref_summary_pause_history">عند التمكين، لن تظهر الأغاني المشغلة حديثا في المحفوظات</string>
-    <string name="pref_summary_remember_tab">الانتقال إلى آخر علامة تبويب مستخدمة عند البدء</string>
-    <string name="pref_summary_show_lyrics">عرض كلمات الأغاني المتزامنة على غلاف الألبوم</string>
-    <string name="pref_summary_suggestions">إظهار خليط موسيقي جديد على الشاشة الرئيسية</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">تمكين تغيير الأغنية بالسحب في أي مكان على الشاشة المشغلة الآن</string>
-    <string name="pref_summary_swipe_to_dismiss">اسحب للأسفل لإلغاء المشغل الصغير</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_shuffle">سوف يتم تعطيل وضع الخلط عند التشغيل من قائمة جديدة</string>
     <string name="pref_summary_toggle_volume">في حال توفر مساحة كافية قم بعرض شريط التحكم بالصوت في شاشة التشغيل الآن</string>
-    <string name="pref_summary_wallpaper_accent">استخراج اللون الثانوي من صورة الخلفية</string>
-    <string name="pref_summary_whitelist">إظهار الموسيقى فقط من مجلد الموسيقى</string>
+    <string name="pref_summary_extra_controls">اضافة المزيد من التحكم في المشغل المصغر</string>
+    <string name="pref_summary_genre_toggle">تفعيل تبويب النوع</string>
+    <string name="pref_summary_home_banner">تفعيل وضع البانر في الشاشة الرئيسية</string>
     <string name="pref_title_album_art_on_lockscreen">عرض غطاء الالبوم</string>
-    <string name="pref_title_album_artists_only">التنقل بواسطة ألبوم الفنان</string>
-    <string name="pref_title_album_cover_style">ثيم غطاء الالبوم</string>
-    <string name="pref_title_album_cover_transform">تخطي غطاء الالبوم</string>
+    <string name="pref_title_tab_text_mode">وضع عناوين التبويبات</string>
+    <string name="pref_title_album_grid_style">شبكة الالبومات</string>
     <string name="pref_title_app_shortcuts">تلوين اختصارات التطبيق</string>
-    <string name="pref_title_appbar_mode">نمط الرأس</string>
+    <string name="pref_title_artist_grid_style">شبكة الفنانين</string>
     <string name="pref_title_audio_ducking">خفض الصوت عند فقد التركيز</string>
-    <string name="pref_title_audio_fade">تلاشي الصوت</string>
     <string name="pref_title_auto_download_artist_images">تحميل تلقائي لصور الالبومات</string>
-    <string name="pref_title_blacklist">القائمة السوداء</string>
-    <string name="pref_title_bluetooth_playback">تشغيل البلوتوث</string>
     <string name="pref_title_blurred_album_art">تضبيب صورة الالبوم</string>
-    <string name="pref_title_circle_button">زر التشغيل الدائري</string>
+    <string name="pref_title_choose_equalizer">أختر معادل الصوت</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_cross_fade">التلاشي (تجريبي)</string>
-    <string name="pref_title_custom_font">استخدام خط مانروب</string>
-    <string name="pref_title_desaturated_color">لون مفصّل</string>
-    <string name="pref_title_expand_now_playing_panel">إظهار شاشة التشغيل</string>
-    <string name="pref_title_extra_controls">المزيد من أزرار التحكم</string>
-    <string name="pref_title_extra_song_info">معلومات الأغنية</string>
     <string name="pref_title_gapless_playback">تشغيل متتابع</string>
     <string name="pref_title_general_theme">سمات التطبيق</string>
-    <string name="pref_title_home_album_grid_style">صورة الألبوم</string>
-    <string name="pref_title_home_artist_grid_style">شبكة الفنان الرئيسية</string>
-    <string name="pref_title_home_banner">صورة الواجهة</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_lyrics_screen_on">إبقاء الشاشة قيد التشغيل عند عرض كلمات الأغاني</string>
-    <string name="pref_title_lyrics_type">نوع الكلمات</string>
-    <string name="pref_title_manage_audio_focus">تشغيل دائمًا</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_pause_history">إيقاف السجل المؤقت</string>
-    <string name="pref_title_remember_tab">تذكر التبويب الأخير</string>
-    <string name="pref_title_show_lyrics">عرض كلمات الأغاني</string>
-    <string name="pref_title_suggestions">عرض الاقتراحات</string>
-    <string name="pref_title_swipe_anywhere_now_playing">اسحب في أي مكان لتغيير الأغنية</string>
-    <string name="pref_title_swipe_to_dismiss">تجاهل مع السحب لأسفل</string>
-    <string name="pref_title_tab_text_mode">وضع عناوين التبويبات</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_toggle_shuffle">وضع الخلط</string>
     <string name="pref_title_toggle_volume">التحكم بالصوت</string>
-    <string name="pref_title_wallpaper_accent">لون لكنة الخلفية</string>
-    <string name="pref_title_whitelist">موسيقى القائمة البيضاء</string>
-    <string name="pro">الكامل</string>
-    <string name="pro_summary">السمة السوداء, تشغيل الآن السمات, تأثير التكدس وأكثر..</string>
-    <string name="profile">الملف الشخصي</string>
+    <string name="pref_title_user_info">معلومات المستخدم</string>
+    <string name="pref_title_extra_controls">المزيد من أزرار التحكم</string>
+    <string name="pref_title_home_banner">صورة الواجهة</string>
+    <string name="pref_title_genre_toggle">عرض تبويب النوع</string>
+    <string name="pref_title_home_artist_grid_style">شبكة الفنان الرئيسية</string>
+    <string name="pref_title_album_cover_transform">تخطي غطاء الالبوم</string>
+    <string name="pref_album_detail_style">شكل معلومات الالبوم</string>
+    <string name="cascading">المتتالية</string>
+    <string name="primary_color">اللون الاساسي</string>
+    <string name="primary_color_desc">لون الثيم الاساسي, الافتراضي الان الازرق الرمادي, يتوافق مع الالوان الداكنة</string>
     <string name="purchase">شراء</string>
+    <string name="purchase_summary">*فكر عميقا قبل الشراء, ولاتسال عن الاسترجاع.</string>
     <string name="queue">تسلسل</string>
     <string name="rate_app">تقييم التطبيق</string>
     <string name="rate_on_google_play_summary">أحببت هذا التطبيق؟ أخبرنا في متجر Google Play كيف يمكننا تحسينه</string>
     <string name="recent_albums">الالبومات الحديثة</string>
     <string name="recent_artists">الفنانون الحديثون</string>
     <string name="remove_action">حذف</string>
+    <string name="remove_banner_photo">حذف صورة البانر</string>
     <string name="remove_cover">حذف الغطاء</string>
     <string name="remove_from_blacklist">حذف من القائمة السوداء</string>
-    <string name="remove_image">إزالة الصورة</string>
+    <string name="remove_profile_photo">حذف صورة العرض</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="replace_cover">استبدال الغلاف</string>
-    <string name="report_an_issue"> تبليغ عن مشكلة</string>
-    <string name="report_bug">تقرير الأخطاء</string>
-    <string name="reset_action">استرداد</string>
     <string name="reset_artist_image">اعادة ضبط صور الالبومات</string>
     <string name="restore">استرجاع</string>
-    <string name="restore_message">هل تريد استعادة النسخة الاحتياطية؟</string>
     <string name="restored_previous_purchase_please_restart">تم استرداد عملية الشراء السابقة. الرجاء اعادة تشغيل التطبيق الاستمتاع بكافة المميزات.</string>
-    <string name="restored_previous_purchases">تم </string>
+    <string name="restored_previous_purchases">"تم "</string>
     <string name="restoring_purchase">استرداد عملية الشراء...</string>
-    <string name="retro_music_player">مشغل الموسيقى Retro</string>
-    <string name="retro_music_pro">ريترو ميوزك - الكامل</string>
-    <string name="ringtone_summary">يحتاج التطبيق إلى إذن للوصول إلى إعدادات جهازك من أجل تعيين الموسيقى كنغمة رنين</string>
-    <string name="ringtone_title">نغمة الرنين (إختياري)</string>
-    <string name="saf_delete_failed">فشل حذف الملف: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">لا يمكن الحصول على 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 يحتاج الوصول إلى بطاقة 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_write_failed">فشلت كتابة الملف: %s</string>
-    <string name="save">حفظ</string>
+    <string name="retro_equalizer">معادل ريترو ميوزك</string>
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">حفظ كملف</string>
@@ -484,21 +306,15 @@
     <string name="saving_changes">حفظ التغييرات</string>
     <string name="scan_media">فحص الميديا</string>
     <string name="scanned_files">تم فحص %1$d من %2$d ملف.</string>
-    <string name="scrobbles_label">تمريرات</string>
+    <string name="search_hint">البحث في مكتبتك...</string>
     <string name="select_all">تحديد الكل</string>
-    <string name="selected">محدد</string>
-    <string name="set">تعيين</string>
+    <string name="select_banner_photo">اختيار صورة البانر</string>
     <string name="set_artist_image">اختيار صورة الفنان</string>
-    <string name="share_app">مشاركة التطبيق</string>
-    <string name="share_summary">شارك التطبيق مع أصدقائك وأسرتك</string>
-    <string name="share_to_stories">شارك في القصص</string>
-    <string name="show_album_artists">إظهار ألبوم الفنان</string>
     <string name="shuffle">خلط</string>
     <string name="simple">بسيط</string>
     <string name="sleep_timer_canceled">تم إلغاء مؤقت النوم.</string>
     <string name="sleep_timer_set">تم ضبط مؤقت النوم الى %d دقيقة من الآن.</string>
     <string name="social">أجتماعي</string>
-    <string name="social_stories">مشاركة القصة</string>
     <string name="song">الاغنية</string>
     <string name="song_duration">مدة الأغنية</string>
     <string name="songs">الاغاني</string>
@@ -506,22 +322,15 @@
     <string name="sort_order_a_z">تصاعدي</string>
     <string name="sort_order_album">الالبوم</string>
     <string name="sort_order_artist">الفنان</string>
-    <string name="sort_order_composer">المؤلف</string>
     <string name="sort_order_date">التاريخ</string>
-    <string name="sort_order_date_modified">تاريخ التعديل</string>
-    <string name="sort_order_default">الافتراضي</string>
-    <string name="sort_order_num_songs">عدد الأغاني</string>
-    <string name="sort_order_num_songs_desc">العد التنازلي للاغنية</string>
     <string name="sort_order_year">السنة</string>
     <string name="sort_order_z_a">تنازلي</string>
     <string name="speech_not_supported">عذرا! جهازك لايدعم الادخال الصوتي</string>
     <string name="speech_prompt">أبحث في مكتبتك</string>
-    <string name="stack">التكدس</string>
-    <string name="start_play_music">أبدا بتشغيل الموسيقى.</string>
-    <string name="suggestion_songs">اقتراحات</string>
+    <string name="summary_user_info">قم بعرض اسمك في الشاشة الرئيسية</string>
     <string name="support_development">دعم التطوير</string>
-    <string name="swipe_to_unlock">اسخب للفتح</string>
-    <string name="synced_lyrics">مزامنة الكلمات</string>
+    <string name="system_equalizer">معادل الصوت</string>
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">تيليجرام</string>
     <string name="telegram_group_summary">انضم لمجموعة التيليجرام لمناقشة المشاكل, و طرح اقتراحات والمزيد</string>
     <string name="thank_you">شكرا</string>
@@ -530,9 +339,13 @@
     <string name="this_week">هذا الاسبوع</string>
     <string name="this_year">هذه السنة</string>
     <string name="tiny">صغير</string>
-    <string name="tiny_card_style">بطاقة صغيرة</string>
-    <string name="title">عنوان</string>
-    <string name="title_new_backup">نسخة احتياطية جديدة</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>
@@ -540,33 +353,119 @@
     <string name="track_list">رقم المسار</string>
     <string name="translate">ترجمة</string>
     <string name="translate_community">ساعدها لترجمة التطبيق الى لغتك</string>
-    <string name="try_retro_music_premium">جرب ريترو الموسيقى الإصدار المميز</string>
     <string name="twitter_page">تويتر</string>
     <string name="twitter_page_summary">شارك تصميمك مع ريترو ميوزك</string>
-    <string name="unlabeled">غير معنون</string>
-    <string name="unplayable_file">تعذّر تشغيل\u2019t هذه الأغنية.</string>
+    <string name="unplayable_file">\u0644\u0627\u064a\u0645\u0643\u0646 \u062a\u0634\u063a\u064a\u0644 \u0647\u0630\u0627 \u0627\u0644\u0645\u0644\u0641.</string>
     <string name="up_next">التالي</string>
     <string name="update_image">تحديث الصورة</string>
     <string name="updating">تحديث...</string>
-    <string name="user_images_description">صور المستخدم</string>
-    <string name="user_name">إسم المستخدم</string>
-    <string name="username">أسم المستخدم</string>
     <string name="version">الإصدار</string>
-    <string name="vertical_flip">تدوير رأسي</string>
-    <string name="view_on_telegram">عرض على تيليجرام</string>
-    <string name="volume">الصوت</string>
+    <string name="virtualizer">التاثيرات</string>
     <string name="web_search">البحث عبر الانترنت</string>
-    <string name="website">الموقع الإلكتروني</string>
-    <string name="website_summary">تحقق من موقعنا</string>
-    <string name="welcome">مرحبا,</string>
     <string name="what_do_you_want_to_share">مالذي تريد مشاركته?</string>
-    <string name="whats_new">مالجديد</string>
     <string name="window">نافذة</string>
-    <string name="window_corner_edges">حواف دائرية</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="made_with_love">صنع ب❤️في الهند</string>
+    <string name="clear_app_data">مسح بيانات التطبيق</string>
+    <string name="bug_report_summary">حصل خطأ غير متوقع. نأسف لذالك, اذا تكرر معك الخطأ \"قم بمسح بيانات التطبيق\"او ارسل ايميل</string>
+    <string name="error">خطأ</string>
+    <string name="base_color_theme">لون الثيم الاساسي</string>
+    <string name="now_playing_themes">9+ من ثيمات التشغيل الان</string>
+    <string name="carousal_effect_on_now_playing_screen">التاثير الدائري على شاشة التشغيل الآن</string>
+    <string name="window_corner_edges">حواف دائرية</string>
+    <string name="pref_title_album_cover_style">ثيم غطاء الالبوم</string>
+    <string name="circular">دائري</string>
+    <string name="carousal">دائري</string>
+    <string name="now_playing_summary">تخصيص شاشة التشغيل الآن</string>
+    <string name="full_card">بطاقة كاملة</string>
+    <string name="profile">الملف الشخصي</string>
+    <string name="bio">الحالة</string>
+    <string name="auto">تلقائي</string>
+    <string name="labeled">معنون</string>
+    <string name="unlabeled">غير معنون</string>
+    <string name="selected">محدد</string>
+    <string name="depth">العمق</string>
+    <string name="vertical_flip">تدوير رأسي</string>
+    <string name="hinge">مفصل</string>
+    <string name="horizontal_flip">تدوير عمودي</string>
+    <string name="pref_keep_pause_on_zero_volume_summary">ايقاف التشغيل عند مستوى الصوت 0 والتشغيل عند رفع الصوت.ويعمل حتى وانت خارج التطبيق سيتم تشغيل الموسيقى تلقائيا</string>
+    <string name="pref_keep_pause_on_zero_volume_title">ايقاف عند الصفر</string>
+    <string name="whats_new">مالجديد</string>
+    <string name="suggestion_songs">اقتراحات</string>
+    <string name="fit">تناسق</string>
+    <string name="pref_now_playing_screen_title">اضغط او أسحب</string>
+    <string name="pref_now_playing_screen_summary">انقر للفتح أو التمرير بدون الإنتقال الشفاف لشاشة التشغيل الآن</string>
+    <string name="clear_playing_queue">مسح التسلسل</string>
+    <string name="share_app">مشاركة التطبيق</string>
+    <string name="report_bug">تقرير الأخطاء</string>
+    <string name="bug_report_use_account">ارسال بأستخدام حساب چيتهب</string>
+    <string name="login">تسجيل الدخول</string>
+    <string name="bug_report_manual">ارسال يدويا</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">سيتم تحويلك الى صفحة سجل الاخطاء</string>
+    <string name="bug_report_issue">مشكلة</string>
+    <string name="title">عنوان</string>
+    <string name="description">الوصف</string>
+    <string name="username">أسم المستخدم</string>
+    <string name="password">كلمة السر</string>
+    <string name="device_info">معلومات الجهاز</string>
+    <string name="report_an_issue">" تبليغ عن مشكلة"</string>
+    <string name="bug_report_no_username">الرجاء ادخال أسم مستخدم صالح</string>
+    <string name="bug_report_no_password">الرجاء ادخال كلمة سر صالحة</string>
+    <string name="bug_report_no_title">الرجاء ادخال الخطأ هنا</string>
+    <string name="bug_report_no_description">الرجاء ادخال وصف الخطأ</string>
+    <string name="bug_report_uploading">رفع التقرير الى چيتهب</string>
+    <string name="bug_report_failed">لم يمكن ارسال التقرير</string>
+    <string name="bug_report_failed_wrong_credentials">اسم مستخدم او كلمة السر خاطئة</string>
+    <string name="bug_report_failed_invalid_token">دخول غير مكتمل. الرجاء إبلاغ مطور التطبيق</string>
+    <string name="bug_report_failed_issues_not_available">المشاكل غير مفعلة للمستودعات المحددة.الرجاء إبلاغ مطور التطبيق</string>
+    <string name="bug_report_failed_unknown">حدث خطأ غير متوقع.الرجاء إبلاغ المطور</string>
+    <string name="copied_device_info_to_clipboard">تم نسخ معلومات الجهاز للحافظة.</string>
     <string name="your_account_data_is_only_used_for_authentication">بيانات حسابك تستخدم لتوثيق فقط.</string>
+    <string name="pref_snow_fall_title">تأثير تساقط الثلج</string>
+    <string name="pref_title_blacklist">القائمة السوداء</string>
+    <string name="pref_summary_blacklist">محتويات مجلدات القائمة السوداء يتم أخفائها من مكتبتك الموسيقية.</string>
+    <string name="send_crash_log">ارسال تقرير بالخطأ</string>
+    <string name="pinterest_page">بينتريست</string>
+    <string name="pinterest_page_summary">متابعة صفحة البينتريست لمشاهدة الهامات التصميم</string>
+    <string name="pref_filter_song_title">فلترة المدة الزمنية للاغنية</string>
+    <string name="md_error_label">خطأ</string>
+    <string name="md_storage_perm_error">خطأ في الصلاحيات</string>
+    <string name="classic">كلاسيكي</string>
+    <string name="sort_order_composer">المؤلف</string>
+    <string name="composer">المؤلف</string>
+    <string name="next_song">الاغنية التالية</string>
+    <string name="last_song">الاغنية الاخيرة</string>
+    <string name="slide">سحب</string>
+    <string name="save">حفظ</string>
+    <string name="pick_image_intent_text">اختيار صورة</string>
+    <string name="set_photo">تعيين كصورة البروفايل</string>
+    <string name="edit">تعديل</string>
+    <string name="pref_header_library">المكتبة</string>
+    <string name="swipe_to_unlock">اسخب للفتح</string>
+    <string name="add_lyrics">اضافة كلمات</string>
+    <string name="paste_lyrics_here">الصق الكلمات هنا</string>
+    <string name="add_time_framed_lryics">اضافة كلمات مع فواصل زمنية</string>
+    <string name="synced_lyrics">مزامنة الكلمات</string>
+    <string name="dialog_title_set_ringtone">ك نغمة رنين</string>
+    <string name="dialog_message_set_ringtone">السمات لتطبيق ريترو ميوزك بتعديل اعدادات الصوت</string>
+    <string name="about_settings_summary">الفريق, الروابط للتواصل</string>
+    <string name="other_settings_summary">اعدادات اختبارية متقدمة</string>
+    <string name="action_new_playlist">قائمة تشغيل جديدة</string>
+    <string name="finish_last_song">إنهاء الأغنية الأخيرة</string>
+    <string name="image_gradient">الصورة المتدرجة</string>
+    <string name="stack">التكدس</string>
+    <string name="grid_style_label"><![CDATA[الشبكة والأسلوب]]></string>
+    <string name="welcome">مرحبا,</string>
+    <string name="pro_summary">تشغيل الآن السمات ، وتأثير التكدس ، وموضوع اللون وأكثر من ذلك ..</string>
+    <string name="action_play_all">تشغيل الكل</string>
+    <string name="start_play_music">أبدا بتشغيل الموسيقى.</string>
+    <string name="keyboard">الكيبورد</string>
+    <string name="reset_action">استرداد</string>
+    <string name="library_categories">فئات المكتبة الموسيقية</string>
+    <string name="pref_summary_library_categories">تكوين وعرض وترتيب فئات المكتبة.</string>
+    <string name="pref_header_controls">التحكم</string>
+    <string name="pref_header_album">شكل الأسلوب</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-b+es+419/strings.xml b/app/src/main/res/values-b+es+419/strings.xml
deleted file mode 100644
index 8ca945cd7..000000000
--- a/app/src/main/res/values-b+es+419/strings.xml
+++ /dev/null
@@ -1,538 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Acerca de %s</string>
-    <string name="about_settings_summary">Equipo, enlaces sociales</string>
-    <string name="accent_color">Color de acento</string>
-    <string name="accent_color_desc">El color de acento del tema, por defecto es morado</string>
-    <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Agregar a la lista negra</string>
-    <string name="action_add_to_favorites">Agregar a Tus Me gusta</string>
-    <string name="action_add_to_playing_queue">Agregar a la cola de reproducción</string>
-    <string name="action_add_to_playlist">Agregar a playlist</string>
-    <string name="action_cast">Emitir</string>
-    <string name="action_clear_playing_queue">Vaciar cola de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición de ciclo</string>
-    <string name="action_delete">Eliminar</string>
-    <string name="action_delete_from_device">Eliminar del dispositivo</string>
-    <string name="action_details">Detalles</string>
-    <string name="action_edit">Editar</string>
-    <string name="action_go_to_album">Ir al álbum</string>
-    <string name="action_go_to_artist">Ir al artista</string>
-    <string name="action_go_to_genre">Ir a género</string>
-    <string name="action_go_to_lyrics">Ir a la letra</string>
-    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
-    <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 (h)</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_all">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_remove_from_favorites">Eliminar de Tus Me gusta</string>
-    <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
-    <string name="action_remove_from_playlist">Eliminar de la playlist</string>
-    <string name="action_rename">Renombrar</string>
-    <string name="action_save_playing_queue">Guardar cola de reproducción</string>
-    <string name="action_scan">Escanear</string>
-    <string name="action_search">Buscar</string>
-    <string name="action_set">Iniciar</string>
-    <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
-    <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
-    <string name="action_settings">"Configuración"</string>
-    <string name="action_share">Compartir</string>
-    <string name="action_shuffle_all">Aleatorio</string>
-    <string name="action_shuffle_playlist">Playlist aleatorio</string>
-    <string name="action_sleep_timer">Temporizador de apagado</string>
-    <string name="action_sort_order">Ordenar por</string>
-    <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar Me gusta</string>
-    <string name="action_toggle_shuffle">Alternar modo aleatorio</string>
-    <string name="adaptive">Adaptable</string>
-    <string name="add_action">Agregar</string>
-    <string name="add_playlist_title">"Agregar a playlist"</string>
-    <string name="add_time_framed_lryics">Agregar letras de marcos de tiempo</string>
-    <string name="added_song_count_to_playlist">%1$d Canción(es) añadidas a %2$s</string>
-    <string name="added_title_to_playing_queue">"Se agregó 1 canción a la cola de reproducción."</string>
-    <string name="added_x_titles_to_playing_queue">Se agregó %1$d canción a la cola de reproducción.</string>
-    <string name="album">Álbum</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Canción</item>
-        <item quantity="other">Canciones</item>
-    </plurals>
-    <string name="album_artist">Artista del álbum</string>
-    <string name="albums">Álbumes</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbumes</item>
-    </plurals>
-    <string name="always">Siempre</string>
-    <string name="app_share">Hola, echa un vistazo a este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
-    <string name="app_shortcut_top_tracks_short">Canciones más reproducidas</string>
-    <string name="app_widget_big_name">Imagen completa</string>
-    <string name="app_widget_card_name">Tarjeta</string>
-    <string name="app_widget_classic_name">Clásico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeño</string>
-    <string name="app_widget_text_name">Texto mínimo</string>
-    <string name="artist">Artista</string>
-    <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duración del desvanecimiento de audio</string>
-    <string name="audio_focus_denied">Enfoque de audio denegado.</string>
-    <string name="audio_settings_summary">Cambiar los ajustes de sonido y ajustar los controles del ecualizador</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Haga una copia de seguridad y restaure su configuración, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Respaldo y restauración]]></string>
-    <string name="backup_title">Respaldos</string>
-    <string name="biography">Biografía</string>
-    <string name="black_theme_name">Negro puro</string>
-    <string name="blacklist">Lista negra</string>
-    <string name="blur">Difuminado</string>
-    <string name="blur_card">Tarjeta difuminado</string>
-    <string name="bug_report_failed">No se puede enviar el informe</string>
-    <string name="bug_report_failed_invalid_token">Token de acceso no válido. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_issues_not_available">Los problemas no están habilitados para el repositorio seleccionado. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_unknown">Ocurrió un error inesperado. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_wrong_credentials">Nombre de usuario o contraseña incorrectos</string>
-    <string name="bug_report_issue">Problema</string>
-    <string name="bug_report_manual">Enviar manualmente</string>
-    <string name="bug_report_no_description">Ingrese una descripción del problema</string>
-    <string name="bug_report_no_password">Ingrese su contraseña válida de GitHub</string>
-    <string name="bug_report_no_title">Por favor ingrese un título de problema</string>
-    <string name="bug_report_no_username">Ingrese su nombre de usuario válido de GitHub</string>
-    <string name="bug_report_summary">Ocurrió un error inesperado. Lamento haber encontrado este error, si sigue fallando \"Borre los datos de la aplicación\" o enviar un correo electrónico </string>
-    <string name="bug_report_use_account">Enviar usando la cuenta de GitHub</string>
-    <string name="buy_now">Compre ahora</string>
-    <string name="cancel_current_timer">Cancelar</string>
-    <string name="card">Tarjeta</string>
-    <string name="card_color_style">Tarjeta coloreada</string>
-    <string name="card_square">Tarjeta cuadrada</string>
-    <string name="card_style">Tarjeta</string>
-    <string name="carousal_effect_on_now_playing_screen">Efecto de carrusel en la pantalla de reproducción</string>
-    <string name="cascading">En cascada</string>
-    <string name="changelog">Registro de cambios</string>
-    <string name="changelog_summary">Ver las novedades</string>
-    <string name="choose_image">Elegir imágen</string>
-    <string name="choose_restore_title">Elige qué restaurar</string>
-    <string name="circle">Circular</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Clásico</string>
-    <string name="clear_action">Borrar</string>
-    <string name="clear_blacklist">Borrar lista negra</string>
-    <string name="clear_history">Limpiar historial</string>
-    <string name="clear_playing_queue">Borrar cola</string>
-    <string name="color">Color</string>
-    <string name="colors">Colores</string>
-    <string name="composer">Compositores</string>
-    <string name="copied_device_info_to_clipboard">Información del dispositivo copiada al portapapeles.</string>
-    <string name="could_not_create_playlist">No se pudo\u2019no crear la playlist.</string>
-    <string name="could_not_download_album_cover">"No se pudo\u2019descargar una portada de álbum coincidente."</string>
-    <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
-    <string name="could_not_scan_files">No se pudo escanear %d archivos.</string>
-    <string name="create_action">Crea</string>
-    <string name="create_new_backup">Crear</string>
-    <string name="created_playlist_x">Crear playlist %1$s.</string>
-    <string name="credit_title">Miembros y colaboradores </string>
-    <string name="currently_listening_to_x_by_x">Actualmente escuchando %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imágenes personalizadas de artistas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Compartir reporte de fallo</string>
-    <string name="dark_theme_name">Un poco oscuro</string>
-    <string name="delete_playlist_title">Eliminar playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Eliminar la playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Eliminar playlists</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> playlists?]]></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="depth">Profundidad</string>
-    <string name="description">Descripción</string>
-    <string name="device_info">Información del dispositivo</string>
-    <string name="dialog_message_set_ringtone">Permitir que Retro Music modifique la configuración de audio</string>
-    <string name="dialog_title_set_ringtone">Establecer tono de llamada</string>
-    <string name="disc_hint">Número de disco</string>
-    <string name="do_you_want_to_clear_the_blacklist">¿Quieres borrar la lista negra?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres eliminar <b>%1$s</b> de la lista negra?]]></string>
-    <string name="donate">Donar</string>
-    <string name="donate_summary">Si crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
-    <string name="donation_header">Cómprame un:</string>
-    <string name="done">Listo</string>
-    <string name="drive_mode">Modo automóvil</string>
-    <string name="edit_fab">Botón editar</string>
-    <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar letras sincronizadas</string>
-    <string name="empty">Vacío</string>
-    <string name="equalizer">Ecualizador</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Me gusta</string>
-    <string name="finish_last_song">Termina la última canción</string>
-    <string name="fit">Encajado</string>
-    <string name="flat">Plano</string>
-    <string name="folders">Carpetas</string>
-    <string name="follow_system">Seguir al sistema</string>
-    <string name="for_you">Para ti</string>
-    <string name="free">Gratuito</string>
-    <string name="full">Completa</string>
-    <string name="full_card">Tarjeta completa</string>
-    <string name="general_settings_summary">Cambiar el tema y colores de la aplicación</string>
-    <string name="general_settings_title">Apariencia y funcionamiento</string>
-    <string name="genre">Género</string>
-    <string name="genres">Géneros</string>
-    <string name="git_hub_summary">Bifurca el proyecto en GitHub</string>
-    <string name="gradient">Degradado</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="grid_style_label">Estilo de cuadrícula</string>
-    <string name="help_summary">¿Necesitas más ayuda?</string>
-    <string name="hinge">Giro</string>
-    <string name="history">Historial</string>
-    <string name="history_cleared">Historial limpio</string>
-    <string name="history_undo_button">Deshacer</string>
-    <string name="home">Inicio</string>
-    <string name="horizontal_flip">Giro horizontal</string>
-    <string name="image">Imagen</string>
-    <string name="image_gradient">Imagen de degradado</string>
-    <string name="image_settings_summary">Cambiar la configuración de descarga de imágenes del artista</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar lista de reproducción</string>
-    <string name="import_playlist_message">Importa todas las listas de reproducción en el almacenamiento Android con canciones, si las listas ya existen, las canciones se fusionarán.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
-    <string name="instagram_page_summary">Comparte tu configuración de Retro Music en Instagram</string>
-    <string name="keyboard">Teclado</string>
-    <string name="label_bit_rate">Tasa de bits</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_last_modified">Última modificación</string>
-    <string name="label_more_from">Más de %s</string>
-    <string name="label_sampling_rate">Tasa de muestreo</string>
-    <string name="label_track_length">Duración</string>
-    <string name="labeled">Etiquetado</string>
-    <string name="last_added">Añadidos recientemente</string>
-    <string name="last_song">Última canción</string>
-    <string name="library_categories">Categorías de la Biblioteca</string>
-    <string name="licenses">Licencias</string>
-    <string name="light_theme_name">Claramente Blanco</string>
-    <string name="listeners_label">Oyentes</string>
-    <string name="listing_files">Listado de archivos</string>
-    <string name="loading_products">Cargando productos…</string>
-    <string name="login">Iniciar sesión</string>
-    <string name="lyrics">Letras</string>
-    <string name="made_with_love">Hecho con ❤️ en India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Error de permiso</string>
-    <string name="my_name">Nombre</string>
-    <string name="my_top_tracks">Más reproducidas</string>
-    <string name="never">Nunca</string>
-    <string name="new_music_mix">Nueva música</string>
-    <string name="new_playlist_title">Nueva playlist</string>
-    <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
-    <string name="next_song">Siguiente canción</string>
-    <string name="no_albums">No tienes álbumes</string>
-    <string name="no_artists">No tienes artistas</string>
-    <string name="no_audio_ID">"Reproduce primero una canción y vuelve a intentarlo."</string>
-    <string name="no_backups_found">No se encontraron copias de seguridad</string>
-    <string name="no_equalizer">Ecualizador no encontrado</string>
-    <string name="no_genres">No tienes géneros</string>
-    <string name="no_lyrics_found">No se encontraron letras</string>
-    <string name="no_playing_queue">No se está reproduciendo ninguna canción</string>
-    <string name="no_playlists">No tienes playlists</string>
-    <string name="no_purchase_found">No se encontraron compras.</string>
-    <string name="no_results">No hay resultados</string>
-    <string name="no_songs">No tienes canciones</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Letras normales</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no aparece en el almacén de medios.]]></string>
-    <string name="not_recently_played">No reproducido recientemente</string>
-    <string name="nothing_to_scan">Nada que escanear.</string>
-    <string name="nothing_to_see">Nada que ver</string>
-    <string name="notification">Notificación</string>
-    <string name="notification_settings_summary">Personaliza el estilo de la notificación</string>
-    <string name="now_playing">Reproduciendo ahora</string>
-    <string name="now_playing_queue">Cola de reproducción actual</string>
-    <string name="now_playing_summary">Personalizar la pantalla de reproducción actual</string>
-    <string name="now_playing_themes">Más de 9 temas para la pantalla de reproducción actual</string>
-    <string name="only_on_wifi">Solo con Wi-Fi</string>
-    <string name="other_settings_summary">Funciones de prueba avanzadas</string>
-    <string name="others">Otro</string>
-    <string name="over_cover">Sobre la portada</string>
-    <string name="password">Contraseña</string>
-    <string name="past_three_months">Últimos 3 meses</string>
-    <string name="paste_lyrics_here">Pega las Letras Aquí</string>
-    <string name="paste_timeframe_lyrics_here">Pegar las letras con marcas de tiempo aquí</string>
-    <string name="peek">Mirar</string>
-    <string name="permission_external_storage_denied">Permiso para acceder al almacenamiento externo denegado.</string>
-    <string name="permission_summary">La aplicación necesita permiso para acceder al almacenamiento del dispositivo para reproducir música</string>
-    <string name="permission_title">Acceso al Almacenamiento</string>
-    <string name="permissions_denied">Permisos denegados.</string>
-    <string name="personalize">Personalizar</string>
-    <string name="personalize_settings_summary">Personalizar la ventana de reproduciendo ahora y los controles de la interfaz</string>
-    <string name="pick_from_local_storage">Elegir del almacenamiento local</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">App bar mode</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Aleatorio</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">Ordenar por</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Compositores</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Year</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-    <string name="bug_report_success">Bug report successful</string>
-</resources>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
new file mode 100644
index 000000000..568b6f5b6
--- /dev/null
+++ b/app/src/main/res/values-bg/strings.xml
@@ -0,0 +1,702 @@
+<?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_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_genre">Към жанра</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_sort_order">Ред на сортиране</string>
+
+    <string name="action_tag_editor">Редактор на етикети</string>
+
+    <string name="adaptive">Адаптивен</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_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="app_widget_text_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="auto">Авто</string>
+
+    <string name="base_color_theme">Основна цветова тема</string>
+
+    <string name="bass_boost">Усилване на баса</string>
+
+    <string name="bio">Биография</string>
+
+    <string name="biography">Биография</string>
+
+    <string name="black_theme_name">Просто черно</string>
+
+    <string name="blacklist">Черен списък</string>
+
+    <string name="blur">Замъглено</string>
+
+    <string name="blur_card">Замъглена карта</string>
+
+    <string name="bug_report_failed">Неуспешно изпращане на доклада</string>
+    <string name="bug_report_failed_invalid_token">Невалиден тоукън за достъп. Моля, свържете се с разработчика на приложението.</string>
+    <string name="bug_report_failed_issues_not_available">Моля, свържете се с разработчика на приложението.</string>
+    <string name="bug_report_failed_unknown">Грешка. Моля, свържете се с разработчика на приложението.</string>
+    <string name="bug_report_failed_wrong_credentials">Грешно име или парола</string>
+    <string name="bug_report_issue">Проблем</string>
+    <string name="bug_report_manual">Изпрати ръчно</string>
+    <string name="bug_report_no_description">Моля, въведете описание на проблема</string>
+    <string name="bug_report_no_password">Моля, въведете валидна GitHub парола</string>
+    <string name="bug_report_no_title">Моля, въведете заглавие за проблема</string>
+    <string name="bug_report_no_username">Моля, въведете валидно GitHub име</string>
+    <string name="bug_report_summary">Възникна неочаквана грешка. Съжалявам, че намери този бъг, ако проблемът продължава
+\"Изчисти данните от приложението\"</string>
+    <string name="bug_report_uploading">Качване на доклада в GitHub...</string>
+    <string name="bug_report_use_account">Изпрати чрез GitHub акаунт</string>
+
+    <string name="cancel_current_timer">Отмени</string>
+
+    <string name="card">Карта</string>
+
+    <string name="card_circular_style">Кръг</string>
+
+    <string name="card_color_style">Оцветена карта</string>
+
+    <string name="card_style">Карта</string>
+
+    <string name="carousal">Въртележка</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Ефект на въртележка на екрана с песен</string>
+
+    <string name="cascading">Каскаден</string>
+
+    <string name="cast">Предавай</string>
+
+    <string name="changelog">Списък с промените</string>
+
+    <string name="changelog_summary">Списък промените в Telegram канала</string>
+
+    <string name="circular">Кръгъл</string>
+
+    <string name="clear_action">Изчисти</string>
+
+    <string name="clear_app_data">Изчисти данните от приложението</string>
+
+    <string name="clear_blacklist">Изчисти черен списък</string>
+
+    <string name="clear_playing_queue">Изчисти опашката</string>
+
+    <string name="clear_playlist_title">Изчисти плейлист</string>
+    <string name="clear_playlist_x"><![CDATA[\u0418\u0437\u0447\u0438\u0441\u0442\u0438 \u043f\u043b\u0435\u0439\u043b\u0438\u0441\u0442 <b>%1$s</b>? \u0422\u043e\u0432\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435 \u0434\u0430 \u0431\u044a\u0434\u0435 \u043e\u0442\u043c\u0435\u043d\u0435\u043d\u043e!]]></string>
+
+    <string name="close_notification">Затвори</string>
+
+    <string name="color">Цвят</string>
+
+    <string name="color_theme_name">Цвят</string>
+
+    <string name="colors">Цветове</string>
+
+    <string name="copied_device_info_to_clipboard">Копирана информация за устройството в клипборда.</string>
+
+    <string name="could_not_create_playlist">\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0441\u044a\u0437\u0434\u0430\u0432\u0430\u043d\u0435 \u043d\u0430 \u043f\u043b\u0435\u0439\u043b\u0438\u0441\u0442.</string>
+    <string name="could_not_download_album_cover">"\u041d\u0435\u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0438\u0437\u0442\u0435\u0433\u043b\u044f\u043d\u0435 \u043d\u0430 \u043a\u043e\u0440\u0438\u0446\u0430 \u043d\u0430 \u0430\u043b\u0431\u0443\u043c\u0430."</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="credit_title">Членове и сътрудници</string>
+
+    <string name="currently_listening_to_x_by_x">В момента се слуша %1$s от %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="depth">Дълбочина</string>
+
+    <string name="description">Описание</string>
+
+    <string name="device_info">Информация за устройството</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="edit_cover">Редактирай корица</string>
+
+    <string name="empty">Празно</string>
+
+    <string name="equalizer">Усилвател</string>
+
+    <string name="error">Грешка</string>
+
+    <string name="faq">Често задавани въпроси</string>
+
+    <string name="favorites">Любими</string>
+
+    <string name="fit">Побери</string>
+
+    <string name="flat">Плосък</string>
+
+    <string name="folders">Папки</string>
+
+    <string name="for_you">За теб</string>
+
+    <string name="full">Пълно</string>
+
+    <string name="full_card">Пълна карта</string>
+
+    <string name="general_settings_summary">Смени темата и цветовете на приложението</string>
+    <string name="general_settings_title">Изглед и усещане</string>
+
+    <string name="genre">Жанр</string>
+
+    <string name="genres">Жанрове</string>
+
+    <string name="git_hub_summary">Подкрепи проекта в GitHub</string>
+
+    <string name="google_plus_community">Присъедини се към Google Plus общността, където можеш да поискаш помощ и да следиш за Retro Music актуализации</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="hinge">Панта</string>
+
+    <string name="history">История</string>
+
+    <string name="home">Начало</string>
+
+    <string name="horizontal_flip">Хоризонтално завъртане</string>
+
+    <string name="image">Изображение</string>
+
+    <string name="image_settings_summary">Промени настройките за изтегляне на изображения на изпълнителите</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Добавени %1$d песни в плейлист %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Сподели твоят Retro Music изглед в Instagram</string>
+
+    <string name="label_bit_rate">Bitrate</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="labeled">С етикет</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="login">Влез</string>
+
+    <string name="lyrics">Текст</string>
+
+    <string name="made_with_love">Направено с ❤️ в Индия</string>
+
+    <string name="material">Материален</string>
+
+    <string name="my_name">Моето име</string>
+
+    <string name="my_top_tracks">Най-слушани</string>
+
+    <string name="never">Никога</string>
+
+    <string name="new_banner_photo">Нова снимка на корицата</string>
+
+    <string name="new_playlist_title">Нов плейлист</string>
+
+    <string name="new_profile_photo">Нова профилна снимка</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="normal_lyrics">Нормален текст</string>
+
+    <string name="normal_style">Нормален</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="now_playing_summary">Персонализирай екрана с песен</string>
+    <string name="now_playing_themes">9+ теми на екрана с песен</string>
+
+    <string name="only_on_wifi">Само през Wi-Fi</string>
+
+    <string name="others">Други</string>
+
+    <string name="password">Парола</string>
+
+    <string name="past_three_months">Последните 3 месеца</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_album_detail_style">Стил на детайли на албума</string>
+
+    <string name="pref_blur_amount_summary">Количество на замъгленост при темите, колкото по-ниско, толкова по-бързо</string>
+    <string name="pref_blur_amount_title">Количество на замъгленост</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_keep_pause_on_zero_volume_summary">Паузирай когато музиката е на нула и пусни при увеличаване на звука. Внимание, че при увеличаване на звука музиката започва дори и извън приложението.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Паузирай на нула</string>
+    <string name="pref_keep_screen_on_summary">Имайте предвид, че тази настройка може да повлияе на батерията.</string>
+    <string name="pref_keep_screen_on_title">Дръж екрана включен</string>
+
+    <string name="pref_now_playing_screen_summary">Натисни за или плъзни за без прозрачна навигация на екрана с песен</string>
+    <string name="pref_now_playing_screen_title">Натисни или плъзни</string>
+
+
+    <string name="pref_snow_fall_title">Ефект на валящ сняг</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Използвай корицата на настоящата песен като фон на заключен екран</string>
+    <string name="pref_summary_audio_ducking">Понижи звука, когато бъде получен звук от системата или известие</string>
+    <string name="pref_summary_blacklist">Съдържанието на блокиратите папки е скрито от библиотеката Ви.</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">"\u041e\u0446\u0432\u0435\u0442\u044f\u0432\u0430 \u0438\u0437\u0432\u0435\u0441\u0442\u0438\u0435\u0442\u043e \u0432 \u043d\u0430\u0439-\u044f\u0440\u043a\u0438\u044f \u0446\u0432\u044f\u0442 \u043d\u0430 \u043a\u043e\u0440\u0438\u0446\u0430\u0442\u0430 \u043d\u0430 \u0430\u043b\u0431\u0443\u043c\u0430"</string>
+    <string name="pref_summary_dominant_color">Преобладаващият цвят ще бъде избран от корицата на албума или на изпълнителя</string>
+    <string name="pref_summary_extra_controls">Добави допълнителни контроли за мини-плейъра</string>
+    <string name="pref_summary_gapless_playback">"Може да причини проблеми на някои устройства."</string>
+    <string name="pref_summary_genre_toggle">Покажи раздел с жанрове</string>
+    <string name="pref_summary_home_banner">Покажи стил на начална корица</string>
+    <string name="pref_summary_ignore_media_store_artwork">Може да увеличи резолюцията на корицата, но води до по-бавно зареждане на изображението. Включете единствено ако имате проблем с корици с ниска резолюция</string>
+    <string name="pref_summary_lock_screen">Използвай персонализираните контроли за заключен екран на Retro Music</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_shuffle">Режимът на разбъркване ще се изключи при пускане на списък с нови песни</string>
+    <string name="pref_summary_toggle_volume">Ако има достатъчно пространство, контроли за звука ще бъдат показани на екрана</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Покажи корица на албум</string>
+    <string name="pref_title_album_cover_style">Тема на корица на албум</string>
+    <string name="pref_title_album_cover_transform">Стил на корица на албуми на екрана с песен</string>
+    <string name="pref_title_album_grid_style">Мрежа на албум</string>
+    <string name="pref_title_app_shortcuts">Оцветени преки пътища на приложение</string>
+    <string name="pref_title_artist_grid_style">Мрежа на изпълнител</string>
+    <string name="pref_title_audio_ducking">Намали звук при загуба на фокус</string>
+    <string name="pref_title_auto_download_artist_images">Изтегляй автоматично изображение на изпълнителя</string>
+    <string name="pref_title_blacklist">Черен списък</string>
+    <string name="pref_title_blurred_album_art">Замъгли корицата на албума</string>
+    <string name="pref_title_choose_equalizer">Избери усилвател</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_extra_controls">Допълнителни контроли</string>
+    <string name="pref_title_gapless_playback">Слушане без пауза</string>
+    <string name="pref_title_general_theme">Тема на приложението</string>
+    <string name="pref_title_genre_toggle">Покажи раздел за жанрове</string>
+    <string name="pref_title_home_artist_grid_style">Начална мрежа на изпълнители</string>
+    <string name="pref_title_home_banner">Начална корица</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_tab_text_mode">Режим на заглавия на раздели</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_toggle_shuffle">Режим на разбъркване</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="profile">Профил</string>
+
+    <string name="purchase">Купи</string>
+
+    <string name="purchase_summary">*Мисли преди да купиш, не моли за пари обратно.</string>
+
+    <string name="queue">Опашка</string>
+
+    <string name="rate_app">Оцени приложението</string>
+
+    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
+
+    <string name="recent_albums">Скорошни албуми</string>
+
+    <string name="recent_artists">Скорошни изпълнители</string>
+
+    <string name="remove_action">Премахни</string>
+
+    <string name="remove_banner_photo">Премахни снимка на корица</string>
+
+    <string name="remove_cover">Премахни корица</string>
+
+    <string name="remove_from_blacklist">Премахни от черен списък</string>
+
+    <string name="remove_profile_photo">Премахни профилна снимка</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="report_an_issue">Докладвай проблем</string>
+
+    <string name="report_bug">Докладвай нередности</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_equalizer">Retro Music Усилвател</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Запази като файл</string>
+
+    <string name="save_playlists_title">Запази като файлове</string>
+
+    <string name="saved_playlist_to">Плейлист запазен в %s.</string>
+
+    <string name="saving_changes">Запазване на промените</string>
+
+    <string name="scan_media">Сканиране на файловете</string>
+
+    <string name="scanned_files">Сканирани %1$d от %2$d файла.</string>
+
+    <string name="search_hint">Търсене в библиотеката ти...</string>
+
+    <string name="select_all">Избери всички</string>
+
+    <string name="select_banner_photo">Избери снимка за корица</string>
+
+    <string name="selected">Избран</string>
+
+    <string name="set_artist_image">Задай снимка на изпълнител</string>
+
+    <string name="share_app">Сподели приложението</string>
+
+    <string name="shuffle">Разбъркай</string>
+
+    <string name="simple">Семпъл</string>
+
+    <string name="sleep_timer_canceled">Таймерът на заспиване беше отменен.</string>
+    <string name="sleep_timer_set">Таймерът на заспиване е зададен на %d минути от сега.</string>
+
+    <string name="small">Малък албум</string>
+
+    <string name="social">Социални</string>
+
+    <string name="song">Песен</string>
+
+    <string name="song_duration">Продължителност на песен</string>
+
+    <string name="songs">Песни</string>
+
+    <string name="sort_order">Ред на сортиране</string>
+    <string name="sort_order_a_z">Покачващ се</string>
+    <string name="sort_order_album">Албум</string>
+    <string name="sort_order_artist">Изпълнител</string>
+    <string name="sort_order_date">Дата</string>
+    <string name="sort_order_year">Година</string>
+    <string name="sort_order_z_a">Намаляващ</string>
+
+    <string name="speech_not_supported">Съжалявам, но устройството не поддържа гласово въвеждане</string>
+
+    <string name="speech_prompt">Търсене в библиотеката</string>
+
+    <string name="suggestion_songs">Предложения</string>
+
+    <string name="summary_user_info">Покажи името ти на началния екран</string>
+
+    <string name="support_development">Подкрепа на разработката</string>
+
+    <string name="synced_lyrics">Синхронизиран текст</string>
+
+    <string name="system_equalizer">Системен усилвател</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
+
+    <string name="thank_you">Благодаря!</string>
+
+    <string name="the_audio_file">Аудио файлът</string>
+
+    <string name="this_month">Този месец</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_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 за CD3 песен 4)"</string>
+
+    <string name="track_list">Номер на песен</string>
+
+    <string name="translate">Превод</string>
+
+    <string name="translate_community">Помогни да преведем приложението на твоя език</string>
+
+    <string name="twitter_page">Twitter</string>
+    <string name="twitter_page_summary">Сподели дизайна си с Retro Music</string>
+
+    <string name="unlabeled">Без етикет</string>
+
+    <string name="unplayable_file">\u041f\u0435\u0441\u0435\u043d\u0442\u0430 \u043d\u0435 \u043c\u043e\u0436\u0430 \u0434\u0430 \u0441\u0435 \u0438\u0437\u043f\u044a\u043b\u043d\u0438.</string>
+
+    <string name="up_next">Следва</string>
+
+    <string name="update_image">Обнови изображение</string>
+
+    <string name="updating">Обновява се...</string>
+
+    <string name="username">Потребителско име</string>
+
+    <string name="version">Версия</string>
+
+    <string name="vertical_flip">Вертикално завъртане</string>
+
+    <string name="virtualizer">Виртуализатор</string>
+
+    <string name="web_search">Уеб търсене</string>
+
+    <string name="what_do_you_want_to_share">Какво искаш да споделиш?</string>
+
+    <string name="whats_new">Какво е ново?</string>
+
+    <string name="window">Прозорец</string>
+
+    <string name="window_corner_edges">Заоблени ъгли</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_will_be_forwarded_to_the_issue_tracker_website">Ще бъдете препратени към сайта на тракера.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Данните на акаунта Ви се използват единствено за автентификация.</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
deleted file mode 100644
index f2ee69deb..000000000
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">O %s</string>
-    <string name="about_settings_summary">Tým, odkazy na sociální sítě</string>
-    <string name="accent_color">Barva akcentů</string>
-    <string name="accent_color_desc">Barva motivu akcentu je výchozí k růžové barvě.</string>
-    <string name="action_about">Informace</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Přidat k oblíbeným</string>
-    <string name="action_add_to_playing_queue">Přidat do fronty </string>
-    <string name="action_add_to_playlist">Přidat do seznamu skladeb…</string>
-    <string name="action_cancel">Zrušit aktuální časovač</string>
-    <string name="action_cast">Hliník</string>
-    <string name="action_clear_playing_queue">Vyčistit frontu</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">Smazat</string>
-    <string name="action_delete_from_device">Vymazat ze zařízení</string>
-    <string name="action_details">Podrobnosti</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">Přejít na album</string>
-    <string name="action_go_to_artist">Přejít na interpreta</string>
-    <string name="action_go_to_genre">Přejít na žánr</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Přejít do začáteční složky</string>
-    <string name="action_grant">Udělit</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_all">Přehrát vše</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_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>
-    <string name="action_rename">Přejmenovat</string>
-    <string name="action_save_playing_queue">Uložit frontu přehrávání</string>
-    <string name="action_scan">Skenovat</string>
-    <string name="action_search">Hledat</string>
-    <string name="action_set">Nastavit</string>
-    <string name="action_set_as_ringtone">Nastavit jako vyzvánění</string>
-    <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_shuffle_all">Náhodný výběr všech skladeb</string>
-    <string name="action_shuffle_playlist">Náhodný výběr playlistu</string>
-    <string name="action_sleep_timer">Časovač vypnutí</string>
-    <string name="action_sort_order">Sort order</string>
-    <string name="action_tag_editor">Editor tagů</string>
-    <string name="action_toggle_favorite">Přepnout oblíbené</string>
-    <string name="action_toggle_shuffle">Přepnout náhodné přehrávání</string>
-    <string name="adaptive">Adaptivní</string>
-    <string name="add_action">Přidat</string>
-    <string name="add_playlist_title">"Přidat do seznamu skladeb"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Přidán 1 titul do fronty přehrávání."</string>
-    <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>
-    <plurals name="albumSongs">
-        <item quantity="one">Skladba</item>
-        <item quantity="few">Skladby</item>
-        <item quantity="many">Skladeb</item>
-        <item quantity="other">Skladeb</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Alba</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="few">Alba</item>
-        <item quantity="many">Alb</item>
-        <item quantity="other">Alb</item>
-    </plurals>
-    <string name="always">Vždy</string>
-    <string name="app_share">Hej, podívejte se na tento skvělý hudební přehrávač na: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Zamíchat</string>
-    <string name="app_shortcut_top_tracks_short">Nejlepší skladby</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Karta</string>
-    <string name="app_widget_classic_name">Klasický</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Malý</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Umělec</string>
-    <string name="artists">Umělci</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">Zaměření zvuku bylo zamítnuto.</string>
-    <string name="audio_settings_summary">Změňte nastavení zvuku a upravte ovládání ekvalizéru</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">Bio</string>
-    <string name="black_theme_name">Velmi černá</string>
-    <string name="blacklist">Černá listina</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Rozostření</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Hlášení se nepodařilo odeslat</string>
-    <string name="bug_report_failed_invalid_token">Neplatný přístupový token. Prosím kontaktujte vývojáře aplikace.</string>
-    <string name="bug_report_failed_issues_not_available">Ve vybraném repozitáři není povoleno hlášení chyb. Prosím kontaktujte vývojáře aplikace.</string>
-    <string name="bug_report_failed_unknown">Vyskytla se neočekávaná chyba. Prosím kontaktujte vývojáře aplikace.</string>
-    <string name="bug_report_failed_wrong_credentials">Špatné uživatelské jméno nebo heslo</string>
-    <string name="bug_report_issue">Problém</string>
-    <string name="bug_report_manual">Odeslat ručně</string>
-    <string name="bug_report_no_description">Prosím zadejte popis problému</string>
-    <string name="bug_report_no_password">Prosím zadejte platné GitHub heslo</string>
-    <string name="bug_report_no_title">Prosím zadejte název problému</string>
-    <string name="bug_report_no_username">Prosím zadejte platné uživatelské jméno na GitHubu</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">Došlo k neočekávané chybě. Je nám líto, že jste našli tuto chybu, pokud aplikace bude stále padat, použijte funkci \"Vymazat data aplikace\" nebo nám pošlete e-mail </string>
-    <string name="bug_report_use_account">Odeslat pomocí účtu GitHub</string>
-    <string name="buy_now">Zakoupit</string>
-    <string name="cancel_current_timer">Zrušit aktuální časovač</string>
-    <string name="card">Karta</string>
-    <string name="card_color_style">Obarvená karta</string>
-    <string name="card_square">Čtvercová karta</string>
-    <string name="card_style">Karta</string>
-    <string name="carousal_effect_on_now_playing_screen">Kolotočový efekt na obrazovce přehrávání</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Přehled změn</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Kruh</string>
-    <string name="circular">Kruhový</string>
-    <string name="classic">Klasický</string>
-    <string name="clear_action">Vyčistit</string>
-    <string name="clear_blacklist">Vyčistit černou listinu</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Vymazat frontu</string>
-    <string name="color">Barva</string>
-    <string name="colors">Barvy</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Skladatel</string>
-    <string name="copied_device_info_to_clipboard">Informace o zařízení zkopírovány do schránky.</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>
-    <string name="could_not_restore_purchase">Nepodařilo se obnovit nákup.</string>
-    <string name="could_not_scan_files">Nelze skenovat %d soubory.</string>
-    <string name="create_action">Vytvořit</string>
-    <string name="create_new_backup">Vytvořit</string>
-    <string name="created_playlist_x">Vytvořený seznam skladeb %1$s.</string>
-    <string name="credit_title">Členové a přispěvatelé </string>
-    <string name="currently_listening_to_x_by_x">Aktuálně posloucháš %1$s od %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Tmavá</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="deleting_songs">Deleting Songs</string>
-    <string name="depth">Hloubka</string>
-    <string name="description">Popis</string>
-    <string name="device_info">Informace o zařízení</string>
-    <string name="dialog_message_set_ringtone">Povolit aplikaci Retro Music upravovat nastavení zvuku</string>
-    <string name="dialog_title_set_ringtone">Nastavit vyzvánění</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Chcete vyčistit černou listinu?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Chcete odstranit <b>%1$s</b> z černé listiny?]]></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="donation_header">Kupte mi:</string>
-    <string name="done">Hotovo</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Prázdný</string>
-    <string name="equalizer">Ekvalizér</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">Často kladené otázky</string>
-    <string name="favorites">Oblíbené</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Dokončit poslední skladbu</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Složky</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">Pro vás</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Změňte motiv a barvy aplikace</string>
-    <string name="general_settings_title">Vzhled a chování</string>
-    <string name="genre">Žánr</string>
-    <string name="genres">Žánry</string>
-    <string name="git_hub_summary">Forkněte projekt na GitHubu</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Styl mřížky</string>
-    <string name="help_summary">Potřebujete další pomoc?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">Historie</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">Domov</string>
-    <string name="horizontal_flip">Horizontální otočení</string>
-    <string name="image">Obrázek</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Změňte nastavení stahování obrázků umělců</string>
-    <string name="import_label">Importovat</string>
-    <string name="import_playlist">Importovat seznam skladeb</string>
-    <string name="import_playlist_message">Importuje všechny seznamy skladeb uvedené v Android Media store, pokud seznam již existuje, seznamy se sloučí.</string>
-    <string name="inserted_x_songs_into_playlist_x">Do playlistu %2$s byly vloženy %1$d skladby.</string>
-    <string name="instagram_page_summary">Sdílejte své nastavení Retro Music na Instagramu</string>
-    <string name="keyboard">Klávesnice</string>
-    <string name="label_bit_rate">Datový tok</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>
-    <string name="label_file_size">Velikost</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">Více od %s</string>
-    <string name="label_sampling_rate">Vzorkovací frekvence</string>
-    <string name="label_track_length">Délka</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Poslední </string>
-    <string name="last_song">Poslední skladba</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licence</string>
-    <string name="light_theme_name">Velmi bílá</string>
-    <string name="listeners_label">Posluchači</string>
-    <string name="listing_files">Výpis souborů</string>
-    <string name="loading_products">Načítání produktů...</string>
-    <string name="login">Přihlásit se</string>
-    <string name="lyrics">Text</string>
-    <string name="made_with_love">Vyrobeno s ❤️ v Indii</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Chyba</string>
-    <string name="md_storage_perm_error">Chyba oprávnění</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Název</string>
-    <string name="my_top_tracks">Moje top skladby</string>
-    <string name="never">Nikdy</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Nový seznam skladeb </string>
-    <string name="new_start_directory">%S je nový úvodní adresář. </string>
-    <string name="next_song">Další Skladba</string>
-    <string name="no_albums">Žádné alba</string>
-    <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_backups_found">No Backups Found</string>
-    <string name="no_equalizer">Nebyl nalezen žádný ekvalizér.</string>
-    <string name="no_genres">Nemáte žádné žánry</string>
-    <string name="no_lyrics_found">Text nenalezen</string>
-    <string name="no_playing_queue">Nic nehraje</string>
-    <string name="no_playlists">Žádné playlisty</string>
-    <string name="no_purchase_found">Nebyl nalezen žádný nákup.</string>
-    <string name="no_results">Žádné výsledky</string>
-    <string name="no_songs">Žádné písně</string>
-    <string name="normal">Normální</string>
-    <string name="normal_lyrics">Normální texty</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> není uveden v úložišti médií.]]></string>
-    <string name="not_recently_played">Nepřehrané nedávno</string>
-    <string name="nothing_to_scan">Nic pro skenování.</string>
-    <string name="nothing_to_see">Není tu nic k vidění</string>
-    <string name="notification">Upozornění</string>
-    <string name="notification_settings_summary">Upravte si styl oznámení</string>
-    <string name="now_playing">Nyní hraje</string>
-    <string name="now_playing_queue">Aktuální fronta</string>
-    <string name="now_playing_summary">Přizpůsobte si obrazovku přehrávání</string>
-    <string name="now_playing_themes">9+ vzhledů pro stránku přehrávání</string>
-    <string name="only_on_wifi">Pouze přes Wifi</string>
-    <string name="other_settings_summary">Pokročilé funkce</string>
-    <string name="others">Jiné</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Heslo</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Povolení přístupu k externímu úložišti bylo zamítnuto.</string>
-    <string name="permission_summary">Aplikace potřebuje přístup k úložišti vašeho zařízení, aby mohla přehráváat hudbu</string>
-    <string name="permission_title">Přístup k úložišti</string>
-    <string name="permissions_denied">Oprávnění byla odepřena.</string>
-    <string name="personalize">Přizpůsobit si</string>
-    <string name="personalize_settings_summary">Přizpůsobte si stránku přehrávání a UI ovládání</string>
-    <string name="pick_from_local_storage">Vyberte z místního úložiště</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Sledujte stránku Pinterest pro inspiraci designu Retro Music</string>
-    <string name="plain">Klasické</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">Oznámení o přehrávání poskytuje akce pro přehrávání/pauzu atd.</string>
-    <string name="playing_notification_name">Oznámení o přehrávání</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Seznam skladeb je prázdný</string>
-    <string name="playlist_name_empty">Název playlistu</string>
-    <string name="playlists">Seznamy skladeb</string>
-    <string name="pref_blur_amount_summary">Množství rozostření použité pro rozostřené motivy, nižší je rychlejší</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filtrovat skladby podle délky</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Pokročilé</string>
-    <string name="pref_header_album">Styl alba</string>
-    <string name="pref_header_audio">Zvuk</string>
-    <string name="pref_header_blacklist">Černá listina</string>
-    <string name="pref_header_controls">Ovládání</string>
-    <string name="pref_header_general">Motiv</string>
-    <string name="pref_header_images">Obrázky</string>
-    <string name="pref_header_library">Knihovna</string>
-    <string name="pref_header_lockscreen">Obrazovka uzamčení</string>
-    <string name="pref_header_playlists">Seznamy skladeb</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pozastavit na nule</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Udržovat obrazovku zapnutou</string>
-    <string name="pref_language_name">Vybrat jazyk</string>
-    <string name="pref_snow_fall_title">Snow fall effect</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_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Oznámení, navigace atd.</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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>
-    <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_classic_notification">Use the classic notification design</string>
-    <string name="pref_summary_colored_app">Pozadí, barva ovládacích tlačítek se mění podle vzhledu alb z obrazovky přehrávače</string>
-    <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_notification">"Vybarv\u00ed ozn\u00e1men\u00ed v \u017eiv\u00e9 barv\u011b krytu alba."</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</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_home_banner">Show or hide the home banner</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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Začít přehrávat ihned po připojení sluchátek</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Zobrazit obal alba</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Motiv obalu alba</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Snížit hlasitost při ztrátě zaostření</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Automatické stahování obrázků interpretů</string>
-    <string name="pref_title_blacklist">Černá listina</string>
-    <string name="pref_title_bluetooth_playback">Přehrávání Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Rozostřit obal alba</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Klasický vzhled oznámení</string>
-    <string name="pref_title_colored_app">Adaptivní barva</string>
-    <string name="pref_title_colored_notification">Barevné notifikace</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</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_home_album_grid_style">Mřížka alb</string>
-    <string name="pref_title_home_artist_grid_style">Mřížka umělců</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorovat obaly v zařízení</string>
-    <string name="pref_title_last_added_interval">Last added playlist interval</string>
-    <string name="pref_title_lock_screen">Ovládání na celou obrazovku</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pref_title_now_playing_screen_appearance">Vzhled</string>
-    <string name="pref_title_open_source_licences">Licence Open source</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Aplikace přes celou obrazovku</string>
-    <string name="pref_title_toggle_toggle_headset">Automatické přehrávání</string>
-    <string name="pref_title_toggle_toggle_shuffle">Režim zamíchání</string>
-    <string name="pref_title_toggle_volume">Ovládání hlasitosti</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profil</string>
-    <string name="purchase">Koupit</string>
-    <string name="queue">Fronta</string>
-    <string name="rate_app">Ohodnoťte aplikaci</string>
-    <string name="rate_on_google_play_summary">Zanechte pozitivní hodnocení na Google Play pokud máte rádi Retro music.</string>
-    <string name="recent_albums">Nedávná alba</string>
-    <string name="recent_artists">Nedávní umělci</string>
-    <string name="remove_action">Odstranit</string>
-    <string name="remove_cover">Odstranit obal</string>
-    <string name="remove_from_blacklist">Odstranit z černé listiny</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Smazat skladbu ze seznamu skladeb</string>
-    <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$d</b> skladby ze seznamu skladeb?]]></string>
-    <string name="rename_playlist_title">Přejmenovat seznam skladeb</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Nahlásit problém</string>
-    <string name="report_bug">Nahlásit chybu</string>
-    <string name="reset_action">Resetovat</string>
-    <string name="reset_artist_image">Obnovit obrázek interpreta</string>
-    <string name="restore">Obnovit</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Předchozí nákup byl obnoven. Restartujte aplikaci pro využití všech funkcí.</string>
-    <string name="restored_previous_purchases">Předchozí nákupy byly obnoveny.</string>
-    <string name="restoring_purchase">Obnovuji nákup…</string>
-    <string name="retro_music_player">Retro Music Přehrávač</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Aplikace potřebuje přístup k nastavení zařízení pro nastavení hudby jako vyzvánění</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">Odstranění souboru se nezdařilo: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Nelze získat SAF URI</string>
-    <string name="saf_guide_slide1_description">Otevřít navigační panel</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 potřebuje přístup k SD kartě</string>
-    <string name="saf_guide_slide2_description">Musíte vybrat kořenový adresář SD karty</string>
-    <string name="saf_guide_slide2_title">Vyberte SD kartu v navigační liště</string>
-    <string name="saf_guide_slide3_description">Neotevírejte žádné podsložky</string>
-    <string name="saf_guide_slide3_title">Vespod obrazovky klepněte na tlačítko \'vybrat\'</string>
-    <string name="saf_write_failed">Zápis souboru selhal: %s</string>
-    <string name="save">Uložit</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Uložit jako soubor</string>
-    <string name="save_playlists_title">Uložit jako soubory</string>
-    <string name="saved_playlist_to">Seznam skladeb uložený do %s.</string>
-    <string name="saving_changes">Uložení změn</string>
-    <string name="scan_media">Skenovat média</string>
-    <string name="scanned_files">Naskenované %1$d z %2$d souborů.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Vybrat vše</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Sdílet aplikaci</string>
-    <string name="share_summary">Sdílejte aplikaci s přáteli a rodinou</string>
-    <string name="share_to_stories">Sdílet do příběhu</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Náhodně</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Časovač vypnutí byl zrušen.</string>
-    <string name="sleep_timer_set">Časovač vypnutí byl nastaven na %d minut.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Skladba</string>
-    <string name="song_duration">Délka skladby</string>
-    <string name="songs">Písně</string>
-    <string name="sort_order">Řazení </string>
-    <string name="sort_order_a_z">Vzestupně</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Umělec</string>
-    <string name="sort_order_composer">Skladatel</string>
-    <string name="sort_order_date">Datum přidání</string>
-    <string name="sort_order_date_modified">Datum změny</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Počet skladeb</string>
-    <string name="sort_order_num_songs_desc">Počet skladeb sestupně</string>
-    <string name="sort_order_year">Rok</string>
-    <string name="sort_order_z_a">Sestupně</string>
-    <string name="speech_not_supported">Promiňte! Vaše zařízení nepodporuje vstup řeči</string>
-    <string name="speech_prompt">Prohledat knihovnu</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Začít přehrávat hudbu.</string>
-    <string name="suggestion_songs">Návrhy</string>
-    <string name="support_development">Podpora vývoje</string>
-    <string name="swipe_to_unlock">Odemkněte posunutím prstu</string>
-    <string name="synced_lyrics">Synchronizované texty</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Připojte se ke skupině na Telegramu, abyste mohli diskutovat o chybách, předkládat návrhy, předvádět se a více</string>
-    <string name="thank_you">Děkujeme!</string>
-    <string name="the_audio_file">Audio soubor</string>
-    <string name="this_month">Tento měsíc</string>
-    <string name="this_week">Tento týden</string>
-    <string name="this_year">Tento rok</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Malá karta</string>
-    <string name="title">Název</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Dnes</string>
-    <string name="top_albums">Nejlepší alba</string>
-    <string name="top_artists">Top umělci</string>
-    <string name="track_hint">"Skladba (2 pro stopu 2 ​​nebo 3004 pro čtvrtou stopu z CD3)"</string>
-    <string name="track_list">Číslo skladby</string>
-    <string name="translate">Překlad</string>
-    <string name="translate_community">Pomožte nám přeložit tuto aplikaci do vašeho jazyka</string>
-    <string name="try_retro_music_premium">Vyzkoušejte Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Sdílejte svůj design s Retro Music</string>
-    <string name="unlabeled">Bez štítku</string>
-    <string name="unplayable_file">Tuto p\u00edse\u0148 se nepoda\u0159ilo p\u0159ehr\u00e1t.</string>
-    <string name="up_next">Další</string>
-    <string name="update_image">Aktualizovat obrázek</string>
-    <string name="updating">Aktualizace...</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">Uživatelské Jméno</string>
-    <string name="username">Uživatelské jméno</string>
-    <string name="version">Verze</string>
-    <string name="vertical_flip">Vertikální otočení</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Hlasitost</string>
-    <string name="web_search">Webové vyhledávání</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Vítejte,</string>
-    <string name="what_do_you_want_to_share">Co chcete sdílet?</string>
-    <string name="whats_new">Co je nového</string>
-    <string name="window">Okno</string>
-    <string name="window_corner_edges">Zaoblené rohy</string>
-    <string name="x_has_been_set_as_ringtone">Nastavit %1$s jako zvonění</string>
-    <string name="x_selected">%1$d vybrané</string>
-    <string name="year">Rok</string>
-    <string name="you_have_to_select_at_least_one_category">Musíte zvolit alespoň jednu kategorii.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Budete přesměrováni na webovou stránku pro zadání problému.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Vaše údaje k účtu jsou použity pouze k ověření.</string>
-</resources>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
new file mode 100644
index 000000000..764de3208
--- /dev/null
+++ b/app/src/main/res/values-cs/strings.xml
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Barva akcentů</string>
+    <string name="accent_color_desc">Barva motivu akcentu je výchozí k růžové barvě.</string>
+
+    <string name="action_about">Informace</string>
+    <string name="action_add_to_favorites">Přidat k oblíbeným</string>
+    <string name="action_add_to_playing_queue">"Přidat do fronty "</string>
+    <string name="action_add_to_playlist">Přidat do seznamu skladeb…</string>
+    <string name="action_clear_playing_queue">Vyčistit frontu</string>
+    <string name="action_clear_playlist">Vymazat playlist</string>
+    <string name="action_delete">Smazat</string>
+    <string name="action_delete_from_device">Vymazat ze zařízení</string>
+    <string name="action_details">Podrobnosti</string>
+    <string name="action_go_to_album">Přejít na album</string>
+    <string name="action_go_to_artist">Přejít na interpreta</string>
+    <string name="action_go_to_start_directory">Přejít do začáteční složky</string>
+    <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_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_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>
+    <string name="action_rename">Přejmenovat</string>
+    <string name="action_scan">Skenovat</string>
+    <string name="action_search">Hledat</string>
+    <string name="action_set">Nastavit</string>
+    <string name="action_set_as_ringtone">Nastavit jako vyzvánění</string>
+    <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_shuffle_all">Náhodný výběr všech skladeb</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>
+
+    <string name="add_playlist_title">"Přidat do seznamu skladeb"</string>
+
+    <string name="added_title_to_playing_queue">"Přidán 1 titul do fronty přehrávání."</string>
+    <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_or_artist_empty">Titul nebo umělec je prázdný.</string>
+
+    <string name="albums">Albumy</string>
+
+    <string name="always">Vždy</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Shuffle</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_classic_name">Retro music - Classic</string>
+    <string name="app_widget_small_name">Retro music - Small</string>
+
+    <string name="artist">Umělec</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="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="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>
+    <string name="could_not_scan_files">Nelze skenovat %d soubory.</string>
+
+    <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="dark_theme_name">Tmavá</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_x"><![CDATA[Smazat píseň <b>%1$s</b>?]]></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="empty">Prázdný</string>
+
+    <string name="equalizer">Equalizer</string>
+
+    <string name="favorites">Oblíbené</string>
+
+    <string name="flat">Flat</string>
+
+    <string name="folders">Složky</string>
+
+    <string name="genre">Žánr</string>
+
+    <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="label_bit_rate">Datový tok</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>
+    <string name="label_file_size">Velikost</string>
+    <string name="label_sampling_rate">Vzorkovací frekvence</string>
+    <string name="label_track_length">Délka</string>
+
+    <string name="last_added">"Poslední "</string>
+
+    <string name="library">Knihovna</string>
+
+    <string name="licenses">Licence</string>
+
+    <string name="light_theme_name">Velmi bílá</string>
+
+    <string name="listing_files">Výpis souborů</string>
+
+    <string name="loading_products">Načítání produktů...</string>
+
+    <string name="lyrics">Text</string>
+
+    <string name="my_top_tracks">Moje top skladby</string>
+
+    <string name="never">Nikdy</string>
+
+    <string name="new_playlist_title">"Nový seznam skladeb "</string>
+    <string name="new_start_directory">"%S je nový úvodní adresář. "</string>
+
+    <string name="no_albums">Žádné alba</string>
+    <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_playlists">Žádné playlisty</string>
+    <string name="no_results">Žádné výsledky</string>
+    <string name="no_songs">Žádné písně</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> není uveden v úložišti médií.]]></string>
+
+    <string name="nothing_to_scan">Nic pro skenování.</string>
+
+    <string name="notification">Upozornění</string>
+
+    <string name="now_playing_queue">Aktuální fronta</string>
+
+    <string name="only_on_wifi">Pouze přes Wifi</string>
+
+    <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="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_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>
+    <string name="pref_summary_colored_app">Pozadí, barva ovládacích tlačítek se mění podle vzhledu alb z obrazovky přehrávače</string>
+    <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_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>
+    <string name="pref_title_album_art_on_lockscreen">Zobrazit obal alba</string>
+    <string name="pref_title_app_shortcuts">Barevné zkratky aplikace</string>
+    <string name="pref_title_audio_ducking">Snížit hlasitost při ztrátě zaostření</string>
+    <string name="pref_title_auto_download_artist_images">Automatické stahování obrázků interpretů</string>
+    <string name="pref_title_blurred_album_art">Blur album cover</string>
+    <string name="pref_title_colored_app">Adaptivní barva</string>
+    <string name="pref_title_colored_notification">Barevné notifikace</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>
+    <string name="pref_title_navigation_bar">Barevná navigační lišta</string>
+    <string name="pref_title_now_playing_screen_appearance">Vzhled</string>
+    <string name="pref_title_round_corners">Rohy</string>
+
+    <string name="primary_color">Hlavní barva</string>
+    <string name="primary_color_desc">Primární barva motivu je výchozí pro indigo.</string>
+
+    <string name="queue">Fronta</string>
+
+    <string name="rate_app">Ohodnoťte aplikaci</string>
+    <string name="rate_on_google_play_summary">Zanechte pozitivní hodnocení na Google Play pokud máte rádi Retro music.</string>
+
+    <string name="remove_action">Odstranit</string>
+    <string name="remove_cover">Odstranit obal</string>
+    <string name="remove_song_from_playlist_title">Smazat skladbu ze seznamu skladeb</string>
+    <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_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="scanned_files">Naskenované %1$d z %2$d souborů.</string>
+
+    <string name="search_hint">Prohledat knihovnu...</string>
+
+    <string name="shuffle">Náhodně</string>
+
+    <string name="sleep_timer_canceled">Časovač vypnutí byl zrušen.</string>
+    <string name="sleep_timer_set">Časovač vypnutí byl nastaven na %d minut.</string>
+
+    <string name="song">Skladba</string>
+
+    <string name="songs">Písně</string>
+
+    <string name="sort_order">"Řazení "</string>
+
+    <string name="speech_not_supported">Promiňte! Vaše zařízení nepodporuje vstup řeči</string>
+    <string name="speech_prompt">Prohledat knihovnu</string>
+
+    <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="track_hint">"Skladba (2 pro stopu 2 ​​nebo 3004 pro čtvrtou stopu z CD3)"</string>
+
+    <string name="translate">Překlad</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="updating">Aktualizace...</string>
+
+    <string name="version">Verze</string>
+
+    <string name="web_search">Webové vyhledávání</string>
+
+    <string name="what_do_you_want_to_share">Co chcete sdílet?</string>
+
+    <string name="x_has_been_set_as_ringtone">Nastavit %1$s jako zvonění</string>
+    <string name="x_selected">%1$d vybrané</string>
+
+    <string name="year">Rok</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml
deleted file mode 100644
index 18fcb5fdf..000000000
--- a/app/src/main/res/values-da-rDK/strings.xml
+++ /dev/null
@@ -1,497 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">About %s</string>
-    <string name="about_settings_summary">Team, social links</string>
-    <string name="accent_color">Accent color</string>
-    <string name="accent_color_desc">The theme accent color, defaults to purple</string>
-    <string name="action_about">About</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Add to favorites</string>
-    <string name="action_add_to_playing_queue">Add to playing queue</string>
-    <string name="action_add_to_playlist">Add to playlist</string>
-    <string name="action_cast">Cast</string>
-    <string name="action_clear_playing_queue">Clear playing queue</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>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">Go to album</string>
-    <string name="action_go_to_artist">Go to artist</string>
-    <string name="action_go_to_genre">Go to genre</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <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_all">Play all</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_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>
-    <string name="action_rename">Rename</string>
-    <string name="action_save_playing_queue">Save playing queue</string>
-    <string name="action_scan">Scan</string>
-    <string name="action_search">Search</string>
-    <string name="action_set">Start</string>
-    <string name="action_set_as_ringtone">Set as ringtone</string>
-    <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_shuffle_all">Shuffle all</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>
-    <string name="add_action">Add</string>
-    <string name="add_playlist_title">"Add to playlist"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Songs</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
-    <string name="always">Always</string>
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
-    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Artist</string>
-    <string name="artists">Artists</string>
-    <string name="audio_fade_duration">Audio fade duration</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="auto">Auto</string>
-    <string name="biography">Biography</string>
-    <string name="black_theme_name">Just Black</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Buy now</string>
-    <string name="cancel_current_timer">Cancel</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Classic</string>
-    <string name="clear_action">Clear</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">Color</string>
-    <string name="colors">Colors</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">Create</string>
-    <string name="created_playlist_x">Created playlist %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-    <string name="dark_theme_name">Kinda Dark</string>
-    <string name="delete_playlist_title">Delete playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Delete playlists</string>
-    <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="depth">Depth</string>
-    <string name="description">Description</string>
-    <string name="device_info">Device info</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Donate</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Buy me a:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Empty</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favorites</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Folders</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">For you</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Look and feel</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genres</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grid_size_1">1</string>
-    <string name="grid_size_2">2</string>
-    <string name="grid_size_3">3</string>
-    <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="grid_style_label">Grid style</string>
-    <string name="help_summary">Need more help?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">History</string>
-    <string name="home">Home</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_file_size">Size</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Length</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Last added</string>
-    <string name="last_song">Last song</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licenses</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">Listeners</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Lyrics</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Most played</string>
-    <string name="never">Never</string>
-    <string name="new_playlist_title">New playlist</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Next Song</string>
-    <string name="no_albums">You have no albums</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Permissions denied.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_now_playing_screen_appearance">Now playing theme</string>
-    <string name="pref_title_open_source_licences">Open source licences</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_whitelist">Whitelist music</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">Sort order</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Year</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 78694db93..6d1c3e8e3 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -1,203 +1,294 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Über %s</string>
     <string name="about_settings_summary">Team, soziale Netzwerke</string>
+
     <string name="accent_color">Akzentfarbe</string>
-    <string name="accent_color_desc">Akzentfarbe des Farbthemas, Standard ist Lila</string>
+    <string name="accent_color_desc">Die Akzentfarbe, standardmäßig auf Grün gestellt</string>
+
     <string name="action_about">Über</string>
-    <string name="action_add_to_blacklist">Ausschließen</string>
+
     <string name="action_add_to_favorites">Zu Favoriten hinzufügen</string>
-    <string name="action_add_to_playing_queue">Zur Wiedergabeliste hinzufügen</string>
-    <string name="action_add_to_playlist">Zur Playlist hinzufügen</string>
-    <string name="action_cancel">Timer stoppen</string>
-    <string name="action_cast">Übertragen</string>
-    <string name="action_clear_playing_queue">Wiedergabeliste leeren</string>
-    <string name="action_cycle_repeat">Wiederholungsmodus wechseln</string>
+    <string name="action_add_to_playing_queue">Zur Warteschleife hinzufügen</string>
+    <string name="action_add_to_playlist">Zur Wiedergabeliste hinzufügen</string>
+
+    <string name="action_clear_playing_queue">Warteschleife leeren</string>
+    <string name="action_clear_playlist">Wiedergabeliste leeren</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_edit">Bearbeiten</string>
-    <string name="action_go_to_album">Zum Album gehen</string>
-    <string name="action_go_to_artist">Zum Interpreten gehen</string>
-    <string name="action_go_to_genre">Zum Genre gehen</string>
-    <string name="action_go_to_lyrics">Zum Liedtext gehen</string>
-    <string name="action_go_to_start_directory">Zum Startverzeichnis gehen</string>
+
+    <string name="action_go_to_album">Zum Album</string>
+    <string name="action_go_to_artist">Zum Interpreten</string>
+    <string name="action_go_to_genre">Zu Genre gehen</string>
+    <string name="action_go_to_start_directory">"Zum Startverzeichnis "</string>
+
     <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_grid_size">Rastergröße</string>
+    <string name="action_grid_size_land">Rastergröße (Land)</string>
+
+    <string name="action_new_playlist">Neue Wiedergabeliste</string>
+
+    <string name="action_next">Nächster</string>
+
     <string name="action_play">Abspielen</string>
     <string name="action_play_all">Alles abspielen</string>
-    <string name="action_play_next">Spiele danach ab</string>
+    <string name="action_play_next">Als nächstes abspielen</string>
     <string name="action_play_pause">Abspielen/Pausieren</string>
-    <string name="action_previous">Vorheriges</string>
+
+    <string name="action_previous">Vorheriger</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>
+    <string name="action_remove_from_playing_queue">Von Warteschlange entfernen</string>
+    <string name="action_remove_from_playlist">Von Wiedergabeliste entfernen</string>
+
     <string name="action_rename">Umbenennen</string>
-    <string name="action_save_playing_queue">Wiedergabeliste speichern</string>
+
+    <string name="action_save_playing_queue">Warteschleife abspeichern</string>
+
     <string name="action_scan">Scannen</string>
-    <string name="action_search">Suche</string>
-    <string name="action_set">Verwenden</string>
-    <string name="action_set_as_ringtone">Als Klingelton verwenden</string>
-    <string name="action_set_as_start_directory">Als Startverzeichnis verwenden</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 Startverzeichnis setzen</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">Playlist zufällig abspielen</string>
-    <string name="action_sleep_timer">Einschlafmodus</string>
+
+    <string name="action_shuffle_all">Alles shufflen</string>
+    <string name="action_shuffle_playlist">Wiedergabeliste shufflen</string>
+
+    <string name="action_sleep_timer">Schlaftimer</string>
+
     <string name="action_sort_order">Sortierreihenfolge</string>
-    <string name="action_tag_editor">Tag-Editor</string>
-    <string name="action_toggle_favorite">Favoriten ein-/ausblenden</string>
-    <string name="action_toggle_shuffle">Zufallswiedergabe</string>
+
+    <string name="action_tag_editor">Tags bearbeiten</string>
+
     <string name="adaptive">Adaptiv</string>
+
     <string name="add_action">Hinzufügen</string>
-    <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
-    <string name="add_time_framed_lryics">Synchronisierten Liedtext hinzufügen</string>
-    <string name="added_song_count_to_playlist">%1$d Titel zu %2$s hinzugefügt</string>
-    <string name="added_title_to_playing_queue">"1 Titel wurde zur Wiedergabeliste hinzugefügt."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d Titel wurden zur Wiedergabeliste hinzugefügt.</string>
+
+    <string name="add_lyrics">Songtext hinzufügen</string>
+
+    <string name="add_photo">Bild hinzufügen</string>
+
+    <string name="add_playlist_title">"Zu Wiedergabeliste hinzufügen"</string>
+
+    <string name="add_time_framed_lryics">Synchronisierten Songtext hinzufügen</string>
+
+    <string name="added_title_to_playing_queue">"Ein Titel wurde zur Warteschlange hinzugefügt."</string>
+
+    <string name="added_x_titles_to_playing_queue">%1$d Titel zur Warteschleife hinzugefügt.</string>
+
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Titel</item>
-        <item quantity="other">Titel</item>
-    </plurals>
-    <string name="album_artist">Album-Interpret</string>
+
+    <string name="album_artist">Albuminterpret</string>
+
+    <string name="album_or_artist_empty">Titel oder Interpret ist leer.</string>
+
     <string name="albums">Alben</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Alben</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <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-Titel</string>
-    <string name="app_widget_big_name">Vollbild</string>
-    <string name="app_widget_card_name">Karte</string>
-    <string name="app_widget_classic_name">Klassisch</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Klein</string>
-    <string name="app_widget_text_name">Minimaler Text</string>
+
+    <string name="app_share">Hey, schau\' dir diese coole Musikapp an: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Shufflen</string>
+    <string name="app_shortcut_top_tracks_short">Top Songs</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="app_widget_text_name">Retro Music - Text</string>
+
     <string name="artist">Interpret</string>
+
     <string name="artists">Interpreten</string>
-    <string name="audio_fade_duration">Überblenddauer</string>
-    <string name="audio_focus_denied">Audio-Fokus verweigert.</string>
-    <string name="audio_settings_summary">Toneinstellungen ändern und Klang regeln</string>
+
+    <string name="audio_focus_denied">Audiofokus nicht möglich.</string>
+
+    <string name="audio_settings_summary">Sound- und Equalizer-Optionen einstellen</string>
+
     <string name="auto">Automatisch</string>
-    <string name="backup_restore_settings_summary">Einstellungen, Playlists sichern und wiederherstellen</string>
-    <string name="backup_restore_title"><![CDATA[Sichern & Wiederherstellen]]></string>
-    <string name="backup_title">Sicherungen</string>
+
+    <string name="base_color_theme">Grundfarbe</string>
+
+    <string name="bass_boost">Bassboost</string>
+
+    <string name="bio">Beschreibung</string>
+
     <string name="biography">Biografie</string>
+
     <string name="black_theme_name">Einfach Schwarz</string>
-    <string name="blacklist">Ausschlussliste</string>
-    <string name="bluetooth_summary">Die App benötigt in der Nähe befindliche Geräte, um nach Bluetooth-Geräten zu suchen</string>
-    <string name="bluetooth_title">Geräte in der Nähe</string>
-    <string name="blur">Weichzeichner</string>
-    <string name="blur_card">Weichgezeichnete Karte</string>
+
+    <string name="blacklist">Schwarze Liste</string>
+
+    <string name="blur">Unschärfe</string>
+
+    <string name="blur_card">Karte (Unschärfe)</string>
+
     <string name="bug_report_failed">Fehler beim Melden</string>
     <string name="bug_report_failed_invalid_token">Ungültiger Token. Bitte kontaktiere den Entwickler.</string>
-    <string name="bug_report_failed_issues_not_available">Für dieses Repository sind Fehlermeldungen nicht aktiviert. Bitte den Entwickler kontaktieren.</string>
+    <string name="bug_report_failed_issues_not_available">Für diese Repository sind Fehlermeldungen nicht aktiviert. Bitte den Entwickler kontaktieren.</string>
     <string name="bug_report_failed_unknown">Ein unerwarteter Fehler ist aufgetreten. Bitte kontaktiere den Entwickler.</string>
     <string name="bug_report_failed_wrong_credentials">Falscher Nutzername oder Passwort</string>
     <string name="bug_report_issue">Problem</string>
     <string name="bug_report_manual">Manuell senden</string>
-    <string name="bug_report_no_description">Bitte gib eine Beschreibung ein</string>
+    <string name="bug_report_no_description">Bitte gebe eine Beschreibung ein</string>
     <string name="bug_report_no_password">Bitte nutze das korrekte GitHub-Passwort</string>
-    <string name="bug_report_no_title">Bitte gib einen Fehler-Titel ein</string>
-    <string name="bug_report_no_username">Bitte gib einen gültigen GitHub-Nutzernamen ein</string>
-    <string name="bug_report_success">Fehlerbericht erfolgreich</string>
-    <string name="bug_report_summary">Ein unerwarteter Fehler ist aufgetreten. Sorry, dass du ihn entdeckt hast. Wenn er weiterhin auftritt, App-\"Speicherinhalt löschen\" oder eine E-Mail schicken </string>
-    <string name="bug_report_use_account">Über GitHub-Konto senden</string>
-    <string name="buy_now">Jetzt kaufen</string>
-    <string name="cancel_current_timer">Timer stoppen</string>
+    <string name="bug_report_no_title">Bitte gebe einen Titel ein</string>
+    <string name="bug_report_no_username">Bitte nutze einen gültigen GitHub-Nutzernamen</string>
+    <string name="bug_report_summary">Sorry! Ein unerwarteter Fehler ist aufgetreten. Die App-Daten zurückzusetzen, könnte helfen.</string>
+    <string name="bug_report_uploading">Meldung zu GitHub hochladen...</string>
+    <string name="bug_report_use_account">Via GitHub senden</string>
+
+    <string name="cancel_current_timer">Abbrechen</string>
+
     <string name="card">Karte</string>
-    <string name="card_color_style">Farbige Karte</string>
-    <string name="card_square">Quadratische Karte</string>
+
+    <string name="card_circular_style">Rund</string>
+
+    <string name="card_color_style">Karte (Farbe)</string>
+
     <string name="card_style">Karte</string>
+
+    <string name="carousal">Karussell</string>
+
     <string name="carousal_effect_on_now_playing_screen">Karussell-Effekt auf dem Abspielbildschirm</string>
+
     <string name="cascading">Kaskadierend</string>
+
+    <string name="cast">Übertragen</string>
+
     <string name="changelog">Änderungen</string>
-    <string name="changelog_summary">Sieh dir an, was neu ist</string>
-    <string name="choose_image">Bild wählen</string>
-    <string name="choose_restore_title">Wähle, was wiederherzustellen ist</string>
-    <string name="circle">Kreis</string>
+
+    <string name="changelog_summary">Änderungsprotokoll im Telegram-Channel</string>
+
     <string name="circular">Rund</string>
-    <string name="classic">Klassisch</string>
+
+    <string name="classic">Klassik</string>
+
     <string name="clear_action">Leeren</string>
-    <string name="clear_blacklist">Ausschlussliste leeren</string>
-    <string name="clear_history">Verlauf löschen</string>
-    <string name="clear_playing_queue">Warteschlange leeren</string>
+
+    <string name="clear_app_data">App-Daten zurücksetzen</string>
+
+    <string name="clear_blacklist">Leeren</string>
+
+    <string name="clear_playing_queue">Leeren</string>
+
+    <string name="clear_playlist_title">Wiedergabeliste leeren</string>
+    <string name="clear_playlist_x"><![CDATA[Die Wiedergabeliste <b>%1$s</b> leeren? Dies kann nicht r\u00fcckg\u00e4ngig gemacht werden!]]></string>
+
+    <string name="close_notification">Schließen</string>
+
     <string name="color">Farbe</string>
+
+    <string name="color_theme_name">Farbe</string>
+
     <string name="colors">Farben</string>
-    <string name="compact">Kompakt</string>
+
     <string name="composer">Komponist</string>
-    <string name="copied_device_info_to_clipboard">Geräteinfo wurde in Zwischenablage kopiert.</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 heruntergeladen werden."</string>
+
+    <string name="copied_device_info_to_clipboard">Geräteinformationen wurden kopiert</string>
+
+    <string name="could_not_create_playlist">Wiedergabeliste konnte nicht erstellt werden.</string>
+    <string name="could_not_download_album_cover">"Passendes Albumcover konnte nicht gefunden werden."</string>
     <string name="could_not_restore_purchase">Kauf konnte nicht wiederhergestellt werden.</string>
-    <string name="could_not_scan_files">%d Datei(en) konnte(n) nicht gescannt werden.</string>
+    <string name="could_not_scan_files">%d Dateien konnten nicht gescannt werden.</string>
+
     <string name="create_action">Erstellen</string>
-    <string name="create_new_backup">Erstellen</string>
-    <string name="created_playlist_x">Playlist %1$s erstellt.</string>
+
+    <string name="created_playlist_x">Wiedergabeliste %1$s wurde erstellt.</string>
+
     <string name="credit_title">Helfende Hände</string>
+
     <string name="currently_listening_to_x_by_x">Du hörst gerade %1$s von %2$s.</string>
-    <string name="custom_artist_images">Benutzerdefinierte Interpretenbilder</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Absturzbericht teilen</string>
-    <string name="dark_theme_name">Irgendwie dunkel</string>
-    <string name="delete_playlist_title">Playlist löschen</string>
-    <string name="delete_playlist_x"><![CDATA[Die Playlist <b>%1$s</b> löschen?]]></string>
-    <string name="delete_playlists_title">Playlists löschen</string>
-    <string name="delete_song_title">Titel löschen</string>
-    <string name="delete_song_x"><![CDATA[Titel <b>%1$s</b> löschen?]]></string>
-    <string name="delete_songs_title">Titel löschen</string>
-    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> Playlists löschen?]]></string>
-    <string name="delete_x_songs"><![CDATA[<b>%1$d</b> Titel löschen?]]></string>
-    <string name="deleted_x_songs">%1$d Titel gelöscht.</string>
-    <string name="deleting_songs">Titel werden gelöscht</string>
+
+    <string name="dark_theme_name">Ziemlich Dunkel</string>
+
+    <string name="default_hint">Kein Songtext</string>
+
+    <string name="delete_playlist_title">Wiedergabeliste löschen</string>
+    <string name="delete_playlist_x"><![CDATA[Soll die Wiedergabeliste <b>%1$s</b> gelöscht werden?]]></string>
+
+    <string name="delete_playlists_title">Wiedergabelisten löschen</string>
+
+    <string name="delete_song_title">Song löschen</string>
+    <string name="delete_song_x"><![CDATA[Soll der Song <b>%1$s</b> gelöscht werden?]]></string>
+
+    <string name="delete_songs_title">Songs löschen</string>
+
+    <string name="delete_x_playlists"><![CDATA[Sollen die Wiedergabelisten <b>%1$d</b> gelöscht werden?]]></string>
+    <string name="delete_x_songs"><![CDATA[Sollen die Songs <b>%1$d</b> gelöscht werden?]]></string>
+    <string name="deleted_x_songs">%1$d Song(s) wurden gelöscht.</string>
+
     <string name="depth">Tiefe</string>
+
     <string name="description">Beschreibung</string>
+
     <string name="device_info">Geräteinfo</string>
+
     <string name="dialog_message_set_ringtone">Retro Music erlauben, Audioeinstellungen zu verändern</string>
+
     <string name="dialog_title_set_ringtone">Klingelton festlegen</string>
-    <string name="disc_hint">CD-Nummer</string>
-    <string name="do_you_want_to_clear_the_blacklist">Möchtest du die Ausschlussliste leeren?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Ausschlussliste entfernen?]]></string>
+
+    <string name="do_you_want_to_clear_the_blacklist">Möchtest du die schwarze Liste leeren?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der schwarzen Liste entfernen?]]></string>
+
     <string name="donate">Spenden</string>
-    <string name="donate_summary">Falls du meinst, ich habe mir etwas für meine Arbeit verdient, kannst du hier gerne ein bisschen Geld hinterlassen</string>
-    <string name="donation_header">Kauf\' mir ein(e/n):</string>
-    <string name="done">Fertig</string>
-    <string name="drive_mode">Fahrmodus</string>
-    <string name="edit_fab">Bearbeitungs-Schaltfläche</string>
-    <string name="edit_normal_lyrics">Liedtext bearbeiten</string>
-    <string name="edit_synced_lyrics">Synchronisierten Liedtext bearbeiten</string>
-    <string name="empty">Leeren</string>
+
+    <string name="donate_summary">Wenn du denkst, dass mein Werk Geld wert ist, kannst du mir hier gerne ein paar Euros lassen.</string>
+
+    <string name="donation_header">Kauf\' mir:</string>
+
+    <string name="download_from_last_fm">Von Last.fm herunterladen</string>
+
+    <string name="edit">Bearbeiten</string>
+
+    <string name="edit_cover">Cover bearbeiten</string>
+
+    <string name="empty">Leer</string>
+
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Konnte keine Sicherung erstellen</string>
-    <string name="error_delete_backup">Konnte Sicherung nicht löschen</string>
-    <string name="error_empty_name">Dein Name kann nicht leer sein!</string>
-    <string name="error_load_failed">Laden fehlgeschlagen</string>
-    <string name="error_share_file">Datei konnte nicht geteilt werden</string>
-    <string name="expanded">Erweitert</string>
+
+    <string name="error">Fehler</string>
+
     <string name="faq">FAQ</string>
+
     <string name="favorites">Favoriten</string>
-    <string name="file_already_exists">Datei existiert bereits</string>
-    <string name="finish_last_song">Letzten Titel beenden</string>
-    <string name="fit">Passend</string>
+
+    <string name="finish_last_song">Letzten Song ganz spielen</string>
+
+    <string name="fit">Anpassen</string>
+
     <string name="flat">Flach</string>
+
     <string name="folders">Ordner</string>
-    <string name="follow_system">System folgen</string>
+
     <string name="for_you">Für dich</string>
-    <string name="free">Kostenlos</string>
+
     <string name="full">Voll</string>
-    <string name="full_card">Komplette Karte</string>
-    <string name="general_settings_summary">Thema und Farben der App ändern</string>
+
+    <string name="full_card">Karte (Voll)</string>
+
+    <string name="general_settings_summary">Allgemeine Farben der App ändern</string>
     <string name="general_settings_title">Aussehen</string>
+
     <string name="genre">Genre</string>
+
     <string name="genres">Genres</string>
-    <string name="git_hub_summary">Projekt bei GitHub forken</string>
-    <string name="gradient">Farbverlauf</string>
-    <string name="grant_access">Zugriff gewähren</string>
+
+    <string name="git_hub_summary">Projekt von GitHub forken</string>
+
+    <string name="google_plus_community">Tritt\' der Google Plus-Community bei, um nach Hilfe zu fragen oder Updates zu Retro Music zu erhalten</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,356 +297,483 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Rasterstil</string>
-    <string name="help_summary">Benötigst du weitere Hilfe?</string>
-    <string name="hinge">Blättern</string>
+
+    <string name="grid_style_label"><![CDATA[Vorschaubilder]]></string>
+
+    <string name="hinge">Scharnier</string>
+
     <string name="history">Verlauf</string>
-    <string name="history_cleared">Verlauf gelöscht</string>
-    <string name="history_undo_button">Rückgängig</string>
-    <string name="home">Willkommensbildschirm</string>
+
+    <string name="home">Zuhause</string>
+
     <string name="horizontal_flip">Horizontale Drehung</string>
+
     <string name="image">Bild</string>
+
     <string name="image_gradient">Bild mit Farbverlauf</string>
+
     <string name="image_settings_summary">Download-Verhalten für Interpretenbilder ändern</string>
-    <string name="import_label">Importieren</string>
-    <string name="import_playlist">Playlist importieren</string>
-    <string name="import_playlist_message">Alle im Android-Medienspeicher abgelegten Playlists werden importiert. Falls die Playlists bereits existieren, werden die Titel eingefügt.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d Titel in Playlist %2$s eingefügt.</string>
-    <string name="instagram_page_summary">Teile dein Retro-Music-Design auf Instagram</string>
+
+    <string name="inserted_x_songs_into_playlist_x">%1$d Songs in die Wiedergabeliste %2$s hinzugefügt.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Teile dein Retro Music-Design auf Instagram</string>
+
     <string name="keyboard">Tastatur</string>
+
     <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
+
+    <string name="label_file_format">Formattieren</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_last_modified">Zuletzt geändert</string>
-    <string name="label_more_from">Mehr von %s</string>
-    <string name="label_sampling_rate">Abtastrate</string>
+
+    <string name="label_sampling_rate">Sampling-Rate</string>
+
     <string name="label_track_length">Länge</string>
+
     <string name="labeled">Beschriftet</string>
-    <string name="last_added">Zuletzt hinzugefügt</string>
-    <string name="last_song">Letzter Titel</string>
-    <string name="lets_go">Los</string>
+
+    <string name="last_added">Neu</string>
+
+    <string name="last_song">Letzter Song</string>
+
+    <string name="lets_play_something">Lass\' uns Musik spielen!</string>
+
+    <string name="library">Bibliothek</string>
+
     <string name="library_categories">Bibliothekkategorien</string>
+
     <string name="licenses">Lizenzen</string>
-    <string name="light_theme_name">Deutlich weiß</string>
-    <string name="listeners_label">Zuhörer</string>
+
+    <string name="light_theme_name">Ganz Weiß</string>
+
     <string name="listing_files">Dateien auflisten</string>
-    <string name="loading_products">Produkte werden geladen…</string>
-    <string name="login">Anmelden</string>
-    <string name="lyrics">Liedtext</string>
-    <string name="made_with_love">Mit ❤ in Indien gemacht</string>
+
+    <string name="loading_products">Produkte werden geladen...</string>
+
+    <string name="login">Login</string>
+
+    <string name="lyrics">Songtext</string>
+
+    <string name="made_with_love">Made with ❤️ in India</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Fehler</string>
+
     <string name="md_storage_perm_error">Berechtigungsfehler</string>
-    <string name="message_backup_create_success">Sicherung erfolgreich erstellt.</string>
-    <string name="message_limit_tabs">Nicht mehr als 5 Registerkarten</string>
-    <string name="message_pro_feature">%s ist eine Pro-Funktion.</string>
-    <string name="message_restore_success">Wiederherstellung erfolgreich abgeschlossen.</string>
-    <string name="message_updated">Aktualisiert</string>
-    <string name="message_welcome"><![CDATA[Hallo! <br>Willkommen bei %s]]></string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Meistgespielt</string>
-    <string name="never">Nie</string>
-    <string name="new_music_mix">Neuer Musik-Mix</string>
-    <string name="new_playlist_title">Neue Playlist</string>
+
+    <string name="my_name">Mein Name</string>
+
+    <string name="my_top_tracks">Top Songs</string>
+
+    <string name="never">Niemals</string>
+
+    <string name="new_banner_photo">Neues Banner-Foto</string>
+
+    <string name="new_playlist_title">Neue Wiedergabeliste</string>
+
+    <string name="new_profile_photo">Neues Profilbild</string>
+
     <string name="new_start_directory">%s ist das neue Startverzeichnis.</string>
-    <string name="next_song">Nächster Titel</string>
-    <string name="no_albums">Du hast keine Alben</string>
-    <string name="no_artists">Du hast keine Interpreten</string>
-    <string name="no_audio_ID">"Spiele einen Titel ab und versuche es erneut."</string>
-    <string name="no_backups_found">Keine Sicherungen gefunden</string>
-    <string name="no_equalizer">Kein Equalizer gefunden</string>
-    <string name="no_genres">Du hast keine Genres</string>
-    <string name="no_lyrics_found">Keine Liedtexte gefunden</string>
-    <string name="no_playing_queue">Es werden keine Titel abgespielt</string>
-    <string name="no_playlists">Du hast keine Playlists</string>
+
+    <string name="next_song">Nächster Song</string>
+
+    <string name="no_albums">Keine Alben</string>
+
+    <string name="no_artists">Keine Interpreten</string>
+
+    <string name="no_audio_ID">"Spiele zuerst einen Song, dann versuche es erneut."</string>
+
+    <string name="no_equalizer">Kein Equalizer gefunden.</string>
+
+    <string name="no_genres">Keine Genres</string>
+
+    <string name="no_lyrics_found">Kein Songtext gefunden</string>
+
+    <string name="no_playlists">Keine Wiedergabelisten</string>
+
     <string name="no_purchase_found">Kein Kauf gefunden.</string>
+
     <string name="no_results">Keine Ergebnisse</string>
-    <string name="no_songs">Du hast keine Titel</string>
+
+    <string name="no_songs">Keine Songs</string>
+
     <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normaler Liedtext</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ist nicht im Medienspeicher aufgeführt.]]></string>
-    <string name="not_recently_played">Nicht kürzlich abgespielt</string>
+
+    <string name="normal_lyrics">Normaler Songtext</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ist nicht im Medienspeicher aufgelistet.]]></string>
+
     <string name="nothing_to_scan">Nichts zu scannen.</string>
-    <string name="nothing_to_see">Nichts zu sehen</string>
+
     <string name="notification">Benachrichtigung</string>
-    <string name="notification_settings_summary">Den Benachrichtigungsstil anpassen</string>
-    <string name="now_playing">Aktuelle Wiedergabe</string>
-    <string name="now_playing_queue">Wiedergabe-Warteschlange</string>
-    <string name="now_playing_summary">Passe den Wiedergabe-Bildschirm an</string>
-    <string name="now_playing_themes">9+ Themen für den Wiedergabe-Bildschirm</string>
+
+    <string name="notification_settings_summary">Benachrichtigungen bearbeiten</string>
+
+    <string name="now_playing">Derzeit gespielt</string>
+    <string name="now_playing_queue">Derzeit abgespielte Warteschleife</string>
+    <string name="now_playing_summary">Passe den Abspielbildschirm an</string>
+    <string name="now_playing_themes">Mehr als 10 Abspiel-Themes</string>
+
     <string name="only_on_wifi">Nur über WLAN</string>
-    <string name="other_settings_summary">Experimentelle Funktionen</string>
-    <string name="others">Sonstiges</string>
-    <string name="over_cover">Über Cover</string>
+
+    <string name="other_settings_summary">Erweiterte Testfunktionen</string>
+
+    <string name="others">Anderes</string>
+
     <string name="password">Passwort</string>
-    <string name="past_three_months">Letzte 3 Monate</string>
-    <string name="paste_lyrics_here">Liedtext hier einfügen</string>
-    <string name="paste_timeframe_lyrics_here">Synchronisierten Liedtext hier einfügen</string>
-    <string name="peek">Vorschau</string>
-    <string name="permission_bluetooth_denied">Berechtigung für Geräte in der Nähe verweigert.</string>
-    <string name="permission_external_storage_denied">Zugriffsberechtigung für externen Speicher verweigert.</string>
-    <string name="permission_summary">Die App benötigt die Berechtigung zum Zugriff auf den Gerätespeicher, um Musik abspielen zu können</string>
-    <string name="permission_title">Speicherzugriff</string>
-    <string name="permissions_denied">Berechtigungen verweigert.</string>
+
+    <string name="past_three_months">Vergangene 3 Monate</string>
+
+    <string name="paste_lyrics_here">Songtext hier einfügen</string>
+
+    <string name="permission_external_storage_denied">Zugriff auf externen Speicher wurde verweigert.</string>
+
+    <string name="permissions_denied">Zugriff verweigert.</string>
+
     <string name="personalize">Personalisieren</string>
-    <string name="personalize_settings_summary">Wiedergabe-Bildschirm und Steuerelemente anpassen</string>
-    <string name="pick_from_local_storage">Aus lokalem Speicher wählen</string>
+
+    <string name="personalize_settings_summary">Abspiel-Bildschirm und Interface bearbeiten</string>
+
+    <string name="pick_from_local_storage">Vom lokalen Speicher wählen</string>
+
+    <string name="pick_image_intent_text">Bild auswählen</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Folge der Pinterest-Seite für Retro Music Design-Ideen</string>
+    <string name="pinterest_page_summary">Folge der Pinterest-Seite für Retro Music Design Inspirationen</string>
+
     <string name="plain">Einfach</string>
-    <string name="playList_already_exits">Playlist bereits vorhanden</string>
-    <string name="playback_pitch">Tonhöhe</string>
-    <string name="playback_settings">Wiedergabe-Einstellungen</string>
-    <string name="playback_speed">Abspielgeschwindigkeit</string>
-    <string name="playing_notification_description">Die Wiedergabe-Benachrichtigung ermöglicht Play-/Pause-Steuerung etc.</string>
-    <string name="playing_notification_name">Wiedergabe-Benachrichtigung</string>
-    <string name="playlist_created_sucessfully">%s erfolgreich erstellt</string>
-    <string name="playlist_is_empty">Playlist ist leer</string>
-    <string name="playlist_name_empty">Playlist-Name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Stärke der Unschärfe, niedriger ist schneller</string>
-    <string name="pref_blur_amount_title">Stärke der Unschärfe</string>
-    <string name="pref_filter_song_summary">Titel nach Länge filtern</string>
-    <string name="pref_filter_song_title">Nach Titellänge filtern</string>
-    <string name="pref_header_advanced">Sonstiges</string>
+
+    <string name="playing_notification_description">Die Medienbenachrichtigung bietet schnellen Zugriff auf Funktionen wie Abspielen/Pausieren etc.</string>
+    <string name="playing_notification_name">Medienbenachrichtigung</string>
+
+    <string name="playlist_empty_text">Leere Wiedergabeliste</string>
+
+    <string name="playlist_is_empty">Wiedergabeliste ist leer</string>
+
+    <string name="playlist_name_empty">Name der Wiedergabeliste</string>
+
+    <string name="playlists">Wiedergabelisten</string>
+
+    <string name="pref_album_detail_style">Style der Albumdetails</string>
+
+    <string name="pref_blur_amount_summary">Geringere Unschärfe benötigt weniger Rechenleistung.</string>
+    <string name="pref_blur_amount_title">Unschärfe</string>
+
+    <string name="pref_filter_song_title">Nach Spieldauer filtern</string>
+
     <string name="pref_header_album">Album-Stil</string>
-    <string name="pref_header_audio">Ton</string>
-    <string name="pref_header_blacklist">Ausschlussliste</string>
-    <string name="pref_header_controls">Steuerelemente</string>
-    <string name="pref_header_general">Erscheinungsbild</string>
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_controls">Schaltflächen</string>
+    <string name="pref_header_general">Thema</string>
     <string name="pref_header_images">Bilder</string>
     <string name="pref_header_library">Bibliothek</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausiert den Titel, wenn die Lautstärke auf Null fällt und nimmt die Wiedergabe bei steigendem Lautstärkepegel wieder auf. Funktioniert auch außerhalb der App</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Beim Stummschalten pausieren</string>
-    <string name="pref_keep_screen_on_summary">Beachte, dass sich diese Funktion auf die Akkulaufzeit auswirkt</string>
+    <string name="pref_header_playlists">Wiedergabelisten</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Die Musik pausieren, wenn die Lautstärke auf 0 gestellt wird. Achtung! Wenn die Lautstärke wieder erhöht wird, wird die Musik weiter abgespielt.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Bei Stummstellung pausieren</string>
+    <string name="pref_keep_screen_on_summary">Beachte, dass diese Funktion sich auf die Akkulaufzeit auswirkt.</string>
     <string name="pref_keep_screen_on_title">Bildschirm anlassen</string>
-    <string name="pref_language_name">Sprachauswahl</string>
+
+    <string name="pref_now_playing_screen_summary">Tippen oder wischen, um den Abspielbildschirm zu öffnen. Ist Wischen aktiv, kann die Navigationsleiste nicht transparent sein.</string>
+    <string name="pref_now_playing_screen_title">Wischgesten</string>
+
     <string name="pref_snow_fall_title">Schneefall-Effekt</string>
-    <string name="pref_summary_album_art_on_lockscreen">Album-Cover des gespielten Titels als Sperrbildschirm-Hintergrund verwenden</string>
-    <string name="pref_summary_album_artists_only">Album-Interpreten in der Kategorie Interpret anzeigen</string>
-    <string name="pref_summary_audio_ducking">Lautstärke während des Abspiels von Geräte- oder App-Benachrichtigungstönen verringern</string>
-    <string name="pref_summary_audio_fade">Beim Anhalten oder Abspielen eines Titels Lautstärke ab- und aufblenden</string>
-    <string name="pref_summary_blacklist">Der Inhalt ausgeschlossener Ordner wird in deiner Bibliothek ausgeblendet.</string>
-    <string name="pref_summary_bluetooth_playback">Wiedergabe starten, sobald das Bluetooth-Gerät verbunden ist</string>
-    <string name="pref_summary_blurred_album_art">Weichzeichnen der Album-Cover auf dem Sperrbildschirm. Kann Probleme mit anderen Apps und Widgets verursachen</string>
-    <string name="pref_summary_carousel_effect">Karussell-Effekt für Album-Cover auf dem Wiedergabe-Bildschirm. Die Designs Karte und Weichgezeichnete Karte funktionieren nicht</string>
-    <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigungs-Design</string>
-    <string name="pref_summary_colored_app">Farbänderung von Hintergrund und Steuerelementen basierend auf dem Album-Cover vom Wiedergabe-Bildschirm</string>
-    <string name="pref_summary_colored_app_shortcuts">Färbt die App-Verknüpfungen in der Akzentfarbe. Bitte nach jeder Änderung der Akzentfarbe erneut anwenden</string>
-    <string name="pref_summary_colored_notification">"Färbt die Benachrichtigung in der lebendigen Farbe des Album-Covers"</string>
-    <string name="pref_summary_cross_fade">Dauer der Überblendung zwischen den Titeln</string>
-    <string name="pref_summary_desaturated_color">Laut Material-Design-Richtlinien sollen Farben im dunklen Design entsättigt werden</string>
-    <string name="pref_summary_expand_now_playing_panel">Beim Tippen auf die Benachrichtigung wird der Wiedergabe-Bildschirm statt des Willkommensbildschirms angezeigt</string>
-    <string name="pref_summary_extra_controls">Zusätzliche Steuerelemente für Mini-Player hinzufügen</string>
-    <string name="pref_summary_extra_song_info">Zeige zusätzliche Titel-Informationen wie Dateiformat, Bitrate und Frequenz an</string>
-    <string name="pref_summary_gapless_playback">"Kann auf manchen Geräten Abspielprobleme verursachen."</string>
-    <string name="pref_summary_home_banner">Willkommensbildschirm-Banner anzeigen oder ausblenden</string>
-    <string name="pref_summary_ignore_media_store_artwork">Kann die Qualität des Album-Covers erhöhen, aber verursacht längere Bild-Ladezeiten. Nur aktivieren, falls Probleme mit niedrig aufgelösten Bildern bestehen</string>
-    <string name="pref_summary_library_categories">Konfiguriere Sichtbarkeit und Reihenfolge der Bibliothekskategorien.</string>
-    <string name="pref_summary_lock_screen">Verwende die eigenen Steuerelemente von Retro Music auf dem Sperrbildschirm</string>
-    <string name="pref_summary_manage_audio_focus">Audio immer im Hintergrund abspielen, auch während etwas anderes abgespielt wird</string>
-    <string name="pref_summary_open_source_licences">Lizenz-Details über Open-Source-Software</string>
-    <string name="pref_summary_pause_history">Wenn aktiviert, erscheinen neu abgespielte Lieder nicht im Verlauf</string>
-    <string name="pref_summary_remember_tab">Beim Start die zuletzt verwendete Registerkarte öffnen</string>
-    <string name="pref_summary_show_lyrics">Synchronisierten Liedtext über Album-Cover anzeigen</string>
-    <string name="pref_summary_suggestions">Neuer Musik-Mix auf dem Willkommensbildschirm anzeigen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Aktiviert den Titelwechsel durch Wischen auf dem Wiedergabe-Bildschirm</string>
-    <string name="pref_summary_swipe_to_dismiss">Zum Schließen des Mini-Players nach unten wischen</string>
-    <string name="pref_summary_toggle_full_screen">Den Vollbildmodus aktivieren</string>
-    <string name="pref_summary_toggle_headset">Wiedergabe starten, sobald Kopfhörer verbunden sind</string>
-    <string name="pref_summary_toggle_shuffle">Zufallswiedergabe wird ausgeschaltet, wenn eine neue Wiedergabeliste abgespielt wird</string>
-    <string name="pref_summary_toggle_volume">Bei ausreichend Platz Lautstärkeregler auf Wiedergabe-Bildschirm anzeigen</string>
-    <string name="pref_summary_wallpaper_accent">Akzentfarbe aus Hintergrund extrahieren</string>
-    <string name="pref_summary_whitelist">Nur Musik aus dem Ordner /Music einbeziehen</string>
-    <string name="pref_title_album_art_on_lockscreen">Album-Cover anzeigen</string>
-    <string name="pref_title_album_artists_only">Nach Album-Interpreten sortieren</string>
-    <string name="pref_title_album_cover_style">Stil des Album-Covers</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Nutzt das Albumcover des derzeitigen Songs als Sperrbildschirmhintergrund.</string>
+    <string name="pref_summary_audio_ducking">Benachrichtigungen, Navigation etc.</string>
+    <string name="pref_summary_blacklist">Die Musik in Ordnern von der schwarzen Liste wird nicht angezeigt.</string>
+    <string name="pref_summary_blurred_album_art">Stellt das Albumcover auf dem Sperrbildschirm unscharf. Dies kann Probleme mit Apps von Drittanbietern und Widgets verursachen.</string>
+    <string name="pref_summary_carousel_effect">Karusselleffekt beim Albumcover auf dem Abspiel-Bildschirm. Die Designs Karte und Karte (Unschärfe) unterstützen diese Funktion nicht.</string>
+    <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigungsdesign</string>
+    <string name="pref_summary_colored_app">Hintergrund und Steuerungsflächen ändern ihre Farbe basierend auf dem Albumcover</string>
+    <string name="pref_summary_colored_app_shortcuts">Färbt App-Schaltflächen in der gewählten Akzentfarbe. Wenn du die Akzentfarbe geändert hast, schalte diesen Effekt bitte aus und wieder ein.</string>
+    <string name="pref_summary_colored_navigation_bar">Färbt die Navigationsleiste in die primäre Farbe.</string>
+    <string name="pref_summary_colored_notification">"F\u00e4rbt die Benachrichtigung basierend auf der dominierenden Farbe des Albumcovers."</string>
+    <string name="pref_summary_dominant_color">Dominierende Farbe wird vom Album- oder Interpretencover gewählt.</string>
+    <string name="pref_summary_extra_controls">Zusätzliche Schaltflächen für den Mini-Player</string>
+    <string name="pref_summary_gapless_playback">"Kann Wiedergabeprobleme auf einigen Geräten verursachen."</string>
+    <string name="pref_summary_genre_toggle">Genre-Tab</string>
+    <string name="pref_summary_home_banner">Home-Banner</string>
+    <string name="pref_summary_ignore_media_store_artwork">Kann die Qualität des Albumcovers erhöhen, bringt aber langsamere Bildladezeiten mit. Schalte dies nur ein, wenn du Probleme mit Albencovern von niedriger Auflösung hast.</string>
+    <string name="pref_summary_library_categories">Stelle Sichtbarkeit und Reihenfolge der Bibliothekkategorien ein.</string>
+    <string name="pref_summary_lock_screen">Sperrbildschirmbedienungen für Retro Music.</string>
+    <string name="pref_summary_open_source_licences">Lizenzdetails für Open Source-Software</string>
+    <string name="pref_summary_round_corners">Gerundete Ecken für Fenster, Albumcover etc.</string>
+    <string name="pref_summary_tab_titles">Kategorienbezeichnungen in Navigationsleiste ein/ausschalten.</string>
+    <string name="pref_summary_toggle_full_screen">Ansicht ohne Status- und Navigationsleiste</string>
+    <string name="pref_summary_toggle_headset">Mit Wiedergabe starten, sobald Kopfhörer verbunden sind.</string>
+    <string name="pref_summary_toggle_shuffle">Shufflemodus wird ausgeschaltet, sobald neue Wiedergabe gestartet wird</string>
+    <string name="pref_summary_toggle_volume">Falls Platz vorhanden ist, Lautstärkeregler auf Derzeit gespielt-Bildschirm zeigen</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Albumcover zeigen</string>
+    <string name="pref_title_album_cover_style">Aussehen des Albumcovers</string>
     <string name="pref_title_album_cover_transform">Stil des Album-Covers</string>
-    <string name="pref_title_app_shortcuts">Farbige App-Verknüpfungen</string>
-    <string name="pref_title_appbar_mode">Stil der Suchleiste</string>
-    <string name="pref_title_audio_ducking">Lautstärke bei Fokusverlust reduzieren</string>
-    <string name="pref_title_audio_fade">Audio überblenden</string>
-    <string name="pref_title_auto_download_artist_images">Interpreten-Bilder automatisch herunterladen</string>
-    <string name="pref_title_blacklist">Ausschlussliste</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth-Wiedergabe</string>
-    <string name="pref_title_blurred_album_art">Album-Cover weichzeichnen</string>
-    <string name="pref_title_circle_button">Runder Wiedergabeknopf</string>
-    <string name="pref_title_classic_notification">Klassischer Benachrichtigungsstil</string>
-    <string name="pref_title_colored_app">Farbanpassung</string>
-    <string name="pref_title_colored_notification">Farbige Benachrichtigungen</string>
-    <string name="pref_title_cross_fade">Überblenden (experimentell)</string>
-    <string name="pref_title_custom_font">Manrope-Schriftart verwenden</string>
-    <string name="pref_title_desaturated_color">Entsättigte Farben</string>
-    <string name="pref_title_expand_now_playing_panel">Wiedergabe-Bildschirm anzeigen</string>
-    <string name="pref_title_extra_controls">Zusätzliche Steuerelemente</string>
-    <string name="pref_title_extra_song_info">Titel-Info</string>
-    <string name="pref_title_gapless_playback">Unterbrechungsfreie Wiedergabe</string>
-    <string name="pref_title_general_theme">App-Design</string>
-    <string name="pref_title_home_album_grid_style">Alben-Darstellung</string>
-    <string name="pref_title_home_artist_grid_style">Interpreten-Darstellung</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Cover aus dem Medienspeicher ignorieren</string>
-    <string name="pref_title_last_added_interval">Zeitraum für \"Zuletzt-hinzugefügt\"-Playlist</string>
-    <string name="pref_title_lock_screen">Vollbildsteuerung</string>
-    <string name="pref_title_lyrics_screen_on">Display aktiv halten, wenn Liedtexte angezeigt werden</string>
-    <string name="pref_title_lyrics_type">Art des Liedtextes</string>
-    <string name="pref_title_manage_audio_focus">Immer abspielen</string>
-    <string name="pref_title_now_playing_screen_appearance">Stil des Wiedergabe-Bildschirms</string>
-    <string name="pref_title_open_source_licences">Open-Source-Lizenzen</string>
-    <string name="pref_title_pause_history">Verlauf pausieren</string>
-    <string name="pref_title_remember_tab">Letzte Registerkarte merken</string>
-    <string name="pref_title_show_lyrics">Liedtext anzeigen</string>
-    <string name="pref_title_suggestions">Vorschläge anzeigen</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Wische irgendwo um den Titel zu wechseln</string>
-    <string name="pref_title_swipe_to_dismiss">Zum Schließen nach unten wischen</string>
+    <string name="pref_title_album_grid_style">Album-Rasteransicht</string>
+    <string name="pref_title_app_shortcuts">Gefärbte App-Schaltflächen</string>
+    <string name="pref_title_artist_grid_style">Interpreten-Rasteransicht</string>
+    <string name="pref_title_audio_ducking">Reduziere Lautstärke bei Fokusverlust</string>
+    <string name="pref_title_auto_download_artist_images">Lade Interpretenbild automatisch herunter</string>
+    <string name="pref_title_blacklist">Schwarze Liste</string>
+    <string name="pref_title_blurred_album_art">Albumcover unscharf stellen</string>
+    <string name="pref_title_choose_equalizer">Equalizer wählen</string>
+    <string name="pref_title_classic_notification">Klassisches Benachrichtigungsdesign</string>
+    <string name="pref_title_colored_app">Adaptive Farbe</string>
+    <string name="pref_title_colored_notification">Farbige Benachrichtigung</string>
+    <string name="pref_title_extra_controls">Zusätzliche Schaltflächen</string>
+    <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
+    <string name="pref_title_general_theme">App Design</string>
+    <string name="pref_title_genre_toggle">Genre-Tab anzeigen</string>
+    <string name="pref_title_home_artist_grid_style">Künstlerbilder auf der Startseite</string>
+    <string name="pref_title_home_banner">Home-Banner</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignoriere Cover im Medienspeicher</string>
+    <string name="pref_title_last_added_interval">Zuletzt hinzugefügt-Playlistintervall</string>
+    <string name="pref_title_lock_screen">Vollbildschirmsteuerung</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_tab_text_mode">Beschriftung der Navigationselemente</string>
     <string name="pref_title_toggle_carousel_effect">Karussell-Effekt</string>
-    <string name="pref_title_toggle_full_screen">Vollbildmodus</string>
+    <string name="pref_title_toggle_dominant_color">Dominante Farbe</string>
+    <string name="pref_title_toggle_full_screen">Vollbild-Modus</string>
+    <string name="pref_title_toggle_tab_titles">Navigationsleistentitel</string>
     <string name="pref_title_toggle_toggle_headset">Automatische Wiedergabe</string>
-    <string name="pref_title_toggle_toggle_shuffle">Zufallswiedergabe</string>
-    <string name="pref_title_toggle_volume">Lautstärkeregler</string>
-    <string name="pref_title_wallpaper_accent">Akzentfarbe aus Hintergrundbild</string>
-    <string name="pref_title_whitelist">Einbezogene Musik</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Dunkles Design, Stil des Wiedergabe-Bildschirms, Karussell-Effekt usw.</string>
+    <string name="pref_title_toggle_toggle_shuffle">Shuffle-Modus</string>
+    <string name="pref_title_toggle_volume">Lautstärkesteuerung</string>
+    <string name="pref_title_user_info">Nutzerinfo</string>
+
+    <string name="primary_color">Primärfarbe</string>
+    <string name="primary_color_desc">Die Primärfarbe, standardmäßig blau/grau, funktioniert nun auch mit dunklen Farben</string>
+
+    <string name="pro_summary">Themes für \"Now Playing\", Karussell-Effekte und mehr</string>
+
     <string name="profile">Profil</string>
+
     <string name="purchase">Kaufen</string>
-    <string name="queue">Warteschlange</string>
+
+    <string name="purchase_summary">*Denke vor dem Kauf nach, frage nicht nach einer Rückerstattung.</string>
+
+    <string name="queue">Warteschleife</string>
+
     <string name="rate_app">App bewerten</string>
-    <string name="rate_on_google_play_summary">Du magst die App? Lass uns im Google Play Store wissen, wie wir sie verbessern können</string>
-    <string name="recent_albums">Kürzlich abgespielte Alben</string>
-    <string name="recent_artists">Kürzlich abgespielte Interpreten</string>
+
+    <string name="rate_on_google_play_summary">Gefällt dir die App? Lass\' es uns im Google Play Store wissen, um die Gesamterfahrung für alle zu verbessern!</string>
+
+    <string name="recent_albums">Kürzlich gespielte Alben</string>
+
+    <string name="recent_artists">Kürzlich gehörte Interpreten</string>
+
     <string name="remove_action">Entfernen</string>
+
+    <string name="remove_banner_photo">Banner-Foto entfernen</string>
+
     <string name="remove_cover">Cover entfernen</string>
-    <string name="remove_from_blacklist">Von Ausschlussliste entfernen</string>
-    <string name="remove_image">Bild entfernen</string>
-    <string name="remove_song_from_playlist_title">Titel aus Playlist entfernen</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Den Titel <b>%1$s</b> aus der Playlist entfernen?]]></string>
-    <string name="remove_songs_from_playlist_title">Titel aus der Playlist entfernen</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> Titel aus der Playlist entfernen?]]></string>
-    <string name="rename_playlist_title">Playlist umbenennen</string>
-    <string name="replace_cover">Cover ersetzen</string>
-    <string name="report_an_issue">Ein Problem melden</string>
+
+    <string name="remove_from_blacklist">Von der Blacklist löschen</string>
+
+    <string name="remove_profile_photo">Profilbild entfernen</string>
+
+    <string name="remove_song_from_playlist_title">Song von Wiedergabeliste entfernen</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Den Song <b>%1$s</b> von der Wiedergabeliste entfernen?]]></string>
+
+    <string name="remove_songs_from_playlist_title">Entferne Songs von Wiedergabeliste</string>
+
+    <string name="remove_x_songs_from_playlist"><![CDATA[Entferne <b>%1$d</b> Songs von der Wiedergabeliste?]]></string>
+
+    <string name="rename_playlist_title">Wiedergabeliste umbenennen</string>
+
+    <string name="report_an_issue">Fehler melden</string>
+
     <string name="report_bug">Einen Fehler melden</string>
+
     <string name="reset_action">Zurücksetzen</string>
-    <string name="reset_artist_image">Interpreten-Bild zurücksetzen</string>
+
+    <string name="reset_artist_image">Interpretenbild zurücksetzen</string>
+
     <string name="restore">Wiederherstellen</string>
-    <string name="restore_message">Möchtest du die Sicherung wiederherstellen?</string>
-    <string name="restored_previous_purchase_please_restart">Früherer Kauf wiederhergestellt. Starte die App bitte neu, um alle Funktionen nutzen zu können.</string>
-    <string name="restored_previous_purchases">Frühere Käufe wiederhergestellt.</string>
-    <string name="restoring_purchase">Kauf wird wiederhergestellt…</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="restored_previous_purchase_please_restart">Vorherigen Kauf wiederherstellen. Starte die App bitte neu, um den Vorgang abzuschließen.</string>
+    <string name="restored_previous_purchases">Vorherige Käufe wiederhergestellt.</string>
+
+    <string name="restoring_purchase">Kauf wird wiederhergestellt...</string>
+
+    <string name="retro_equalizer">Retro Music-Equalizer</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Die App benötigt die Berechtigung zum Ändern von Systemeinstellungen, um Musik als Klingelton festlegen zu können</string>
-    <string name="ringtone_title">Klingelton (optional)</string>
-    <string name="saf_delete_failed">Löschen der Datei fehlgeschlagen: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Kann SAF URI nicht abrufen</string>
-    <string name="saf_guide_slide1_description">Navigationsleiste öffnen</string>
-    <string name="saf_guide_slide1_description_before_o">Aktiviere \'SD-Karte anzeigen\' im Überlaufmenü</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s benötigt Zugriff auf die SD-Karte</string>
-    <string name="saf_guide_slide2_description">Du musst das Stammverzeichnis deiner SD-Karte auswählen</string>
-    <string name="saf_guide_slide2_title">SD-Karte in der Navigationsleiste auswählen</string>
-    <string name="saf_guide_slide3_description">Keine Unterordner öffnen</string>
-    <string name="saf_guide_slide3_title">Tippe auf die Auswählen-Schaltfläche am unteren Bildschirmrand</string>
-    <string name="saf_write_failed">Schreibvorgang fehlgeschlagen: %s</string>
+
     <string name="save">Speichern</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Als Datei speichern</string>
+
     <string name="save_playlists_title">Als Dateien speichern</string>
-    <string name="saved_playlist_to">Wiedergabeliste unter %s gespeichert.</string>
+
+    <string name="saved_playlist_to">Wiedergabeliste als %s gespeichert</string>
+
     <string name="saving_changes">Änderungen werden gespeichert</string>
+
     <string name="scan_media">Medien scannen</string>
+
     <string name="scanned_files">%1$d von %2$d Dateien gescannt.</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="search_hint">Durchsuche deine Bibliothek...</string>
+
     <string name="select_all">Alle auswählen</string>
-    <string name="selected">Ausgewählt</string>
-    <string name="set">Festgelegt</string>
-    <string name="set_artist_image">Lege ein Interpreten-Bild fest</string>
+
+    <string name="select_banner_photo">Banner-Foto auswählen</string>
+
+    <string name="selected">Ausgewähltes beschriftet</string>
+
+    <string name="send_crash_log">Crashlogs senden</string>
+
+    <string name="set">Set</string>
+
+    <string name="set_artist_image">Wähle ein Interpretenbild</string>
+
+    <string name="set_photo">Profilfoto festlegen</string>
+
     <string name="share_app">App teilen</string>
-    <string name="share_summary">Teile die App mit deinen Freunden und Verwandten</string>
-    <string name="share_to_stories">In Stories teilen</string>
-    <string name="show_album_artists">Album-Interpreten anzeigen</string>
-    <string name="shuffle">Zufallswiedergabe</string>
+
+    <string name="shuffle">Shuffle</string>
+
     <string name="simple">Einfach</string>
-    <string name="sleep_timer_canceled">Einschlafmodus abgebrochen.</string>
-    <string name="sleep_timer_set">Einschlafmodus auf %d Minuten gesetzt.</string>
-    <string name="social">Soziale Medien</string>
-    <string name="social_stories">Story teilen</string>
-    <string name="song">Titel</string>
-    <string name="song_duration">Länge</string>
-    <string name="songs">Titel</string>
-    <string name="sort_order">Sortieren nach</string>
+
+    <string name="sleep_timer_canceled">Schlaftimer abgebrochen</string>
+    <string name="sleep_timer_set">Schlaftimer gesetzt für %d Minuten.</string>
+
+    <string name="slide">Folie</string>
+
+    <string name="small">Kleines Album</string>
+
+    <string name="social">Sozial</string>
+
+    <string name="song">Song</string>
+
+    <string name="song_duration">Songlänge</string>
+
+    <string name="songs">Songs</string>
+
+    <string name="sort_order">Sortierreihenfolge</string>
     <string name="sort_order_a_z">Aufsteigend</string>
     <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Interpret</string>
+    <string name="sort_order_artist">Künstler</string>
     <string name="sort_order_composer">Komponist</string>
-    <string name="sort_order_date">Hinzufügedatum</string>
-    <string name="sort_order_date_modified">Änderungsdatum</string>
-    <string name="sort_order_default">Standard</string>
-    <string name="sort_order_num_songs">Titel-Nummer</string>
-    <string name="sort_order_num_songs_desc">Titel-Nummer absteigend</string>
+    <string name="sort_order_date">Datum</string>
     <string name="sort_order_year">Jahr</string>
     <string name="sort_order_z_a">Absteigend</string>
-    <string name="speech_not_supported">Tut uns leid! Dein Gerät unterstützt keine Spracheingabe</string>
-    <string name="speech_prompt">Bibliothek durchsuchen</string>
+
+    <string name="speech_not_supported">Tut uns leid, aber dein Gerät unterstützt keine Spracheingabe!</string>
+
+    <string name="speech_prompt">Durchsuche deine Bibliothek</string>
+
     <string name="stack">Gestapelt</string>
-    <string name="start_play_music">Spiele Musik ab.</string>
-    <string name="suggestion_songs">Empfehlungen</string>
-    <string name="support_development">Entwicklung unterstützen</string>
-    <string name="swipe_to_unlock">Zum Entsperren Wischen</string>
-    <string name="synced_lyrics">Synchronisierter Liedtext</string>
+
+    <string name="start_play_music">Beginne Musik zu spielen.</string>
+
+    <string name="suggestion_songs">Für dich</string>
+
+    <string name="summary_user_info">Zeige deinen Namen auf dem Startbildschirm</string>
+
+    <string name="support_development">Unterstütze die Entwicklung</string>
+
+    <string name="swipe_to_unlock">Wischen zum Entsperren</string>
+
+    <string name="synced_lyrics">Synchronisierter Songtext</string>
+
+    <string name="system_equalizer">System-Equalizer</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Tritt der Telegram-Gruppe bei, um über Fehler zu diskutieren, Vorschläge zu machen, zu protzen usw.</string>
+    <string name="telegram_group_summary">Betritt die Telegram-Gruppe um über Fehler zu diskutieren, um Vorschläge zu geben usw.</string>
+
     <string name="thank_you">Vielen Dank!</string>
-    <string name="the_audio_file">Audio-Datei</string>
+
+    <string name="the_audio_file">Die Audiodatei</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">Winzig</string>
-    <string name="tiny_card_style">Winzige Karte</string>
+
     <string name="title">Titel</string>
-    <string name="title_new_backup">Neue Sicherung</string>
+
+    <string name="title_dashboard">Bedienfläche</string>
+
+    <string name="title_good_afternoon">Guten Nachmittag!</string>
+    <string name="title_good_day">Guten Tag!</string>
+    <string name="title_good_evening">Einen schönen Abend!</string>
+    <string name="title_good_morning">Guten Morgen!</string>
+    <string name="title_good_night">Gute Nacht!</string>
+
+    <string name="title_user_info">Wie lautet dein Name?</string>
+
     <string name="today">Heute</string>
-    <string name="top_albums">Top-Alben</string>
-    <string name="top_artists">Top-Interpreten</string>
-    <string name="track_hint">"Titelnummer (2 für Titel 2 oder 3004 für CD 3, Titel 4)"</string>
-    <string name="track_list">Titel-Nummer</string>
+
+    <string name="top_albums">Top Alben</string>
+
+    <string name="top_artists">Top Interpreten</string>
+
+    <string name="track_hint">"Songnummer (2 für Song 2 oder 3004 für CD3 Song 4)"</string>
+
+    <string name="track_list">Songnummer</string>
+
     <string name="translate">Übersetzen</string>
-    <string name="translate_community">Hilf uns, die App in deine Sprache zu übersetzen</string>
-    <string name="try_retro_music_premium">Retro Music Premium testen</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Teile dein Design mit Retro Music</string>
-    <string name="unlabeled">Unbenannt</string>
-    <string name="unplayable_file">Titel konnte nicht abgespielt werden.</string>
-    <string name="up_next">Als Nächstes</string>
+
+    <string name="translate_community">Hilf\' uns, die App in deine Sprache zu übersetzen!</string>
+
+    <string name="twitter_page">Twitter-Seite</string>
+    <string name="twitter_page_summary">Teile dein Design mit RetroMusic</string>
+
+    <string name="unlabeled">Unbeschriftet</string>
+
+    <string name="unplayable_file">Song konnte nicht gespielt werden.</string>
+
+    <string name="up_next">Als nächstes</string>
+
     <string name="update_image">Bild aktualisieren</string>
-    <string name="updating">Aktualisiere…</string>
-    <string name="user_images_description">Benutzerbilder</string>
-    <string name="user_name">Benutzername</string>
+
+    <string name="updating">Aktualisieren...</string>
+
     <string name="username">Benutzername</string>
+
     <string name="version">Version</string>
+
     <string name="vertical_flip">Vertikale Drehung</string>
-    <string name="view_on_telegram">Auf Telegram ansehen</string>
-    <string name="volume">Lautstärke</string>
-    <string name="web_search">Internetsuche</string>
-    <string name="website">Webseite</string>
-    <string name="website_summary">Besuche unsere Webseite</string>
+
+    <string name="virtualizer">Surroundsound</string>
+
+    <string name="web_search">Websuche</string>
+
     <string name="welcome">Willkommen,</string>
+
     <string name="what_do_you_want_to_share">Was möchtest du teilen?</string>
-    <string name="whats_new">Was ist neu</string>
+
+    <string name="whats_new">Neuigkeiten</string>
+
     <string name="window">Fenster</string>
+
     <string name="window_corner_edges">Runde Ecken</string>
-    <string name="x_has_been_set_as_ringtone">%1$s als Klingelton verwenden.</string>
+
+    <string name="x_has_been_set_as_ringtone">Stelle %1$s als deinen Klingelton ein.</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="you_will_be_forwarded_to_the_issue_tracker_website">Du wirst auf die Problembehandlungs-Seite weitergeleitet.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Deine Accountdaten werden ausschließlich zur Authentifizierung genutzt.</string>
+
+    <string name="you_have_to_select_at_least_one_category">Du musst mindestens eine Kategorie auswählen</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Du wirst auf die Issue Tracker-Seite weitergeleitet.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Deine Accountdaten werden ausschließlich zur Authentifizierung genutzt</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
new file mode 100644
index 000000000..b37ff8b59
--- /dev/null
+++ b/app/src/main/res/values-de/strings.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Akzentfarbe</string>
+    <string name="accent_color_desc">Akzentfarbe des Farbthemas, Standard 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 Wiedergabeliste hinzufügen</string>
+    <string name="action_add_to_playlist">Zur Playlist hinzufügen...</string>
+
+    <string name="action_clear_playing_queue">Wiedergabeliste leeren</string>
+    <string name="action_clear_playlist">Playlist leeren</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">Zum Album gehen</string>
+    <string name="action_go_to_artist">Zum Künstler gehen</string>
+    <string name="action_go_to_start_directory">Zum Startverzeichnis gehen</string>
+
+    <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_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_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>
+
+    <string name="action_rename">Umbenennen</string>
+
+    <string name="action_save_playing_queue">Wiedergabeliste speichern</string>
+
+    <string name="action_scan">Scannen</string>
+
+    <string name="action_search">Suche</string>
+
+    <string name="action_set">Verwenden</string>
+    <string name="action_set_as_ringtone">Als Klingelton verwenden</string>
+    <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_shuffle_all">Alle 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>
+
+    <string name="add_action">Hinzufügen</string>
+
+    <string name="add_photo">Bild \nhinzufügen</string>
+
+    <string name="add_playlist_title">"Zur Playlist hinzufügen"</string>
+
+    <string name="added_title_to_playing_queue">"1 Titel wurde zur Wiedergabeliste hinzugefügt."</string>
+
+    <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_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_widget_big_name">Retro Music - Big</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="artists">Künstler</string>
+
+    <string name="audio_focus_denied">Audio Fokus verweigert.</string>
+
+    <string name="biography">Biografie</string>
+
+    <string name="black_theme_name">Sehr schwarz</string>
+
+    <string name="blacklist">Blacklist</string>
+
+    <string name="cancel_current_timer">Timer stoppen</string>
+
+    <string name="changelog">Änderungen</string>
+
+    <string name="changelog_summary">Changelog über Telegram-App verwaltet.</string>
+
+    <string name="clear_action">Leer</string>
+
+    <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="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>
+    <string name="could_not_scan_files">%d Dateien konnte(n) nicht gescannt werden.</string>
+
+    <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="dark_theme_name">Dunkel</string>
+
+    <string name="default_hint">keine Lyrics</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_x"><![CDATA[Song <b>%1$s</b> 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>
+
+    <string name="do_you_want_to_clear_the_blacklist">Möchtest du die Blacklist leeren?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Möchtest du <b>%1$s</b> von der Blacklist entfernen?]]></string>
+
+    <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="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="genre">Genre</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 Song(s) in Playlist %2$s eingefü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">Sampling Rate</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 abspielen</string>
+
+    <string name="library">Bibliothek</string>
+
+    <string name="licenses">Lizenzen</string>
+
+    <string name="light_theme_name">Sehr weiß</string>
+
+    <string name="listing_files">Gelistete Dateien</string>
+
+    <string name="loading_products">Produkte werden geladen...</string>
+
+    <string name="lyrics">Lyrics</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">"Song abspielen und anschließend erneut versuchen."</string>
+
+    <string name="no_equalizer">Keinen Equalizer gefunden.</string>
+
+    <string name="no_lyrics_found">Keine Lyrics gefunden</string>
+
+    <string name="no_playlists">Keine Playlisten</string>
+
+    <string name="no_results">Keine Ergebnisse</string>
+
+    <string name="no_songs">Keine Songs</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="now_playing_queue">Aktuelle Wiedergabeliste</string>
+
+    <string name="only_on_wifi">Nur über Wi-Fi</string>
+
+    <string name="past_three_months">Letzte 3 Monate</string>
+
+    <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="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>
+
+    <string name="playlist_is_empty">Playlist ist leer</string>
+
+    <string name="playlist_name_empty">Playlistname</string>
+
+    <string name="playlists">Wiedergabelisten</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">Playlist</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>
+    <string name="pref_summary_classic_notification">Nutze das klassische Benachrichtigungs-Design</string>
+    <string name="pref_summary_colored_app">Hintergrund und Bedienelemente färben sich je nach Album-Cover</string>
+    <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_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">Vollständige Musiksteuerung auf dem Sperrbildschirm einschalten.</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>
+
+    <string name="pref_title_album_art_on_lockscreen">Album Cover anzeigen</string>
+    <string name="pref_title_app_shortcuts">Gefärbte App Shortcuts</string>
+    <string name="pref_title_audio_ducking">Lautstärke bei Fokusverlust reduzieren</string>
+    <string name="pref_title_auto_download_artist_images">Künstler Bild automatisch downloaden</string>
+    <string name="pref_title_blurred_album_art">Album Cover weichzeichnen</string>
+    <string name="pref_title_classic_notification">Klassisches Design für Benachrichtigungen.</string>
+    <string name="pref_title_colored_app">selbstanpassende Farbe</string>
+    <string name="pref_title_colored_notification">Gefärbte Benachrichtigung</string>
+    <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
+    <string name="pref_title_general_theme">Hauptthema</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_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_full_screen">Vollbild App</string>
+    <string name="pref_title_toggle_volume">Lautstärkeregler</string>
+    <string name="pref_title_user_info">Benutzerinformationen</string>
+
+    <string name="primary_color">Hauptfarbe</string>
+    <string name="primary_color_desc">Primäre Farbe des Farbthemas, Standard ist indigo</string>
+
+    <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="remove_action">Entfernen</string>
+
+    <string name="remove_cover">Cover entfernen</string>
+
+    <string name="remove_from_blacklist">Von der Blacklist löschen</string>
+
+    <string name="remove_song_from_playlist_title">Songs von 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">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_playlist_title">Playlist umbenennen</string>
+
+    <string name="restored_previous_purchases">Käufe wiederhergestellt</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="scanned_files">%1$d von %2$d Dateien gescannt.</string>
+
+    <string name="search_hint">Bibliothek durchsuchen...</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>
+
+    <string name="song">Song</string>
+
+    <string name="song_duration">Songdauer</string>
+
+    <string name="songs">Titel</string>
+
+    <string name="sort_order">Sortierreihenfolge</string>
+
+    <string name="speech_not_supported">Tut uns leid! Dein Gerät unterstützt keine Spracheingabe</string>
+
+    <string name="speech_prompt">Bibliothek durchsuchen</string>
+
+    <string name="summary_user_info">Zeige nur deinen Namen auf dem Startbildschirm</string>
+
+    <string name="support_development">Entwickler unterstützen</string>
+
+    <string name="thank_you">Vielen Dank!</string>
+
+    <string name="the_audio_file">Die Audiodatei</string>
+
+    <string name="this_month">Diesen Monat</string>
+
+    <string name="this_week">Diese Woche</string>
+
+    <string name="this_year">Dieses Jahr</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="translate">Übersetzen</string>
+
+    <string name="unplayable_file">Song konnte nicht abgespielt werden.</string>
+
+    <string name="up_next">Als Nächstes</string>
+
+    <string name="update_image">Bild aktualisieren</string>
+
+    <string name="updating">Aktualisieren...</string>
+
+    <string name="version">Version</string>
+
+    <string name="web_search">Internetsuche</string>
+
+    <string name="what_do_you_want_to_share">Was möchtest du teilen?</string>
+
+    <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="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
deleted file mode 100644
index 775927ad8..000000000
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Σχετικά με %s</string>
-    <string name="about_settings_summary">Ομάδα, κοινωνικοί σύνδεσμοι</string>
-    <string name="accent_color">Χρώμα έμφασης</string>
-    <string name="accent_color_desc">Το χρώμα έμφασης του θέματος, η προεπιλογή είναι το μωβ</string>
-    <string name="action_about">Σχετικά με</string>
-    <string name="action_add_to_blacklist">Προσθήκη στην μαύρη λίστα</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_cancel">Ακύρωση τρέχων χρονοδιακόπτη</string>
-    <string name="action_cast">Μετάδοση</string>
-    <string name="action_clear_playing_queue">Εκκαθάριση ουράς αναπαραγωγής</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_edit">Επεξεργασία</string>
-    <string name="action_go_to_album">Μετάβαση στο άλμπουμ</string>
-    <string name="action_go_to_artist">Μετάβαση στον καλλιτέχνη</string>
-    <string name="action_go_to_genre">Μετάβαση στο είδος</string>
-    <string name="action_go_to_lyrics">Μετάβαση στους Στίχους</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">Μέγεθος Πλέγματος (landscape mode)</string>
-    <string name="action_new_playlist">Νέα λίστα αναπαραγωγής</string>
-    <string name="action_next">Επόμενο</string>
-    <string name="action_play">Αναπαραγωγή</string>
-    <string name="action_play_all">Αναπαραγωγή όλων</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">Αφαίρεση από 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_sort_order">Σειρά ταξινόμησης</string>
-    <string name="action_tag_editor">Επεξεργασία Ετικετών</string>
-    <string name="action_toggle_favorite">Εναλλαγή αγαπημένου</string>
-    <string name="action_toggle_shuffle">Εναλλαγή λειτουργίας τυχαίας σειράς</string>
-    <string name="adaptive">Προσαρμοστικό</string>
-    <string name="add_action">Προσθήκη</string>
-    <string name="add_playlist_title">"Προσθήκη στη λίστα αναπαραγωγής"</string>
-    <string name="add_time_framed_lryics">Προσθήκη Στίχων Με Χρονικό Πλαίσιο</string>
-    <string name="added_song_count_to_playlist">Προστέθηκαν %1$d τραγούδι(α) στο %2$s</string>
-    <string name="added_title_to_playing_queue">"Προστέθηκε 1 κομμάτι στην ουρά αναπαραγωγής."</string>
-    <string name="added_x_titles_to_playing_queue">Προστέθηκαν %1$d κομμάτια στην ουρά αναπαραγωγής.</string>
-    <string name="album">Άλμπουμ</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Κομμάτι</item>
-        <item quantity="other">Κομμάτια</item>
-    </plurals>
-    <string name="album_artist">Καλλιτέχνης Άλμπουμ</string>
-    <string name="albums">Άλμπουμ</string>
-    <plurals name="albums">
-        <item quantity="one">Άλμπουμ</item>
-        <item quantity="other">Άλμπουμς</item>
-    </plurals>
-    <string name="always">Πάντα</string>
-    <string name="app_share">Τσεκάρετε αυτό το κούλ music player στο:https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Τυχαία αναπαραγωγή</string>
-    <string name="app_shortcut_top_tracks_short">Κορυφαία Κομμάτια</string>
-    <string name="app_widget_big_name">Πλήρης εικόνα</string>
-    <string name="app_widget_card_name">Κάρτα</string>
-    <string name="app_widget_classic_name">Κλασσικό</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Μικρό</string>
-    <string name="app_widget_text_name">Ελάχιστο Κείμενο</string>
-    <string name="artist">Καλλιτέχνης</string>
-    <string name="artists">Καλλιτέχνες</string>
-    <string name="audio_fade_duration">Διάρκεια εξασθένισης ήχου</string>
-    <string name="audio_focus_denied">Η εστίαση ήχου απορρίφθηκε.</string>
-    <string name="audio_settings_summary">Αλλάξτε τις ρυθμίσεις ήχου και προσαρμόστε τα χειριστήρια του ισοσταθμιστή</string>
-    <string name="auto">Αυτόματο</string>
-    <string name="backup_restore_settings_summary">Δημιουργία αντιγράφων ασφαλείας και επαναφορά ρυθμίσεων, λιστών αναπαραγωγής</string>
-    <string name="backup_restore_title"><![CDATA[Αντίγραφο Ασφαλείας & Επαναφορά]]></string>
-    <string name="backup_title">Αντίγραφα Ασφαλείας</string>
-    <string name="biography">Βιογραφία</string>
-    <string name="black_theme_name">Απλά Μαύρο</string>
-    <string name="blacklist">Μαύρη λίστα</string>
-    <string name="bluetooth_summary">Η εφαρμογή χρειάζεται άδεια κοντινών συσκευών για να ελέγξει για συσκευές Bluetooth</string>
-    <string name="bluetooth_title">Κοντινές συσκευές</string>
-    <string name="blur">Θολούρα</string>
-    <string name="blur_card">Κάρτα θαμπώματος</string>
-    <string name="bug_report_failed">Δεν είναι δυνατή η αποστολή αναφοράς</string>
-    <string name="bug_report_failed_invalid_token">Μη έγκυρο διακριτικό πρόσβασης. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.</string>
-    <string name="bug_report_failed_issues_not_available">Τα ζητήματα δεν είναι ενεργοποιημένα για το επιλεγμένο αποθετήριο. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.</string>
-    <string name="bug_report_failed_unknown">Προέκυψε ένα μη αναμενόμενο σφάλμα. Επικοινωνήστε με τον προγραμματιστή της εφαρμογής.</string>
-    <string name="bug_report_failed_wrong_credentials">Λάθος όνομα χρήστη ή κωδικός</string>
-    <string name="bug_report_issue">Ζήτημα</string>
-    <string name="bug_report_manual">Αποστολή χειροκίνητα</string>
-    <string name="bug_report_no_description">Παρακαλώ εισαγάγετε μια περιγραφή ζητήματος</string>
-    <string name="bug_report_no_password">Παρακαλώ εισαγάγετε τον έγκυρο κωδικό πρόσβασης GitHub</string>
-    <string name="bug_report_no_title">Παρακαλώ εισαγάγετε έναν τίτλο ζητήματος</string>
-    <string name="bug_report_no_username">Παρακαλώ εισαγάγετε το έγκυρο όνομα χρήστη GitHub</string>
-    <string name="bug_report_success">Επιτυχής αναφορά σφάλματος</string>
-    <string name="bug_report_summary">Προέκυψε ένα μη αναμενόμενο σφάλμα. Λυπούμαστε που βρήκατε αυτό το σφάλμα, εάν εξακολουθεί να παρουσιάζεται  \"\"Διαγραφή δεδομένων εφαρμογής\" ή στείλτε ένα Email </string>
-    <string name="bug_report_use_account">Αποστολή χρησιμοποιώντας λογαριασμό GitHub</string>
-    <string name="buy_now">Αγορά τώρα</string>
-    <string name="cancel_current_timer">Ακύρωση τρέχων χρονοδιακόπτη</string>
-    <string name="card">Κάρτα</string>
-    <string name="card_color_style">Έγχρωμη κάρτα</string>
-    <string name="card_square">Τετράγωνη Κάρτα</string>
-    <string name="card_style">Κάρτα</string>
-    <string name="carousal_effect_on_now_playing_screen">Εφέ καρουσέλ στην οθόνη του παίζει τώρα</string>
-    <string name="cascading">Με υπερχείλιση</string>
-    <string name="changelog">Λίστα Αλλαγών</string>
-    <string name="changelog_summary">Δείτε τι νέο υπάρχει</string>
-    <string name="choose_image">Επιλογή Εικόνας</string>
-    <string name="choose_restore_title">Επιλέξτε τι να επαναφέρετε</string>
-    <string name="circle">Κύκλος</string>
-    <string name="circular">&gt;Κυκλικό</string>
-    <string name="classic">Κλασσικό</string>
-    <string name="clear_action">Εκκαθάριση</string>
-    <string name="clear_blacklist">Εκκαθάριση blacklist</string>
-    <string name="clear_history">Εκκαθάριση Ιστορικού</string>
-    <string name="clear_playing_queue">Εκκαθάριση ουράς</string>
-    <string name="color">Χρώμα</string>
-    <string name="colors">Χρώματα</string>
-    <string name="compact">Συμπικνωμένο</string>
-    <string name="composer">Συνθέτης</string>
-    <string name="copied_device_info_to_clipboard">Οι πληροφοριές συσκευής αντιγράφηκαν στο πρόχειρο.</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>
-    <string name="could_not_restore_purchase">Δεν ήταν δυνατή η επαναφορά της αγοράς.</string>
-    <string name="could_not_scan_files">Αδυναμία στη σάρωση %d αρχείων.</string>
-    <string name="create_action">Δημιουργία</string>
-    <string name="create_new_backup">Δημιουργία</string>
-    <string name="created_playlist_x">Δημιουργήθηκε η λίστα αναπαραγωγής %1$s.</string>
-    <string name="credit_title">Μέλη και συνεισφέροντες </string>
-    <string name="currently_listening_to_x_by_x">Παίζει το %1$s από τους %2$s.</string>
-    <string name="custom_artist_images">Προσαρμοσμένες Εικόνες Καλλιτέχνη</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Αποστολή Αναφοράς Σφάλματος</string>
-    <string name="dark_theme_name">Κάπως Σκούρο</string>
-    <string name="delete_playlist_title">Διαγραφή playlist</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="depth">Βάθος</string>
-    <string name="description">Περιγραφή</string>
-    <string name="device_info">Πληροφορίες συσκευής</string>
-    <string name="dialog_message_set_ringtone">Επιτρέψτε στο Retro Music να τροποποιεί τις ρυθμίσεις ήχου</string>
-    <string name="dialog_title_set_ringtone">Ορισμός ήχου κλήσης</string>
-    <string name="disc_hint">Αριθμός Δίσκου</string>
-    <string name="do_you_want_to_clear_the_blacklist">Εκκαθάριση της blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Αφαίρεση <b>%1$s</b> από τη blacklist?]]></string>
-    <string name="donate">Δώρισε</string>
-    <string name="donate_summary">Αν σου άρεσε η εφαρμογή μπορείς να δωρίσεις εδώ. </string>
-    <string name="donation_header">Αγορασέ μου ένα</string>
-    <string name="done">Ολοκληρώθηκε</string>
-    <string name="drive_mode">Λειτουργία οδήγησης</string>
-    <string name="edit_fab">Κουμπί Επεξεργασίας</string>
-    <string name="edit_normal_lyrics">Επεξεργασία Στίχων</string>
-    <string name="edit_synced_lyrics">Επεξεργασία Συγχρονισμένων Στίχων</string>
-    <string name="empty">Κενό</string>
-    <string name="equalizer">Ισοσταθμιστής</string>
-    <string name="error_create_backup">Αδυναμία δημιουργίας αντιγράφων ασφαλείας</string>
-    <string name="error_delete_backup">Αδυναμία διαγραφής αντιγράφων ασφαλείας</string>
-    <string name="error_empty_name">Το όνομά δεν μπορεί να είναι κενό!</string>
-    <string name="error_load_failed">Αποτυχία φόρτωσης</string>
-    <string name="error_share_file">Αδυναμία κοινοποίησης αρχείου</string>
-    <string name="expanded">Επεκταμένο</string>
-    <string name="faq">Συχνές ερωτήσεις</string>
-    <string name="favorites">Αγαπημένα</string>
-    <string name="file_already_exists">Το αρχείο υπάρχει ήδη</string>
-    <string name="finish_last_song">Τελειώσε το τελευταίο κομμάτι</string>
-    <string name="fit">Προσαρμογή</string>
-    <string name="flat">Επίπεδο</string>
-    <string name="folders">Φάκελοι</string>
-    <string name="follow_system">Βάση του συστήματος</string>
-    <string name="for_you">Για σένα</string>
-    <string name="free">Δωρεάν</string>
-    <string name="full">Πλήρες</string>
-    <string name="full_card">Πλήρης κάρτα</string>
-    <string name="general_settings_summary">Αλλάξτε το θέμα και τα χρώματα της εφαρμογής</string>
-    <string name="general_settings_title">Eμφάνιση και Αίσθηση</string>
-    <string name="genre">Είδος</string>
-    <string name="genres">Είδη</string>
-    <string name="git_hub_summary">Fork το έργο στο GitHub</string>
-    <string name="gradient">Διαβάθμιση</string>
-    <string name="grant_access">Παραχώρηση πρόσβασης</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="grid_style_label">Στυλ πλέγματος</string>
-    <string name="help_summary">Χρειάζεστε περισσότερη βοήθεια;</string>
-    <string name="hinge">Ρολάρισμα</string>
-    <string name="history">Ιστορικό</string>
-    <string name="history_cleared">Το ιστορικό διαγράφηκε</string>
-    <string name="history_undo_button">Αναίρεση</string>
-    <string name="home">Αρχική</string>
-    <string name="horizontal_flip">Οριζόντια αναστροφή</string>
-    <string name="image">Εικόνα</string>
-    <string name="image_gradient">Διαβαθμισμένη Εικόνα</string>
-    <string name="image_settings_summary">Αλλαγή των ρυθμίσεων λήψης εικόνων καλλιτέχνη</string>
-    <string name="import_label">Εισαγωγή</string>
-    <string name="import_playlist">Εισαγωγή λίστας αναπαραγωγής</string>
-    <string name="import_playlist_message">Εισάγει όλες τις λίστες αναπαραγωγής του Android Media Store με τραγούδια, αν οι λίστες αναπαραγωγής υπάρχουν ήδη, τα τραγούδια θα συγχωνευτούν.</string>
-    <string name="inserted_x_songs_into_playlist_x">Προστέθηκαν %1$d κομμάτια στη λίστα αναπαραγωγής %2$s.</string>
-    <string name="instagram_page_summary">Μοιραστείτε το setup του Retro Music σας για προβολή στο Instagram</string>
-    <string name="keyboard">Πληκτρολόγιο</string>
-    <string name="label_bit_rate">Ρυθμός μετάδοσης bit</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_last_modified">Τελευταία Τροποποιημένα</string>
-    <string name="label_more_from">Περισσότερα από %s</string>
-    <string name="label_sampling_rate">Ρυθμός δειγματοληψίας</string>
-    <string name="label_track_length">Μήκος</string>
-    <string name="labeled">Με ετικέτα</string>
-    <string name="last_added">Προστέθηκαν τελευταία</string>
-    <string name="last_song">Τελευταίο κομμάτι</string>
-    <string name="lets_go">Ξεκινάμε</string>
-    <string name="library_categories">Κατηγορίες βιβλιοθήκης</string>
-    <string name="licenses">Άδειες</string>
-    <string name="light_theme_name">Ξεκάθαρα Λευκό</string>
-    <string name="listeners_label">Ακροατές</string>
-    <string name="listing_files">Καταγραφή αρχείων</string>
-    <string name="loading_products">Φόρτωση προϊόντων...</string>
-    <string name="login">Σύνδεση</string>
-    <string name="lyrics">Στίχοι</string>
-    <string name="made_with_love">Φτιαγμένο με ❤️ στην Ινδία</string>
-    <string name="material">Υλικό</string>
-    <string name="md_error_label">Σφάλμα</string>
-    <string name="md_storage_perm_error">Σφάλμα άδειας</string>
-    <string name="message_backup_create_success">Επιτυχής δημιουργία αντιγράφου ασφαλείας.</string>
-    <string name="message_limit_tabs">Το πολύ 5 επιλογές</string>
-    <string name="message_pro_feature">%s είναι μία δυνατότητα της έκδοσης Prο.</string>
-    <string name="message_restore_success">Η επαναφορά ολοκληρώθηκε επιτυχώς.</string>
-    <string name="message_updated">Ενημερώθηκε</string>
-    <string name="message_welcome"><![CDATA[Γεια σας! <br>Καλώς ήρθατε στο %s]]></string>
-    <string name="my_name">Το Όνομά μου</string>
-    <string name="my_top_tracks">Τα Κορυφαία Κομμάτια μου</string>
-    <string name="never">Ποτέ</string>
-    <string name="new_music_mix">Νέο Μείγμα Μουσικής</string>
-    <string name="new_playlist_title">Νέα λίστα αναπαραγωγής</string>
-    <string name="new_start_directory">%s είναι ο νέος κατάλογος εκκίνησης.</string>
-    <string name="next_song">Επόμενο Κομμάτι</string>
-    <string name="no_albums">Κανένα άλμπουμ</string>
-    <string name="no_artists">Κανένας καλλιτέχνης</string>
-    <string name="no_audio_ID">"Παίξτε ενα κομμάτι πρώτα, και ξαναπροσπαθήστε."</string>
-    <string name="no_backups_found">Δεν βρέθηκαν αντίγραφα ασφαλείας</string>
-    <string name="no_equalizer">Δεν βρέθηκε ισοσταθμιστής.</string>
-    <string name="no_genres">Κανένα είδος</string>
-    <string name="no_lyrics_found">Δεν βρέθηκαν στίχοι</string>
-    <string name="no_playing_queue">Δεν παίζει κανένα κομμάτι</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="normal_lyrics">Κανονικοί στίχοι</string>
-    <string name="not_listed_in_media_store"><![CDATA[Το <b>%s</b> δεν υπάρχει στο media store.]]></string>
-    <string name="not_recently_played">Δεν παίχτηκαν πρόσφατα</string>
-    <string name="nothing_to_scan">Δεν υπάρχει στοιχείο προς σάρωση.</string>
-    <string name="nothing_to_see">Τίποτα για να δείτε</string>
-    <string name="notification">Ειδοποίηση</string>
-    <string name="notification_settings_summary">Προσαρμόστε το στυλ ειδοποίησης</string>
-    <string name="now_playing">Παίζει τώρα</string>
-    <string name="now_playing_queue">Ουρά \"Παίζει Τώρα\"</string>
-    <string name="now_playing_summary">Προσαρμόστε την οθόνη παίζει τώρα</string>
-    <string name="now_playing_themes">9+ τώρα παίζει θέματα</string>
-    <string name="only_on_wifi">Μόνο από Wi-Fi</string>
-    <string name="other_settings_summary">Προηγμένες δοκιμαστικές δυνατότητες</string>
-    <string name="others">Άλλα</string>
-    <string name="over_cover">Πάνω Από Το Εξώφυλλο</string>
-    <string name="password">Κωδικός πρόσβασης</string>
-    <string name="past_three_months">Τους περασμένους 3 μήνες</string>
-    <string name="paste_lyrics_here">Επικολλήστε τους στίχους εδω</string>
-    <string name="paste_timeframe_lyrics_here">Επικόλληση στίχων χρονικού πλαισίου εδώ</string>
-    <string name="peek">Ματιά</string>
-    <string name="permission_bluetooth_denied">Η άδεια πρόσβασης σε κοντινές συσκευές απορρίφθηκε.</string>
-    <string name="permission_external_storage_denied">Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.</string>
-    <string name="permission_summary">Η εφαρμογή χρειάζεται άδεια για πρόσβαση στον αποθηκευτικό χώρο της συσκευής σας για την αναπαραγωγή μουσικής</string>
-    <string name="permission_title">Πρόσβαση Χώρου Αποθήκευσης</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="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Ακολουθήστε τη σελίδα Pinterest για έμπνευση σχεδιασμού του Retro Music</string>
-    <string name="plain">Απλό</string>
-    <string name="playList_already_exits">Η λίστα αναπαραγωγής υπάρχει ήδη</string>
-    <string name="playback_pitch">Τόνος</string>
-    <string name="playback_settings">Ρυθμίσεις Αναπαραγωγής</string>
-    <string name="playback_speed">Ταχύτητα Αναπαραγωγής</string>
-    <string name="playing_notification_description">Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για αναπαραγωγή/παύση, κλπ.</string>
-    <string name="playing_notification_name">Ειδοποίηση Αναπαραγωγής</string>
-    <string name="playlist_created_sucessfully">%s δημιουργήθηκε επιτυχώς</string>
-    <string name="playlist_is_empty">H Λίστα αναπαραγωγής είναι κενή</string>
-    <string name="playlist_name_empty">Όνομα Λίστα αναπαραγωγής</string>
-    <string name="playlists">Λίστες αναπαραγωγής</string>
-    <string name="pref_blur_amount_summary">Η ποσότητα θαμπώματος που εφαρμόζεται για θέματα θαμπάδων, το χαμηλότερο είναι ταχύτερο</string>
-    <string name="pref_blur_amount_title">Ποσότητα θαμπώματος</string>
-    <string name="pref_filter_song_summary">Φιλτράρετε κομμάτια κατά μήκος</string>
-    <string name="pref_filter_song_title">Φιλτράρετε τη διάρκεια του κομματιού</string>
-    <string name="pref_header_advanced">Προηγμένες</string>
-    <string name="pref_header_album">Στυλ άλμπουμ</string>
-    <string name="pref_header_audio">Ήχος</string>
-    <string name="pref_header_blacklist">Μαύρη λίστα</string>
-    <string name="pref_header_controls">Στοιχεία ελέγχου</string>
-    <string name="pref_header_general">Θέμα</string>
-    <string name="pref_header_images">Εικόνες</string>
-    <string name="pref_header_library">Βιβλιοθήκη</string>
-    <string name="pref_header_lockscreen">Οθόνη Κλειδώματος</string>
-    <string name="pref_header_playlists">Λίστες αναπαραγωγής</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Παύει το τραγούδι όταν η ένταση μειώνεται στο μηδέν και αρχίζει να αναπαράγεται όταν αυξάνεται το επίπεδο έντασης. Λειτουργεί επίσης εκτός της εφαρμογής</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Παύση στο μηδέν</string>
-    <string name="pref_keep_screen_on_summary">Λάβετε υπόψη ότι η ενεργοποίηση αυτής της λειτουργίας ενδέχεται να επηρεάσει τη διάρκεια ζωής της μπαταρίας</string>
-    <string name="pref_keep_screen_on_title">Διατηρήστε την οθόνη ενεργή</string>
-    <string name="pref_language_name">πιλέξτε γλώσσα</string>
-    <string name="pref_snow_fall_title">Εφέ πτώσης χιονιού</string>
-    <string name="pref_summary_album_art_on_lockscreen">Χρησιμοποιεί το εξώφυλλο του τρέχων κομματιού ως φόντο οθόνης κλειδώματος.</string>
-    <string name="pref_summary_album_artists_only">Εμφάνιση Καλλιτεχνών Άλμπουμ στην κατηγορία Καλλιτέχνης</string>
-    <string name="pref_summary_audio_ducking">Ειδοποιήσεις, πλοήγηση, κλπ.</string>
-    <string name="pref_summary_audio_fade">Εξασθένηση ήχου κατά την παύση ή αναπαραγωγή τραγουδιού</string>
-    <string name="pref_summary_blacklist">Το περιεχόμενο των φακέλων στη μαύρη λίστα είναι κρυμμένο από τη βιβλιοθήκη σας.</string>
-    <string name="pref_summary_bluetooth_playback">Ξεκινά να παίζει μόλις συνδεθείτε με συσκευή Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Θολώνει το εξώφυλλο άλμπουμ στην οθόνη κλειδώματος. Μπορεί να προκαλέσει προβλήματα με εφαρμογές και widgets.</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">Χρωματίζει τα app shortcuts με το επιλεγμένο χρώμα τονισμού.</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_cross_fade">Διάρκεια σταδιακής εξασθένησης μεταξύ τραγουδιών</string>
-    <string name="pref_summary_desaturated_color">Σύμφωνα με τις γραμμές οδηγών του Material Design τα χρώματα θα πρέπει να αποκορεσθούν σε σκοτεινή λειτουργία</string>
-    <string name="pref_summary_expand_now_playing_panel">Κάνοντας κλικ στην ειδοποίηση θα εμφανίζεται η οθόνη αναπαραγωγής αντί της αρχικής οθόνης</string>
-    <string name="pref_summary_extra_controls">Προσθήκη επιπλέον ελέγχων για τον μίνι αναπαραγωγέα</string>
-    <string name="pref_summary_extra_song_info">Εμφάνιση επιπλέον πληροφοριών τραγουδιού, όπως μορφή αρχείου, bitrate και συχνότητα</string>
-    <string name="pref_summary_gapless_playback">"Μπορεί να προκαλέσει προβλήματα με την αναπαραγωγή σε κάποιες συσκευές."</string>
-    <string name="pref_summary_home_banner">Προβολή ή απόκρυψη αρχικού πανό</string>
-    <string name="pref_summary_ignore_media_store_artwork">Μπορεί να αυξήσει την ποιότητα των εξωφύλλων άλμπουμ, αλλά προκαλεί αργή φόρτωση εικόνων. Ενεργοποιήστε αυτή την επίλογη μόνο εαν αντιμετωπίζετε προβλήματα με εξώφυλλα χαμηλής ανάλυσης.</string>
-    <string name="pref_summary_library_categories">Ρυθμίστε την ορατότητα και τη σειρά των κατηγοριών βιβλιοθήκης.</string>
-    <string name="pref_summary_lock_screen">Ενεργοποίηση διακοπτών ρύθμισης στην οθόνη κλειδώματος.</string>
-    <string name="pref_summary_manage_audio_focus">Να αναπαράγεται πάντα ο ήχος στο παρασκήνιο ανεξάρτητα από οτιδήποτε άλλο αναπαράγεται</string>
-    <string name="pref_summary_open_source_licences">Λεπτομέρειες άδειας για τη χρήση open source λογισμικού</string>
-    <string name="pref_summary_pause_history">Όταν είναι ενεργοποιημένο, τα τραγούδια που αναπαράγονται πρόσφατα δεν θα εμφανίζονται στο ιστορικό</string>
-    <string name="pref_summary_remember_tab">Μεταβείτε στην τελευταία χρησιμοποιημένη καρτέλα κατά την έναρξη</string>
-    <string name="pref_summary_show_lyrics">Εμφάνιση συγχρονισμένων στίχων πάνω από το εξώφυλλο άλμπουμ</string>
-    <string name="pref_summary_suggestions">Εμφάνιση Νέου Μείγματος Μουσικής στην Αρχική οθόνη</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Επιτρέπει την αλλαγή τραγουδιού σύροντας οπουδήποτε στην οθόνη αναπαραγωγής</string>
-    <string name="pref_summary_swipe_to_dismiss">Σύρετε προς τα κάτω για να κλείσετε τον μίνι αναπαραγωγέα</string>
-    <string name="pref_summary_toggle_full_screen">Ενεργοποίηση της επιλογής για χρήση πλήρους οθόνης</string>
-    <string name="pref_summary_toggle_headset">Όταν συνδεθούν ηχεία/ακουστικά , αρχίζει η αναπαραγωγή</string>
-    <string name="pref_summary_toggle_shuffle">Η λειτουργία ανακατέματος θα απενεργοποιείται όταν αναπαράγεται μια νέα λίστα τραγουδιών</string>
-    <string name="pref_summary_toggle_volume">Εαν υπάρχει χώρος στην οθόνη αναπαραγωγής, ενεργοποιήστε τον πίνακα ελέγχου έντασης.</string>
-    <string name="pref_summary_wallpaper_accent">Εξαγωγή απόχρωσης από την ταπετσαρία</string>
-    <string name="pref_summary_whitelist">Εμφάνιση μουσικής μόνο από το φάκελο /Μουσική</string>
-    <string name="pref_title_album_art_on_lockscreen">Εμφάνιση εξωφύλλου άλμπουμ.</string>
-    <string name="pref_title_album_artists_only">Πλοήγηση κατά Καλλιτέχνη Άλμπουμ</string>
-    <string name="pref_title_album_cover_style">Θέμα εξώφυλλου άλμπουμ</string>
-    <string name="pref_title_album_cover_transform">Παράλειψη εξώφυλλου άλμπουμ</string>
-    <string name="pref_title_app_shortcuts">Χρωματιστά app shortcuts</string>
-    <string name="pref_title_appbar_mode">Μορφή επικεφαλίδας</string>
-    <string name="pref_title_audio_ducking">Μείωση έντασης όταν υπάρχουν εισερχόμενες ειδοποιήσεις</string>
-    <string name="pref_title_audio_fade">Εξασθένηση Ήχου</string>
-    <string name="pref_title_auto_download_artist_images">Αυτόματη λήψη εικόνων καλλιτεχνών</string>
-    <string name="pref_title_blacklist">Μαύρη λίστα</string>
-    <string name="pref_title_bluetooth_playback">Αναπαραγωγή μέσω Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Θόλωμα εξωφύλλων άλμπουμ</string>
-    <string name="pref_title_circle_button">Κυκλικό κουμπί αναπαραγωγής</string>
-    <string name="pref_title_classic_notification">Κλασσικό design ειδοποίησης</string>
-    <string name="pref_title_colored_app">Προσαρμοστικό Χρώμα</string>
-    <string name="pref_title_colored_notification">Χρωματιστή ειδοποίηση</string>
-    <string name="pref_title_cross_fade">Σταδιακός Εξασθενισμός (Beta)</string>
-    <string name="pref_title_custom_font">Χρήση γραμματοσειράς Manrope</string>
-    <string name="pref_title_desaturated_color">Αποκορεσμένο χρώμα</string>
-    <string name="pref_title_expand_now_playing_panel">Εμφάνιση οθόνης αναπαραγωγής</string>
-    <string name="pref_title_extra_controls">Πρόσθετα στοιχεία ελέγχου</string>
-    <string name="pref_title_extra_song_info">Πληροφορίες τραγουδιού</string>
-    <string name="pref_title_gapless_playback">Αναπαραγωγή χωρίς κενά</string>
-    <string name="pref_title_general_theme">Γενικό θέμα</string>
-    <string name="pref_title_home_album_grid_style">Πλέγμα άλμπουμ</string>
-    <string name="pref_title_home_artist_grid_style">Πλέγμα καλλιτέχνη</string>
-    <string name="pref_title_home_banner">Πανό</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">Full screen Ρυθμίσεις</string>
-    <string name="pref_title_lyrics_screen_on">Να παραμένει ενεργή η οθόνη όταν εμφανίζονται οι στίχοι</string>
-    <string name="pref_title_lyrics_type">Τύπος στίχων</string>
-    <string name="pref_title_manage_audio_focus">Πάντα αναπαραγωγή</string>
-    <string name="pref_title_now_playing_screen_appearance">Εμφάνιση</string>
-    <string name="pref_title_open_source_licences">Άδειες λογισμικού open source</string>
-    <string name="pref_title_pause_history">Παύση ιστορικού</string>
-    <string name="pref_title_remember_tab">Απομνημόνευση τελευταίας καρτέλας</string>
-    <string name="pref_title_show_lyrics">Εμφάνιση στίχων</string>
-    <string name="pref_title_suggestions">Εμφάνιση προτάσεων</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Σύρετε οπουδήποτε για να αλλάξετε τραγούδι</string>
-    <string name="pref_title_swipe_to_dismiss">Κλείσιμο με σάρωση προς τα κάτω</string>
-    <string name="pref_title_tab_text_mode">Λειτουργία τίτλων καρτελών</string>
-    <string name="pref_title_toggle_carousel_effect">Εφέ καρουσέλ</string>
-    <string name="pref_title_toggle_full_screen">Full screen εφαρμογή</string>
-    <string name="pref_title_toggle_toggle_headset">Αυτόματη αναπαραγωγή</string>
-    <string name="pref_title_toggle_toggle_shuffle">Τυχαία λειτουργία</string>
-    <string name="pref_title_toggle_volume">Πίνακας Ελέγχου Έντασης</string>
-    <string name="pref_title_wallpaper_accent">Απόχρωση ταπετσαρίας</string>
-    <string name="pref_title_whitelist">Λίστα επιτρεπόμενων κομματιών</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Μαύρο θέμα, Θέματα στο Τώρα παίζει, εφέ Καρουσέλ και πολλά άλλα..</string>
-    <string name="profile">Προφίλ</string>
-    <string name="purchase">Αγορά</string>
-    <string name="queue">Ουρά</string>
-    <string name="rate_app">Βαθμολόγησε την εφαρμογή</string>
-    <string name="rate_on_google_play_summary">Σας αρέσει αυτό το app; Γράψτε μας τις εντυπώσεις σας στο 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">Αφαίρεση από τη blacklist</string>
-    <string name="remove_image">Αφαίρεση Εικόνας</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="replace_cover">Αντικατάσταση Εξωφύλλου</string>
-    <string name="report_an_issue">Αναφέρετε ένα πρόβλημα</string>
-    <string name="report_bug">Αναφορά προβλήματος</string>
-    <string name="reset_action">Επαναφορά</string>
-    <string name="reset_artist_image">Επαναφορά εικόνας καλλιτέχνη</string>
-    <string name="restore">Επαναφορά</string>
-    <string name="restore_message">Θέλετε να επαναφέρετε το αντίγραφο ασφαλείας;</string>
-    <string name="restored_previous_purchase_please_restart">Επαναφορά προηγούμενης αγοράς. Επανεκκινήστε την εφαρμογή για να χρησιμοποιήσετε όλες τις δυνατότητες.</string>
-    <string name="restored_previous_purchases">Επαναφορά προηγούμενων αγορών επιτυχής.</string>
-    <string name="restoring_purchase">Επαναφορά αγοράς…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Η εφαρμογή χρειάζεται άδεια για να αποκτήσει πρόσβαση στις ρυθμίσεις της συσκευής σας για να ορίσει τη μουσική ως ήχος κλήσης</string>
-    <string name="ringtone_title">Ήχος Κλήσης (Προαιρετικό)</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_write_failed">Η εγγραφή αρχείου απέτυχε: %s</string>
-    <string name="save">Αποθήκευση</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Αποθήκευσε ως αρχείο</string>
-    <string name="save_playlists_title">Αποθήκευση ως αρχεία</string>
-    <string name="saved_playlist_to">Η Λίστα αναπαραγωγής αποθηκεύτηκε στο %s.</string>
-    <string name="saving_changes">Αποθηκευόνται οι αλλαγές...</string>
-    <string name="scan_media">Σάρωση μέσων</string>
-    <string name="scanned_files">Σαρώθηκαν %1$d από %2$d αρχεία.</string>
-    <string name="scrobbles_label">Σρόμπες</string>
-    <string name="select_all">Επιλογή όλων</string>
-    <string name="selected">Επιλεγμένα</string>
-    <string name="set">Ορισμός</string>
-    <string name="set_artist_image">Ορισμός εικόνας καλλιτέχνη</string>
-    <string name="share_app">Κοινοποίηστε την Εφαρμογή</string>
-    <string name="share_summary">Μοιραστείτε την εφαρμογή με τους φίλους και την οικογένειά σας</string>
-    <string name="share_to_stories">Κοινοποίηση στις Ιστορίες</string>
-    <string name="show_album_artists">Εμφάνιση Καλλιτεχνών Άλμπουμ</string>
-    <string name="shuffle">Τυχαία Αναπαραγωγή</string>
-    <string name="simple">Απλό</string>
-    <string name="sleep_timer_canceled">Χρονοδιακόπτης ύπνου ακυρώθηκε.</string>
-    <string name="sleep_timer_set">Ο χρονοδιακόπτης ύπνου ορίστικε για %d λεπτά από τώρα.</string>
-    <string name="social">Κοινωνικά</string>
-    <string name="social_stories">Μοιραστείτε την ιστορία</string>
-    <string name="song">Κομμάτι</string>
-    <string name="song_duration">Διάρκεια κομματιού</string>
-    <string name="songs">Κομμάτια</string>
-    <string name="sort_order">Σειρά Διάταξης</string>
-    <string name="sort_order_a_z">Αύξουσα</string>
-    <string name="sort_order_album">Άλμπουμ</string>
-    <string name="sort_order_artist">Καλλιτέχνης</string>
-    <string name="sort_order_composer">Συνθέτης</string>
-    <string name="sort_order_date">Ημερομηνία προσθήκης</string>
-    <string name="sort_order_date_modified">Ημερομηνία τροποποιήσης</string>
-    <string name="sort_order_default">Προεπιλεγμένη</string>
-    <string name="sort_order_num_songs">Αριθμός τραγουδιών</string>
-    <string name="sort_order_num_songs_desc">Αριθμός τραγουδιών φθίνουσα</string>
-    <string name="sort_order_year">Έτος</string>
-    <string name="sort_order_z_a">Φθίνουσα</string>
-    <string name="speech_not_supported">Ουπς! Η συσκευή σου δεν υποστηρίζει εισαγωγή φωνής</string>
-    <string name="speech_prompt">Αναζητήστε στην Βιβλιοθήκη</string>
-    <string name="stack">Στοίβα</string>
-    <string name="start_play_music">Ξεκινήστε να παίζετε μουσική.</string>
-    <string name="suggestion_songs">Προτάσεις</string>
-    <string name="support_development">Υποστήριξη ανάπτυξης της εφαρμογής</string>
-    <string name="swipe_to_unlock">Σύρετε για ξεκλείδωμα</string>
-    <string name="synced_lyrics">Συγχρονισμένοι στίχοι</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Γίνετε μέλος της ομάδας Telegram για να συζητήσετε σφάλματα, να κάνετε προτάσεις, να επιδείξετε και άλλα</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="tiny_card_style">Μικρή κάρτα</string>
-    <string name="title">Τίτλος</string>
-    <string name="title_new_backup">Νέο Αντίγραφο Ασφαλείας</string>
-    <string name="today">Σήμερα</string>
-    <string name="top_albums">Κορυφαία άλμπουμ</string>
-    <string name="top_artists">Κορυφαίοι καλλιτέχνες</string>
-    <string name="track_hint">"Κομμάτι (2 για κομμάτι 2, ή 3004 για CD3 κομμάτι 4)"</string>
-    <string name="track_list">Αριθμός Κομματιού</string>
-    <string name="translate">Μετάφραση</string>
-    <string name="translate_community">Βοηθήστε μας να μεταφράσουμε την εφαρμογή στη γλώσσα σας</string>
-    <string name="try_retro_music_premium">Δοκιμάστε το Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Μοιραστείτε το σχέδιό σας με το Retro Music</string>
-    <string name="unlabeled">Χωρίς ετικέτα</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_image">Ενημέρωση εικόνας</string>
-    <string name="updating">Ενημέρωση σε εξέλιξη...</string>
-    <string name="user_images_description">Εικόνες Χρήστη</string>
-    <string name="user_name">Όνομα Χρήστη</string>
-    <string name="username">Όνομα χρήστη</string>
-    <string name="version">Έκδοση</string>
-    <string name="vertical_flip">Κάθετη αναστροφή</string>
-    <string name="view_on_telegram">Προβολή στο Telegram</string>
-    <string name="volume">Ένταση</string>
-    <string name="web_search">Αναζήτηση στον ιστό</string>
-    <string name="website">Ιστοσελίδα</string>
-    <string name="website_summary">Δείτε την Ιστοσελίδα μας</string>
-    <string name="welcome">Καλώς ήρθατε,</string>
-    <string name="what_do_you_want_to_share">Τι θα θέλατε να μοιραστείτε;</string>
-    <string name="whats_new">Τί νέο υπάρχει</string>
-    <string name="window">Παράθυρο</string>
-    <string name="window_corner_edges">Στρογγυλεμένες γωνίες</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="you_will_be_forwarded_to_the_issue_tracker_website">Θα προωθηθείτε στον ιστότοπο παρακολούθησης ζητημάτων.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Τα δεδομένα του λογαριασμού σας χρησιμοποιούνται μόνο για έλεγχο ταυτότητας.</string>
-</resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
new file mode 100644
index 000000000..6950ddc0f
--- /dev/null
+++ b/app/src/main/res/values-el/strings.xml
@@ -0,0 +1,434 @@
+<?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">Προσθήκη σε playlist...</string>
+
+    <string name="action_clear_playing_queue">Εκκαθάριση ουράς αναπαραγωγής</string>
+    <string name="action_clear_playlist">Εκκαθάριση 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">Μέγεθος Πλέγματος (landscape mode)</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">Αφαίρεση από 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">Τυχαία αναπ/γη playlist</string>
+
+    <string name="action_sleep_timer">Χρονοδιακόπτης Ύπνου</string>
+
+    <string name="action_tag_editor">Επεξεργασία Ετικετών</string>
+
+    <string name="add_action">Προσθήκη</string>
+
+    <string name="add_photo">Προσθήκη εικόνας</string>
+
+    <string name="add_playlist_title">"Προσθήκη στη playlist"</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>
+
+    <string name="always">Πάντα</string>
+
+    <string name="app_share">Τσεκάρετε αυτό το κούλ music player στο:https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <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="biography">Βιογραφία</string>
+
+    <string name="black_theme_name">Απλά Μαύρο</string>
+
+    <string name="blacklist">Blacklist</string>
+
+    <string name="cancel_current_timer">Ακύρωση τρέχων χρονοδιακόπτη</string>
+
+    <string name="changelog">Λίστα Αλλαγών</string>
+
+    <string name="changelog_summary">Η Λίστα Αλλαγών συντηρείται από το Telegram app</string>
+
+    <string name="clear_action">Εκκαθάριση</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="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>
+    <string name="could_not_scan_files">Αδυναμία στο σκανάρισμα %d αρχείων.</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="dark_theme_name">Κάπως Σκούρο</string>
+
+    <string name="default_hint">Δεν βρέθηκαν στίχοι.</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_x"><![CDATA[Διαγραφή του κομματιού <b>%1$s</b>?]]></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>
+
+    <string name="do_you_want_to_clear_the_blacklist">Εκκαθάριση της blacklist?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Αφαίρεση <b>%1$s</b> από τη blacklist?]]></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="full">Πλήρες</string>
+
+    <string name="genre">Είδος</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 κομμάτια στη playlist %2$s.</string>
+
+    <string name="label_bit_rate">Bitrate</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">Νέα playlist</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">Δεν βρέθηκαν playlists</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> δεν υπάρχει στο media store.]]></string>
+
+    <string name="nothing_to_scan">Δεν υπάρχει στοιχείο προς σάρωση.</string>
+
+    <string name="notification">Ειδοποίηση</string>
+
+    <string name="now_playing_queue">Ουρά \"Παίζει Τώρα\"</string>
+
+    <string name="only_on_wifi">Μόνο από Wi-Fi</string>
+
+    <string name="past_three_months">Τους περασμένους 3 μήνες</string>
+
+    <string name="permission_external_storage_denied">Η άδεια για προσπέλαση του external storage δεν παραχωρήθηκε.</string>
+
+    <string name="permissions_denied">Οι άδειες δεν παραχωρήθηκαν.</string>
+
+    <string name="pick_from_local_storage">Επιλογή από Χώρο Αποθήκευσης</string>
+
+    <string name="plain">Απλό</string>
+
+    <string name="playing_notification_description">Η ειδοποίηση αναπαραγωγής προσφέρει κουμπιά για play/pause, κλπ.</string>
+    <string name="playing_notification_name">Ειδοποίηση Αναπαραγωγής</string>
+
+    <string name="playlist_empty_text">Κενή playlist</string>
+
+    <string name="playlist_is_empty">H Playlist είναι κενή</string>
+
+    <string name="playlist_name_empty">Όνομα Playlist</string>
+
+    <string name="playlists">Playlists</string>
+
+    <string name="pref_header_audio">Ήχος</string>
+    <string name="pref_header_images">Εικόνες</string>
+    <string name="pref_header_lockscreen">Οθόνη Κλειδώματος</string>
+    <string name="pref_header_playlists">Playlists</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>
+    <string name="pref_summary_classic_notification">Χρήση του κλασσικού design ειδοποιήσεων.</string>
+    <string name="pref_summary_colored_app">Το φόντο και το κουμπί ελέγχου αλλάζουν σύμφωνα με το εξώφυλλο άλμπουμ</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_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">Λεπτομέρειες άδειας για τη χρήση open source λογισμικού</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">Χρωματιστά 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">Κλασσικό design ειδοποίησης</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">Παράληψη 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_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_full_screen">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="queue">Ουρά</string>
+
+    <string name="rate_app">Βαθμολόγησε την εφαρμογή</string>
+
+    <string name="rate_on_google_play_summary">Σας αρέσει αυτό το app; Γράψτε μας τις εντυπώσεις σας στο Google Play για να σας παρέχουμε μια καλύτερη εμπειρία</string>
+
+    <string name="remove_action">Αφαίρεση</string>
+
+    <string name="remove_cover">Αφαίρεση Εξώφυλλου</string>
+
+    <string name="remove_from_blacklist">Αφαίρεση από τη blacklist</string>
+
+    <string name="remove_song_from_playlist_title">Αφαίρεσε το κομμάτι από την playlist</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_playlist_title">Μετονόμασε την playlist</string>
+
+    <string name="reset_artist_image">Επαναφορά εικόνας καλλιτέχνη</string>
+
+    <string name="restored_previous_purchases">Επαναφορά προηγούμενων αγορών επιτυχής.</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="scanned_files">Σαρώθηκαν %1$d από %2$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>
+
+    <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_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="track_hint">"Κομμάτι (2 για κομμάτι 2, ή 3004 για CD3 κομμάτι 4)"</string>
+
+    <string name="track_list">Αριθμός Κομματιού</string>
+
+    <string name="translate">Μετάφραση</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_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="x_has_been_set_as_ringtone">Ορισμός %1$s ως ήχου κλήσης.</string>
+
+    <string name="x_selected">%1$d έχει επιλεγεί</string>
+
+    <string name="year">Χρονιά</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-en-rUS/strings.xml b/app/src/main/res/values-en-rUS/strings.xml
deleted file mode 100644
index 8de59d38d..000000000
--- a/app/src/main/res/values-en-rUS/strings.xml
+++ /dev/null
@@ -1,634 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">About %s</string>
-    <string name="about_settings_summary">Team, social links</string>
-
-    <string name="accent_color">Accent color</string>
-    <string name="accent_color_desc">The theme accent color, defaults to purple</string>
-
-    <string name="action_about">About</string>
-    <string name="action_add_to_favorites">Add to favorites</string>
-    <string name="action_add_to_playing_queue">Add to playing queue</string>
-    <string name="action_add_to_playlist">Add to playlist</string>
-    <string name="action_clear_playing_queue">Clear playing queue</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>
-    <string name="action_go_to_album">Go to album</string>
-    <string name="action_go_to_artist">Go to artist</string>
-    <string name="action_go_to_genre">Go to genre</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <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_all">Play all</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_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>
-    <string name="action_rename">Rename</string>
-    <string name="action_save_playing_queue">Save playing queue</string>
-    <string name="action_scan">Scan</string>
-    <string name="action_search">Search</string>
-    <string name="action_set">Start</string>
-    <string name="action_set_as_ringtone">Set as ringtone</string>
-    <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_shuffle_all">Shuffle all</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>
-
-    <string name="add_action">Add</string>
-    <string name="add_playlist_title">"Add to playlist"</string>
-
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-
-    <string name="album">Album</string>
-
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Songs</item>
-    </plurals>
-
-    <string name="album_artist">Album artist</string>
-
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
-
-    <string name="always">Always</string>
-
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
-    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_widget_big_name">Big</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Text</string>
-
-    <string name="artist">Artist</string>
-
-    <string name="artists">Artists</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="auto">Auto</string>
-
-    <string name="biography">Biography</string>
-
-    <string name="black_theme_name">Just Black</string>
-
-    <string name="blacklist">Blacklist</string>
-
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-
-    <string name="buy_now">Buy now</string>
-
-    <string name="cancel_current_timer">Cancel</string>
-
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_style">Card</string>
-
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-
-    <string name="cascading">Cascading</string>
-
-    <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Changelog maintained on the Telegram channel</string>
-
-    <string name="circle">Circle</string>
-
-    <string name="circular">Circular</string>
-
-    <string name="classic">Classic</string>
-
-    <string name="clear_action">Clear</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_playing_queue">Clear queue</string>
-
-    <string name="color">Color</string>
-
-    <string name="colors">Colors</string>
-
-    <string name="composer">Composer</string>
-
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-
-    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-
-    <string name="create_action">Create</string>
-
-    <string name="created_playlist_x">Created playlist %1$s.</string>
-
-    <string name="credit_title">Members and contributors </string>
-
-    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-
-    <string name="dark_theme_name">Kinda Dark</string>
-
-    <string name="delete_playlist_title">Delete playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Delete playlists</string>
-    <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="depth">Depth</string>
-
-    <string name="description">Description</string>
-
-    <string name="device_info">Device info</string>
-
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-
-    <string name="donate">Donate</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-
-    <string name="donation_header">Buy me a:</string>
-
-    <string name="drive_mode">Drive mode</string>
-
-    <string name="empty">Empty</string>
-
-    <string name="equalizer">Equalizer</string>
-
-    <string name="faq">FAQ</string>
-
-    <string name="favorites">Favorites</string>
-
-    <string name="finish_last_song">Finish last song</string>
-
-    <string name="fit">Fit</string>
-
-    <string name="flat">Flat</string>
-
-    <string name="folders">Folders</string>
-
-    <string name="follow_system">Follow system</string>
-
-    <string name="for_you">For you</string>
-
-    <string name="free">Free</string>
-
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Look and feel</string>
-
-    <string name="genre">Genre</string>
-
-    <string name="genres">Genres</string>
-
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-
-    <string name="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="grid_style_label">Grid style</string>
-
-    <string name="hinge">Hinge</string>
-
-    <string name="history">History</string>
-
-    <string name="home">Home</string>
-
-    <string name="horizontal_flip">Horizontal flip</string>
-
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-
-    <string name="keyboard">Keyboard</string>
-
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_file_size">Size</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Length</string>
-
-    <string name="labeled">Labeled</string>
-
-    <string name="last_added">Last added</string>
-    <string name="last_song">Last song</string>
-
-    <string name="library_categories">Library categories</string>
-
-    <string name="licenses">Licenses</string>
-
-    <string name="light_theme_name">Clearly White</string>
-
-    <string name="listeners_label">Listeners</string>
-
-    <string name="listing_files">Listing files</string>
-
-    <string name="loading_products">Loading products…</string>
-
-    <string name="login">Login</string>
-
-    <string name="lyrics">Lyrics</string>
-
-    <string name="made_with_love">Made with ❤️ in India</string>
-
-    <string name="material">Material</string>
-
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Most played</string>
-
-    <string name="never">Never</string>
-
-    <string name="new_playlist_title">New playlist</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-
-    <string name="next_song">Next Song</string>
-
-    <string name="no_albums">You have no albums</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-
-    <string name="other_settings_summary">Advanced testing features</string>
-
-    <string name="others">Other</string>
-
-    <string name="password">Password</string>
-
-    <string name="past_three_months">Past 3 months</string>
-
-    <string name="peek">Peek</string>
-
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-
-    <string name="permissions_denied">Permissions denied.</string>
-
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-
-    <string name="pick_from_local_storage">Pick from local storage</string>
-
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-
-    <string name="plain">Plain</string>
-
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-
-    <string name="playlists">Playlists</string>
-
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_summary_album_art_on_lockscreen">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_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <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_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_now_playing_screen_appearance">Now playing theme</string>
-    <string name="pref_title_open_source_licences">Open source licences</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-
-    <string name="profile">Profile</string>
-
-    <string name="purchase">Purchase</string>
-
-    <string name="queue">Playing Queue</string>
-
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-
-    <string name="rename_playlist_title">Rename playlist</string>
-
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-
-    <string name="restore">Restore</string>
-
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-
-    <string name="restoring_purchase">Restoring purchase…</string>
-
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-
-    <string name="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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-
-    <string name="saving_changes">Saving changes</string>
-
-    <string name="scan_media">Scan media</string>
-
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-
-    <string name="scrobbles_label">Scrobbles</string>
-
-    <string name="select_all">Select all</string>
-
-    <string name="selected">Selected</string>
-
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-
-    <string name="share_app">Share app</string>
-    <string name="share_to_stories">Share to Stories</string>
-
-    <string name="shuffle">Shuffle</string>
-
-    <string name="simple">Simple</string>
-
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-
-    <string name="songs">Songs</string>
-
-    <string name="sort_order">Sort order</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-
-    <string name="stack">Stack</string>
-
-    <string name="start_play_music">Start playing music.</string>
-
-    <string name="suggestion_songs">Suggestions</string>
-
-    <string name="support_development">Support development</string>
-
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-
-    <string name="synced_lyrics">Synced lyrics</string>
-
-    <!-- Message displayed when tag editing fails -->
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-
-    <string name="thank_you">Thank you!</string>
-
-    <string name="the_audio_file">The audio file</string>
-
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-
-    <string name="title">Title</string>
-
-    <string name="today">Today</string>
-
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-
-    <string name="unlabeled">Unlabeled</string>
-
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-
-    <string name="up_next">Up next</string>
-
-    <string name="update_image">Update image</string>
-
-    <string name="updating">Updating…</string>
-
-    <string name="username">Username</string>
-
-    <string name="version">Version</string>
-
-    <string name="vertical_flip">Vertical flip</string>
-
-    <string name="volume">Volume</string>
-
-    <string name="web_search">Web search</string>
-
-    <string name="welcome">Welcome,</string>
-
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-
-    <string name="whats_new">What\'s New</string>
-
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-
-    <string name="year">Year</string>
-
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 239ae40a4..19f561451 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -1,203 +1,294 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Acerca de %s</string>
     <string name="about_settings_summary">Equipo, enlaces sociales</string>
+
     <string name="accent_color">Color de énfasis</string>
-    <string name="accent_color_desc">El color de énfasis del tema, por defecto es morado</string>
+    <string name="accent_color_desc">El color del tema de acentuado, por defecto verde azulado.</string>
+
     <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Añadir a Lista negra</string>
+
     <string name="action_add_to_favorites">Añadir a favoritos</string>
-    <string name="action_add_to_playing_queue">Añadir a la cola de reproducción</string>
-    <string name="action_add_to_playlist">Añadir a la lista de reproducción</string>
-    <string name="action_cancel">Cancelar</string>
-    <string name="action_cast">Emitir</string>
-    <string name="action_clear_playing_queue">Limpiar cola de reproducción</string>
-    <string name="action_cycle_repeat">Cambiar a modo repetición</string>
+    <string name="action_add_to_playing_queue">Añadir a cola de reproducción</string>
+    <string name="action_add_to_playlist">Añadir a lista de reproducción</string>
+
+    <string name="action_clear_playing_queue">Vaciar cola de reproducción</string>
+    <string name="action_clear_playlist">Limpiar lista de reproducción</string>
+
     <string name="action_delete">Eliminar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
+
     <string name="action_details">Detalles</string>
-    <string name="action_edit">Editar</string>
+
     <string name="action_go_to_album">Ir al álbum</string>
     <string name="action_go_to_artist">Ir al artista</string>
     <string name="action_go_to_genre">Ir al género</string>
-    <string name="action_go_to_lyrics">Ir a la letra</string>
-    <string name="action_go_to_start_directory">Ir al directorio inicial</string>
+    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
+
     <string name="action_grant">Permitir</string>
-    <string name="action_grid_size">Tamaño de la cuadricula</string>
-    <string name="action_grid_size_land">Tamaño de cuadrícula (h)</string>
+
+    <string name="action_grid_size">Tamaño de la cuadrícula</string>
+    <string name="action_grid_size_land">Tamaño de la cuadricula (espacio)</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_all">Reproducir todo</string>
     <string name="action_play_next">Reproducir siguiente</string>
-    <string name="action_play_pause">Reproducir/Pausar</string>
+    <string name="action_play_pause">Reproducir/Pausa</string>
+
     <string name="action_previous">Anterior</string>
-    <string name="action_remove_from_favorites">Eliminar de favoritos</string>
-    <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
-    <string name="action_remove_from_playlist">Remover de la lista de reproducción</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>
+
     <string name="action_rename">Renombrar</string>
+
     <string name="action_save_playing_queue">Guardar cola de reproducción</string>
-    <string name="action_scan">Examinar</string>
+
+    <string name="action_scan">Escanear</string>
+
     <string name="action_search">Buscar</string>
+
     <string name="action_set">Iniciar</string>
     <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
     <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_shuffle_all">Mezclar todo</string>
     <string name="action_shuffle_playlist">Mezclar lista de reproducción</string>
-    <string name="action_sleep_timer">Temporizador de sueño</string>
-    <string name="action_sort_order">Ordenar por</string>
+
+    <string name="action_sleep_timer">Temporizador</string>
+
+    <string name="action_sort_order">Orden de clasificación</string>
+
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar favoritos</string>
-    <string name="action_toggle_shuffle">Alternar modo aleatorio</string>
-    <string name="adaptive">Adaptable</string>
-    <string name="add_action">Agregar</string>
-    <string name="add_playlist_title">"Agregar a lista de reproducción"</string>
-    <string name="add_time_framed_lryics">Añadir letras sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d Canción(es) añadida(s) a %2$s</string>
-    <string name="added_title_to_playing_queue">"Se ha agregado 1 canción a la cola de reproducción."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d canciones agregadas a la cola de reproducción.</string>
+
+    <string name="adaptive">Adaptado</string>
+
+    <string name="add_action">Añadir</string>
+
+    <string name="add_lyrics">Añadir letra</string>
+
+    <string name="add_photo">Añadir\nfoto</string>
+
+    <string name="add_playlist_title">"Añadir a lista de reproducción"</string>
+
+    <string name="add_time_framed_lryics">Añadir retardo para letras</string>
+
+    <string name="added_title_to_playing_queue">"Se ha añadido 1 canción a la cola de reproducción."</string>
+
+    <string name="added_x_titles_to_playing_queue">Se han añadido %1$d canciones a la cola de reproducción.</string>
+
     <string name="album">Álbum</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Canción</item>
-        <item quantity="other">Canciones</item>
-    </plurals>
-    <string name="album_artist">Artista del álbum</string>
+
+    <string name="album_artist">"Álbum del artista "</string>
+
+    <string name="album_or_artist_empty">El título o artista está vacío.</string>
+
     <string name="albums">Álbumes</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbumes</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">Siempre</string>
-    <string name="app_share">Mira este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
-    <string name="app_shortcut_top_tracks_short">Canciones más reproducidas</string>
-    <string name="app_widget_big_name">Imagen completa</string>
-    <string name="app_widget_card_name">Tarjeta</string>
-    <string name="app_widget_classic_name">Clásico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeño</string>
-    <string name="app_widget_text_name">Texto mínimo</string>
+
+    <string name="app_share">¡Hola! Echa un vistazo a este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Mezclar</string>
+    <string name="app_shortcut_top_tracks_short">Canciones Top</string>
+
+    <string name="app_widget_big_name">Retro Music - Grande</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="app_widget_text_name">Retro Music - Texto</string>
+
     <string name="artist">Artista</string>
+
     <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duración del desvanecimiento de audio</string>
+
     <string name="audio_focus_denied">Enfoque de audio denegado.</string>
-    <string name="audio_settings_summary">Modifica los ajustes de sonido y ajusta los controles del ecualizador</string>
+
+    <string name="audio_settings_summary">Cambiar la configuración de sonido y ajustes del ecualizador</string>
+
     <string name="auto">Automático</string>
-    <string name="backup_restore_settings_summary">Respalda y recupera tus configuraciones, listas de reproducción</string>
-    <string name="backup_restore_title"><![CDATA[Copia de seguridad y restauración]]></string>
-    <string name="backup_title">Copias de seguridad</string>
-    <string name="biography">Biografías</string>
-    <string name="black_theme_name">Sólo negro</string>
+
+    <string name="base_color_theme">Elegir color del tema</string>
+
+    <string name="bass_boost">Potenciador de bajos</string>
+
+    <string name="bio">Biografía</string>
+
+    <string name="biography">Biografía</string>
+
+    <string name="black_theme_name">Solo Negro</string>
+
     <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">La aplicación necesita el permiso de los dispositivos cercanos para buscar dispositivos bluetooth</string>
-    <string name="bluetooth_title">Dispositivos cercanos</string>
+
     <string name="blur">Desenfoque</string>
-    <string name="blur_card">Tarjeta con desenfoque</string>
-    <string name="bug_report_failed">No se puede enviar el informe</string>
-    <string name="bug_report_failed_invalid_token">Token de acceso no válido. Por favor, contacta con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_issues_not_available">Las incidencias no están habilitadas para el repositorio seleccionado. Por favor, póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_unknown">Se ha producido un error inesperado. Por favor, contacta con el desarrollador de la aplicación</string>
-    <string name="bug_report_failed_wrong_credentials">Usuario o contraseña incorrectos</string>
-    <string name="bug_report_issue">Problema</string>
+
+    <string name="blur_card">Tarjeta desenfocada</string>
+
+    <string name="bug_report_failed">Es imposible enviar el reporte</string>
+    <string name="bug_report_failed_invalid_token">Token de acceso invalido. Por favor, contacta con el desarrollador de la app.</string>
+    <string name="bug_report_failed_issues_not_available">Los problemas no están habilitados para el repositorio seleccionado. Por favor, póngase en contacto con el desarrollador de la aplicación.</string>
+    <string name="bug_report_failed_unknown">Un error inesperado a ocurrido. Por favor, contacta col el desarrollador de la app.</string>
+    <string name="bug_report_failed_wrong_credentials">Usuario o contraseña incorrecta</string>
+    <string name="bug_report_issue">Problemas</string>
     <string name="bug_report_manual">Enviar manualmente</string>
     <string name="bug_report_no_description">Por favor, describe el problema</string>
-    <string name="bug_report_no_password">Por favor, introduce tu contraseña de GitHub</string>
-    <string name="bug_report_no_title">Por favor, introduce un título para el problema</string>
-    <string name="bug_report_no_username">Por favor, introduce tu nombre de usuario de GitHub</string>
-    <string name="bug_report_success">Error reportado correctamente</string>
-    <string name="bug_report_summary">Se ha producido un error inesperado. Sentimos que haya encontrado este error, si sigue fallando \"Borre los datos de la aplicación\" o envíe un correo electrónico </string>
-    <string name="bug_report_use_account">Enviar usando la cuenta de Github</string>
-    <string name="buy_now">Comprar ahora</string>
+    <string name="bug_report_no_password">Por favor, introduzca contraseña valida de GitHub</string>
+    <string name="bug_report_no_title">Por favor, escribe el titulo del problema</string>
+    <string name="bug_report_no_username">Por favor, introduzca usuario valido de GitHub</string>
+    <string name="bug_report_summary">Ha ocurrido un error inesperado. Sentimos lo ocurrido, prueba a \"Limpiar datos de la aplicación\". Si el problema persiste envíanos un email.</string>
+    <string name="bug_report_uploading">Enviando el reporte a GitHub...</string>
+    <string name="bug_report_use_account">Envía usando la cuenta de GitHub</string>
+
     <string name="cancel_current_timer">Cancelar</string>
+
     <string name="card">Tarjeta</string>
+
+    <string name="card_circular_style">Circular</string>
+
     <string name="card_color_style">Tarjeta coloreada</string>
-    <string name="card_square">Tarjeta cuadrada</string>
+
     <string name="card_style">Tarjeta</string>
+
+    <string name="carousal">Carrusel</string>
+
     <string name="carousal_effect_on_now_playing_screen">Efecto carrusel en la pantalla de reproducción</string>
+
     <string name="cascading">En cascada</string>
+
+    <string name="cast">Emitir</string>
+
     <string name="changelog">Registro de cambios</string>
-    <string name="changelog_summary">Consulta las novedades</string>
-    <string name="choose_image">Elegir imagen</string>
-    <string name="choose_restore_title">Elige qué restaurar</string>
-    <string name="circle">Círculo</string>
+
+    <string name="changelog_summary">Registro de cambios continuo en el canal de Telegram</string>
+
     <string name="circular">Circular</string>
+
     <string name="classic">Clásico</string>
+
     <string name="clear_action">Limpiar</string>
-    <string name="clear_blacklist">Limpiar lista negra</string>
-    <string name="clear_history">Limpiar historial</string>
-    <string name="clear_playing_queue">Limpiar la cola</string>
+
+    <string name="clear_app_data">Limpiar datos de la aplicación</string>
+
+    <string name="clear_blacklist">Vaciar lista negra</string>
+
+    <string name="clear_playing_queue">Limpiar cola de reproducción</string>
+
+    <string name="clear_playlist_title">Vaciar lista de reproducción</string>
+    <string name="clear_playlist_x"><![CDATA[\u00bfDesea limpiar la lista de reproducci\u00f3n <b>%1$s</b>? \u00a1Esta acci\u00f3n no se puede deshacer!]]></string>
+
+    <string name="close_notification">Cerrar</string>
+
     <string name="color">Color</string>
+
+    <string name="color_theme_name">Color</string>
+
     <string name="colors">Colores</string>
-    <string name="compact">Compacto</string>
+
     <string name="composer">Compositor</string>
-    <string name="copied_device_info_to_clipboard">Información de dispositivo copiada al portapapeles.</string>
-    <string name="could_not_create_playlist">No se pudo crear la lista de reproducción.</string>
-    <string name="could_not_download_album_cover">"No se pudo descargar una portada de álbum coincidente."</string>
+
+    <string name="copied_device_info_to_clipboard">Información del dispositivo copiado al portapapeles.</string>
+
+    <string name="could_not_create_playlist">Imposible crear la lista de reproducci\u00f3n.</string>
+    <string name="could_not_download_album_cover">"No se pudo descargar la portada del \u00e1lbum correspondiente."</string>
     <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
-    <string name="could_not_scan_files">No se pudieron escanear %d archivos.</string>
+    <string name="could_not_scan_files">No se pudieron escanear los archivos.</string>
+
     <string name="create_action">Crear</string>
-    <string name="create_new_backup">Crear</string>
-    <string name="created_playlist_x">Lista de reproducción %1$s creada.</string>
-    <string name="credit_title">Miembros y colaboradores </string>
-    <string name="currently_listening_to_x_by_x">Actualmente estás escuchando %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imágenes de artista personalizadas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Compartir informe de error</string>
-    <string name="dark_theme_name">Un poco oscuro</string>
+
+    <string name="created_playlist_x">Lista de reproducción creada.</string>
+
+    <string name="credit_title">Miembros y colaboradores</string>
+
+    <string name="currently_listening_to_x_by_x">Estás escuchando a</string>
+
+    <string name="dark_theme_name">Algo oscuro</string>
+
+    <string name="default_hint">No hay letras</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_song_x"><![CDATA[¿Eliminar canción?]]></string>
+
     <string name="delete_songs_title">Eliminar canciones</string>
-    <string name="delete_x_playlists"><![CDATA[¿Eliminar las <b>%1$d</b> listas de reproducción?]]></string>
-    <string name="delete_x_songs"><![CDATA[¿Eliminar las <b>%1$d</b> canciones?]]></string>
-    <string name="deleted_x_songs">%1$d canciones eliminadas.</string>
-    <string name="deleting_songs">Eliminando canciones</string>
+
+    <string name="delete_x_playlists"><![CDATA[¿Eliminar lista de reproducción?]]></string>
+    <string name="delete_x_songs"><![CDATA[¿Desea eliminar <b>%1$d</b> canciones?]]></string>
+    <string name="deleted_x_songs">Se han eliminado %1$d canciones.</string>
+
     <string name="depth">Profundidad</string>
+
     <string name="description">Descripción</string>
+
     <string name="device_info">Información del dispositivo</string>
+
     <string name="dialog_message_set_ringtone">Permitir a Retro Music modificar los ajustes de audio</string>
-    <string name="dialog_title_set_ringtone">Establecer tono de llamada</string>
-    <string name="disc_hint">Número de disco</string>
+
+    <string name="dialog_title_set_ringtone">Establecer como tono</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[¿Quiere eliminar <b>%1$s</b> de la lista negra?]]></string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres eliminar <b>%1$s</b> de la lista negra?]]></string>
+
     <string name="donate">Donar</string>
-    <string name="donate_summary">Si crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
-    <string name="donation_header">Cómprame:</string>
-    <string name="done">Listo</string>
-    <string name="drive_mode">Modo coche</string>
-    <string name="edit_fab">Botón Editar</string>
-    <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar Letras sincronizadas</string>
+
+    <string name="donate_summary">"Si crees que merezco que me paguen por mi trabajo, puedes donarme un poco de dinero aquí "</string>
+
+    <string name="donation_header">Invitarme a:</string>
+
+    <string name="download_from_last_fm">Descargar de last.fm</string>
+
+    <string name="edit">Editar</string>
+
+    <string name="edit_cover">Editar carátula</string>
+
     <string name="empty">Vacío</string>
+
     <string name="equalizer">Ecualizador</string>
-    <string name="error_create_backup">No se pudo crear la copia de seguridad</string>
-    <string name="error_delete_backup">No se pudo eliminar la copia de seguridad</string>
-    <string name="error_empty_name">¡Su nombre no puede estar vacío!</string>
-    <string name="error_load_failed">Carga fallida</string>
-    <string name="error_share_file">No se pudo compartir el archivo</string>
-    <string name="expanded">Expandido</string>
-    <string name="faq">Preguntas más frecuentes</string>
+
+    <string name="error">Error</string>
+
+    <string name="faq">Preguntas frecuentes</string>
+
     <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">El archivo ya existe</string>
-    <string name="finish_last_song">Terminar última canción</string>
-    <string name="fit">Ajustado</string>
+
+    <string name="finish_last_song">Termina la última canción</string>
+
+    <string name="fit">Fit</string>
+
     <string name="flat">Plano</string>
+
     <string name="folders">Carpetas</string>
-    <string name="follow_system">Seguir al sistema</string>
+
     <string name="for_you">Para ti</string>
-    <string name="free">Gratuito</string>
-    <string name="full">Completa</string>
+
+    <string name="full">Lleno</string>
+
     <string name="full_card">Tarjeta completa</string>
-    <string name="general_settings_summary">Cambiar el tema y colores de la aplicación</string>
-    <string name="general_settings_title">Apariencia y funcionamiento</string>
+
+    <string name="general_settings_summary">Cambiar el tema y los colores de la aplicación</string>
+    <string name="general_settings_title">Apariencia</string>
+
     <string name="genre">Género</string>
+
     <string name="genres">Géneros</string>
-    <string name="git_hub_summary">Bifurca el proyecto en GitHub</string>
-    <string name="gradient">Degradado</string>
-    <string name="grant_access">Conceder acceso</string>
+
+    <string name="git_hub_summary">Siga el proyecto en GitHub</string>
+
+    <string name="google_plus_community">Únete a la comunidad de Google Plus, donde puedes pedir ayuda o seguir las actualizaciones de Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,356 +297,483 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Estilo de cuadrícula</string>
-    <string name="help_summary">¿Necesitas más ayuda?</string>
-    <string name="hinge">Giro</string>
+
+    <string name="grid_style_label"><![CDATA[Cuadricula y estilo]]></string>
+
+    <string name="hinge">Bisagra</string>
+
     <string name="history">Historial</string>
-    <string name="history_cleared">Historial borrado</string>
-    <string name="history_undo_button">Deshacer</string>
+
     <string name="home">Inicio</string>
-    <string name="horizontal_flip">Giro horizontal</string>
+
+    <string name="horizontal_flip">Giro Horizontal</string>
+
     <string name="image">Imagen</string>
+
     <string name="image_gradient">Imagen de degradado</string>
-    <string name="image_settings_summary">Cambiar los ajustes de descarga de imágenes del artista</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar lista de reproducción</string>
-    <string name="import_playlist_message">Importa todas las listas de reproducción del almacenamiento Android con canciones, si las listas ya existen, las canciones se fusionarán.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
-    <string name="instagram_page_summary">Comparte tu configuración de Retro Music para mostrarlo en Instagram</string>
+
+    <string name="image_settings_summary">Cambiar los ajustes de descarga para imágenes de artista</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Se han añadido %1$d canciones a la lista %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Comparte tu configuración de Retro Music en Instagram</string>
+
     <string name="keyboard">Teclado</string>
+
     <string name="label_bit_rate">Tasa de bits</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_name">Nombre de archivo</string>
+    <string name="label_file_path">Ruta de archivo</string>
     <string name="label_file_size">Tamaño</string>
-    <string name="label_last_modified">Última modificación</string>
-    <string name="label_more_from">Más de %s</string>
+
     <string name="label_sampling_rate">Tasa de muestreo</string>
-    <string name="label_track_length">Duración</string>
-    <string name="labeled">Etiquetado</string>
-    <string name="last_added">Añadidos recientemente</string>
+
+    <string name="label_track_length">Tamaño</string>
+
+    <string name="labeled">Con etiquetas</string>
+
+    <string name="last_added">Último agregado</string>
+
     <string name="last_song">Última canción</string>
-    <string name="lets_go">¡Vamos!</string>
-    <string name="library_categories">Categorías de la Biblioteca</string>
+
+    <string name="lets_play_something">Vamos a poner algo de música</string>
+
+    <string name="library">Biblioteca</string>
+
+    <string name="library_categories">Categorías biblioteca</string>
+
     <string name="licenses">Licencias</string>
-    <string name="light_theme_name">Claramente Blanco</string>
-    <string name="listeners_label">Oyentes</string>
-    <string name="listing_files">Listando archivos</string>
-    <string name="loading_products">Cargando productos…</string>
+
+    <string name="light_theme_name">Blanco</string>
+
+    <string name="listing_files">Listado de archivos</string>
+
+    <string name="loading_products">Cargando productos...</string>
+
     <string name="login">Iniciar sesión</string>
-    <string name="lyrics">Letras</string>
+
+    <string name="lyrics">"Letras "</string>
+
     <string name="made_with_love">Hecho con ❤️ en India</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Error</string>
+
     <string name="md_storage_perm_error">Error de permisos</string>
-    <string name="message_backup_create_success">Copia de seguridad creada con correctamente.</string>
-    <string name="message_limit_tabs">No más de 5 artículos</string>
-    <string name="message_pro_feature">%s es una característica Pro.</string>
-    <string name="message_restore_success">La restauración se ha completado con éxito.</string>
-    <string name="message_updated">Actualizado</string>
-    <string name="message_welcome"><![CDATA[¡Hola! <br> Bienvenido(a) a %s]]></string>
-    <string name="my_name">Nombre</string>
+
+    <string name="my_name">Mi nombre</string>
+
     <string name="my_top_tracks">Más reproducidas</string>
+
     <string name="never">Nunca</string>
-    <string name="new_music_mix">Nueva mezcla musical</string>
+
+    <string name="new_banner_photo">"Nueva foto de perfil "</string>
+
     <string name="new_playlist_title">Nueva lista de reproducción</string>
+
+    <string name="new_profile_photo">Nueva foto de perfil</string>
+
     <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
+
     <string name="next_song">Próxima canción</string>
-    <string name="no_albums">No tienes álbumes</string>
-    <string name="no_artists">No tienes artistas</string>
-    <string name="no_audio_ID">"Reproduce primero una canción y vuelve a intentarlo."</string>
-    <string name="no_backups_found">No se han encontrado copias de seguridad</string>
+
+    <string name="no_albums">Sin álbumes</string>
+
+    <string name="no_artists">Sin 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_genres">No tienes géneros</string>
-    <string name="no_lyrics_found">No se encontraron letras</string>
-    <string name="no_playing_queue">No se está reproduciendo ninguna canción</string>
-    <string name="no_playlists">No tienes listas de reproducción</string>
-    <string name="no_purchase_found">No se encontraron compras.</string>
+
+    <string name="no_genres">Sin géneros</string>
+
+    <string name="no_lyrics_found">No se encontró la letra</string>
+
+    <string name="no_playlists">Sin listas de reproducción</string>
+
+    <string name="no_purchase_found">No se ha encontrado ninguna compra.</string>
+
     <string name="no_results">Sin resultados</string>
-    <string name="no_songs">No tienes canciones</string>
+
+    <string name="no_songs">Sin canciones</string>
+
     <string name="normal">Normal</string>
-    <string name="normal_lyrics">Letras normales</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no aparece en el almacén de medios.]]></string>
-    <string name="not_recently_played">No reproducido recientemente</string>
-    <string name="nothing_to_scan">Nada para examinar.</string>
-    <string name="nothing_to_see">Nada para ver</string>
+
+    <string name="normal_lyrics">Letra normal</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no está listado en el almacenamiento interno.]]></string>
+
+    <string name="nothing_to_scan">Nada que escanear</string>
+
     <string name="notification">Notificación</string>
-    <string name="notification_settings_summary">Personaliza el estilo de la notificación</string>
-    <string name="now_playing">Reproduciendo ahora</string>
-    <string name="now_playing_queue">Cola de reproducción actual</string>
-    <string name="now_playing_summary">Personalizar la ventana de reproducción actual</string>
-    <string name="now_playing_themes">Más de 9 temas para la ventana de reproducción actual</string>
-    <string name="only_on_wifi">Solo con Wi-Fi</string>
+
+    <string name="notification_settings_summary">Personalizar el estilo de la notificación</string>
+
+    <string name="now_playing">Reproduciendo</string>
+    <string name="now_playing_queue">Cola de reproducción</string>
+    <string name="now_playing_summary">Personalizar la pantalla de reproducción</string>
+    <string name="now_playing_themes">Más de 9 temas de reproducción</string>
+
+    <string name="only_on_wifi">Sólo con Wi-Fi</string>
+
     <string name="other_settings_summary">Funciones avanzadas experimentales</string>
+
     <string name="others">Otro</string>
-    <string name="over_cover">Sobre la portada</string>
+
     <string name="password">Contraseña</string>
-    <string name="past_three_months">Más de 3 meses</string>
-    <string name="paste_lyrics_here">Pega las Letras Aquí</string>
-    <string name="paste_timeframe_lyrics_here">Pegar las letras con marcas de tiempo aquí</string>
-    <string name="peek">Mirar</string>
-    <string name="permission_bluetooth_denied">Permiso de dispositivos cercanos denegado.</string>
+
+    <string name="past_three_months">Últimos 3 meses</string>
+
+    <string name="paste_lyrics_here">Pegar letra aquí</string>
+
     <string name="permission_external_storage_denied">Permiso para acceder al almacenamiento externo denegado.</string>
-    <string name="permission_summary">La aplicación necesita permiso para acceder al almacenamiento de tu dispositivo y reproducir música</string>
-    <string name="permission_title">Acceso al Almacenamiento</string>
-    <string name="permissions_denied">Permiso denegado.</string>
+
+    <string name="permissions_denied">Permisos denegados.</string>
+
     <string name="personalize">Personalizar</string>
-    <string name="personalize_settings_summary">Personalizar la ventana de reproducción actual y los controles de la interfaz</string>
-    <string name="pick_from_local_storage">Elegir del almacenamiento local</string>
+
+    <string name="personalize_settings_summary">Personalizar la pantalla de reproducción y los controles de la interfaz</string>
+
+    <string name="pick_from_local_storage">Seleccionar del almacenamiento local</string>
+
+    <string name="pick_image_intent_text">Escoger imagen</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Síguenos en Pinterest para inspirarte en el diseño de Retro Music</string>
+    <string name="pinterest_page_summary">Síguenos en Pinterest para inspirarte en el diseño de Retro Music.</string>
+
     <string name="plain">Plano</string>
-    <string name="playList_already_exits">La lista de reproducción ya existe</string>
-    <string name="playback_pitch">Tono</string>
-    <string name="playback_settings">Configuración de reproducción</string>
-    <string name="playback_speed">Velocidad de reproducción</string>
-    <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc.</string>
+
+    <string name="playing_notification_description">La notificación de reproducción muestra acciones de reproducción/pausa, etc.</string>
     <string name="playing_notification_name">Notificación de reproducción</string>
-    <string name="playlist_created_sucessfully">%s creado con éxito</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 de reproducción</string>
-    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado a los temas desenfocados, más bajo es más rápido</string>
+
+    <string name="playlists">Listas</string>
+
+    <string name="pref_album_detail_style">Estilo de la información del álbum</string>
+
+    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado para los temas con desenfoque, más bajo es más rápido</string>
     <string name="pref_blur_amount_title">Cantidad de desenfoque</string>
-    <string name="pref_filter_song_summary">Filtrar canciones por longitud</string>
-    <string name="pref_filter_song_title">Filtrar duración de la canción</string>
-    <string name="pref_header_advanced">Avanzado</string>
+
+    <string name="pref_filter_song_title">Filtro por duración de la canción</string>
+
     <string name="pref_header_album">Estilo del álbum</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
     <string name="pref_header_controls">Controles</string>
     <string name="pref_header_general">Tema</string>
     <string name="pref_header_images">Imágenes</string>
     <string name="pref_header_library">Biblioteca</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausa la canción cuando el volumen disminuye a cero y vuelve a reproducir cuando se aumenta el volumen. También funciona fuera de la aplicación</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pausar en cero</string>
-    <string name="pref_keep_screen_on_summary">Tenga en cuenta que habilitar esta función puede afectar la duración de la batería</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Pausa la reproducción cuando el volumen disminuye a cero y comienza a reproducir cuando se aumenta el nivel de volumen. ¡Cuidado! También funciona aun no estando la aplicación en primer plano.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pausar en silencio</string>
+    <string name="pref_keep_screen_on_summary">Tenga en cuenta que habilitar esta función puede afectar a la vida útil de la batería.</string>
     <string name="pref_keep_screen_on_title">Mantener la pantalla encendida</string>
-    <string name="pref_language_name">Seleccionar idioma</string>
-    <string name="pref_snow_fall_title">Efecto de nieve</string>
-    <string name="pref_summary_album_art_on_lockscreen">Usar la portada del álbum de la canción en reproducción como fondo de la pantalla de bloqueo</string>
-    <string name="pref_summary_album_artists_only">Mostrar Artistas de Álbum en la categoría Artista</string>
-    <string name="pref_summary_audio_ducking">Bajar el volumen cuando se reproduzca un sonido del sistema o se reciba una notificación</string>
-    <string name="pref_summary_audio_fade">Desvanecer el audio cuando la canción está pausada o reproducido</string>
-    <string name="pref_summary_blacklist">El contenido de las carpetas en la lista negra está oculto en su biblioteca.</string>
-    <string name="pref_summary_bluetooth_playback">Comienza a reproducir tan pronto como esté conectado al dispositivo Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Desenfocar la portada el álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
-    <string name="pref_summary_carousel_effect">Efecto carrusel para la portada del álbum en la ventana de reproducción. En los temas \"Tarjeta\" y \"Tarjeta Desenfocada\" no funcionará</string>
-    <string name="pref_summary_classic_notification">Usar el diseño de notificación clásico</string>
-    <string name="pref_summary_colored_app">El color del fondo y los botones de control cambian de acuerdo a la portada del álbum para la ventana 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 cambie el color, activa esta opción para que surta efecto</string>
-    <string name="pref_summary_colored_notification">"Colorea la notificación con el color vibrante de la portada del álbum"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">Según las líneas de la guía Material Design en los colores del modo oscuro deben ser desaturados</string>
-    <string name="pref_summary_expand_now_playing_panel">Al hacer clic en la notificación se mostrará la pantalla de reproducción en lugar de la pantalla de inicio</string>
-    <string name="pref_summary_extra_controls">Añadir controles extra al mini reproductor</string>
-    <string name="pref_summary_extra_song_info">Mostrar información extra de canciones, como el formato de archivo, tasa de bits y frecuencia</string>
+
+    <string name="pref_now_playing_screen_summary">Toca para abrir con o desliza sin la barra de navegación transparente de la pantalla de reproducción</string>
+    <string name="pref_now_playing_screen_title">Hacer clic o deslizar</string>
+
+    <string name="pref_snow_fall_title">Efecto de caída de nieve</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se está reproduciendo como fondo de la pantalla de bloqueo</string>
+    <string name="pref_summary_audio_ducking">Baja el volumen cuando se reproduce un sonido del sistema o se recibe una notificación</string>
+    <string name="pref_summary_blacklist">Las carpetas en la lista negra serán ocultadas de tu biblioteca.</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 para la caratula en la pantalla de reproducción. Tenga en cuenta que los temas tarjeta y tarjeta desenfocada no funcionarán</string>
+    <string name="pref_summary_classic_notification">Usa el diseño clásico de notificaciones</string>
+    <string name="pref_summary_colored_app">Los colores de fondo y de los botones de control cambian acorde a la caratula del álbum que se está reproduciendo</string>
+    <string name="pref_summary_colored_app_shortcuts">Colorea los atajos de la aplicación en el color de énfasis. Activa esta opción cada vez que cambies el color para que surta efecto</string>
+    <string name="pref_summary_colored_navigation_bar">Colorea la barra de navegación en el color primario</string>
+    <string name="pref_summary_colored_notification">"Colorea la notificaci\u00f3n en el color vibrante de la portada del \u00e1lbum"</string>
+    <string name="pref_summary_dominant_color">El color dominante se elegirá de la portada del álbum o del artista</string>
+    <string name="pref_summary_extra_controls">Añade controles extra para el mini reproductor</string>
     <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
-    <string name="pref_summary_home_banner">Mostrar u ocultar el banner de inicio</string>
-    <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero provoca tiempos de carga de imágenes más lentos. Solo habilite esto si tiene problemas con portadas de baja resolución</string>
+    <string name="pref_summary_genre_toggle">Activa la pestaña géneros</string>
+    <string name="pref_summary_home_banner">Muestra la portada en la pantalla de inicio</string>
+    <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero reduce el tiempo de carga de la imagen. Solo habilite esto si tiene problemas con obras de arte de baja resolución</string>
     <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
-    <string name="pref_summary_lock_screen">Usar los controles personalizados de Retro Music en la pantalla de bloqueo</string>
-    <string name="pref_summary_manage_audio_focus">Reproducir siempre el audio en segundo plano independientemente de lo que se esté reproduciendo</string>
-    <string name="pref_summary_open_source_licences">Detalles de licencia para software de código abierto</string>
-    <string name="pref_summary_pause_history">Cuando se activa, las canciones recién reproducidas no se muestran en el historial</string>
-    <string name="pref_summary_remember_tab">Navegar a la última pestaña usada al iniciar</string>
-    <string name="pref_summary_show_lyrics">Mostrar letras sincronizadas sobre la portada del álbum</string>
-    <string name="pref_summary_suggestions">Mostrar mezcla de nueva música en la pantalla de inicio</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Permite cambiar de canción deslizando el dedo en cualquier parte de la pantalla de reproducción</string>
-    <string name="pref_summary_swipe_to_dismiss">Desliza el dedo hacia abajo para descartar el minirreproductor</string>
+    <string name="pref_summary_lock_screen">Utiliza los controles de pantalla de bloqueo personalizados de Retro Music</string>
+    <string name="pref_summary_open_source_licences">Detalles de licencia para software open source</string>
+    <string name="pref_summary_round_corners">Redondea los bordes de la aplicación</string>
+    <string name="pref_summary_tab_titles">Muestra nombres para las pestañas de navegación inferiores</string>
     <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
-    <string name="pref_summary_toggle_headset">Comenzar a reproducir inmediatamente cuando se conecten audífonos</string>
-    <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará cuando se reproduzca una nueva lista de canciones</string>
-    <string name="pref_summary_toggle_volume">Mostrar controles de volumen si hay suficiente espacio disponible</string>
-    <string name="pref_summary_wallpaper_accent">Extrae el color del fondo de pantalla</string>
-    <string name="pref_summary_whitelist">Mostrar solo música de la carpeta /Music</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar la portada del álbum</string>
-    <string name="pref_title_album_artists_only">Navegar por Artista del Álbum</string>
+    <string name="pref_summary_toggle_headset">Inicia el reproductor inmediatamente después de conectar unos auriculares</string>
+    <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará al reproducir una nueva lista de canciones</string>
+    <string name="pref_summary_toggle_volume">Si hay espacio suficiente, muestra los controles de volumen en la pantalla de reproducción</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Mostrar portada del álbum</string>
     <string name="pref_title_album_cover_style">Tema de la portada del álbum</string>
-    <string name="pref_title_album_cover_transform">Saltar portada de álbum</string>
-    <string name="pref_title_app_shortcuts">Accesos directos de la aplicación coloreados</string>
-    <string name="pref_title_appbar_mode">Estilo de cabecera</string>
-    <string name="pref_title_audio_ducking">Reducir el volumen cuando se pierda el enfoque</string>
-    <string name="pref_title_audio_fade">Desvanecer audio</string>
-    <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
+    <string name="pref_title_album_cover_transform">Estilo de la caratula en reproducción</string>
+    <string name="pref_title_album_grid_style">Cuadrícula de álbums</string>
+    <string name="pref_title_app_shortcuts">Atajos de la aplicación coloreados</string>
+    <string name="pref_title_artist_grid_style">Cuadrícula de artistas</string>
+    <string name="pref_title_audio_ducking">Reducir volumen al perder enfoque</string>
+    <string name="pref_title_auto_download_artist_images">Descargar imágenes de artista automáticamente</string>
     <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Reproducción por Bluetooth</string>
     <string name="pref_title_blurred_album_art">Desenfocar portada del álbum</string>
-    <string name="pref_title_circle_button">Botón de reproducción circular</string>
-    <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
-    <string name="pref_title_colored_app">Color adaptable</string>
+    <string name="pref_title_choose_equalizer">Elegir ecualizador</string>
+    <string name="pref_title_classic_notification">Diseño clásico para notificaciones</string>
+    <string name="pref_title_colored_app">Color adaptativo</string>
     <string name="pref_title_colored_notification">Notificación coloreada</string>
-    <string name="pref_title_cross_fade">Transición (Beta)</string>
-    <string name="pref_title_custom_font">Usar la fuente \"Manrope\"</string>
-    <string name="pref_title_desaturated_color">Color desaturado</string>
-    <string name="pref_title_expand_now_playing_panel">Mostrar en pantalla de reproducción actual</string>
-    <string name="pref_title_extra_controls">Controles extras</string>
-    <string name="pref_title_extra_song_info">Información de la canción</string>
-    <string name="pref_title_gapless_playback">Reproducción sin pausas</string>
+    <string name="pref_title_extra_controls">Controles adicionales</string>
+    <string name="pref_title_gapless_playback">Reproducción sin interrupciones</string>
     <string name="pref_title_general_theme">Tema de la aplicación</string>
-    <string name="pref_title_home_album_grid_style">Cuadrícula de álbum</string>
-    <string name="pref_title_home_artist_grid_style">Cuadrícula del artista</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorar las portadas del Almacén de Medios</string>
-    <string name="pref_title_last_added_interval">Intervalo de la lista \"Añadidos Recientemente\"</string>
-    <string name="pref_title_lock_screen">Controles en pantalla completa</string>
-    <string name="pref_title_lyrics_screen_on">Mantener la pantalla encendida al mostrar letras</string>
-    <string name="pref_title_lyrics_type">Tipos de letra</string>
-    <string name="pref_title_manage_audio_focus">Juega siempre</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción actual</string>
+    <string name="pref_title_genre_toggle">Mostrar géneros</string>
+    <string name="pref_title_home_artist_grid_style">Cuadrícula de inicio de artistas</string>
+    <string name="pref_title_home_banner">Portada de inicio</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignorar carátulas provenientes del almacenamiento local</string>
+    <string name="pref_title_last_added_interval">Intervalo últimas canciones añadidas</string>
+    <string name="pref_title_lock_screen">Controles de pantalla completa</string>
+    <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
+    <string name="pref_title_now_playing_screen_appearance">Tema de la pantalla de reproducción</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
-    <string name="pref_title_pause_history">Pausar historial</string>
-    <string name="pref_title_remember_tab">Recordar la última pestaña</string>
-    <string name="pref_title_show_lyrics">Mostrar Letras</string>
-    <string name="pref_title_suggestions">Mostrar sugerencias</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Desliza hacia cualquier lugar para cambiar la canción</string>
-    <string name="pref_title_swipe_to_dismiss">Descarta deslizando hacia abajo</string>
-    <string name="pref_title_tab_text_mode">Modo de los títulos de las pestañas</string>
-    <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
-    <string name="pref_title_toggle_full_screen">Aplicación en pantalla completa</string>
-    <string name="pref_title_toggle_toggle_headset">Reproducir automáticamente</string>
+    <string name="pref_title_round_corners">Bordes</string>
+    <string name="pref_title_tab_text_mode">Estilo de las pestañas de título</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">Aplicación a pantalla completa</string>
+    <string name="pref_title_toggle_tab_titles">Nombres de las pestañas</string>
+    <string name="pref_title_toggle_toggle_headset">Reproducción automática</string>
     <string name="pref_title_toggle_toggle_shuffle">Modo aleatorio</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
-    <string name="pref_title_wallpaper_accent">Color de énfasis del fondo de pantalla</string>
-    <string name="pref_title_whitelist">Música en lista blanca</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema Negro, Temas \"Ahora reproduciendo\", Efecto Carrusel y más...</string>
+    <string name="pref_title_user_info">Información del usuario</string>
+
+    <string name="primary_color">Color primario</string>
+    <string name="primary_color_desc">El color de tema primario, azul grisáceo por defecto, por ahora funciona con colores oscuros</string>
+
+    <string name="pro_summary">Temas en reproducción, efecto Carrusel, tema de color y más ...</string>
+
     <string name="profile">Perfil</string>
+
     <string name="purchase">Comprar</string>
-    <string name="queue">Reproduciendo Cola</string>
-    <string name="rate_app">Califica la aplicación</string>
-    <string name="rate_on_google_play_summary">¿Te encanta la aplicación? Haznos saber en Google Play Store cómo podemos hacerla aún mejor</string>
+
+    <string name="purchase_summary">*Piense antes de comprar, no solicite un reembolso.</string>
+
+    <string name="queue">Cola</string>
+
+    <string name="rate_app">Valorar la aplicación</string>
+
+    <string name="rate_on_google_play_summary">¿Te gusta esta aplicación? Háganos saber en Google Play Store cómo podemos hacerlo aún mejor</string>
+
     <string name="recent_albums">Álbumes recientes</string>
+
     <string name="recent_artists">Artistas recientes</string>
+
     <string name="remove_action">Eliminar</string>
-    <string name="remove_cover">Eliminar portada</string>
-    <string name="remove_from_blacklist">Eliminar de la lista negra</string>
-    <string name="remove_image">Quitar imagen</string>
+
+    <string name="remove_banner_photo">Eliminar foto de portada</string>
+
+    <string name="remove_cover">Eliminar carátula</string>
+
+    <string name="remove_from_blacklist">Quitar de la lista negra</string>
+
+    <string name="remove_profile_photo">Eliminar foto de perfil</string>
+
     <string name="remove_song_from_playlist_title">Eliminar canción de la lista de reproducción</string>
     <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_playlist_title">Renombrar lista de reproducción</string>
-    <string name="replace_cover">Reemplazar la portada</string>
-    <string name="report_an_issue">Reportar una incidencia</string>
-    <string name="report_bug">Reportar fallo</string>
+
+    <string name="report_an_issue">Reporta un problema</string>
+
+    <string name="report_bug">Reporta problemas</string>
+
     <string name="reset_action">Restablecer</string>
-    <string name="reset_artist_image">Reiniciar imagen del artista</string>
+
+    <string name="reset_artist_image">Restablecer imagen de artista</string>
+
     <string name="restore">Restaurar</string>
-    <string name="restore_message">Do you want to restore backup?</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 anteriores restauradas.</string>
-    <string name="restoring_purchase">Restaurando compra…</string>
-    <string name="retro_music_player">Reproductor Retro Music</string>
+
+    <string name="restored_previous_purchase_please_restart">Restablecer compra anterior. Reinicia la aplicación para disfrutar de todas las funciones.</string>
+    <string name="restored_previous_purchases">Compra anterior restaurada.</string>
+
+    <string name="restoring_purchase">Restableciendo compra...</string>
+
+    <string name="retro_equalizer">Ecualizador de Retro Music</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">La aplicación necesita permiso para acceder a la configuración de tu dispositivo para establecer música como Tono de Llamada</string>
-    <string name="ringtone_title">Tono de Llamada (Opcional)</string>
-    <string name="saf_delete_failed">La eliminación del archivo: %s falló</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener SAF URI</string>
-    <string name="saf_guide_slide1_description">Abrir el cajón de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Activar \"Mostrar tarjeta SD\" en el menú</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 cajón de navegación</string>
-    <string name="saf_guide_slide3_description">No abra ninguna sub-carpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_write_failed">Error al escribir: %s</string>
+
     <string name="save">Guardar</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Guardar como archivo</string>
+
     <string name="save_playlists_title">Guardar como archivos</string>
-    <string name="saved_playlist_to">Guardar lista de reproducción a %s.</string>
+
+    <string name="saved_playlist_to">Lista de reproducción guardada en %s.</string>
+
     <string name="saving_changes">Guardando cambios</string>
-    <string name="scan_media">Examinar medios</string>
-    <string name="scanned_files">%1$d de %2$d archivos examinados.</string>
-    <string name="scrobbles_label">Enviar a</string>
+
+    <string name="scan_media">Escanear archivos</string>
+
+    <string name="scanned_files">Archivos escaneados %1$d de %2$d</string>
+
+    <string name="search_hint">Buscar en tu biblioteca...</string>
+
     <string name="select_all">Seleccionar todo</string>
+
+    <string name="select_banner_photo">Elegir una foto de portada</string>
+
     <string name="selected">Seleccionado</string>
+
+    <string name="send_crash_log">Enviar registro de depuración</string>
+
     <string name="set">Establecer</string>
-    <string name="set_artist_image">Establecer imagen del artista</string>
-    <string name="share_app">Compartir aplicación</string>
-    <string name="share_summary">Comparte la aplicación con tus amigos y familia</string>
-    <string name="share_to_stories">Compartir en Historias</string>
-    <string name="show_album_artists">Mostrar Artistas del Álbum</string>
-    <string name="shuffle">Aleatorio</string>
+
+    <string name="set_artist_image">Establecer imagen de artista</string>
+
+    <string name="set_photo">Establecer imagen de perfil</string>
+
+    <string name="share_app">Comparte la app</string>
+
+    <string name="shuffle">Mezclar</string>
+
     <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
-    <string name="sleep_timer_set">Temporizado establecido para %d minutos desde ahora.</string>
-    <string name="social">Redes Sociales</string>
-    <string name="social_stories">Compartir historia</string>
+
+    <string name="sleep_timer_canceled">Temporizador cancelado</string>
+    <string name="sleep_timer_set">Temporizador programado para %d minutos</string>
+
+    <string name="slide">Presentación</string>
+
+    <string name="small">Album pequeño</string>
+
+    <string name="social">Social</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="sort_order">Orden de clasificación</string>
     <string name="sort_order_a_z">Ascendente</string>
     <string name="sort_order_album">Álbum</string>
     <string name="sort_order_artist">Artista</string>
     <string name="sort_order_composer">Compositor</string>
-    <string name="sort_order_date">Fecha agregada</string>
-    <string name="sort_order_date_modified">Fecha de modificación</string>
-    <string name="sort_order_default">Por defecto</string>
-    <string name="sort_order_num_songs">Número de canciones</string>
-    <string name="sort_order_num_songs_desc">Número de canciones descendente</string>
+    <string name="sort_order_date">Fecha</string>
     <string name="sort_order_year">Año</string>
     <string name="sort_order_z_a">Descendente</string>
-    <string name="speech_not_supported">¡Lo siento! Tu dispositivo no es compatible con la entrada de voz</string>
+
+    <string name="speech_not_supported">¡Lo sentimos! Tu dispositivo no es compatible con las entradas por voz</string>
+
     <string name="speech_prompt">Buscar en tu biblioteca</string>
+
     <string name="stack">Apilado</string>
+
     <string name="start_play_music">Comenzar a reproducir música.</string>
+
     <string name="suggestion_songs">Sugerencias</string>
-    <string name="support_development">Apoya el desarrollo</string>
-    <string name="swipe_to_unlock">Deslizar para desbloquear</string>
-    <string name="synced_lyrics">Letras sincronizadas</string>
+
+    <string name="summary_user_info">Solo mostrar tu nombre en la pantalla de inicio</string>
+
+    <string name="support_development">Apoyar el desarrollo</string>
+
+    <string name="swipe_to_unlock">Desbloquear</string>
+
+    <string name="synced_lyrics">Letra sincronizada</string>
+
+    <string name="system_equalizer">Ecualizador del sistema</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Únete al grupo de Telegram para discutir los fallos, hacer sugerencias, presumir y más</string>
+    <string name="telegram_group_summary">Únase al grupo de Telegram para discutir errores, hacer sugerencias, presumir y más</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">Diminuto</string>
-    <string name="tiny_card_style">Tarjeta diminuta</string>
-    <string name="title">Titulo</string>
-    <string name="title_new_backup">New Backup</string>
+
+    <string name="tiny">Pequeño</string>
+
+    <string name="title">Título</string>
+
+    <string name="title_dashboard">Panel</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_user_info">Cómo te llamas</string>
+
     <string name="today">Hoy</string>
-    <string name="top_albums">Álbumes más reproducidos</string>
-    <string name="top_artists">Artistas más reproducidos</string>
-    <string name="track_hint">"Pista (2 para pista 2 o 3004 para CD3 pista 4)"</string>
+
+    <string name="top_albums">Mejores álbumes</string>
+
+    <string name="top_artists">Mejores artistas</string>
+
+    <string name="track_hint">"Pista (2 para la pista 2 o 3004 para la pista 4 del CD3)"</string>
+
     <string name="track_list">Número de pista</string>
+
     <string name="translate">Traducir</string>
+
     <string name="translate_community">Ayúdanos a traducir la aplicación a tu idioma</string>
-    <string name="try_retro_music_premium">Prueba Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Comparte tu diseño con Retro Music</string>
-    <string name="unlabeled">Sin etiqueta</string>
-    <string name="unplayable_file">No se pudo reproducir esta canción.</string>
-    <string name="up_next">A continuación</string>
+
+    <string name="unlabeled">Sin etiquetas</string>
+
+    <string name="unplayable_file">No se pudo reproducir esta canci\u00f3n.</string>
+
+    <string name="up_next">Siguientes</string>
+
     <string name="update_image">Actualizar imagen</string>
-    <string name="updating">Actualizando…</string>
-    <string name="user_images_description">Imágenes del Usuario</string>
-    <string name="user_name">Nombre de Usuario</string>
-    <string name="username">Usuario</string>
+
+    <string name="updating">Actualizando...</string>
+
+    <string name="username">Nombre de Usuario</string>
+
     <string name="version">Versión</string>
+
     <string name="vertical_flip">Giro vertical</string>
-    <string name="view_on_telegram">Ver en Telegram</string>
-    <string name="volume">Volumen</string>
-    <string name="web_search">Buscar en la Web</string>
-    <string name="website">Sitio Web</string>
-    <string name="website_summary">Echa un vistazo a nuestro Sitio Web</string>
+
+    <string name="virtualizer">Virtualizador</string>
+
+    <string name="web_search">Búsqueda en la web</string>
+
     <string name="welcome">Bienvenido,</string>
+
     <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
-    <string name="whats_new">Lo Nuevo</string>
+
+    <string name="whats_new">Novedades</string>
+
     <string name="window">Ventana</string>
-    <string name="window_corner_edges">Esquinas redondeadas</string>
-    <string name="x_has_been_set_as_ringtone">%1$s establecido como tu tono de llamada.</string>
-    <string name="x_selected">%1$d seleccionado(s)</string>
+
+    <string name="window_corner_edges">Bordes redondeados</string>
+
+    <string name="x_has_been_set_as_ringtone">Establecer %1$s como 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">Tienes que seleccionar al menos una categoría.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web para reportar incidencias.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Los datos de tu cuenta sólo se utilizan para la autenticación.</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web para reportar problemas.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">La información de tu cuenta es solo para autenticar tu identidad.</string>
+    <string name="label_more_from">More from %s</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 c5b5af75a..f78f2ee95 100644
--- a/app/src/main/res/values-es-rUS/strings.xml
+++ b/app/src/main/res/values-es-rUS/strings.xml
@@ -1,203 +1,272 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Acerca de %s</string>
-    <string name="about_settings_summary">Equipo, enlaces sociales</string>
-    <string name="accent_color">Color de acento</string>
-    <string name="accent_color_desc">El color de acento del tema, por defecto es morado</string>
-    <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Agregar a la lista negra</string>
-    <string name="action_add_to_favorites">Agregar a Tus Me gusta</string>
-    <string name="action_add_to_playing_queue">Agregar a la cola de reproducción</string>
-    <string name="action_add_to_playlist">Agregar a playlist</string>
-    <string name="action_cancel">Cancelar</string>
-    <string name="action_cast">Emitir</string>
-    <string name="action_clear_playing_queue">Vaciar cola de reproducción</string>
-    <string name="action_cycle_repeat">Modo de repetición de ciclo</string>
+    <string name="accent_color">Hello</string>
+    <string name="accent_color_desc">El color de énfasis del tema, por defecto es verde azulado</string>
+
+    <string name="action_about">Acerca de Retro Music Player</string>
+
+    <string name="action_add_to_favorites">Añadir a favoritos</string>
+    <string name="action_add_to_playing_queue">Añadir a la cola de reproducción</string>
+    <string name="action_add_to_playlist">Añadir a la lista de reproducción</string>
+
+    <string name="action_clear_playing_queue">Borrar cola de reproducción</string>
+    <string name="action_clear_playlist">Limpiar lista</string>
+
     <string name="action_delete">Eliminar</string>
     <string name="action_delete_from_device">Eliminar del dispositivo</string>
+
     <string name="action_details">Detalles</string>
-    <string name="action_edit">Editar</string>
+
     <string name="action_go_to_album">Ir al álbum</string>
     <string name="action_go_to_artist">Ir al artista</string>
     <string name="action_go_to_genre">Ir a género</string>
-    <string name="action_go_to_lyrics">Ir a la letra</string>
-    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
+    <string name="action_go_to_start_directory">Ir al inicio</string>
+
     <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 (h)</string>
-    <string name="action_new_playlist">Nueva playlist</string>
+    <string name="action_grid_size_land">Tamaño de cuadrícula (horizontal)</string>
+
     <string name="action_next">Siguiente</string>
+
     <string name="action_play">Reproducir</string>
-    <string name="action_play_all">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_remove_from_favorites">Eliminar de Tus Me gusta</string>
-    <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
-    <string name="action_remove_from_playlist">Eliminar de la playlist</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">Remover de la lista de reproducción</string>
+
     <string name="action_rename">Renombrar</string>
+
     <string name="action_save_playing_queue">Guardar cola de reproducción</string>
+
     <string name="action_scan">Escanear</string>
+
     <string name="action_search">Buscar</string>
+
     <string name="action_set">Iniciar</string>
     <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
     <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
-    <string name="action_settings">"Configuración"</string>
+
+    <string name="action_settings">"Ajustes"</string>
+
     <string name="action_share">Compartir</string>
+
     <string name="action_shuffle_all">Aleatorio</string>
-    <string name="action_shuffle_playlist">Lista de reproducción aleatoria</string>
-    <string name="action_sleep_timer">Temporizador de sueño</string>
+    <string name="action_shuffle_playlist">Reproducción aleatoria de lista</string>
+
+    <string name="action_sleep_timer">Temporizador de apagado</string>
+
     <string name="action_sort_order">Ordenar por</string>
+
     <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Alternar favoritos</string>
-    <string name="action_toggle_shuffle">Alternar modo aleatorio</string>
-    <string name="adaptive">Adaptable</string>
+
+    <string name="adaptive">Adaptativo</string>
+
     <string name="add_action">Agregar</string>
-    <string name="add_playlist_title">"Añadir a la lista de reproducción"</string>
-    <string name="add_time_framed_lryics">Añadir letras sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d cancion(es) añadidas a %2$s</string>
-    <string name="added_title_to_playing_queue">"Se agregó 1 canción a la cola de reproducción."</string>
-    <string name="added_x_titles_to_playing_queue">Se agregó %1$d canción(es) a la cola de reproducción.</string>
+
+    <string name="add_photo">Agregar \nfoto</string>
+
+    <string name="add_playlist_title">"Agregar a la lista"</string>
+
+    <string name="added_title_to_playing_queue">"Se agregó 1 canción a la lista"</string>
+
+    <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>
-    <plurals name="albumSongs">
-        <item quantity="one">Canción</item>
-        <item quantity="other">Canciones</item>
-    </plurals>
+
     <string name="album_artist">Artista del álbum</string>
+
+    <string name="album_or_artist_empty">El título o artista está vacío.</string>
+
     <string name="albums">Álbumes</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbumes</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">Siempre</string>
-    <string name="app_share">Echa un vistazo a este genial reproductor de música en: https://play.google.com/store/apps/details?id=%s</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 -->
     <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
-    <string name="app_shortcut_top_tracks_short">Canciones más reproducidas</string>
-    <string name="app_widget_big_name">Imagen completa</string>
-    <string name="app_widget_card_name">Tarjeta</string>
-    <string name="app_widget_classic_name">Clásico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeño</string>
-    <string name="app_widget_text_name">Texto mínimo</string>
+    <string name="app_shortcut_top_tracks_short">Hello</string>
+
+    <string name="app_widget_big_name">Retro Music - Grande</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="app_widget_text_name">Retro Music - Texto</string>
+
     <string name="artist">Artista</string>
+
     <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duración del desvanecimiento de audio</string>
-    <string name="audio_focus_denied">Enfoque de audio denegado.</string>
-    <string name="audio_settings_summary">Cambiar los ajustes de sonido y ajustar los controles del ecualizador</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Haz una copia de seguridad y restaura tu configuración, listas de reproducción</string>
-    <string name="backup_restore_title"><![CDATA[Copia de seguridad y restauración]]></string>
-    <string name="backup_title">Copias de seguridad</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="auto">Automático</string>
+
+    <string name="base_color_theme">Color base del tema</string>
+
+    <string name="bass_boost">Refuerzo de Graves</string>
+
+    <string name="bio">Biografía</string>
+
     <string name="biography">Biografía</string>
-    <string name="black_theme_name">Negro puro</string>
-    <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">La aplicación necesita permiso a dispositivos cercanos para comprobar si hay dispositivos Bluetooth</string>
-    <string name="bluetooth_title">Dispositivos cercanos</string>
-    <string name="blur">Desenfocado</string>
-    <string name="blur_card">Desenfocar tarjeta</string>
-    <string name="bug_report_failed">No se puede enviar el informe</string>
-    <string name="bug_report_failed_invalid_token">Token de acceso no válido. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_issues_not_available">Los problemas no están habilitados para el repositorio seleccionado. Póngase en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_unknown">Ocurrió un error inesperado. Ponte en contacto con el desarrollador de la aplicación.</string>
-    <string name="bug_report_failed_wrong_credentials">Nombre de usuario o contraseña incorrectos</string>
-    <string name="bug_report_issue">Problema</string>
+
+    <string name="black_theme_name">Negro</string>
+
+    <string name="blacklist">Lista Negra</string>
+
+    <string name="blur">Desenfoque</string>
+
+    <string name="blur_card">Tarjeta con desenfoque</string>
+
+    <string name="bug_report_failed">No se puede enviar el reporte</string>
+    <string name="bug_report_failed_invalid_token">Token de acceso inválido. Por favor, contacta con el desarrollador de la aplicación</string>
+    <string name="bug_report_failed_issues_not_available">Los problemas no están habilitados para el repositorio seleccionado. Por favor, contacta con el desarrollador de la aplicación</string>
+    <string name="bug_report_failed_unknown">Se ha producido un error inesperado. Por favor, contacta con el desarrollador de la aplicación</string>
+    <string name="bug_report_failed_wrong_credentials">Usuario o contraseña incorrectos</string>
+    <string name="bug_report_issue">Problemas</string>
     <string name="bug_report_manual">Enviar manualmente</string>
-    <string name="bug_report_no_description">Por favor ingresa una descripción del problema</string>
-    <string name="bug_report_no_password">Por favor, introduce tu contraseña de GitHub válida</string>
-    <string name="bug_report_no_title">Por favor, ingresa un título del problema</string>
-    <string name="bug_report_no_username">Por favor, introduce tu nombre de usuario de GitHub válido</string>
-    <string name="bug_report_success">Error reportado correctamente</string>
-    <string name="bug_report_summary">Ocurrió un error inesperado. Lamentamos que hayas encontrado este error, si sigue fallando \"Borra los datos de la aplicación\" o envíanos un correo electrónico </string>
-    <string name="bug_report_use_account">Enviar usando la cuenta de GitHub</string>
-    <string name="buy_now">Compra ahora</string>
+    <string name="bug_report_no_description">Por favor, escribe la descripción del problema</string>
+    <string name="bug_report_no_password">Por favor, introduce tu contraseña de GitHub</string>
+    <string name="bug_report_no_title">Por favor, introduce un título para el problema</string>
+    <string name="bug_report_no_username">Por favor, introduce tu nombre de usuario de GitHub</string>
+    <string name="bug_report_summary">Ocurrió un error inesperado. Lamento que hayas encontrado este error, si sigue fallando, borra los datos de la aplicación</string>
+    <string name="bug_report_uploading">Subiendo reporte a GitHub...</string>
+    <string name="bug_report_use_account">Enviar usando la cuenta de Github</string>
+
     <string name="cancel_current_timer">Cancelar</string>
+
     <string name="card">Tarjeta</string>
+
+    <string name="card_circular_style">Circular</string>
+
     <string name="card_color_style">Tarjeta coloreada</string>
-    <string name="card_square">Tarjeta cuadrada</string>
+
     <string name="card_style">Tarjeta</string>
-    <string name="carousal_effect_on_now_playing_screen">Efecto Carrusel en la pantalla de reproducción</string>
+
+    <string name="carousal">Carrusel</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Efecto carrusel en la ventana de reproducción</string>
+
     <string name="cascading">En cascada</string>
-    <string name="changelog">Registro de cambios</string>
-    <string name="changelog_summary">Ver las novedades</string>
-    <string name="choose_image">Elegir imágen</string>
-    <string name="choose_restore_title">Elige qué restaurar</string>
-    <string name="circle">Circular</string>
+
+    <string name="cast">Emitir</string>
+
+    <string name="changelog">Lista de cambios</string>
+
+    <string name="changelog_summary">La lista de cambios se encuentra disponible en el canal de Telegram</string>
+
     <string name="circular">Circular</string>
-    <string name="classic">Clásico</string>
-    <string name="clear_action">Borrar</string>
-    <string name="clear_blacklist">Borrar lista negra</string>
-    <string name="clear_history">Limpiar historial</string>
-    <string name="clear_playing_queue">Borrar cola</string>
+
+    <string name="clear_action">Limpiar</string>
+
+    <string name="clear_app_data">Borrar datos de la aplicación</string>
+
+    <string name="clear_blacklist">Limpiar lista negra</string>
+
+    <string name="clear_playing_queue">Limpiar la cola</string>
+
+    <string name="clear_playlist_title">Limpiar lista</string>
+    <string name="clear_playlist_x"><![CDATA[\u00bfLimpiar la lista <b>%1$s</b>? \u00a1Esto no se puede deshacer!]]></string>
+
+    <string name="close_notification">Cerrar</string>
+
     <string name="color">Color</string>
+
+    <string name="color_theme_name">Color</string>
+
     <string name="colors">Colores</string>
-    <string name="compact">Compacto</string>
-    <string name="composer">Compositores</string>
-    <string name="copied_device_info_to_clipboard">Información del dispositivo copiada al portapapeles.</string>
-    <string name="could_not_create_playlist">No se pudo\u2019no crear la playlist.</string>
-    <string name="could_not_download_album_cover">"No se pudo\u2019descargar una portada de álbum coincidente."</string>
-    <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
-    <string name="could_not_scan_files">No se pudo escanear %d archivos.</string>
-    <string name="create_action">Crea</string>
-    <string name="create_new_backup">Crear</string>
-    <string name="created_playlist_x">Crear playlist %1$s.</string>
-    <string name="credit_title">Miembros y colaboradores </string>
-    <string name="currently_listening_to_x_by_x">Actualmente escuchando %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imágenes personalizadas de artistas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Compartir reporte de fallo</string>
-    <string name="dark_theme_name">Un poco oscuro</string>
-    <string name="delete_playlist_title">Eliminar playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Eliminar la playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Eliminar playlists</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> playlists?]]></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="copied_device_info_to_clipboard">Información del dispositivo copiada al portapapeles</string>
+
+    <string name="could_not_create_playlist">No se pudo crear la lista</string>
+    <string name="could_not_download_album_cover">"No se pudo descargar una portada de \u00e1lbum coincidente"</string>
+    <string name="could_not_restore_purchase">No se pudo restaurar la compra</string>
+    <string name="could_not_scan_files">No se pudieron escanear %d archivos</string>
+
+    <string name="create_action">Crear</string>
+
+    <string name="created_playlist_x">Se creó la lista reproducción %1$s</string>
+
+    <string name="credit_title">Miembros y contribuidores</string>
+
+    <string name="currently_listening_to_x_by_x">Estás escuchando %1$s de %2$s</string>
+
+    <string name="dark_theme_name">Oscuro</string>
+
+    <string name="default_hint">No hay letras</string>
+
+    <string name="delete_playlist_title">Eliminar lista</string>
+    <string name="delete_playlist_x"><![CDATA[¿Eliminar la lista <b>%1$s</b>?]]></string>
+
+    <string name="delete_playlists_title">Eliminar listas</string>
+
+    <string name="delete_song_x"><![CDATA[¿Eliminar la canción <b>%1$s</b>?]]></string>
+
+    <string name="delete_x_playlists"><![CDATA[¿Eliminar <b>%1$d</b> listas?]]></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="depth">Profundidad</string>
+
     <string name="description">Descripción</string>
+
     <string name="device_info">Información del dispositivo</string>
-    <string name="dialog_message_set_ringtone">Permitir que Retro Music modifique la configuración de audio</string>
-    <string name="dialog_title_set_ringtone">Establecer tono de llamada</string>
-    <string name="disc_hint">Número de disco</string>
-    <string name="do_you_want_to_clear_the_blacklist">¿Quieres borrar la lista negra?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[¿Quieres eliminar <b>%1$s</b> de la lista negra?]]></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 crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
-    <string name="donation_header">Cómprame un:</string>
-    <string name="done">Listo</string>
-    <string name="drive_mode">Modo automóvil</string>
-    <string name="edit_fab">Botón editar</string>
-    <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar letras sincronizadas</string>
+
+    <string name="donation_header">Cómprame:</string>
+
+    <string name="download_from_last_fm">Descargar desde Last.fm</string>
+
+    <string name="edit">Editar</string>
+
+    <string name="edit_cover">Editar portada</string>
+
     <string name="empty">Vacío</string>
+
     <string name="equalizer">Ecualizador</string>
-    <string name="error_create_backup">No se pudo crear la copia de seguridad</string>
-    <string name="error_delete_backup">No se pudo eliminar la copia de seguridad</string>
-    <string name="error_empty_name">¡Tu nombre no puede estar vacío!</string>
-    <string name="error_load_failed">Fallo al cargar</string>
-    <string name="error_share_file">No se pudo compartir el archivo</string>
-    <string name="expanded">Expandido</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Me gusta</string>
-    <string name="file_already_exists">El archivo ya existe</string>
-    <string name="finish_last_song">Termina la última canción</string>
-    <string name="fit">Encajado</string>
+
+    <string name="error">Error</string>
+
+    <string name="faq">Preguntas más frecuentes</string>
+
+    <string name="favorites">Favoritos</string>
+
+    <string name="fit">Ajustado</string>
+
     <string name="flat">Plano</string>
+
     <string name="folders">Carpetas</string>
-    <string name="follow_system">Seguir al sistema</string>
+
     <string name="for_you">Para ti</string>
-    <string name="free">Gratuito</string>
-    <string name="full">Completa</string>
+
+    <string name="full">Completo</string>
+
     <string name="full_card">Tarjeta completa</string>
-    <string name="general_settings_summary">Cambiar el tema y colores de la aplicación</string>
-    <string name="general_settings_title">Apariencia y funcionamiento</string>
+
+    <string name="general_settings_summary">Cambia el tema y colores de la aplicación</string>
+    <string name="general_settings_title">Apariencia</string>
+
     <string name="genre">Género</string>
+
     <string name="genres">Géneros</string>
+
     <string name="git_hub_summary">Bifurca el proyecto en GitHub</string>
-    <string name="gradient">Degradado</string>
-    <string name="grant_access">Permitir acceso</string>
+
+    <string name="google_plus_community">Únete a nuestra comunidad de Google Plus, donde puedes pedir ayuda o seguir las actualizaciones de Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,356 +275,428 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Estilo de cuadrícula</string>
-    <string name="help_summary">¿Necesitas más ayuda?</string>
+
     <string name="hinge">Giro</string>
+
     <string name="history">Historial</string>
-    <string name="history_cleared">Historial limpio</string>
-    <string name="history_undo_button">Deshacer</string>
+
     <string name="home">Inicio</string>
+
     <string name="horizontal_flip">Giro horizontal</string>
+
     <string name="image">Imagen</string>
-    <string name="image_gradient">Imagen de degradado</string>
-    <string name="image_settings_summary">Cambiar la configuración de descarga de imágenes del artista</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar lista de reproducción</string>
-    <string name="import_playlist_message">Importa todas las listas de reproducción en el almacenamiento Android con canciones, si las listas ya existen, las canciones se fusionarán.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
-    <string name="instagram_page_summary">Comparte tu configuración de Retro Music en Instagram</string>
-    <string name="keyboard">Teclado</string>
+
+    <string name="image_settings_summary">Cambia la configuración de descarga de imágenes de artistas</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Añadiste %1$d canciones a la lista %2$s</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Comparte tu configuración de Retro Music para exhibirlo en Instagram</string>
+
     <string name="label_bit_rate">Tasa de bits</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_path">Ruta de archivo</string>
     <string name="label_file_size">Tamaño</string>
-    <string name="label_last_modified">Última modificación</string>
-    <string name="label_more_from">Más de %s</string>
-    <string name="label_sampling_rate">Tasa de muestreo</string>
+
+    <string name="label_sampling_rate">Frecuencia de muestreo</string>
+
     <string name="label_track_length">Duración</string>
+
     <string name="labeled">Etiquetado</string>
-    <string name="last_added">Añadidos recientemente</string>
-    <string name="last_song">Última canción</string>
-    <string name="lets_go">Vamos</string>
-    <string name="library_categories">Categorías de la Biblioteca</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="licenses">Licencias</string>
-    <string name="light_theme_name">Claramente Blanco</string>
-    <string name="listeners_label">Oyentes</string>
+
+    <string name="light_theme_name">Blanco</string>
+
     <string name="listing_files">Listado de archivos</string>
-    <string name="loading_products">Cargando productos…</string>
-    <string name="login">Iniciar sesión</string>
+
+    <string name="loading_products">Cargando productos...</string>
+
+    <string name="login">Inicio de sesión</string>
+
     <string name="lyrics">Letras</string>
+
     <string name="made_with_love">Hecho con ❤️ en India</string>
+
     <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Error de permiso</string>
-    <string name="message_backup_create_success">Copia de seguridad creada exitosamente.</string>
-    <string name="message_limit_tabs">No más de 5 elementos</string>
-    <string name="message_pro_feature">%s es una característica disponible en la versión Pro.</string>
-    <string name="message_restore_success">Restauración completada con éxito.</string>
-    <string name="message_updated">Actualizada</string>
-    <string name="message_welcome"><![CDATA[¡Hola <br>! Bienvenido a %s]]></string>
-    <string name="my_name">Nombre</string>
+
+    <string name="my_name">Mi Nombre</string>
+
     <string name="my_top_tracks">Más reproducidas</string>
+
     <string name="never">Nunca</string>
-    <string name="new_music_mix">Nueva música</string>
-    <string name="new_playlist_title">Nueva playlist</string>
-    <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
-    <string name="next_song">Siguiente canción</string>
-    <string name="no_albums">No tienes álbumes</string>
-    <string name="no_artists">No tienes artistas</string>
-    <string name="no_audio_ID">"Reproduce primero una canción y vuelve a intentarlo."</string>
-    <string name="no_backups_found">No se encontraron copias de seguridad</string>
-    <string name="no_equalizer">Ecualizador no encontrado</string>
-    <string name="no_genres">No tienes géneros</string>
+
+    <string name="new_banner_photo">Nueva foto de portada</string>
+
+    <string name="new_playlist_title">Nueva lista</string>
+
+    <string name="new_profile_photo">Nueva foto de perfil</string>
+
+    <string name="new_start_directory">%s es el nuevo directorio de inicio</string>
+
+    <string name="no_albums">No hay álbumes</string>
+
+    <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ó ecualizador</string>
+
+    <string name="no_genres">No hay géneros</string>
+
     <string name="no_lyrics_found">No se encontraron letras</string>
-    <string name="no_playing_queue">No se está reproduciendo ninguna canción</string>
-    <string name="no_playlists">No tienes playlists</string>
-    <string name="no_purchase_found">No se encontraron compras.</string>
-    <string name="no_results">No hay resultados</string>
-    <string name="no_songs">No tienes canciones</string>
+
+    <string name="no_playlists">No hay listas</string>
+
+    <string name="no_purchase_found">No se encontraron compras previas</string>
+
+    <string name="no_results">Sin resultados</string>
+
+    <string name="no_songs">No hay canciones</string>
+
     <string name="normal">Normal</string>
+
     <string name="normal_lyrics">Letras normales</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no aparece en el almacén de medios.]]></string>
-    <string name="not_recently_played">No reproducido recientemente</string>
-    <string name="nothing_to_scan">Nada que escanear.</string>
-    <string name="nothing_to_see">Nada que ver</string>
-    <string name="notification">Notificación</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no se encuentra listado en los medios almacenados]]></string>
+
+    <string name="nothing_to_scan">Nada para escanear</string>
+
+    <string name="notification">Notificaciones</string>
+
     <string name="notification_settings_summary">Personaliza el estilo de la notificación</string>
+
     <string name="now_playing">Reproduciendo ahora</string>
     <string name="now_playing_queue">Cola de reproducción actual</string>
-    <string name="now_playing_summary">Personalizar la pantalla de reproducción actual</string>
-    <string name="now_playing_themes">Más de 9 temas para la pantalla de reproducción actual</string>
+    <string name="now_playing_summary">Personalizar la ventana de reproducción</string>
+    <string name="now_playing_themes">Más de 9 temas para la ventana de reproducción</string>
+
     <string name="only_on_wifi">Solo con Wi-Fi</string>
-    <string name="other_settings_summary">Funciones de prueba avanzadas</string>
+
     <string name="others">Otro</string>
-    <string name="over_cover">Sobre la portada</string>
+
     <string name="password">Contraseña</string>
+
     <string name="past_three_months">Últimos 3 meses</string>
-    <string name="paste_lyrics_here">Pega las Letras Aquí</string>
-    <string name="paste_timeframe_lyrics_here">Pegar las letras con marcas de tiempo aquí</string>
-    <string name="peek">Mirar</string>
-    <string name="permission_bluetooth_denied">Permiso a dispositivos cercanos denegado.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">La aplicación necesita permiso para acceder al almacenamiento del dispositivo para reproducir música</string>
-    <string name="permission_title">Acceso al Almacenamiento</string>
-    <string name="permissions_denied">Permisos denegados.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Personalizar la ventana de reproduciendo ahora y los controles de la interfaz</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Velocidad de reproducción</string>
+
+    <string name="permission_external_storage_denied">Permiso para acceder al almacenamiento externo denegado</string>
+
+    <string name="permissions_denied">Permisos denegados</string>
+
+    <string name="personalize">Personalizar</string>
+
+    <string name="personalize_settings_summary">Personaliza la ventana de reproducción y controles de interfaz de usuario</string>
+
+    <string name="pick_from_local_storage">Seleccionar del almacenamiento interno</string>
+
+    <string name="plain">Sencillo</string>
+
     <string name="playing_notification_description">La notificación de reproducción proporciona acciones para reproducir/pausar, etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s creada exitosamente</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Nombre de la lista de reproducción</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado a los temas desenfocados, la cantidad más baja es más rápida</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</string>
+
+    <string name="playlists">Listas</string>
+
+    <string name="pref_album_detail_style">Estilo de detalle de álbum</string>
+
+    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado a los temas de desenfoque, más bajo es más rápido</string>
     <string name="pref_blur_amount_title">Cantidad de desenfoque</string>
-    <string name="pref_filter_song_summary">Filtrar canciones por duración</string>
-    <string name="pref_filter_song_title">Filtrar duración de la canción</string>
-    <string name="pref_header_advanced">Avanzado</string>
-    <string name="pref_header_album">Estilo del álbum</string>
+
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
-    <string name="pref_header_controls">Controles</string>
     <string name="pref_header_general">Tema</string>
     <string name="pref_header_images">Imágenes</string>
-    <string name="pref_header_library">Biblioteca</string>
     <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
     <string name="pref_header_playlists">Listas de reproducción</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausa la canción cuando el volumen disminuye a cero y vuelve a reproducir cuando se aumenta el volumen. También funciona fuera de la aplicación</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Pausa la reproducción en cero y la reproduce después de subir el volumen. Aviso: cuando subas el volumen, la música empezará a sonar incluso fuera de la aplicación</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pausar en cero</string>
-    <string name="pref_keep_screen_on_summary">Ten en cuenta que habilitar esta función puede afectar la duración de la batería</string>
+    <string name="pref_keep_screen_on_summary">Tenga en cuenta que habilitar esta función puede afectar la duración de la batería</string>
     <string name="pref_keep_screen_on_title">Mantener la pantalla encendida</string>
-    <string name="pref_language_name">Seleccionar el idioma</string>
-    <string name="pref_snow_fall_title">Efecto de nieve</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se está reproduciendo como fondo de pantalla de la pantalla de bloqueo</string>
-    <string name="pref_summary_album_artists_only">Mostrar artistas de álbumes en la categoría de artistas</string>
-    <string name="pref_summary_audio_ducking">Bajar el volumen cuando se reproduce un sonido del sistema o se recibe una notificación</string>
-    <string name="pref_summary_audio_fade">Desvanecer el audio cuando la canción está en pausa o se reproduce</string>
-    <string name="pref_summary_blacklist">El contenido de las carpetas de la lista negra se oculta de la biblioteca.</string>
-    <string name="pref_summary_bluetooth_playback">Comienza a reproducir en cuanto se conecta al dispositivo bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Difumina 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 para la carátula del álbum en la pantalla de reproducción. Tenga en cuenta que los temas Tarjeta y Tarjeta Desenfocada no funcionarán</string>
-    <string name="pref_summary_classic_notification">Utiliza el diseño clásico de las notificaciones</string>
-    <string name="pref_summary_colored_app">El fondo y los colores de los botones de control cambian según la carátula 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 acento. Cada vez que cambie el color por favor active esto para que tenga efecto</string>
-    <string name="pref_summary_colored_notification">"Colorea la notificación con el color vibrante de la portada del álbum"</string>
-    <string name="pref_summary_cross_fade">Duración del crossfade entre canciones</string>
-    <string name="pref_summary_desaturated_color">Según las líneas de la guía Material Design en los colores del modo oscuro deben ser desaturados</string>
-    <string name="pref_summary_expand_now_playing_panel">Al hacer clic en la notificación se mostrará la pantalla de reproducción en lugar de la pantalla de inicio</string>
-    <string name="pref_summary_extra_controls">Añadir controles extra al mini reproductor</string>
-    <string name="pref_summary_extra_song_info">Mostrar información extra de canciones, como el formato de archivo, tasa de bits y frecuencia</string>
-    <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
-    <string name="pref_summary_home_banner">Mostrar u ocultar el banner de inicio</string>
-    <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero provoca tiempos de carga de imágenes más lentos. Solo habilite esto si tiene problemas con portadas de baja resolución</string>
-    <string name="pref_summary_library_categories">Configure la visibilidad y el orden de las categorías de la biblioteca.</string>
-    <string name="pref_summary_lock_screen">Usar los controles personalizados de Retro Music en la pantalla de bloqueo</string>
-    <string name="pref_summary_manage_audio_focus">Reproducir siempre audio en segundo plano sin importar cualquier cosa que se reproduzca</string>
-    <string name="pref_summary_open_source_licences">Detalles de licencia para software de código abierto</string>
-    <string name="pref_summary_pause_history">Cuando está habilitado, las canciones recién reproducidas no se mostrarán en el historial</string>
-    <string name="pref_summary_remember_tab">Navegar a la última pestaña usada al iniciar</string>
-    <string name="pref_summary_show_lyrics">Mostrar letras sincronizadas sobre la portada del álbum</string>
-    <string name="pref_summary_suggestions">Mostrar mezcla de nueva música en la pantalla de inicio</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Permite cambiar la canción deslizando en cualquier lugar de la pantalla de reproducción</string>
-    <string name="pref_summary_swipe_to_dismiss">Desliza el dedo hacia abajo para descartar el mini reproductor</string>
+
+    <string name="pref_now_playing_screen_summary">Click para abrir con o sin navegación transparente de la pantalla de reproducción actual</string>
+    <string name="pref_now_playing_screen_title">Hacer Clic o Deslizar</string>
+
+    <string name="pref_snow_fall_title">Efecto \"Snow Fall\"</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Utiliza la portada del álbum de la canción que se reproduce como fondo de pantalla de bloqueo</string>
+    <string name="pref_summary_audio_ducking">Baja el volumen cuando se reproduzca un sonido del sistema o se reciba una notificación</string>
+    <string name="pref_summary_blacklist">El contenido de las carpetas de la lista negra se oculta de la biblioteca</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 la ventana de reproducción. No funciona en los temas \"Desenfoque\" y \"Tarjeta con desenfoque\"</string>
+    <string name="pref_summary_classic_notification">Utiliza el diseño clásico de notificación</string>
+    <string name="pref_summary_colored_app">Los colores del fondo y de los botones de control cambian de acuerdo con la portada del álbum en la ventana de reproducción</string>
+    <string name="pref_summary_colored_app_shortcuts">Colorea los accesos directos de la aplicación con 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_dominant_color">El color dominante se elegirá de la imagen del álbum o artista</string>
+    <string name="pref_summary_extra_controls">"Añadir controles extra al minireproductor "</string>
+    <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos"</string>
+    <string name="pref_summary_genre_toggle">Mostrar/Ocultar pestaña de géneros</string>
+    <string name="pref_summary_home_banner">Mostar/Ocultar banner de pantalla de inicio</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. Actívalo solo si tienes problemas con portadas de baja resolución</string>
+    <string name="pref_summary_lock_screen">Utiliza los controles de pantalla de bloqueo personalizados de Retro Music</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 las esquinas de la aplicación</string>
+    <string name="pref_summary_tab_titles">Mostrar/Ocultar títulos para las pestañas de la barra de navegación inferior</string>
     <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
-    <string name="pref_summary_toggle_headset">Comenzar a reproducir inmediatamente cuando se conecten audífonos</string>
+    <string name="pref_summary_toggle_headset">Empezar a reproducir inmediatamente después de conectar los auriculares</string>
     <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará cuando se reproduzca una nueva lista de canciones</string>
-    <string name="pref_summary_toggle_volume">Mostrar controles de volumen si hay suficiente espacio disponible</string>
-    <string name="pref_summary_wallpaper_accent">Extrae el color del fondo de pantalla</string>
-    <string name="pref_summary_whitelist">Mostrar solo música de la carpeta /Musica</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar la portada del álbum</string>
-    <string name="pref_title_album_artists_only">Navegar por Artista del Álbum</string>
+    <string name="pref_summary_toggle_volume">Muestra los controles de volumen en la ventana de reproducción, si hay suficiente espacio disponible</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Mostrar portada del álbum</string>
     <string name="pref_title_album_cover_style">Tema de la portada del álbum</string>
-    <string name="pref_title_album_cover_transform">Saltar portada de álbum</string>
-    <string name="pref_title_app_shortcuts">Accesos directos de la aplicación coloreados</string>
-    <string name="pref_title_appbar_mode">Estilo de cabecera</string>
-    <string name="pref_title_audio_ducking">Reducir el volumen cuando se pierda el enfoque</string>
-    <string name="pref_title_audio_fade">Desvanecer audio</string>
+    <string name="pref_title_album_cover_transform">Estilo de portada del álbum en reproducción</string>
+    <string name="pref_title_album_grid_style">Cuadrícula del álbum</string>
+    <string name="pref_title_app_shortcuts">Accesos directos coloreados</string>
+    <string name="pref_title_artist_grid_style">Cuadrícula de artistas</string>
+    <string name="pref_title_audio_ducking">Reducir volumen al recibir notificaciones</string>
     <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
-    <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Reproducción por Bluetooth</string>
+    <string name="pref_title_blacklist">Lista Negra</string>
     <string name="pref_title_blurred_album_art">Desenfocar portada del álbum</string>
-    <string name="pref_title_circle_button">Botón de reproducción circular</string>
-    <string name="pref_title_classic_notification">Diseño de notificación clásico</string>
-    <string name="pref_title_colored_app">Color adaptable</string>
+    <string name="pref_title_choose_equalizer">Elegir ecualizador</string>
+    <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_cross_fade">Transición (Beta)</string>
-    <string name="pref_title_custom_font">Usar la fuente \"Manrope\"</string>
-    <string name="pref_title_desaturated_color">Color desaturado</string>
-    <string name="pref_title_expand_now_playing_panel">Mostrar la pantalla de reproducción actual</string>
-    <string name="pref_title_extra_controls">Controles adicionales</string>
-    <string name="pref_title_extra_song_info">Información de la canción</string>
+    <string name="pref_title_extra_controls">Controles extra</string>
     <string name="pref_title_gapless_playback">Reproducción sin pausas</string>
     <string name="pref_title_general_theme">Tema de la aplicación</string>
-    <string name="pref_title_home_album_grid_style">Cuadrícula del álbum</string>
-    <string name="pref_title_home_artist_grid_style">Cuadrícula del artista</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorar las portadas del Almacén de Medios</string>
+    <string name="pref_title_genre_toggle">Mostrar pestaña de géneros</string>
+    <string name="pref_title_home_artist_grid_style">Cuadrícula de artista en pantalla de inicio</string>
+    <string name="pref_title_home_banner">Banner de pantalla de inicio</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">Intervalo de la lista \"Añadidos Recientemente\"</string>
-    <string name="pref_title_lock_screen">Controles en pantalla completa</string>
-    <string name="pref_title_lyrics_screen_on">Mantener la pantalla encendida cuando se muestran las letras de la canción</string>
-    <string name="pref_title_lyrics_type">Tipo de letras</string>
-    <string name="pref_title_manage_audio_focus">Reproducir siempre</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción actual</string>
+    <string name="pref_title_lock_screen">Controles a pantalla completa</string>
+    <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
+    <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción</string>
     <string name="pref_title_open_source_licences">Licencias de código abierto</string>
-    <string name="pref_title_pause_history">Pausar el historial</string>
-    <string name="pref_title_remember_tab">Recordar la última pestaña</string>
-    <string name="pref_title_show_lyrics">Mostrar letras</string>
-    <string name="pref_title_suggestions">Mostrar sugerencias</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Desliza en cualquier lugar para cambiar la canción</string>
-    <string name="pref_title_swipe_to_dismiss">Descartar con deslizar hacia abajo</string>
-    <string name="pref_title_tab_text_mode">Modo de los títulos de las pestañas</string>
-    <string name="pref_title_toggle_carousel_effect">Efecto Carrusel</string>
-    <string name="pref_title_toggle_full_screen">Aplicación en pantalla completa</string>
+    <string name="pref_title_round_corners">Esquinas redondeadas</string>
+    <string name="pref_title_tab_text_mode">Tipo de títulos de pestañas</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 a pantalla completa</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_toggle_shuffle">Modo aleatorio</string>
+    <string name="pref_title_toggle_toggle_shuffle">Aleatorio</string>
     <string name="pref_title_toggle_volume">Controles de volumen</string>
-    <string name="pref_title_wallpaper_accent">Color de acento del fondo de pantalla</string>
-    <string name="pref_title_whitelist">Música en lista blanca</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema negro, temas para la ventana de Reproducción Actual, efecto Carrusel y más...</string>
+    <string name="pref_title_user_info">Información de usuario</string>
+
+    <string name="primary_color">Color principal</string>
+    <string name="primary_color_desc">El color principal del tema -por defecto es azul grisáceo- temporalmente funciona con colores oscuros</string>
+
     <string name="profile">Perfil</string>
+
     <string name="purchase">Comprar</string>
-    <string name="queue">Reproduciendo cola</string>
-    <string name="rate_app">Califica la aplicación</string>
-    <string name="rate_on_google_play_summary">¿Te encanta la aplicación? Haznoslo saber en la Play Store cómo podemos hacerla aún mejor</string>
+
+    <string name="purchase_summary">*Piensa antes de comprar, no pidas un reembolso</string>
+
+    <string name="queue">Cola</string>
+
+    <string name="rate_app">Calificar app</string>
+
+    <string name="rate_on_google_play_summary">Te gusta la aplicación? Haznos saber en Google Play Store cómo podemos hacerla aún mejor</string>
+
     <string name="recent_albums">Álbumes recientes</string>
+
     <string name="recent_artists">Artistas recientes</string>
+
     <string name="remove_action">Eliminar</string>
+
+    <string name="remove_banner_photo">Eliminar foto del banner</string>
+
     <string name="remove_cover">Eliminar portada</string>
+
     <string name="remove_from_blacklist">Eliminar de la lista negra</string>
-    <string name="remove_image">Eliminar imagen</string>
-    <string name="remove_song_from_playlist_title">Eliminar la canción de la lista de reproducción</string>
-    <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_playlist_title">Renombrar lista de reproducción</string>
-    <string name="replace_cover">Reemplazar la portada</string>
-    <string name="report_an_issue">Reportar un problema</string>
-    <string name="report_bug">Reportar fallo</string>
-    <string name="reset_action">Restablecer</string>
-    <string name="reset_artist_image">Reiniciar imagen del artista</string>
+
+    <string name="remove_profile_photo">Eliminar foto de perfil</string>
+
+    <string name="remove_song_from_playlist_title">Eliminar canción de la lista</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[¿Eliminar la canción </b>%1$s<b> de la lista?]]></string>
+
+    <string name="remove_songs_from_playlist_title">Eliminar canciones de la lista</string>
+
+    <string name="remove_x_songs_from_playlist"><![CDATA[¿Eliminar </b>%1$d<b> canciones de la lista?]]></string>
+
+    <string name="rename_playlist_title">Renombrar lista</string>
+
+    <string name="report_an_issue">Reporta un problema</string>
+
+    <string name="report_bug">Reportar un error</string>
+
+    <string name="reset_artist_image">Restablecer imagen de artista</string>
+
     <string name="restore">Restaurar</string>
-    <string name="restore_message">¿Quieres restaurar la copia de seguridad?</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 anteriores restauradas.</string>
-    <string name="restoring_purchase">Restaurando compra…</string>
-    <string name="retro_music_player">Reproductor Retro</string>
-    <string name="retro_music_pro">Reproductor Retro Pro</string>
-    <string name="ringtone_summary">La aplicación necesita permiso para acceder a la configuración de tu dispositivo para establecer música como Tono de Llamada</string>
-    <string name="ringtone_title">Tono de Llamada (Opcional)</string>
-    <string name="saf_delete_failed">La eliminación del archivo: %s falló</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">No se puede obtener SAF URI</string>
-    <string name="saf_guide_slide1_description">Abrir el cajón de navegación</string>
-    <string name="saf_guide_slide1_description_before_o">Activar \"Mostrar tarjeta SD\" en el menú</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 cajón de navegación</string>
-    <string name="saf_guide_slide3_description">No abra ninguna sub-carpeta</string>
-    <string name="saf_guide_slide3_title">Toca el botón \'seleccionar\' en la parte inferior de la pantalla</string>
-    <string name="saf_write_failed">Error al escribir: %s</string>
-    <string name="save">Guardar</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 previas restauradas</string>
+
+    <string name="restoring_purchase">Restaurando compra...</string>
+
+    <string name="retro_equalizer">Ecualizador Retro</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Guardar como archivo</string>
+
     <string name="save_playlists_title">Guardar como archivos</string>
-    <string name="saved_playlist_to">Guardar lista de reproducción a %s.</string>
+
+    <string name="saved_playlist_to">Guardar lista de reproducción a %s</string>
+
     <string name="saving_changes">Guardando cambios</string>
-    <string name="scan_media">Examinar medios</string>
-    <string name="scanned_files">%1$d de %2$d archivos examinados.</string>
-    <string name="scrobbles_label">Enviar a</string>
-    <string name="select_all">Seleccionar todo</string>
+
+    <string name="scan_media">Escanear medios</string>
+
+    <string name="scanned_files">Escaneados %1$d de %2$d  archivos</string>
+
+    <string name="search_hint">Busca en tu biblioteca...</string>
+
+    <string name="select_all">Seleccionar todos</string>
+
+    <string name="select_banner_photo">Seleccionar foto del banner</string>
+
     <string name="selected">Seleccionado</string>
-    <string name="set">Establecer</string>
-    <string name="set_artist_image">Establecer imagen del artista</string>
-    <string name="share_app">Compartir aplicación</string>
-    <string name="share_summary">Comparte la aplicación con tus amigos y familia</string>
-    <string name="share_to_stories">Compartir en Historias</string>
-    <string name="show_album_artists">Mostrar Artistas del Álbum</string>
+
+    <string name="set_artist_image">Establecer imagen de artista</string>
+
+    <string name="share_app">Compartir app</string>
+
     <string name="shuffle">Aleatorio</string>
+
     <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
-    <string name="sleep_timer_set">Temporizado establecido para %d minutos desde ahora.</string>
-    <string name="social">Redes Sociales</string>
-    <string name="social_stories">Compartir historia</string>
+
+    <string name="sleep_timer_canceled">Temporizador apagado</string>
+    <string name="sleep_timer_set">Temporizador establecido para %d minutos desde ahora</string>
+
+    <string name="small">"Portada Pequeña
+"</string>
+
+    <string name="social">Social</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="sort_order_a_z">Ascendente</string>
     <string name="sort_order_album">Álbum</string>
     <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Compositores</string>
-    <string name="sort_order_date">Fecha agregada</string>
-    <string name="sort_order_date_modified">Fecha de modificación</string>
-    <string name="sort_order_default">Predeterminado</string>
-    <string name="sort_order_num_songs">Número de canciones</string>
-    <string name="sort_order_num_songs_desc">Número de canciones descendente</string>
+    <string name="sort_order_date">Fecha</string>
     <string name="sort_order_year">Año</string>
     <string name="sort_order_z_a">Descendente</string>
-    <string name="speech_not_supported">¡Lo siento! Tu dispositivo no es compatible con la entrada de voz</string>
-    <string name="speech_prompt">Buscar en tu biblioteca</string>
-    <string name="stack">Apilado</string>
-    <string name="start_play_music">Comenzar a reproducir música.</string>
-    <string name="suggestion_songs">Sugerencias</string>
-    <string name="support_development">Apoya el desarrollo</string>
-    <string name="swipe_to_unlock">Desliza para desbloquear</string>
-    <string name="synced_lyrics">Letras sincronizadas</string>
+
+    <string name="speech_not_supported">¡Lo sentimos! Su dispositivo no soporta la entrada de voz</string>
+
+    <string name="speech_prompt">Busca en tu biblioteca</string>
+
+    <string name="suggestion_songs">Recomendaciones</string>
+
+    <string name="summary_user_info">Muestra tu nombre en la pantalla de inicio</string>
+
+    <string name="support_development">Soporte de desarrollo</string>
+
+    <string name="synced_lyrics">Letras Sincronizadas</string>
+
+    <string name="system_equalizer">Ecualizador del Sistema</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Únete al grupo de Telegram para discutir los fallos, hacer sugerencias, presumir y más</string>
+    <string name="telegram_group_summary">Únete al grupo de Telegram para discutir los errores y hacer sugerencias</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">Diminuto</string>
-    <string name="tiny_card_style">Tarjeta diminuta</string>
-    <string name="title">Titulo</string>
-    <string name="title_new_backup">Nueva copia de seguridad</string>
+
+    <string name="tiny">Pequeño</string>
+
+    <string name="title">Título</string>
+
+    <string name="title_dashboard">"Tablero "</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_user_info">Cuál es tu nombre</string>
+
     <string name="today">Hoy</string>
-    <string name="top_albums">Álbumes más reproducidos</string>
+
+    <string name="top_albums">"Top álbumes "</string>
+
     <string name="top_artists">Artistas más reproducidos</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_community">Ayúdanos a traducir la aplicación a tu idioma</string>
-    <string name="try_retro_music_premium">Prueba Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Comparte tu diseño con Retro Music</string>
-    <string name="unlabeled">Sin etiqueta</string>
-    <string name="unplayable_file">No se pudo reproducir esta canción.</string>
+
+    <string name="unlabeled">No etiquetado</string>
+
+    <string name="unplayable_file">No se pudo reproducir esta canci\u00f3n</string>
+
     <string name="up_next">A continuación</string>
+
     <string name="update_image">Actualizar imagen</string>
-    <string name="updating">Actualizando…</string>
-    <string name="user_images_description">Imágenes del Usuario</string>
-    <string name="user_name">Nombre del usuario</string>
-    <string name="username">Usuario</string>
+
+    <string name="updating">Actualizando...</string>
+
+    <string name="username">Nombre de usuario</string>
+
     <string name="version">Versión</string>
-    <string name="vertical_flip">Giro vertical</string>
-    <string name="view_on_telegram">Ver en Telegram</string>
-    <string name="volume">Volumen</string>
-    <string name="web_search">Buscar en la Web</string>
-    <string name="website">Sitio Web</string>
-    <string name="website_summary">Echa un vistazo a nuestro Sitio Web</string>
-    <string name="welcome">Bienvenido,</string>
+
+    <string name="vertical_flip">giro vertical</string>
+
+    <string name="virtualizer">Virtualizador</string>
+
+    <string name="web_search">Búsqueda web</string>
+
     <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
+
     <string name="whats_new">Lo Nuevo</string>
+
     <string name="window">Ventana</string>
+
     <string name="window_corner_edges">Esquinas redondeadas</string>
-    <string name="x_has_been_set_as_ringtone">Establecer %1$s como tono de llamada.</string>
+
+    <string name="x_has_been_set_as_ringtone">Establecer %1$s como 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">Tienes que seleccionar al menos una categoría.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web para reportar incidencias.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Los datos de tu cuenta sólo se utilizan para la autenticación.</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Serás redirigido al sitio web de seguimiento de problemas</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Los datos de tu cuenta sólo se utilizan para la autenticación</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
new file mode 100644
index 000000000..613484160
--- /dev/null
+++ b/app/src/main/res/values-es/strings.xml
@@ -0,0 +1,704 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Music</string>
+    <string name="accent_color_desc">El color acentuado por defecto es verde</string>
+
+    <string name="action_about">Acerca de</string>
+
+    <string name="action_add_to_favorites">Añadir a favoritos</string>
+    <string name="action_add_to_playing_queue">Agregar a la cola de reproducción</string>
+    <string name="action_add_to_playlist">Agregar a lista de reproducción</string>
+
+    <string name="action_clear_playing_queue">Limpiar cola de reproducción</string>
+    <string name="action_clear_playlist">Borrar lista de reproducción</string>
+
+    <string name="action_delete">Eliminar</string>
+    <string name="action_delete_from_device">Borrar del dispositivo</string>
+
+    <string name="action_details">Detalles</string>
+
+    <string name="action_go_to_album">Ir al álbum</string>
+    <string name="action_go_to_artist">Ir al artista</string>
+    <string name="action_go_to_genre">Ir al género</string>
+    <string name="action_go_to_start_directory">Ir al directorio de inicio</string>
+
+    <string name="action_grant">Conceder</string>
+
+    <string name="action_grid_size">Tamaño de la cuadricula</string>
+    <string name="action_grid_size_land">Tamaño de la cuadricula (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/Pausa</string>
+
+    <string name="action_previous">Anterior</string>
+
+    <string name="action_remove_from_favorites">Eliminar de favoritos</string>
+    <string name="action_remove_from_playing_queue">Eliminar de la cola de reproducción</string>
+    <string name="action_remove_from_playlist">Eliminar de la lista de reproducción</string>
+
+    <string name="action_rename">Renombrar</string>
+
+    <string name="action_save_playing_queue">Guardar lista de reproducción</string>
+
+    <string name="action_scan">Escanear</string>
+
+    <string name="action_search">Buscar</string>
+
+    <string name="action_set">Iniciar</string>
+    <string name="action_set_as_ringtone">Establecer como tono de llamada</string>
+    <string name="action_set_as_start_directory">Establecer como directorio de inicio</string>
+
+    <string name="action_settings">"Configuración"</string>
+
+    <string name="action_share">Compartir</string>
+
+    <string name="action_shuffle_all">Mezclar todo</string>
+    <string name="action_shuffle_playlist">Lista de reproducción aleatoria</string>
+
+    <string name="action_sleep_timer">Temporizador de apagado</string>
+
+    <string name="action_sort_order">Ordenar por</string>
+
+    <string name="action_tag_editor">Editor de etiquetas</string>
+
+    <string name="adaptive">Adaptativo</string>
+
+    <string name="add_action">Agregar</string>
+
+    <string name="add_photo">Agregar foto</string>
+
+    <string name="add_playlist_title">"Agregar a lista de reproducción"</string>
+
+    <string name="added_title_to_playing_queue">"Se ha agregado 1 canción a la cola de reproducción"</string>
+
+    <string name="added_x_titles_to_playing_queue">%1$d canciones agregadas a la cola de reproducción</string>
+
+    <string name="album">Álbum</string>
+
+    <string name="album_artist">Artista del álbum</string>
+
+    <string name="album_or_artist_empty">El titulo o artista está vacío</string>
+
+    <string name="albums">Álbumes</string>
+
+    <!-- Android Auto -->
+    <string name="always">Siempre</string>
+
+    <string name="app_share">Ve este cool reproductor de música en: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Aleatorio</string>
+    <string name="app_shortcut_top_tracks_short">Canciones más reproducidas</string>
+
+    <string name="app_widget_big_name">Retro Music - Grande</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="app_widget_text_name">Retro music - Texto</string>
+
+    <string name="artist">Artista</string>
+
+    <string name="artists">Artistas</string>
+
+    <string name="audio_focus_denied">Enfoque de audio denegado</string>
+
+    <string name="audio_settings_summary">Modifica los ajustes de sonido y ajusta los controles del ecualizador</string>
+
+    <string name="auto">Automático</string>
+
+    <string name="base_color_theme">Color base del tema</string>
+
+    <string name="bass_boost">Refuerzo de graves</string>
+
+    <string name="bio">Biografía</string>
+
+    <string name="biography">Biografía</string>
+
+    <string name="black_theme_name">Negro</string>
+
+    <string name="blacklist">Lista negra</string>
+
+    <string name="blur">Desenfoque</string>
+
+    <string name="blur_card">Tarjeta desenfocada</string>
+
+    <string name="bug_report_failed">Enviando el reporte a GitHub...</string>
+    <string name="bug_report_failed_invalid_token">Token de acceso invalido. Por favor, contacta con el desarrollador de la app.</string>
+    <string name="bug_report_failed_issues_not_available">El problema no esta habilitado para el repositorio seleccionado. Por favor, contacta col el desarrollador de la app.</string>
+    <string name="bug_report_failed_unknown">Un error inesperado a ocurrido. Por favor, contacta col el desarrollador de la app.</string>
+    <string name="bug_report_failed_wrong_credentials">Usuario o contraseña incorrecta</string>
+    <string name="bug_report_issue">Problemas</string>
+    <string name="bug_report_manual">Enviar manualmente</string>
+    <string name="bug_report_no_description">Por favor, describe el problema</string>
+    <string name="bug_report_no_password">Por favor, entra tu contraseña de GitHub Valido</string>
+    <string name="bug_report_no_title">Por favor, escribe el titulo del problema</string>
+    <string name="bug_report_no_username">Por favor, entra tu usuario de GitHub Valido</string>
+    <string name="bug_report_summary">Ocurrió un error inesperado. Lamento que hayas encontrado este error, si sigue fallando \"Borra los datos de la aplicación\"</string>
+    <string name="bug_report_uploading">Enviando el reporte a GitHub...</string>
+    <string name="bug_report_use_account">Envía usando la cuenta de GitHub</string>
+
+    <string name="cancel_current_timer">Cancelar</string>
+
+    <string name="card">Tarjeta</string>
+
+    <string name="card_circular_style">Circular</string>
+
+    <string name="card_color_style">Tarjeta Coloreada</string>
+
+    <string name="card_style">Tarjeta</string>
+
+    <string name="carousal">Carrusel</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Efecto carrusel en la ventana de reproducción</string>
+
+    <string name="cascading">En cascada</string>
+
+    <string name="cast">Transmitir</string>
+
+    <string name="changelog">Registro de cambios</string>
+
+    <string name="changelog_summary">Registro de cambios disponible en el canal de Telegram</string>
+
+    <string name="circular">Circular</string>
+
+    <string name="clear_action">Limpiar</string>
+
+    <string name="clear_app_data">Borrar datos de la aplicación</string>
+
+    <string name="clear_blacklist">Limpiar lista negra</string>
+
+    <string name="clear_playing_queue">Limpiar cola de reproducción</string>
+
+    <string name="clear_playlist_title">Limpiar lista de reproducción</string>
+    <string name="clear_playlist_x"><![CDATA[\u00bfLimpiar la lista de reproducci\u00f3n<b>%1$s</b>? \u00a1Esto no se puede deshacer!]]></string>
+
+    <string name="close_notification">Cerrar</string>
+
+    <string name="color">Color</string>
+
+    <string name="color_theme_name">Color</string>
+
+    <string name="colors">Colores</string>
+
+    <string name="copied_device_info_to_clipboard">Información del dispositivo copiado al porta-papeles.</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 coincidente."</string>
+    <string name="could_not_restore_purchase">No se pudo restaurar la compra.</string>
+    <string name="could_not_scan_files">No se pudieron escanear los %d archivos.</string>
+
+    <string name="create_action">Crear</string>
+
+    <string name="created_playlist_x">Lista de reproducción %1$s creada</string>
+
+    <string name="credit_title">Miembros y contribuidores</string>
+
+    <string name="currently_listening_to_x_by_x">Estás escuchando %1$s de %2$s</string>
+
+    <string name="dark_theme_name">"Un poco oscuro "</string>
+
+    <string name="default_hint">No hay letras</string>
+
+    <string name="delete_playlist_title">Eliminar lista de reproducción</string>
+    <string name="delete_playlist_x"><![CDATA[¿Eliminar lista de reproducción <b>%1$s</b>?]]></string>
+
+    <string name="delete_playlists_title">Eliminar listas de reproducción</string>
+
+    <string name="delete_song_x"><![CDATA[¿Eliminar la canción <b>%1$s</b>?]]></string>
+
+    <string name="delete_x_playlists"><![CDATA[¿Eliminar <b>%1$d</b> de tus playlist? ]]></string>
+    <string name="delete_x_songs"><![CDATA[¿Eliminar <b>%1$d</b> canciones?]]></string>
+    <string name="deleted_x_songs">%1$d canciones eliminadas.</string>
+
+    <string name="depth">Profundidad</string>
+
+    <string name="description">Descripción</string>
+
+    <string name="device_info">Información del dispositivo</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[¿Quiere eliminar <b>%1$s</b> de la lista negra?]]></string>
+
+    <string name="donate">Donar</string>
+
+    <string name="donate_summary">Si crees que merezco que me paguen por mi trabajo, puedes dejar algo de dinero aquí</string>
+
+    <string name="donation_header">Cómprame:</string>
+
+    <string name="download_from_last_fm">Descargar de Last.fm</string>
+
+    <string name="edit_cover">Editar portada</string>
+
+    <string name="empty">Vacio</string>
+
+    <string name="equalizer">Ecualizador</string>
+
+    <string name="error">Error</string>
+
+    <string name="faq">Preguntas más frecuentes</string>
+
+    <string name="favorites">Favoritos</string>
+
+    <string name="fit">Fit</string>
+
+    <string name="flat">Plano</string>
+
+    <string name="folders">Carpetas</string>
+
+    <string name="for_you">Para ti</string>
+
+    <string name="full">Completo</string>
+
+    <string name="full_card">Tarjeta completa</string>
+
+    <string name="general_settings_summary">Cambiar el tema y colores de la aplicación</string>
+    <string name="general_settings_title">Aspecto y la sensación</string>
+
+    <string name="genre">Género</string>
+
+    <string name="genres">Géneros</string>
+
+    <string name="git_hub_summary">Haz Fork del proyecto en GitHub</string>
+
+    <string name="google_plus_community">Únase a la comunidad de Google Plus donde puede pedir ayuda o seguir las actualizaciones Retro Music</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="hinge">Bisagra</string>
+
+    <string name="history">Historial</string>
+
+    <string name="home">Inicio</string>
+
+    <string name="horizontal_flip">Giro Horizontal</string>
+
+    <string name="image">Imagen</string>
+
+    <string name="image_settings_summary">Cambiar la configuración de descarga de imágenes del artista</string>
+
+    <string name="inserted_x_songs_into_playlist_x">%1$d canciones agregadas a la lista de reproducción %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Comparte tu configuración de Retro Music en Instagram</string>
+
+    <string name="label_bit_rate">Velocidad de bits</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="labeled">Etiquetado</string>
+
+    <string name="last_added">Añadidos recientemente</string>
+
+    <string name="lets_play_something">Vamos a tocar un poco de música</string>
+
+    <string name="library">Biblioteca</string>
+
+    <string name="licenses">Licencias</string>
+
+    <string name="light_theme_name">Blanco claro</string>
+
+    <string name="listing_files">Listando archivos</string>
+
+    <string name="loading_products">Cargando productos...</string>
+
+    <string name="login">Iniciar Sección</string>
+
+    <string name="lyrics">Letras</string>
+
+    <string name="made_with_love">Hecho con ❤️ en India</string>
+
+    <string name="material">Material</string>
+
+    <string name="my_name">"Nombre "</string>
+
+    <string name="my_top_tracks">Más reproducidas</string>
+
+    <string name="never">Nunca</string>
+
+    <string name="new_banner_photo">Nueva foto del banner</string>
+
+    <string name="new_playlist_title">Nueva lista de reproducción</string>
+
+    <string name="new_profile_photo">Nueva foto de perfil</string>
+
+    <string name="new_start_directory">%s es el nuevo directorio de inicio.</string>
+
+    <string name="no_albums">No hay Álbumes</string>
+
+    <string name="no_artists">No hay Artistas</string>
+
+    <string name="no_audio_ID">"Primero reproduce una canción, luego intenta de nuevo."</string>
+
+    <string name="no_equalizer">No se encontró ecualizador</string>
+
+    <string name="no_genres">No hay Géneros</string>
+
+    <string name="no_lyrics_found">No se encontró letra</string>
+
+    <string name="no_playlists">No hay Listas de Reproducción</string>
+
+    <string name="no_purchase_found">No se encontraron compras.</string>
+
+    <string name="no_results">Sin resultados</string>
+
+    <string name="no_songs">No hay Canciones</string>
+
+    <string name="normal">Normal</string>
+
+    <string name="normal_lyrics">Letras normales</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> no aparece en la lista de medios.]]></string>
+
+    <string name="nothing_to_scan">Nada para escanear.</string>
+
+    <string name="notification">Notificación</string>
+
+    <string name="notification_settings_summary">Personalizar el estilo de la notificación</string>
+
+    <string name="now_playing">Reproduciendo</string>
+    <string name="now_playing_queue">Cola de reproducción</string>
+    <string name="now_playing_summary">Personalizar la ventana de reproducción</string>
+    <string name="now_playing_themes">Más de 9 temas para la ventana de reproducción</string>
+
+    <string name="only_on_wifi">Solo con Wi-Fi</string>
+
+    <string name="others">Otro</string>
+
+    <string name="password">Contraseña</string>
+
+    <string name="past_three_months">Más de 3 meses</string>
+
+    <string name="permission_external_storage_denied">Permiso de acceso al almacenamiento externo denegado.</string>
+
+    <string name="permissions_denied">Permiso denegado.</string>
+
+    <string name="personalize">Personalizar</string>
+
+    <string name="personalize_settings_summary">Personalizar la ventana de reproducción y los controles de la interfaz</string>
+
+    <string name="pick_from_local_storage">Elegir del almacenamiento local</string>
+
+    <string name="plain">Simple</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 de reproducción</string>
+
+    <string name="pref_album_detail_style">Estilo del detalle del Album</string>
+
+    <string name="pref_blur_amount_summary">Cantidad de desenfoque aplicado a los temas desenfocados, más bajo es más rápido</string>
+    <string name="pref_blur_amount_title">Cantidad de desenfoque</string>
+
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Tema</string>
+    <string name="pref_header_images">Imágenes</string>
+    <string name="pref_header_lockscreen">Pantalla de bloqueo</string>
+    <string name="pref_header_playlists">Listas de reproducción</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Pausar la reproducción cuando se esta en silencio y reproducir cuando se aumenta el volumen. ¡Cuidado! Cuando se aumenta el volumen se empezara la reproducción aunque se este fuera de la app.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pausar en silencio</string>
+    <string name="pref_keep_screen_on_summary">Tenga en cuenta que habilitar esta función puede afectar la duración de la batería</string>
+    <string name="pref_keep_screen_on_title">Mantener la pantalla encendida</string>
+
+    <string name="pref_now_playing_screen_summary">Toca para abrir con o desliza sin la barra de navegación transparente de la pantalla de reproducción</string>
+    <string name="pref_now_playing_screen_title">Toca o desliza</string>
+
+
+    <string name="pref_snow_fall_title">Efecto de nevada</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Usar la portada del álbum de la canción en reproducción como fondo de la pantalla de bloqueo</string>
+    <string name="pref_summary_audio_ducking">Bajar el volumen cuando se reproduzca un sonido del sistema o se reciba una notificación</string>
+    <string name="pref_summary_blacklist">Las carpetas en la lista negra, serán ocultado de tu librería.</string>
+    <string name="pref_summary_blurred_album_art">Desenfocar la portada el álbum en la pantalla de bloqueo. Puede causar problemas con aplicaciones y widgets de terceros</string>
+    <string name="pref_summary_carousel_effect">Efecto carrusel para la portada del álbum en la ventana de reproducción. En los temas \"Tarjeta\" y \"Tarjeta Desenfocada\" no funcionará</string>
+    <string name="pref_summary_classic_notification">Usar el diseño de notificación clásico</string>
+    <string name="pref_summary_colored_app">El color del fondo y los botones de control cambian de acuerdo a la portada del álbum para la ventana 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 cambie el color, active 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_dominant_color">Se tomará el color dominante de la portada del álbum o imagen del artista</string>
+    <string name="pref_summary_extra_controls">Añadir controles extra al mini reproductor</string>
+    <string name="pref_summary_gapless_playback">"Puede causar problemas de reproducción en algunos dispositivos."</string>
+    <string name="pref_summary_genre_toggle">Mostrar/Ocultar pestaña de géneros</string>
+    <string name="pref_summary_home_banner">Mostrar/Ocultar banner en inicio</string>
+    <string name="pref_summary_ignore_media_store_artwork">Puede aumentar la calidad de la portada del álbum, pero provoca tiempos de carga de imágenes más lentos. Solo habilite esto si tiene problemas con portadas de baja resolución</string>
+    <string name="pref_summary_lock_screen">Usar los controles personalizados de Retro Music en la pantalla de bloqueo</string>
+    <string name="pref_summary_open_source_licences">Detalles de licencia para software de código abierto</string>
+    <string name="pref_summary_round_corners">Redondear las esquinas de la aplicación</string>
+    <string name="pref_summary_tab_titles">Mostrar/Ocultar nombres de las pestañas de navegación</string>
+    <string name="pref_summary_toggle_full_screen">Modo inmersivo</string>
+    <string name="pref_summary_toggle_headset">Comenzar a reproducir inmediatamente se conecten audífonos</string>
+    <string name="pref_summary_toggle_shuffle">El modo aleatorio se desactivará cuando se reproduzca una nueva lista de canciones</string>
+    <string name="pref_summary_toggle_volume">Mostrar controles de volumen si hay suficiente espacio disponible.</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Mostrar/Ocultar portada del álbum</string>
+    <string name="pref_title_album_cover_style">Tema de la portada del álbum</string>
+    <string name="pref_title_album_cover_transform">Estilo de la caratula en reproducción</string>
+    <string name="pref_title_album_grid_style">Cuadricula del álbum</string>
+    <string name="pref_title_app_shortcuts">Accesos directos de la aplicación coloreados</string>
+    <string name="pref_title_artist_grid_style">Cuadricula de los artistas</string>
+    <string name="pref_title_audio_ducking">Reducir el volumen en pérdida de enfoque</string>
+    <string name="pref_title_auto_download_artist_images">Descarga automática de imágenes de artistas</string>
+    <string name="pref_title_blacklist">Lista negra</string>
+    <string name="pref_title_blurred_album_art">Desenfocar portada del álbum</string>
+    <string name="pref_title_choose_equalizer">Elegir ecualizador</string>
+    <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_extra_controls">Controles extra</string>
+    <string name="pref_title_gapless_playback">Reproducción sin interrupciones</string>
+    <string name="pref_title_general_theme">Tema de la aplicación</string>
+    <string name="pref_title_genre_toggle">Mostrar pestaña de géneros</string>
+    <string name="pref_title_home_artist_grid_style">Cuadricula de los artistas en inicio</string>
+    <string name="pref_title_home_banner">Banner de inicio</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">Intervalo de la lista \"Añadidos Recientemente\"</string>
+    <string name="pref_title_lock_screen">Controles en pantalla completa</string>
+    <string name="pref_title_navigation_bar">Barra de navegación coloreada</string>
+    <string name="pref_title_now_playing_screen_appearance">Tema de la ventana de reproducción</string>
+    <string name="pref_title_open_source_licences">Licencias de código abierto</string>
+    <string name="pref_title_round_corners">Bordes de las esquinas</string>
+    <string name="pref_title_tab_text_mode">Forma de los títulos de las pestañas</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">Aplicación en pantalla completa</string>
+    <string name="pref_title_toggle_tab_titles">Títulos de las pestañas</string>
+    <string name="pref_title_toggle_toggle_headset">Reproducir automáticamente</string>
+    <string name="pref_title_toggle_toggle_shuffle">Modo aleatorio</string>
+    <string name="pref_title_toggle_volume">Controles de volumen</string>
+    <string name="pref_title_user_info">Información del usuario</string>
+
+    <string name="primary_color">Color principal</string>
+    <string name="primary_color_desc">El color principal del tema, por defecto es gris azulado, por ahora funciona con colores oscuros</string>
+
+    <string name="profile">Perfil</string>
+
+    <string name="purchase">Comprar</string>
+
+    <string name="purchase_summary">*Piense antes de comprar, no pida un reembolso.</string>
+
+    <string name="queue">Cola</string>
+
+    <string name="rate_app">Califica la aplicación</string>
+
+    <string name="rate_on_google_play_summary">¿Te encanta la aplicación? Haznos saber en Google Play Store cómo podemos hacerla aún mejor</string>
+
+    <string name="recent_albums">Álbumes recientes</string>
+
+    <string name="recent_artists">Artistas recientes</string>
+
+    <string name="remove_action">Eliminar</string>
+
+    <string name="remove_banner_photo">Eliminar foto del banner</string>
+
+    <string name="remove_cover">Eliminar portada</string>
+
+    <string name="remove_from_blacklist">Eliminar de la lista negra</string>
+
+    <string name="remove_profile_photo">Eliminar foto de perfil</string>
+
+    <string name="remove_song_from_playlist_title">Eliminar canción de la lista de reproducción</string>
+    <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_playlist_title">Renombrar lista de reproducción</string>
+
+    <string name="report_an_issue">Reporta un problema</string>
+
+    <string name="report_bug">Reporta problemas</string>
+
+    <string name="reset_artist_image">Reiniciar 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 anteriores restauradas.</string>
+
+    <string name="restoring_purchase">Restaurando compra...</string>
+
+    <string name="retro_equalizer">Ecualizador de Reto Music</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Guardar como archivo</string>
+
+    <string name="save_playlists_title">Guardar como archivos</string>
+
+    <string name="saved_playlist_to">Lista de reproducción guardada en %s.</string>
+
+    <string name="saving_changes">Guardando cambios</string>
+
+    <string name="scan_media">Escanear medios</string>
+
+    <string name="scanned_files">%1$d de %2$d archivos escaneados.</string>
+
+    <string name="search_hint">Buscar en tu biblioteca...</string>
+
+    <string name="select_all">Seleccionar todos</string>
+
+    <string name="select_banner_photo">Seleccionar foto del banner</string>
+
+    <string name="selected">Seleccionado</string>
+
+    <string name="set_artist_image">Establecer imagen del artista</string>
+
+    <string name="share_app">Comparte la app</string>
+
+    <string name="shuffle">Aleatorio</string>
+
+    <string name="simple">Sencillo</string>
+
+    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
+    <string name="sleep_timer_set">Temporizador de apagado establecido para %d minutos desde ahora.</string>
+
+    <string name="small">Español</string>
+
+    <string name="social">Social</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="sort_order_a_z">Ascendente</string>
+    <string name="sort_order_album">Álbum</string>
+    <string name="sort_order_artist">Artista</string>
+    <string name="sort_order_date">Fecha</string>
+    <string name="sort_order_year">Año</string>
+    <string name="sort_order_z_a">Descendente</string>
+
+    <string name="speech_not_supported">¡Lo siento! Su dispositivo no es compatible con la entrada de voz</string>
+
+    <string name="speech_prompt">Buscar en tu biblioteca</string>
+
+    <string name="suggestion_songs">Sugerencias</string>
+
+    <string name="summary_user_info">Solo mostrar tu nombre en la pantalla de inicio</string>
+
+    <string name="support_development">Apoya el desarrollo</string>
+
+    <string name="synced_lyrics">Letras sincronizadas</string>
+
+    <string name="system_equalizer">Ecualizador del sistema</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Únete al grupo de Telegram para discutir los errores, hacer sugerencias, presumir y más</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">Titulo</string>
+
+    <string name="title_dashboard">Tablero</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_user_info">¿Cómo te llamas?</string>
+
+    <string name="today">Hoy</string>
+
+    <string name="top_albums">Álbumes mas reproducidos</string>
+
+    <string name="top_artists">Artistas más reproducidos</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_community">Ayúdanos a traducir la aplicación a tu lenguaje</string>
+
+    <string name="twitter_page">Twitter</string>
+    <string name="twitter_page_summary">Comparte tu diseño con Retro Music</string>
+
+    <string name="unlabeled">Sin etiqueta</string>
+
+    <string name="unplayable_file">No se pudo reproducir esta canci\u00f3n.</string>
+
+    <string name="up_next">A continuación</string>
+
+    <string name="update_image">Actualizar imagen</string>
+
+    <string name="updating">Actualizando...</string>
+
+    <string name="username">Nombre de Usuario</string>
+
+    <string name="version">Versión</string>
+
+    <string name="vertical_flip">Giro vertical</string>
+
+    <string name="virtualizer">Virtualizador</string>
+
+    <string name="web_search">Búsqueda web</string>
+
+    <string name="what_do_you_want_to_share">¿Qué quieres compartir?</string>
+
+    <string name="whats_new">Novedades</string>
+
+    <string name="window">Ventana</string>
+
+    <string name="window_corner_edges">Esquinas redondeadas</string>
+
+    <string name="x_has_been_set_as_ringtone">%1$s establecido como tono de llamada.</string>
+
+    <string name="x_selected">%1$d seleccionados</string>
+
+    <string name="year">Año</string>
+
+    <string name="you_have_to_select_at_least_one_category">Tienes que seleccionar al menos una categoría</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Sera redirigido al sitio web para reportar problemas.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">La información de tu cuenta es solo para autenticar tu identidad.</string>
+    <string name="label_more_from">More from %s</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 50320cab6..91d1a4c51 100644
--- a/app/src/main/res/values-eu-rES/strings.xml
+++ b/app/src/main/res/values-eu-rES/strings.xml
@@ -1,86 +1,130 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">About %s</string>
-    <string name="about_settings_summary">Team, social links</string>
     <string name="accent_color">Azentu kolorea</string>
     <string name="accent_color_desc">Gaiaren azentu kolorea. Lehenetsia: teal</string>
+
     <string name="action_about">Honi buruz</string>
+
     <string name="action_add_to_favorites">Gogokoetara gehitu</string>
     <string name="action_add_to_playing_queue">Ilaran gehitu</string>
     <string name="action_add_to_playlist">Erreprodukzio zerrendan gehitu</string>
+
     <string name="action_clear_playing_queue">Erreprodukzio ilara garbitu</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
+    <string name="action_clear_playlist">Erreprodukzio zerrenda garbitu</string>
+
     <string name="action_delete">Ezabatu</string>
     <string name="action_delete_from_device">Gailutik ezabatu</string>
+
     <string name="action_details">Xehetasunak</string>
+
     <string name="action_go_to_album">Albumera joan</string>
     <string name="action_go_to_artist">Artistara joan</string>
     <string name="action_go_to_genre">Generora joan</string>
     <string name="action_go_to_start_directory">Hasierako direktoriora joan</string>
+
     <string name="action_grant">Onartu</string>
+
     <string name="action_grid_size">Sareta tamaina</string>
     <string name="action_grid_size_land">Sareta tamaina (paisaia)</string>
-    <string name="action_new_playlist">New playlist</string>
+
     <string name="action_next">Hurrengoa</string>
+
     <string name="action_play">Erreproduzitu</string>
-    <string name="action_play_all">Play all</string>
     <string name="action_play_next">Hurrengoa erreproduzitu</string>
     <string name="action_play_pause">Erreproduzitu/Pausatu</string>
+
     <string name="action_previous">Aurrekoa</string>
+
     <string name="action_remove_from_favorites">Kendu gogokoetatik</string>
     <string name="action_remove_from_playing_queue">Erreprodukzio ilaratik kendu</string>
     <string name="action_remove_from_playlist">Erreprodukzio zerrendatik kendu</string>
+
     <string name="action_rename">Berrizendatu</string>
+
     <string name="action_save_playing_queue">Erreprodukzio ilara gorde</string>
+
     <string name="action_scan">Eskaneatu</string>
+
     <string name="action_search">Bilatu</string>
+
     <string name="action_set">Hasi</string>
     <string name="action_set_as_ringtone">Dei-tonu bezala ezarri</string>
     <string name="action_set_as_start_directory">Hasierako direktorio bezala ezarri</string>
+
     <string name="action_settings">"Ezarpenak"</string>
+
     <string name="action_share">Partekatu</string>
+
     <string name="action_shuffle_all">Nahastu guztiak</string>
     <string name="action_shuffle_playlist">Nahastu erreprodukzio zerrenda</string>
+
     <string name="action_sleep_timer">Lo tenporizadorea</string>
+
     <string name="action_sort_order">Ordenatze irizpidea</string>
+
     <string name="action_tag_editor">Etiketa editorea</string>
-    <string name="action_toggle_favorite">Toggle favorite</string>
-    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
+
     <string name="adaptive">Moldagarria</string>
+
     <string name="add_action">Gehitu</string>
+
+    <string name="add_photo">Argazkia\ngehitu</string>
+
     <string name="add_playlist_title">"Erreprodukzio zerrendan gehitu"</string>
+
     <string name="added_title_to_playing_queue">"Abestia erreprodukzio ilaran gehitu da"</string>
+
     <string name="added_x_titles_to_playing_queue">%1$d abesti erreproduzkio ilaran gehitu dira</string>
+
     <string name="album">Albuma</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Songs</item>
-    </plurals>
+
     <string name="album_artist">Albumeko artista</string>
+
+    <string name="album_or_artist_empty">Izenburua edo artista hutsik dago</string>
+
     <string name="albums">Albumak</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">Beti</string>
+
     <string name="app_share">Begiratu musika erreproduzitzaile hau: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
     <string name="app_shortcut_shuffle_all_short">Nahastu</string>
     <string name="app_shortcut_top_tracks_short">Pista onenak</string>
-    <string name="app_widget_big_name">Handia</string>
-    <string name="app_widget_card_name">Txartela</string>
-    <string name="app_widget_classic_name">Klasikoa</string>
-    <string name="app_widget_small_name">Txikia</string>
-    <string name="app_widget_text_name">Testua</string>
+
+    <string name="app_widget_big_name">Retro music - Handia</string>
+    <string name="app_widget_card_name">Retro music - Txartela</string>
+    <string name="app_widget_classic_name">Retro music - Klasikoa</string>
+    <string name="app_widget_small_name">Retro music - Txikia</string>
+    <string name="app_widget_text_name">Retro music - Testua</string>
+
     <string name="artist">Artista</string>
+
     <string name="artists">Artistak</string>
+
     <string name="audio_focus_denied">Audio fokatzea ukatua</string>
+
     <string name="audio_settings_summary">Aldatu soinu ezarpenak eta doitu nahasgailuaren kontrolak</string>
+
     <string name="auto">Automatikoa</string>
+
+    <string name="base_color_theme">Oinarrizko kolore gaia</string>
+
+    <string name="bass_boost">Baxu Bultzada</string>
+
+    <string name="bio">Bio</string>
+
     <string name="biography">Biografia</string>
+
     <string name="black_theme_name">Beltza bakarrik</string>
+
     <string name="blacklist">Zerrenda beltza</string>
+
     <string name="blur">Lausotzea</string>
+
     <string name="blur_card">Txartel lausotua</string>
+
     <string name="bug_report_failed">Ezin izan da txostena bidali</string>
     <string name="bug_report_failed_invalid_token">Okerreko sarrera fitxa. Mesedez aplikazioaren garatzailearekin harremanetan jarri</string>
     <string name="bug_report_failed_issues_not_available">Arazoak ez daude gaituta aukeratutako biltegian. Mesedez aplikazioaren garatzailearekin harremanetan jarri</string>
@@ -93,73 +137,134 @@
     <string name="bug_report_no_title">Mesedez sartu arazoaren titulu bat</string>
     <string name="bug_report_no_username">Mesedez sartu zure baliozko GitHub-eko erabiltzaile izena</string>
     <string name="bug_report_summary">Ustekabeko akats bat gertatu da. Sentitzen dugu akats hau aurkitu izana, huts egiten jarraitzen batu \"Garbitu aplikazioaren datuak\"</string>
+    <string name="bug_report_uploading">Txostena GitHub-era igotzen...</string>
     <string name="bug_report_use_account">GitHub kontua erabiliz bidali</string>
-    <string name="buy_now">Buy now</string>
+
     <string name="cancel_current_timer">Ezeztatu</string>
+
     <string name="card">Txartela</string>
+
+    <string name="card_circular_style">Zirkularra</string>
+
     <string name="card_color_style">Txartel koloreztatua</string>
+
     <string name="card_style">Txartela</string>
+
+    <string name="carousal">Karrusela</string>
+
     <string name="carousal_effect_on_now_playing_screen">Karrusel efektua orain erreproduzitzen pantailan</string>
+
     <string name="cascading">Ur jauzi moduan</string>
+
+    <string name="cast">Igorri</string>
+
     <string name="changelog">Aldaketa zerrenda</string>
+
     <string name="changelog_summary">Aldaketa zerrenda Telegrameko kanalean mantentzen da</string>
-    <string name="circle">Circle</string>
+
     <string name="circular">Zirkularra</string>
-    <string name="classic">Classic</string>
+
     <string name="clear_action">Garbitu</string>
+
+    <string name="clear_app_data">Garbitu aplikazioaren datuak</string>
+
     <string name="clear_blacklist">Zerrenda beltza garbitu</string>
+
     <string name="clear_playing_queue">Ilara garbitu</string>
+
+    <string name="clear_playlist_title">Erreprodukzio zerrenda garbitu</string>
+    <string name="clear_playlist_x"><![CDATA[<b>%1$s</b> erreprodukzio zerrenda garbitu? Hau ezin da desegin!]]></string>
+
+    <string name="close_notification">Itxi</string>
+
     <string name="color">Kolorea</string>
+
+    <string name="color_theme_name">Kolorea</string>
+
     <string name="colors">Koloreak</string>
-    <string name="composer">Composer</string>
+
     <string name="copied_device_info_to_clipboard">Gailuaren informazioa arbelean kopiatuta</string>
+
     <string name="could_not_create_playlist">Ezin izan da erreprodukzio zerrenda sortu</string>
     <string name="could_not_download_album_cover">"Ezin izan da bat datorren albumaren azalik deskargatu"</string>
     <string name="could_not_restore_purchase">Ezin izan da erosketa leheneratu</string>
     <string name="could_not_scan_files">Ezin izan dira %d fitxategiak eskaneatu</string>
+
     <string name="create_action">Sortu</string>
+
     <string name="created_playlist_x">%1$s erreprodukzio zerrenda sortua</string>
+
     <string name="credit_title">Kideak eta laguntzaileak</string>
+
     <string name="currently_listening_to_x_by_x">%2$s-(r)en %1$s entzuten ari zara</string>
+
     <string name="dark_theme_name">Nahiko iluna</string>
+
+    <string name="default_hint">Letrarik ez</string>
+
     <string name="delete_playlist_title">Erreprodukzio zerrenda ezabatu</string>
     <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> erreprodukzio zerrenda ezabatu?]]></string>
+
     <string name="delete_playlists_title">Erreprodukzio zerrendak ezabatu</string>
-    <string name="delete_song_title">Delete song</string>
+
     <string name="delete_song_x"><![CDATA[<b>%1$s</b> abestia ezabatu?]]></string>
-    <string name="delete_songs_title">Delete songs</string>
+
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> erreprodukzio zerrenda ezabatu?]]></string>
     <string name="delete_x_songs"><![CDATA[<b>%1$d</b> abesti ezabatu?]]></string>
     <string name="deleted_x_songs">%1$d abesti ezabatu dira</string>
+
     <string name="depth">Sakonera</string>
+
     <string name="description">Azalpena</string>
+
     <string name="device_info">Gailuaren informazioa</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
+
     <string name="do_you_want_to_clear_the_blacklist">Zerrenda beltza garbitu nahi duzu?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[<b>%1$s</b> zerrenda beltzetik ezabatu nahi duzu?]]></string>
+
     <string name="donate">Lagundu diruz</string>
+
     <string name="donate_summary">Nire lanagatik ordaindua izan behar dudala pentsatzen baduzu, diru apur bat utzi dezakezu hemen</string>
+
     <string name="donation_header">Erosidazu:</string>
-    <string name="drive_mode">Drive mode</string>
+
+    <string name="download_from_last_fm">Deskargatu Last.fm-tik</string>
+
+    <string name="edit_cover">Azala editatu</string>
+
     <string name="empty">Hutsik</string>
+
     <string name="equalizer">Nahasgailua</string>
+
+    <string name="error">Akatsa</string>
+
     <string name="faq">Ohiko galderak</string>
+
     <string name="favorites">Gogokoak</string>
-    <string name="finish_last_song">Finish last song</string>
+
     <string name="fit">Egokitu</string>
+
     <string name="flat">Laua</string>
+
     <string name="folders">Karpetak</string>
-    <string name="follow_system">Follow system</string>
+
     <string name="for_you">Zuretzako</string>
-    <string name="free">Free</string>
+
     <string name="full">Beteta</string>
+
     <string name="full_card">Txartel betea</string>
+
     <string name="general_settings_summary">Aldatu applikazioaren gai eta koloreak</string>
     <string name="general_settings_title">Itxura</string>
+
     <string name="genre">Generoa</string>
+
     <string name="genres">Generoak</string>
+
     <string name="git_hub_summary">GitHub-en proiektua zatitu</string>
+
+    <string name="google_plus_community">Batu Google Plus-eko komunitatea laguntza eskatzeko edo Retro Music-en eguneraketak jarraitzeko</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -168,284 +273,427 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Grid style</string>
+
     <string name="hinge">Bisagra</string>
+
     <string name="history">Historiala</string>
+
     <string name="home">Hasiera</string>
+
     <string name="horizontal_flip">Iraulketa horizontala</string>
+
     <string name="image">Irudia</string>
-    <string name="image_gradient">Gradient image</string>
+
     <string name="image_settings_summary">Aldatu artisten irudien deskarga ezarpenak</string>
+
     <string name="inserted_x_songs_into_playlist_x">%1$d abesti gehitu dira %2$s erreprodukzio zerrendan</string>
+
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Partekatu zure Retro Music-en konfigurazioa Instagram-en</string>
-    <string name="keyboard">Keyboard</string>
+
     <string name="label_bit_rate">Bit-tasa</string>
+
     <string name="label_file_format">Formatua</string>
     <string name="label_file_name">Fitxategiaren izena</string>
     <string name="label_file_path">Fitxategiaren kokalekua</string>
     <string name="label_file_size">Tamaina</string>
-    <string name="label_last_modified">Ultima modificacion</string>
-    <string name="label_more_from">More from %s</string>
+
     <string name="label_sampling_rate">Laginketa tasa</string>
+
     <string name="label_track_length">Luzera</string>
+
     <string name="labeled">Etiketaduna</string>
+
     <string name="last_added">Gehitutako azkenak</string>
-    <string name="last_song">Last song</string>
-    <string name="library_categories">Library categories</string>
+
+    <string name="lets_play_something">Musika erreproduzitu dezagun</string>
+
+    <string name="library">Liburutegia</string>
+
     <string name="licenses">Lizentziak</string>
+
     <string name="light_theme_name">Zuria jakina</string>
-    <string name="listeners_label">Listeners</string>
+
     <string name="listing_files">Fitxategien zerrenda</string>
+
     <string name="loading_products">Produktuak kargatzen...</string>
+
     <string name="login">Saioa hasi</string>
+
     <string name="lyrics">Letrak</string>
+
     <string name="made_with_love">❤️-z Indian egina</string>
-    <string name="material">Материален</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
+
+    <string name="material">Material</string>
+
     <string name="my_name">Nire izena</string>
+
     <string name="my_top_tracks">Gehien erreproduzituak</string>
+
     <string name="never">Inoiz ez</string>
+
+    <string name="new_banner_photo">Banner argazki berria</string>
+
     <string name="new_playlist_title">Erreprodukzio zerrenda berria</string>
+
+    <string name="new_profile_photo">Profileko argazki berria</string>
+
     <string name="new_start_directory">%s da hasierako direktorio berria</string>
-    <string name="next_song">Next Song</string>
+
     <string name="no_albums">Albumik ez</string>
+
     <string name="no_artists">Artistarik ez</string>
+
     <string name="no_audio_ID">"Lehenik erreproduzitu abesti bat, saiatu berriro ondoren"</string>
+
     <string name="no_equalizer">Nahasgailurik ez da aurkitu</string>
+
     <string name="no_genres">Generorik ez</string>
+
     <string name="no_lyrics_found">Ez da letrarik aurkitu</string>
-    <string name="no_playing_queue">No songs playing</string>
+
     <string name="no_playlists">Erreprodukzio zerrendarik ez</string>
+
     <string name="no_purchase_found">Ez da erosketarik aurkitu</string>
+
     <string name="no_results">Emaitzarik ez</string>
+
     <string name="no_songs">Abestirik ez</string>
+
     <string name="normal">Normala</string>
+
     <string name="normal_lyrics">Letra normalak</string>
+
+    <string name="normal_style">Normala</string>
+
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ez dator dendan zerrendatua]]></string>
+
     <string name="nothing_to_scan">Eskaneatzekorik ez</string>
-    <string name="nothing_to_see">Nothing to see</string>
+
     <string name="notification">Jakinarazpena</string>
+
     <string name="notification_settings_summary">Jakinarazpen estiloa pertsonalizatu</string>
+
     <string name="now_playing">Orain erreproduzitzen</string>
     <string name="now_playing_queue">Erreprodukzio ilara</string>
     <string name="now_playing_summary">Pertsonalizatu orain erreproduzitzen pantaila</string>
     <string name="now_playing_themes">9+ orain erreproduzitzen gai</string>
+
     <string name="only_on_wifi">Wi-Fi-arekin bakarrik</string>
-    <string name="other_settings_summary">Advanced testing features</string>
+
     <string name="others">Bestelako</string>
+
     <string name="password">Pasahitza</string>
+
     <string name="past_three_months">Azken 3 hilabeteak</string>
-    <string name="peek">Peek</string>
+
     <string name="permission_external_storage_denied">Kanpoko biltegiratzera sarbidea ukatua</string>
+
     <string name="permissions_denied">Baimenak ukatuak izan dira</string>
+
     <string name="personalize">Pertsonalizatu</string>
+
     <string name="personalize_settings_summary">Pertsonalizatu zure orain erreproduzitzen eta UI kontrolak</string>
+
     <string name="pick_from_local_storage">Tokiko biltegitik hautatu</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
+
     <string name="plain">Arrunta</string>
+
     <string name="playing_notification_description">Erreproduzitzen jakinarazpenak erreproduzitu/pausatu etab. ekintzak eskaintzen ditu</string>
     <string name="playing_notification_name">Erreproduzitzen jakinarazpena</string>
+
+    <string name="playlist_empty_text">Erreprodukzio zerrenda hutsa</string>
+
     <string name="playlist_is_empty">Erreprodukzio zerrenda hutsik dago</string>
+
     <string name="playlist_name_empty">Erreprodukzio zerrendaren izena</string>
+
     <string name="playlists">Erreprodukzio zerrendak</string>
+
+    <string name="pref_album_detail_style">Albumaren xehetasunen estiloa</string>
+
     <string name="pref_blur_amount_summary">Gai lausoetan ezarritako lausotze maila, baxuagoa azkarragoa da</string>
     <string name="pref_blur_amount_title">Lausotze maila</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
+
     <string name="pref_header_audio">Audioa</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Controls</string>
     <string name="pref_header_general">Gaia</string>
     <string name="pref_header_images">Irudiak</string>
-    <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">Blokeo-pantaila</string>
     <string name="pref_header_playlists">Erreprodukzio zerrendak</string>
+
     <string name="pref_keep_pause_on_zero_volume_summary">Pausaru zeroan eta erreproduzitu bolumena igotzean. Adi, bolumena igotzean aplikaziotik kanpo egonik ere erreproduzituko da</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pausatu zeroan</string>
     <string name="pref_keep_screen_on_summary">Gogoan izan eginbide hau aktibatzeak eragina izan dezakeela bateriaren iraupenean</string>
     <string name="pref_keep_screen_on_title">Mantendu pantaila pizturik</string>
-    <string name="pref_language_name">Select language</string>
+
+    <string name="pref_now_playing_screen_summary">Orain erreproduzitzen pantailaren nabigazio gardena irekitzeko klikatu, irristatu gardentasunik gabeko nabigaziorako</string>
+    <string name="pref_now_playing_screen_title">Klikatu edo irristatu</string>
+
     <string name="pref_snow_fall_title">Elur efektua</string>
+
     <string name="pref_summary_album_art_on_lockscreen">Erabili erreproduzitzen ari den abestiaren azala blokeo-pantailako horma-paper gisa</string>
     <string name="pref_summary_audio_ducking">Jaitsi bolumena sistemaren soinuren batek jotzean edo jakinarazpen bat jasotzean</string>
     <string name="pref_summary_blacklist">Zerrenda beltzean jarritako edukiak zure liburutegitik ezkutatuko dira</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
     <string name="pref_summary_blurred_album_art">Lausotu albumaren azala blokeo-pantailan. Arazoak sor ditzazke hirugarrenen aplikazio edota widgetekin</string>
     <string name="pref_summary_carousel_effect">Karrusel efektua erreprodukzio pantailako album azalerako. Kontuan izan Txartela eta Txartel lausotua gaiek ez dutela funtzionatuko</string>
     <string name="pref_summary_classic_notification">Erabili jakinarazpenen diseinu klasikoa</string>
     <string name="pref_summary_colored_app">Orain erreproduzitzen pantailan atzealdeko eta kontrol botoien koloreak album azalaren arabera aldatuko dira</string>
     <string name="pref_summary_colored_app_shortcuts">Aplikazioaren lasterbideak azentu kolorean ezartzen ditu. Kolorea aldatzen duzun bakoitzean hau birraktibatu aldaketak aplikatzeko</string>
+    <string name="pref_summary_colored_navigation_bar">Nabigazio barra kolore nagusian koloreztatu</string>
     <string name="pref_summary_colored_notification">"Jakinarazpena albumaren azalaren kolore nagusian ezarri"</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
+    <string name="pref_summary_dominant_color">Albumaren edo artistaren azaletik kolore menderatzailea hartuko da</string>
     <string name="pref_summary_extra_controls">Gehitu kontrol gehigarriak erreproduzitzaile txikirako</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
     <string name="pref_summary_gapless_playback">"Erreprodukzio arazoak sor ditzake gailu batzuetan"</string>
+    <string name="pref_summary_genre_toggle">Txandakatu genero fitxa</string>
     <string name="pref_summary_home_banner">Txandakatu hasierako banner estiloa</string>
     <string name="pref_summary_ignore_media_store_artwork">Album azalaren kalitatea hobetu dezake, baina irudien kargatze-denbora moteltzen du. Soilik bereizmen baxuko azalekin arazoa baduzu aktibatu</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
     <string name="pref_summary_lock_screen">Retro Music-en pantaila-blokeoko kontrolak erabili</string>
     <string name="pref_summary_open_source_licences">Software librerako lizentziaren xehetasunak</string>
+    <string name="pref_summary_round_corners">Biribildu aplikazioaren ertzak</string>
+    <string name="pref_summary_tab_titles">Aktibatu beheko nabigazio fitxetarako tituluak</string>
     <string name="pref_summary_toggle_full_screen">Murgiltze modua</string>
     <string name="pref_summary_toggle_headset">Hasi erreproduzitzen entzungailuak konektatzeaz bat</string>
     <string name="pref_summary_toggle_shuffle">Nahasketa modua desaktibatuko da abesti zerrenda berria erreproduzitzean</string>
     <string name="pref_summary_toggle_volume">Lekua egonik, erakutsi bolumenaren kontrolak orain erreproduzitzen pantailan</string>
+
     <string name="pref_title_album_art_on_lockscreen">Erakutsi albumaren azala</string>
     <string name="pref_title_album_cover_style">Album azalaren gaia</string>
     <string name="pref_title_album_cover_transform">Albumaren azala saltatu</string>
+    <string name="pref_title_album_grid_style">Album sareta</string>
     <string name="pref_title_app_shortcuts">Koloreztaturiko aplikazio lasterbideak</string>
+    <string name="pref_title_artist_grid_style">Artista sareta</string>
     <string name="pref_title_audio_ducking">Jaitsi bolumena foku galeran</string>
     <string name="pref_title_auto_download_artist_images">Deskargatu artisten irudiak automatikoki</string>
     <string name="pref_title_blacklist">Zerrenda beltza</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
     <string name="pref_title_blurred_album_art">Lausotu albumaren azala</string>
+    <string name="pref_title_choose_equalizer">Hautatu nahasgailua</string>
     <string name="pref_title_classic_notification">Jakinarazpenen diseinu klasikoa</string>
     <string name="pref_title_colored_app">Kolore moldagarria</string>
     <string name="pref_title_colored_notification">Jakinarazpen koloreztatua</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
     <string name="pref_title_extra_controls">Kontrol gehigarriak</string>
-    <string name="pref_title_extra_song_info">Song info</string>
     <string name="pref_title_gapless_playback">Tarterik gabeko erreprodukzioa</string>
     <string name="pref_title_general_theme">Aplikazioaren gaia</string>
+    <string name="pref_title_genre_toggle">Erakutsi genero fitxa</string>
     <string name="pref_title_home_artist_grid_style">Hasierako artista sareta</string>
     <string name="pref_title_home_banner">Hasierako bannerra</string>
     <string name="pref_title_ignore_media_store_artwork">Media dendako azalei ez ikusi egin</string>
     <string name="pref_title_last_added_interval">Gahitutako azkenen erreprodukzio zerrendaren tartea</string>
     <string name="pref_title_lock_screen">Pantaila osoko kontrolak</string>
+    <string name="pref_title_navigation_bar">Nabigazio barra koloreztatua</string>
     <string name="pref_title_now_playing_screen_appearance">Orain erreproduzitzen gaia</string>
     <string name="pref_title_open_source_licences">Software libre lizentziak</string>
+    <string name="pref_title_round_corners">Izkinako ertzak</string>
     <string name="pref_title_tab_text_mode">Fitxen titulu modua</string>
     <string name="pref_title_toggle_carousel_effect">Karrusel efektua</string>
+    <string name="pref_title_toggle_dominant_color">Kolore menderatzailea</string>
     <string name="pref_title_toggle_full_screen">Pantaila osoko aplikazioa</string>
+    <string name="pref_title_toggle_tab_titles">Fitxen tituluak</string>
     <string name="pref_title_toggle_toggle_headset">Erreprodukzio automatikoa</string>
     <string name="pref_title_toggle_toggle_shuffle">Nahastu modua</string>
     <string name="pref_title_toggle_volume">Bolumen kontrolak</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pref_title_user_info">Erabiltzaileari buruz</string>
+
+    <string name="primary_color">Kolore nagusia</string>
+    <string name="primary_color_desc">Gaiaren kolore nagusiak, lehentsia urdin-grisa, kolore ilunekin funtzionatzen du oraingoz</string>
+
     <string name="profile">Profila</string>
+
     <string name="purchase">Erosi</string>
+
+    <string name="purchase_summary">*Pentsatu erosi aurretik, ez eskatu itzulketarik</string>
+
     <string name="queue">Ilara</string>
+
     <string name="rate_app">Baloratu aplikazioa</string>
+
     <string name="rate_on_google_play_summary">Aplikazioa gustatzen zaizu? Esan iezaguzu Google Play Store-n nola hobetu dezakegun</string>
+
     <string name="recent_albums">Azken albumak</string>
+
     <string name="recent_artists">Azken artistak</string>
+
     <string name="remove_action">Kendu</string>
+
+    <string name="remove_banner_photo">Banner argazkia kendu</string>
+
     <string name="remove_cover">Azala kendu</string>
+
     <string name="remove_from_blacklist">Zerrenda beltzetik kendu</string>
+
+    <string name="remove_profile_photo">Profileko argazkia kendu</string>
+
     <string name="remove_song_from_playlist_title">Abestia erreprodukzio zerrendatik kendu</string>
     <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> abestia erreprodukzio zerrendatik kendu?]]></string>
+
     <string name="remove_songs_from_playlist_title">Abestiak erreprodukzio zerrendatik kendu</string>
+
     <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> abesti erreprodukzio zerrendatik kendu?]]></string>
+
     <string name="rename_playlist_title">Erreprodukzio zerrenda berrizendatu</string>
+
     <string name="report_an_issue">Arazo baten berri eman</string>
+
     <string name="report_bug">Eman akatsen berri</string>
-    <string name="reset_action">Reset</string>
+
     <string name="reset_artist_image">Artistaren irudia berrezarri</string>
+
     <string name="restore">Leheneratu</string>
+
     <string name="restored_previous_purchase_please_restart">Aurreko erosketa leheneratua. Mesedez aplikazioa berrabiarazi ezaugarri guztiak erabiltzeko</string>
     <string name="restored_previous_purchases">Aurreko erosketa leheneratua</string>
+
     <string name="restoring_purchase">Erosketa leheneratzen...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Retro Music Nahasgailua</string>
+
     <string name="retro_music_pro">Retro Music Pro</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Gorde fitxategi gisa</string>
+
     <string name="save_playlists_title">Gorde fitxategi gisa</string>
+
     <string name="saved_playlist_to">Erreprodukzio zerrenda %s-n gorde da</string>
+
     <string name="saving_changes">Aldaketak gordetzen</string>
+
     <string name="scan_media">Eskaneatu media</string>
+
     <string name="scanned_files">%2$d-tik %1$d fitxategi eskaneatu dira</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="search_hint">Zure liburutegian bilatu...</string>
+
     <string name="select_all">Hautatu guztiak</string>
+
+    <string name="select_banner_photo">Banner argazkia hautatu</string>
+
     <string name="selected">Hautatua</string>
-    <string name="set">Set</string>
+
     <string name="set_artist_image">Artistaren irudia ezarri</string>
+
     <string name="share_app">Partekatu aplikazioa</string>
-    <string name="share_to_stories">Share to Stories</string>
+
     <string name="shuffle">Nahastu</string>
+
     <string name="simple">Soila</string>
+
     <string name="sleep_timer_canceled">Lo tenporizadorea bertan behera utzi da</string>
     <string name="sleep_timer_set">Lo tenporizadorea %d minuturako ezarri da</string>
+
+    <string name="small">Album txikia</string>
+
     <string name="social">Soziala</string>
-    <string name="social_stories">Share story</string>
+
     <string name="song">Abestia</string>
+
     <string name="song_duration">Abestiaren iraupena</string>
+
     <string name="songs">Abestiak</string>
+
     <string name="sort_order">Ordenatze irizpidea</string>
     <string name="sort_order_a_z">Gorakorra</string>
     <string name="sort_order_album">Albuma</string>
     <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Composer</string>
     <string name="sort_order_date">Data</string>
-    <string name="sort_order_date_modified">Date modified</string>
     <string name="sort_order_year">Urtea</string>
     <string name="sort_order_z_a">Beherakorra</string>
+
     <string name="speech_not_supported">Sentitzen dugu! Zure gailuak ez du ahots bidezko idazketa onartzen</string>
+
     <string name="speech_prompt">Zure liburutegian bilatu</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
+
     <string name="suggestion_songs">Iradokizunak</string>
+
+    <string name="summary_user_info">Zure izena bakarrik erakutsi hasiera pantailan</string>
+
     <string name="support_development">Onartutako garapena</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
+
     <string name="synced_lyrics">Letra sinkronizatuak</string>
+
+    <string name="system_equalizer">Sistemako nahasgailua</string>
+
     <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Batu Telegram-eko kanala akatsak, iradokizunak etab. kontatzeko</string>
+
     <string name="thank_you">Eskerrik asko!</string>
+
     <string name="the_audio_file">Audio fitxategia</string>
+
     <string name="this_month">Hilabete hau</string>
+
     <string name="this_week">Aste hau</string>
+
     <string name="this_year">Urte hau</string>
+
     <string name="tiny">Ñimiñoa</string>
-    <string name="tiny_card_style">Tiny card</string>
+
     <string name="title">Titulua</string>
+
+    <string name="title_dashboard">Arbela</string>
+
+    <string name="title_good_afternoon">Arratsalde on</string>
+    <string name="title_good_day">Egun on</string>
+    <string name="title_good_evening">Arratsalde on</string>
+    <string name="title_good_morning">Egun on</string>
+    <string name="title_good_night">Gabon</string>
+
+    <string name="title_user_info">Zein da zure izena</string>
+
     <string name="today">Gaur</string>
+
     <string name="top_albums">Album onenak</string>
+
     <string name="top_artists">Artista onenak</string>
+
     <string name="track_hint">"Pista (2, 2. pistarako edo 3004 3. CDko 4. pistarako)"</string>
+
     <string name="track_list">Pista zenbakia</string>
+
     <string name="translate">Itzuli</string>
+
     <string name="translate_community">Lagun iezaguzu aplikazioa zure hizkuntzara itzultzen</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Partekatu zure Retro Music-en diseinua</string>
+
     <string name="unlabeled">Etiketa gabe</string>
+
     <string name="unplayable_file">Ezin izan da abestia erreproduzitu</string>
+
     <string name="up_next">Jarraian</string>
+
     <string name="update_image">Irudia eguneratu</string>
+
     <string name="updating">Eguneratzen...</string>
+
     <string name="username">Erabiltzaile izena</string>
+
     <string name="version">Bertsioa</string>
+
     <string name="vertical_flip">Iraulketa bertikala</string>
-    <string name="volume">Volume</string>
+
+    <string name="virtualizer">Birtualizatzailea</string>
+
     <string name="web_search">Web bilaketa</string>
-    <string name="welcome">Welcome,</string>
+
     <string name="what_do_you_want_to_share">Zer partekatu nahi duzu?</string>
+
     <string name="whats_new">Zer berri</string>
+
     <string name="window">Leihoa</string>
+
     <string name="window_corner_edges">Ertz biribilduak</string>
+
     <string name="x_has_been_set_as_ringtone">Ezarri %1$s dei-tonu gisa</string>
+
     <string name="x_selected">%1$d hautaturik</string>
+
     <string name="year">Urtea</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
+
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Arazo bilatzaile webgunera birbidalia izango zara</string>
+
     <string name="your_account_data_is_only_used_for_authentication">Zure kontuaren datuak autentifikaziorako soilik erabiliko dira</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml
deleted file mode 100644
index b4baef208..000000000
--- a/app/src/main/res/values-fa-rIR/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">درباره %s...</string>
-    <string name="about_settings_summary">تیم، پیوندهای اجتماعی</string>
-    <string name="accent_color">رنگ تشدید کننده</string>
-    <string name="accent_color_desc">رنگ تشدید کننده به صورت پیش فرض بنفش انتخاب شده</string>
-    <string name="action_about">درباره</string>
-    <string name="action_add_to_blacklist">افزودن به لیست سیاه</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_cancel">انصراف</string>
-    <string name="action_cast">پخش و نمایش تصویر</string>
-    <string name="action_clear_playing_queue">لیست پخش اهنگ هارا پاک کنید</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_edit">ویرایش</string>
-    <string name="action_go_to_album">رفتن به آلبوم</string>
-    <string name="action_go_to_artist">رفتن به صفحه هنرمند</string>
-    <string name="action_go_to_genre">رفتن به ژانر موسیقی</string>
-    <string name="action_go_to_lyrics">رفتن به متن ترانه</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_all">پخش همه</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_sort_order">ترتیب نمایش</string>
-    <string name="action_tag_editor"> ویرایشگر برچسب </string>
-    <string name="action_toggle_favorite">تغییر علاقه‌مندی‌ها</string>
-    <string name="action_toggle_shuffle">تغییر حالت پخش مخلوط</string>
-    <string name="adaptive">سازگار</string>
-    <string name="add_action">ﺍﻓﺰﻭﺩﻥ</string>
-    <string name="add_playlist_title">"افزودن به لیست پخش"</string>
-    <string name="add_time_framed_lryics">اضافه کردن متون دارای زمان</string>
-    <string name="added_song_count_to_playlist">%1$d عدد آهنگ به %2$s اضافه شد</string>
-    <string name="added_title_to_playing_queue">"یک‌ مورد به لیست پخش اهنگ ها اضافه شد."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d مورد به صف پخش اضافه شد.</string>
-    <string name="album">آلبوم</string>
-    <plurals name="albumSongs">
-        <item quantity="one">آهنگ ها</item>
-        <item quantity="other">آهنگ ها</item>
-    </plurals>
-    <string name="album_artist">آلبومِ هنرمند</string>
-    <string name="albums">آلبوم‌ها</string>
-    <plurals name="albums">
-        <item quantity="one">آلبوم</item>
-        <item quantity="other">آلبوم ها</item>
-    </plurals>
-    <string name="always">همیشه</string>
-    <string name="app_share">به اشتراک گذاری برنامه</string>
-    <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_card_name">کارت</string>
-    <string name="app_widget_classic_name">کلاسیک</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">كوچك</string>
-    <string name="app_widget_text_name">متن کوچک</string>
-    <string name="artist">هنرمند</string>
-    <string name="artists">هنرمندان</string>
-    <string name="audio_fade_duration">مدت زمان محو شدن صدا</string>
-    <string name="audio_focus_denied">تمرکز صدا قطع شد.</string>
-    <string name="audio_settings_summary">تنظیمات صدا را تغییر دهید و کنترل های اکولایزر را تنظیم کنید</string>
-    <string name="auto">خودکار</string>
-    <string name="backup_restore_settings_summary">از تنظیمات، لیست های پخش خود نسخه پشتیبان تهیه و بازیابی کنید</string>
-    <string name="backup_restore_title"><![CDATA[پشتیبان‌گیری و بازیابی]]></string>
-    <string name="backup_title">پشتیبان گیری</string>
-    <string name="biography">زندگینامه</string>
-    <string name="black_theme_name">فقط مشکی</string>
-    <string name="blacklist">لیست سیاه</string>
-    <string name="bluetooth_summary">برای بررسی دستگاه‌های بلوتوث،برنامه نیاز به مجوز دسترسی دستگاه‌های نزدیک دارد</string>
-    <string name="bluetooth_title">دستگاه‌های نزدیک</string>
-    <string name="blur">تاری</string>
-    <string name="blur_card">کارت تاری</string>
-    <string name="bug_report_failed">امکان ارسال گزارش وجود ندارد</string>
-    <string name="bug_report_failed_invalid_token">لطفاً به توسعه دهنده پیام دهید، اشکالی در کار پیش آمد.</string>
-    <string name="bug_report_failed_issues_not_available">مشکلات برای مخزن انتخابی فعال نیستند. لطفا با توسعه دهنده برنامه تماس بگیرید.</string>
-    <string name="bug_report_failed_unknown">یک خطای غیر منتظره پیش آمد. لطفا با توسعه دهنده برنامه تماس بگیرید.</string>
-    <string name="bug_report_failed_wrong_credentials">نام کاربری یا رمز اشتباه است</string>
-    <string name="bug_report_issue">موضوع</string>
-    <string name="bug_report_manual">ارسال دستی</string>
-    <string name="bug_report_no_description">لطفاً عنوان مشکل را وارد کنید</string>
-    <string name="bug_report_no_password">لطفاً رمز گیتهاب خود را وارد کنید</string>
-    <string name="bug_report_no_title">لطفاً عنوان مشکل را وارد کنید</string>
-    <string name="bug_report_no_username">لطفاً نام کاربری GitHub خود را وارد کنید</string>
-    <string name="bug_report_success">گزارش اشکال موفقیت آمیز بود</string>
-    <string name="bug_report_summary">یک مشکل پیش بینی نشده رخ داد. متأسفیم که شما این باگ را پیدا کردید، اگر برنامه به متوقف شدن ادامه داد لطفاً برنامه را کلیر دیتا کنید یا برای ما ایمیل بفرستید </string>
-    <string name="bug_report_use_account">با استفاده از حساب GitHub ارسال کنید</string>
-    <string name="buy_now">اکنون بخرید</string>
-    <string name="cancel_current_timer">انصراف</string>
-    <string name="card">کارت</string>
-    <string name="card_color_style">برگه ی رنگارنگ</string>
-    <string name="card_square">برگه ی مربعی</string>
-    <string name="card_style">کارت</string>
-    <string name="carousal_effect_on_now_playing_screen">حالت چرخ فلک برای صفحه ی پخش موزیک</string>
-    <string name="cascading">کاسکاد</string>
-    <string name="changelog">لیست تغییرات</string>
-    <string name="changelog_summary">ببینید چه چیزی جدید و نو است</string>
-    <string name="choose_image">انتخاب تصویر</string>
-    <string name="choose_restore_title">انتخاب کنید چه چیزی را بازیابی کنید</string>
-    <string name="circle">دایره</string>
-    <string name="circular">دایره ای</string>
-    <string name="classic">کلاسیک</string>
-    <string name="clear_action">پاک‌کردن</string>
-    <string name="clear_blacklist">پاک کردن لیست سیاه</string>
-    <string name="clear_history">پاکسازی تاریخچه</string>
-    <string name="clear_playing_queue">پاکسازی صف</string>
-    <string name="color">رنگ</string>
-    <string name="colors">رنگ ها</string>
-    <string name="compact">جمع و جور</string>
-    <string name="composer">آهنگساز</string>
-    <string name="copied_device_info_to_clipboard">اطلاعات دستگاه در کلیپ بورد کپی شد.</string>
-    <string name="could_not_create_playlist">نمیتوان پلی لیست ساخت.</string>
-    <string name="could_not_download_album_cover">"\"نتونستم عکسی برای این آلبوم پیدا کنم.\"."</string>
-    <string name="could_not_restore_purchase">خرید قابل بازیابی نیست.</string>
-    <string name="could_not_scan_files">%d فایل را نمیتوان اسکن کرد.</string>
-    <string name="create_action">ایجاد کردن</string>
-    <string name="create_new_backup">ایجاد کردن</string>
-    <string name="created_playlist_x">پلی لیست %1$s ساخته شد.</string>
-    <string name="credit_title">اعضا و دست اندرکاران </string>
-    <string name="currently_listening_to_x_by_x">در حال حاضر شما به s$1% از s$2% گوش می‌دهید.</string>
-    <string name="custom_artist_images">تصاویر هنرمند سفارشی</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">به اشتراک گذاری گزارش خرابی</string>
-    <string name="dark_theme_name">تقریبا مشکی</string>
-    <string name="delete_playlist_title">حذف کردن پلی لیست</string>
-    <string name="delete_playlist_x"><![CDATA[حذف پلی لیست <b>%1$s</b>?<b>?]]></string>
-    <string name="delete_playlists_title">حذف کردن پلی لیست ها</string>
-    <string name="delete_song_title">حذف موزیک</string>
-    <string name="delete_song_x"><![CDATA[حذف موزیک %1$s؟]]></string>
-    <string name="delete_songs_title">حذف موزیک ‌ها</string>
-    <string name="delete_x_playlists"><![CDATA[آیا میخواهید پلی لیست %1$d را حذف کنید؟]]></string>
-    <string name="delete_x_songs"><![CDATA[حذف موزیک های %1$d؟]]></string>
-    <string name="deleted_x_songs">%1$d موزیک حذف شدند.</string>
-    <string name="deleting_songs">حذف آهنگ‌ها</string>
-    <string name="depth">عمق</string>
-    <string name="description">توضیحات</string>
-    <string name="device_info">اطلاعات دستگاه</string>
-    <string name="dialog_message_set_ringtone">به موسیقی رترو اجازه دهید تنظیمات صدا را تغییر دهد</string>
-    <string name="dialog_title_set_ringtone">تنظیم آهنگ زنگ</string>
-    <string name="disc_hint">شماره دیسک</string>
-    <string name="do_you_want_to_clear_the_blacklist">ایا می‌خواهید بلک لیست را پاک کنید؟</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[آیا شما میخواهید آهنگ X را از لیست سیاه حذف کنید؟]]></string>
-    <string name="donate">کمک مالی</string>
-    <string name="donate_summary">اگر فکر میکنید شایسته ی دریافت کمک مالی هستم، می توانید مقداری پول اینجا بگذارید</string>
-    <string name="donation_header">برای من بخر:</string>
-    <string name="done">انجام شد</string>
-    <string name="drive_mode">حالت رانندگی</string>
-    <string name="edit_fab">کلید ویرایش</string>
-    <string name="edit_normal_lyrics">ویرایش متن ترانه</string>
-    <string name="edit_synced_lyrics">متن آهنگ های هماهنگ شده</string>
-    <string name="empty">خالی</string>
-    <string name="equalizer">اکولایزر</string>
-    <string name="error_create_backup">پشتیبان گیری \u2019 انجام نشد</string>
-    <string name="error_delete_backup">حذف \u2019 نسخه پشتیبان انجام نشد</string>
-    <string name="error_empty_name">نام شما نمیتواند خالی باشد!</string>
-    <string name="error_load_failed">بارگیری انجام نشد</string>
-    <string name="error_share_file">فایل به اشتراک گذاشته نشد</string>
-    <string name="expanded">گسترش یافته</string>
-    <string name="faq">سوالات متداول</string>
-    <string name="favorites">علاقه‌مندی‌ها</string>
-    <string name="file_already_exists">فایل از قبل موجود میباشد</string>
-    <string name="finish_last_song">پایان آخرین آهنگ</string>
-    <string name="fit">متناسب</string>
-    <string name="flat">تخت</string>
-    <string name="folders">پوشه ها</string>
-    <string name="follow_system">پیروی از سیستم</string>
-    <string name="for_you">برای شما</string>
-    <string name="free">رایگان</string>
-    <string name="full">کامل</string>
-    <string name="full_card">کارت کامل</string>
-    <string name="general_settings_summary">عوض کردن تم و رنگ های برنامه</string>
-    <string name="general_settings_title">شکل ظاهری برنامه</string>
-    <string name="genre">ژانر</string>
-    <string name="genres">ژانر ها</string>
-    <string name="git_hub_summary">ستاره‌دار کردن پروژه در گیت‌هاب</string>
-    <string name="gradient">شیب</string>
-    <string name="grant_access">اجازه دسترسی</string>
-    <string name="grid_size_1">۱</string>
-    <string name="grid_size_2">۲</string>
-    <string name="grid_size_3">۳</string>
-    <string name="grid_size_4">۴</string>
-    <string name="grid_size_5">۵</string>
-    <string name="grid_size_6">۶</string>
-    <string name="grid_size_7">۷</string>
-    <string name="grid_size_8">۸</string>
-    <string name="grid_style_label">نوع شبکه</string>
-    <string name="help_summary">به کمک بیشتری نیاز دارید؟</string>
-    <string name="hinge">لولا</string>
-    <string name="history">تاریخچه پخش اهنگ</string>
-    <string name="history_cleared">تاریخچه پاک شد</string>
-    <string name="history_undo_button">بازگشت به قبل</string>
-    <string name="home">صفحه اصلی</string>
-    <string name="horizontal_flip">حالت افقی</string>
-    <string name="image">تصویر</string>
-    <string name="image_gradient">تصویر شیب دار</string>
-    <string name="image_settings_summary">عوض کردن حالت دانلود تصویر هنرمند</string>
-    <string name="import_label">وارد کردن</string>
-    <string name="import_playlist">وارد کردن لیست پخش</string>
-    <string name="import_playlist_message">تمام لیست های پخش لیست شده در فروشگاه رسانه اندروید را با آهنگ ها وارد می کند، اگر لیست های پخش از قبل وجود داشته باشد، آهنگ ها ادغام می شوند.</string>
-    <string name="inserted_x_songs_into_playlist_x">X اهنگ به پلی لیست Y وارد شد.</string>
-    <string name="instagram_page_summary">تنظیمات Retro Music خود را برای نمایش در اینستاگرام به اشتراک بگذارید</string>
-    <string name="keyboard">کیبورد</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_last_modified">آخرین تغییر</string>
-    <string name="label_more_from">بیشتر از s%</string>
-    <string name="label_sampling_rate">نرخ نمونه‌گذاري</string>
-    <string name="label_track_length">مدت</string>
-    <string name="labeled">برچسب دار</string>
-    <string name="last_added">آخرین اضافه شده</string>
-    <string name="last_song">آخرین آهنگ</string>
-    <string name="lets_go">بزن بریم</string>
-    <string name="library_categories">دسته بندی های کتابخانه</string>
-    <string name="licenses">مجوزها</string>
-    <string name="light_theme_name">کاملا سفید</string>
-    <string name="listeners_label">شنوندگان</string>
-    <string name="listing_files">لیست کردن پوشه ها</string>
-    <string name="loading_products">در حال بارگیری محصولات…</string>
-    <string name="login">ورود</string>
-    <string name="lyrics">متن ترانه</string>
-    <string name="made_with_love">ساخته شده با ❤️ در هند</string>
-    <string name="material">تم material</string>
-    <string name="md_error_label">خطا</string>
-    <string name="md_storage_perm_error">خطای دسترسی</string>
-    <string name="message_backup_create_success">پشتیبان گیری با موفقیت انجام شد.</string>
-    <string name="message_limit_tabs">بیشتر از ۵ مورد نیست</string>
-    <string name="message_pro_feature">%s یک ویژگی نسخه حرفه‌ای برنامه است.</string>
-    <string name="message_restore_success">بازیابی با موفقیت انجام شد.</string>
-    <string name="message_updated">به روز شد</string>
-    <string name="message_welcome"><![CDATA[سلام! <br> به %s خوش آمدید]]></string>
-    <string name="my_name">عنوان</string>
-    <string name="my_top_tracks">بیشترین پخش شده</string>
-    <string name="never">هیچوقت</string>
-    <string name="new_music_mix">میکس موسیقی جدید</string>
-    <string name="new_playlist_title">فهرست پخش جدید %d</string>
-    <string name="new_start_directory">دایرکتوری شروع جدید است%s.</string>
-    <string name="next_song">آهنگ بعدی</string>
-    <string name="no_albums">شما آلبومی ندارید</string>
-    <string name="no_artists">شما هنرمندی ندارید</string>
-    <string name="no_audio_ID">"ابتدا یک آهنگ پخش کنید ، سپس دوباره امتحان کنید."</string>
-    <string name="no_backups_found">هیچ نسخه پشتیبانی یافت نشد</string>
-    <string name="no_equalizer">هیچ اکولایزری یافت نشد</string>
-    <string name="no_genres">شما هیچ ژانری ندارید</string>
-    <string name="no_lyrics_found">متنی یافت نشد</string>
-    <string name="no_playing_queue">آهنگی پخش نمی‌شود</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="normal_lyrics">متن معمولی آهنگ</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> در فروشگاه رسانه فهرست نشده است.]]></string>
-    <string name="not_recently_played">اخیراً پخش نشده</string>
-    <string name="nothing_to_scan">هیچ چیزی برای اسکن نیست.</string>
-    <string name="nothing_to_see">اینچا چیزی برای دیدن نیست</string>
-    <string name="notification">اعلان</string>
-    <string name="notification_settings_summary">اعلان‌ها را سفارشی‌سازی کنید</string>
-    <string name="now_playing">صفحه در حال پخش</string>
-    <string name="now_playing_queue">لیست درحال پخش</string>
-    <string name="now_playing_summary">صفحه پخش اهنگ را شخصی سازی کنید</string>
-    <string name="now_playing_themes">۹+ تم صفحه پخش</string>
-    <string name="only_on_wifi">فقط از طریق wi-fi</string>
-    <string name="other_settings_summary">ویژگی های تستی پیش‌رفته</string>
-    <string name="others">غیره</string>
-    <string name="over_cover">روی پوشش</string>
-    <string name="password">گذرواژه</string>
-    <string name="past_three_months">3 ماه گذشته</string>
-    <string name="paste_lyrics_here">متن را در اینجا بارگزاری کنید</string>
-    <string name="paste_timeframe_lyrics_here">متن های زمان دار را در اینجا بارگزاری کنید</string>
-    <string name="peek">نمایش مختصر</string>
-    <string name="permission_bluetooth_denied">مجوز دستگاه‌های نزدیک داده نشد.</string>
-    <string name="permission_external_storage_denied">مجوز دسترسی به حافظه رد شد</string>
-    <string name="permission_summary">برنامه نیاز به دسترسی به حافظه برای پخش آهنگ ها دارد</string>
-    <string name="permission_title">دسترسی به حافظه</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="pinterest_page">پینترست</string>
-    <string name="pinterest_page_summary">صفحه پینترست را برای الهام گرفتن از طراحی Retro Music دنبال کنید</string>
-    <string name="plain">ساده</string>
-    <string name="playList_already_exits">لیست پخش از قبل وجود دارد</string>
-    <string name="playback_pitch">میزان صدا</string>
-    <string name="playback_settings">تنظیمات پخش</string>
-    <string name="playback_speed">سرعت پخش</string>
-    <string name="playing_notification_description">اعلان پخش، اقداماتی را برای پخش/مکث و غیره ارائه می دهد.</string>
-    <string name="playing_notification_name">اعلان در حال پخش</string>
-    <string name="playlist_created_sucessfully">%s با موفقیت ایجاد شد</string>
-    <string name="playlist_is_empty">صفحه پخش خالی است</string>
-    <string name="playlist_name_empty">نام لیست پخش آهنگ</string>
-    <string name="playlists">لیست پخش آهنگ ها</string>
-    <string name="pref_blur_amount_summary">میزان تاری اعمال شده برای تم هایی که قابلیت بلور دارن، هر چی کمتر، سریعتر است</string>
-    <string name="pref_blur_amount_title">مقدار تاری</string>
-    <string name="pref_filter_song_summary">مرتب‌سازی اهنگ ها بر اساس مدت زمان</string>
-    <string name="pref_filter_song_title">مرتب‌سازی مدت زمان آهنگ</string>
-    <string name="pref_header_advanced">پیشرفته</string>
-    <string name="pref_header_album">سبک آلبوم</string>
-    <string name="pref_header_audio">صدا</string>
-    <string name="pref_header_blacklist">لیست سیاه</string>
-    <string name="pref_header_controls">کنترل ها</string>
-    <string name="pref_header_general">تم</string>
-    <string name="pref_header_images">تصاویر</string>
-    <string name="pref_header_library">کتابخانه</string>
-    <string name="pref_header_lockscreen">صفحه‌ قفل</string>
-    <string name="pref_header_playlists">لیست پخش آهنگ ها</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">آهنگ به محض اینکه صدای گوشی به صفر می‌رسد متوقف می‌شود و به هنگام بالا رفتن صدا موزیک پخش می‌شود</string>
-    <string name="pref_keep_pause_on_zero_volume_title">متوقف شدن صدا هنگامیکه صدای گوشی صفر است</string>
-    <string name="pref_keep_screen_on_summary">اینو به یاد داشته باشید فعال کردن این قابلیت مصرف باتری را بالا می برد</string>
-    <string name="pref_keep_screen_on_title">روشن نگهداشتن صفحه</string>
-    <string name="pref_language_name">انتخاب زبان</string>
-    <string name="pref_snow_fall_title">اثر بارش برف</string>
-    <string name="pref_summary_album_art_on_lockscreen">از عکس آهنگ کنونی به عنوان نمایه ی صفحه ی قفل استفاده کنید</string>
-    <string name="pref_summary_album_artists_only">البوم های هنرمندان را در قسمت دسته نمایش دهید</string>
-    <string name="pref_summary_audio_ducking">صدای گوشی کم شود هنگامیکه از سیستم صدایی شنیده شود یا اعلانی دریافت شود</string>
-    <string name="pref_summary_audio_fade">هنگام توقف یا پخش آهنگ، صدا را محو کنید</string>
-    <string name="pref_summary_blacklist">محتوای پوشه های لیست سیاه از کتابخانه شما پنهان است.</string>
-    <string name="pref_summary_bluetooth_playback">به محض اتصال به دستگاه بلوتوث شروع به پخش کنید</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_notification">"به اعلان های جلذ آلبوم\u2019 رنگ های متنوع بدهید"</string>
-    <string name="pref_summary_cross_fade">مدت زمان تقاطع بین آهنگ ها</string>
-    <string name="pref_summary_desaturated_color">طبق دستورالعمل طراحی Material، خطوط در رنگ‌های حالت تاریک باید غیراشباع باشند</string>
-    <string name="pref_summary_expand_now_playing_panel">با کلیک بر روی اعلان، به جای صفحه اصلی، صفحه در حال پخش نمایش داده می شود</string>
-    <string name="pref_summary_extra_controls">اضافه کردن کنترل های اضافی برای پخش‌کننده کوچک</string>
-    <string name="pref_summary_extra_song_info">نمایش اطلاعات اضافی آهنگ، مانند فرمت فایل، میزان بیت و فرکانس</string>
-    <string name="pref_summary_gapless_playback">"می تواند باعث مشکلات پخش در برخی دستگاه ها شود."</string>
-    <string name="pref_summary_home_banner">نمایش یا عدم نمایش نوار</string>
-    <string name="pref_summary_ignore_media_store_artwork">می تواند کیفیت جلد آلبوم را افزایش دهد، اما باعث کندی بارگذاری تصویر می شود. فقط اگر با آثار هنری با وضوح پایین مشکل دارید این را فعال کنید</string>
-    <string name="pref_summary_library_categories">قابلیت مشاهده و ترتیب دسته‌های کتابخانه را پیکربندی کنید.</string>
-    <string name="pref_summary_lock_screen">از کنترل‌های صفحه قفل سفارشی Retro Music استفاده کنید</string>
-    <string name="pref_summary_manage_audio_focus">همیشه صدا را در پس زمینه بدون توجه به هر چیز دیگری که در حال پخش است پخش کنید</string>
-    <string name="pref_summary_open_source_licences">جزئیات مجوز برای نرم‌افزار منبع باز</string>
-    <string name="pref_summary_pause_history">وقتی فعال باشد، آهنگ‌های تازه پخش شده در تاریخ نمایش داده نمی‌شوند</string>
-    <string name="pref_summary_remember_tab">در شروع به آخرین برگه استفاده شده بروید</string>
-    <string name="pref_summary_show_lyrics">نمایش متن های همگام‌سازی شده روی جلد آلبوم</string>
-    <string name="pref_summary_suggestions">نمایش ترکیب موسیقی جدید در صفحه اصلی</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">تغییر آهنگ را با کشیدن انگشت در هر نقطه ای از صفحه در حال پخش فعال می کند</string>
-    <string name="pref_summary_swipe_to_dismiss">برای رد کردن پخش‌کننده کوچک، انگشت خود را به پایین بکشید</string>
-    <string name="pref_summary_toggle_full_screen">حالت فراگیر</string>
-    <string name="pref_summary_toggle_headset">بلافاصله پس از اتصال هدفون شروع به پخش کنید</string>
-    <string name="pref_summary_toggle_shuffle">هنگام پخش لیست جدیدی از آهنگ‌ها، حالت مخلوط خاموش می‌شود</string>
-    <string name="pref_summary_toggle_volume">اگر فضای کافی در دسترس است، کنترل‌های صدا را در صفحه در حال پخش نمایش دهید</string>
-    <string name="pref_summary_wallpaper_accent">رنگ تاکیدی را از کاغذ دیواری استخراج کنید</string>
-    <string name="pref_summary_whitelist">فقط موسیقی از /Music Folder نمایش داده شود</string>
-    <string name="pref_title_album_art_on_lockscreen">نمایش جلد آلبوم</string>
-    <string name="pref_title_album_artists_only">هدایت توسط آلبوم هنرمند</string>
-    <string name="pref_title_album_cover_style">تم جلد آلبوم</string>
-    <string name="pref_title_album_cover_transform">انیمیشن جلد البوم</string>
-    <string name="pref_title_app_shortcuts">میان بُرهای رنگی برنامه</string>
-    <string name="pref_title_appbar_mode">سبک سربرگ</string>
-    <string name="pref_title_audio_ducking">کاهش حجم در هنگام از دست دادن تمرکز</string>
-    <string name="pref_title_audio_fade">محو کردن صدا</string>
-    <string name="pref_title_auto_download_artist_images">دانلود خودکار تصاویر هنرمندان</string>
-    <string name="pref_title_blacklist">لیست سیاه</string>
-    <string name="pref_title_bluetooth_playback">پخش بلوتوث</string>
-    <string name="pref_title_blurred_album_art">تار کردن جلد البوم</string>
-    <string name="pref_title_circle_button">دکمه پخش دایره ای</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_cross_fade">پخش بعدی قبل از اتمام فعلی (میلی ثانیه)</string>
-    <string name="pref_title_custom_font">از فونت مانروپ استفاده کنید</string>
-    <string name="pref_title_desaturated_color">رنگ غیر اشباع</string>
-    <string name="pref_title_expand_now_playing_panel">نمایش در حال پخش صفحه نمایش</string>
-    <string name="pref_title_extra_controls">کنترل های اضافی</string>
-    <string name="pref_title_extra_song_info">اطلاعات آهنگ</string>
-    <string name="pref_title_gapless_playback">پخش بدون شکاف</string>
-    <string name="pref_title_general_theme">تم برنامه</string>
-    <string name="pref_title_home_album_grid_style">تصویر آلبوم</string>
-    <string name="pref_title_home_artist_grid_style">صفحه هنرمند</string>
-    <string name="pref_title_home_banner">بنر</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_lyrics_screen_on">هنگام نمایش متن ترانه صفحه نمایش را روشن نگه دارید</string>
-    <string name="pref_title_lyrics_type">نوع متن ترانه</string>
-    <string name="pref_title_manage_audio_focus">همیشه پخش کن</string>
-    <string name="pref_title_now_playing_screen_appearance">در حال پخش تم</string>
-    <string name="pref_title_open_source_licences">مجوزهای منبع باز</string>
-    <string name="pref_title_pause_history">توقف تاریخچه</string>
-    <string name="pref_title_remember_tab">به خاطر سپردن آخرین برگه</string>
-    <string name="pref_title_show_lyrics">نمایش متن ترانه</string>
-    <string name="pref_title_suggestions">نمایش پیشنهادات</string>
-    <string name="pref_title_swipe_anywhere_now_playing">برای تغییر آهنگ، انگشت خود را به هر جایی بکشید</string>
-    <string name="pref_title_swipe_to_dismiss">رد کردن با کشیدن انگشت به پایین</string>
-    <string name="pref_title_tab_text_mode">حالت عنوان برگه ها</string>
-    <string name="pref_title_toggle_carousel_effect">جلوه چرخ فلک</string>
-    <string name="pref_title_toggle_full_screen">برنامه تمام‌صفحه</string>
-    <string name="pref_title_toggle_toggle_headset">پخش خودکار</string>
-    <string name="pref_title_toggle_toggle_shuffle">حالت مخلوط</string>
-    <string name="pref_title_toggle_volume">کنترل صدا</string>
-    <string name="pref_title_wallpaper_accent">رنگ تاکیدی کاغذ دیواری</string>
-    <string name="pref_title_whitelist">لیست سفید موسیقی</string>
-    <string name="pro">حرفه‌ای</string>
-    <string name="pro_summary">تم سیاه، تم های در حال پخش، جلوه چرخ فلک و موارد دیگر..</string>
-    <string name="profile">نمایه</string>
-    <string name="purchase">خرید</string>
-    <string name="queue">صف درحال پخش</string>
-    <string name="rate_app">به برنامه امتیاز دهید</string>
-    <string name="rate_on_google_play_summary">این برنامه را دوست دارید؟ در فروشگاه گوگل پلی به ما اطلاع دهید که چگونه می‌توانیم آن را بهتر کنیم</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_image">حذف تصویر</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="replace_cover">جابجایی جلد</string>
-    <string name="report_an_issue">گزارش مشکل</string>
-    <string name="report_bug">گزارش اشکال</string>
-    <string name="reset_action">بازنشانی</string>
-    <string name="reset_artist_image">تنظیم مجدد تصویر هنرمند</string>
-    <string name="restore">بازیابی</string>
-    <string name="restore_message">آیا می خواهید نسخه پشتیبان را بازیابی کنید؟</string>
-    <string name="restored_previous_purchase_please_restart">خرید قبلی بازیابی شد، لطفا برای استفاده از تمام ویژگی ها ، برنامه را دوباره راه اندازی کنید.</string>
-    <string name="restored_previous_purchases">خریدهای قبلی بازیابی شد.</string>
-    <string name="restoring_purchase">در حال برگرداندن پول…</string>
-    <string name="retro_music_player">پخش‌کننده موسیقی Retro</string>
-    <string name="retro_music_pro">پخش‌کننده موسیقی Retro نسخه ویژه</string>
-    <string name="ringtone_summary">برنامه برای دسترسی به تنظیمات دستگاه شما برای تنظیم موسیقی به عنوان آهنگ زنگ نیاز به مجوز دارد</string>
-    <string name="ringtone_title">آهنگ زنگ (اختیاری)</string>
-    <string name="saf_delete_failed">حذف پرونده انجام نشد:%s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">نمی توان آدرس را دریافت کرد</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">باید دایرکتوری ریشه کارت 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_write_failed">پوشه %s نوشته نشد</string>
-    <string name="save">ذخیره</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">ذخیره به عنوان فایل</string>
-    <string name="save_playlists_title">ذخیره به عنوان پرونده ها</string>
-    <string name="saved_playlist_to">پلی لیست در %s ذخیره شد.</string>
-    <string name="saving_changes">در حال ذخیره تغییرات</string>
-    <string name="scan_media">اسکن کردن رسانه</string>
-    <string name="scanned_files">%1$d فایل از تعداد %2$d فایل موجود اسکن شد.</string>
-    <string name="scrobbles_label">تعيين علاقه مندی</string>
-    <string name="select_all">انتخاب همه</string>
-    <string name="selected">انتخاب شده</string>
-    <string name="set">تنظیم</string>
-    <string name="set_artist_image">تنظیم تصویر هنرمند</string>
-    <string name="share_app">اشتراک‌گذاری برنامه</string>
-    <string name="share_summary">برنامه را با دوستان و خانواده خود به اشتراک بگذارید</string>
-    <string name="share_to_stories">اشتراک گذاری در استوری</string>
-    <string name="show_album_artists">نمایش هنرمندان آلبوم</string>
-    <string name="shuffle">حالت مخلوط</string>
-    <string name="simple">ساده</string>
-    <string name="sleep_timer_canceled">زمان خواب لغو شد.</string>
-    <string name="sleep_timer_set">تایمر خواب از هم اکنون برای %d دقیقه تنظیم شده است.</string>
-    <string name="social">شبکه های اجتماعی</string>
-    <string name="social_stories">اشتراک گذاری استوری</string>
-    <string name="song">آهنگ</string>
-    <string name="song_duration">مدت زمان آهنگ</string>
-    <string name="songs">آهنگ ها</string>
-    <string name="sort_order">مرتب سازی</string>
-    <string name="sort_order_a_z">صعودی</string>
-    <string name="sort_order_album">آلبوم</string>
-    <string name="sort_order_artist">هنرمند</string>
-    <string name="sort_order_composer">آهنگساز</string>
-    <string name="sort_order_date">تاریخ اضافه شده</string>
-    <string name="sort_order_date_modified">تاریخ ویرایش شده</string>
-    <string name="sort_order_default">پیش‌فرض</string>
-    <string name="sort_order_num_songs">تعداد آهنگ</string>
-    <string name="sort_order_num_songs_desc">کاهش تعداد آهنگ</string>
-    <string name="sort_order_year">سال</string>
-    <string name="sort_order_z_a">نزولی</string>
-    <string name="speech_not_supported">متاسفم! دستگاه شما از ورودی گفتار پشتیبانی نمی کند</string>
-    <string name="speech_prompt">جستجو کتابخانه شما</string>
-    <string name="stack">دسته</string>
-    <string name="start_play_music">شروع به پخش موسیقی کنید.</string>
-    <string name="suggestion_songs">پیشنهادات</string>
-    <string name="support_development">پشتیبانی از توسعه</string>
-    <string name="swipe_to_unlock">برای باز کردن قفل، انگشت خود را بکشید</string>
-    <string name="synced_lyrics">همگام سازی متن ترانه ها</string>
-    <string name="telegram_group">تلگرام</string>
-    <string name="telegram_group_summary">برای بحث در مورد اشکالات، ارائه پیشنهادات، نمایش و موارد دیگر به گروه تلگرام بپیوندید</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="tiny_card_style">کارت کوچک</string>
-    <string name="title">عنوان</string>
-    <string name="title_new_backup">پشتیبان گیری جدید</string>
-    <string name="today">امروز</string>
-    <string name="top_albums">آلبوم های برتر</string>
-    <string name="top_artists">هنرمندان برتر</string>
-    <string name="track_hint">"آهنگ (2 برای آهنگ 2 یا 3004 برای آهنگ CD3 4)"</string>
-    <string name="track_list">شماره  آهنگ</string>
-    <string name="translate">ترجمه کردن</string>
-    <string name="translate_community">به ما کمک کنید تا برنامه را به زبان شما ترجمه کنیم</string>
-    <string name="try_retro_music_premium">نسخه ویژه موزیک پلیر Retro را امتحان کنید</string>
-    <string name="twitter_page">توییتر</string>
-    <string name="twitter_page_summary">طرح خود را با موسیقی Retro به اشتراک بگذارید</string>
-    <string name="unlabeled">بدون برچسب</string>
-    <string name="unplayable_file">این آهنگ پخش نمیشود.</string>
-    <string name="up_next">تا بعدی</string>
-    <string name="update_image">بروز رسانی تصویر</string>
-    <string name="updating">درحال به روز رسانی…</string>
-    <string name="user_images_description">تصاویر کاربر</string>
-    <string name="user_name">نام کاربری</string>
-    <string name="username">نام کاربری</string>
-    <string name="version">نسخه</string>
-    <string name="vertical_flip">چرخش عمودی</string>
-    <string name="view_on_telegram">مشاهده در تلگرام</string>
-    <string name="volume">حجم صدا</string>
-    <string name="web_search">جستجوی وب</string>
-    <string name="website">وب سایت</string>
-    <string name="website_summary">وب سایت ما را نگاه کنید</string>
-    <string name="welcome">خوش آمدید</string>
-    <string name="what_do_you_want_to_share">چه چیزی را میخوای به اشتراک بگذاری؟</string>
-    <string name="whats_new">چه چیزی جدیده</string>
-    <string name="window">پنجره</string>
-    <string name="window_corner_edges">گوشه های گرد</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="you_will_be_forwarded_to_the_issue_tracker_website">شما به وب سایت ردیاب مشکل هدایت می شوید.</string>
-    <string name="your_account_data_is_only_used_for_authentication">اطلاعات حساب شما فقط برای احراز هویت استفاده می شود.</string>
-</resources>
diff --git a/app/src/main/res/values-fil-rPH/strings.xml b/app/src/main/res/values-fil-rPH/strings.xml
deleted file mode 100644
index 5312aaf02..000000000
--- a/app/src/main/res/values-fil-rPH/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Tungkol sa %s</string>
-    <string name="about_settings_summary">Koponan, mga social link</string>
-    <string name="accent_color">Kulay ng accent</string>
-    <string name="accent_color_desc">Ang kulay ng theme accent ay, naka-default sa purple</string>
-    <string name="action_about">Tungkol sa</string>
-    <string name="action_add_to_blacklist">Idagdag sa Blacklist</string>
-    <string name="action_add_to_favorites">Idagdag sa mga paborito</string>
-    <string name="action_add_to_playing_queue">Idagdag sa playing queue</string>
-    <string name="action_add_to_playlist">Idagdag sa playlist</string>
-    <string name="action_cancel">Kanselahin</string>
-    <string name="action_cast">Kast</string>
-    <string name="action_clear_playing_queue">Burahin ang playing queue</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">Tanggalin</string>
-    <string name="action_delete_from_device">Tanggalin sa device</string>
-    <string name="action_details">Mga detalye</string>
-    <string name="action_edit">I-edit</string>
-    <string name="action_go_to_album">Pumunta sa album</string>
-    <string name="action_go_to_artist">Pumunta sa artist</string>
-    <string name="action_go_to_genre">Pumunta sa genre</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Pumunta sa start directory</string>
-    <string name="action_grant">Payagan</string>
-    <string name="action_grid_size">Sukat ng grid</string>
-    <string name="action_grid_size_land">Sukat ng grid (tanawin)</string>
-    <string name="action_new_playlist">Bagong playlist</string>
-    <string name="action_next">Susunod</string>
-    <string name="action_play">I-play</string>
-    <string name="action_play_all">I-play lahat</string>
-    <string name="action_play_next">I-play ang kasunod</string>
-    <string name="action_play_pause">I-play/I-pause</string>
-    <string name="action_previous">Mga nauna</string>
-    <string name="action_remove_from_favorites">Alisin sa mga paborito</string>
-    <string name="action_remove_from_playing_queue">Alisin sa playing queue</string>
-    <string name="action_remove_from_playlist">Alisin sa playlist</string>
-    <string name="action_rename">I-rename</string>
-    <string name="action_save_playing_queue">I-save sa playing queue</string>
-    <string name="action_scan">I-scan</string>
-    <string name="action_search">Hanapin</string>
-    <string name="action_set">Simulan</string>
-    <string name="action_set_as_ringtone">Itakda bilang ringtone</string>
-    <string name="action_set_as_start_directory">Itakda bilang start directory</string>
-    <string name="action_settings">"Mga Setting"</string>
-    <string name="action_share">Ibahagi</string>
-    <string name="action_shuffle_all">I-shuffle lahat</string>
-    <string name="action_shuffle_playlist">I-shuffle ang playlist</string>
-    <string name="action_sleep_timer">Orasan ng pagtulog</string>
-    <string name="action_sort_order">Iayos ang order</string>
-    <string name="action_tag_editor">I-edit ang tag</string>
-    <string name="action_toggle_favorite">I-toggle sa paborito</string>
-    <string name="action_toggle_shuffle">I-toggle sa shuffle mode</string>
-    <string name="adaptive">Adaptive</string>
-    <string name="add_action">Magdagdag</string>
-    <string name="add_playlist_title">"Idagdag sa playlist"</string>
-    <string name="add_time_framed_lryics">Mag-dagdag ng Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Nadagdag ang 1 title sa playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Nadagdag ang %1$d titles sa playing queue.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Kanta</item>
-        <item quantity="other">Mga Kanta</item>
-    </plurals>
-    <string name="album_artist">Album ng Artist</string>
-    <string name="albums">Mga Album</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Mga Album</item>
-    </plurals>
-    <string name="always">Pirme</string>
-    <string name="app_share">Uy tingnan ang napakagandang music player na ito sa: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Balasahin</string>
-    <string name="app_shortcut_top_tracks_short">Mga Nangungunang Kanta</string>
-    <string name="app_widget_big_name">Buong Larawan</string>
-    <string name="app_widget_card_name">Kard</string>
-    <string name="app_widget_classic_name">Klasiko</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Maliit</string>
-    <string name="app_widget_text_name">Minimal na Teksto</string>
-    <string name="artist">Artista</string>
-    <string name="artists">Mga Artista</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">Hindi naka-focus ang audio.</string>
-    <string name="audio_settings_summary">I-change ang sound settings at i-adjust ang equalizer controls</string>
-    <string name="auto">I-auto</string>
-    <string name="backup_restore_settings_summary">Backup at i-restore ang iyong mga setting, at mga playlist</string>
-    <string name="backup_restore_title"><![CDATA[Mag-Backup & Mag-Restore]]></string>
-    <string name="backup_title">Mga Backup</string>
-    <string name="biography">Talambuhay</string>
-    <string name="black_theme_name">Itim Lamang</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Hindi makapag-padala ng report</string>
-    <string name="bug_report_failed_invalid_token">Hindi tama ang na-access na token. Mangyaring makipag-ugnayan sa developer ng app.</string>
-    <string name="bug_report_failed_issues_not_available">Hindi pinagana ang mga isyu para sa napiling repositoryo. Mangyaring makipag-ugnayan sa developer ng app.</string>
-    <string name="bug_report_failed_unknown">May naganap na hindi inaasahang error. Mangyaring makipag-ugnayan sa developer ng app.</string>
-    <string name="bug_report_failed_wrong_credentials">Hindi tama ang username o password</string>
-    <string name="bug_report_issue">Isyu</string>
-    <string name="bug_report_manual">I-send ng manu-mano</string>
-    <string name="bug_report_no_description">Mangyaring maglagay ng paglalarawan ng isyu</string>
-    <string name="bug_report_no_password">Pakilagay ang iyong wastong password sa GitHub</string>
-    <string name="bug_report_no_title">Maglagay ng pamagat sa isyu</string>
-    <string name="bug_report_no_username">Pakilagay ang iyong wastong GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">May naganap na hindi inaasahang error. Paumanhin, nakikita mo ang bug na ito, kung patuloy itong nagka-crash \"Burahin ang data ng app\" o magpadala ng Email </string>
-    <string name="bug_report_use_account">Ipadala gamit ang GitHub account</string>
-    <string name="buy_now">Bumili na ngayon</string>
-    <string name="cancel_current_timer">Kanselahin</string>
-    <string name="card">Kard</string>
-    <string name="card_color_style">May kulay na kard</string>
-    <string name="card_square">Parisukat na kard</string>
-    <string name="card_style">Kard</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect sa now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Mga Pagbabago</string>
-    <string name="changelog_summary">Tingnan kung Ano\'ng Bago</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Bilog</string>
-    <string name="circular">Pabilog</string>
-    <string name="classic">Klasiko</string>
-    <string name="clear_action">Linisin</string>
-    <string name="clear_blacklist">Linisin ang blacklist</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Linisin ang queue</string>
-    <string name="color">Kulay</string>
-    <string name="colors">Mga kulay</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Kompositor</string>
-    <string name="copied_device_info_to_clipboard">Kinopya ang impormasyon ng device sa clipboard.</string>
-    <string name="could_not_create_playlist">Hindi makagawa ng playlist.</string>
-    <string name="could_not_download_album_cover">"Hindi makapag-download ng katugmang cover ng album."</string>
-    <string name="could_not_restore_purchase">Hindi naibalik ang binili.</string>
-    <string name="could_not_scan_files">Hindi ma-scan ang %d files.</string>
-    <string name="create_action">Lumikha</string>
-    <string name="create_new_backup">Lumikha</string>
-    <string name="created_playlist_x">Nilikhang playlist %1$s.</string>
-    <string name="credit_title">Mga Miyembro at Kontribyutor </string>
-    <string name="currently_listening_to_x_by_x">Kasalukuyang nakikinig sa %1$s ni %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Medyo Madilim</string>
-    <string name="delete_playlist_title">Tanggalin ang playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Tanggalin ang playlist na <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Tanggalin ang mga playlist</string>
-    <string name="delete_song_title">Tanggalin ang kanta</string>
-    <string name="delete_song_x"><![CDATA[Tanggalin ang kanta na <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Tanggalin ang mga kanta</string>
-    <string name="delete_x_playlists"><![CDATA[Tanggalin ang <b>%1$d</b> na mga playlist?]]></string>
-    <string name="delete_x_songs"><![CDATA[Tanggalin ang <b>%1$d</b> na mga kanta?]]></string>
-    <string name="deleted_x_songs">Tinanggal ang %1$d na mga kanta.</string>
-    <string name="deleting_songs">Tinanggal ang mga Kanta</string>
-    <string name="depth">Malalim</string>
-    <string name="description">Paglalarawan</string>
-    <string name="device_info">Impormasyon ng device</string>
-    <string name="dialog_message_set_ringtone">Payagan ang Retro Music na baguhin ang mga setting ng audio</string>
-    <string name="dialog_title_set_ringtone">Itakda ang ringtone</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Gusto mo bang burahin ang blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Gusto mo bang alisin ang <b>%1$s</b> sa blacklist?]]></string>
-    <string name="donate">Mag Donate</string>
-    <string name="donate_summary">Kung sa tingin mo ay karapat-dapat akong mabayaran para sa aking trabaho, maaari kang mag-iwan ng pera dito</string>
-    <string name="donation_header">Bilhan mo ako ng:</string>
-    <string name="done">Tapos na</string>
-    <string name="drive_mode">Nagmamaniho</string>
-    <string name="edit_fab">Pindutan sa Pag-edit</string>
-    <string name="edit_normal_lyrics">I-edit ang Lyrics</string>
-    <string name="edit_synced_lyrics">I-edit ang Naka-sync na Lyrics</string>
-    <string name="empty">Walang laman</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Mga Paborito</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Tapusin ang huling kanta</string>
-    <string name="fit">Angkop</string>
-    <string name="flat">Patag</string>
-    <string name="folders">Mga Folder</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">Para sa\'yo</string>
-    <string name="free">Libre</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full Kard</string>
-    <string name="general_settings_summary">I-change ang theme at mga kulay ng app</string>
-    <string name="general_settings_title">Tanaw at diwa</string>
-    <string name="genre">Dyanra</string>
-    <string name="genres">Mga Dyanra</string>
-    <string name="git_hub_summary">I-fork ang proyekto sa GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Estilo ng Grid</string>
-    <string name="help_summary">Karagdagang tulong?</string>
-    <string name="hinge">Bisagra</string>
-    <string name="history">Kasaysayan</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">Asilo</string>
-    <string name="horizontal_flip">Pahalang na pini-flip</string>
-    <string name="image">Larawan</string>
-    <string name="image_gradient">Gradient na imahe</string>
-    <string name="image_settings_summary">Baguhin ang imahe ng artista sa download settings</string>
-    <string name="import_label">I-import</string>
-    <string name="import_playlist">I-import ang playlist</string>
-    <string name="import_playlist_message">Ini-import nito ang lahat ng playlist na nakalista sa Android Media Store na may mga kanta, kung mayroon nang mga playlist, pagsasamahin ang mga kanta.</string>
-    <string name="inserted_x_songs_into_playlist_x">Nagpasok ng %1$d na kanta sa playlist na %2$s.</string>
-    <string name="instagram_page_summary">Ibahagi ang iyong setup ng Retro Music para ipakita sa Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">Pangalan ng payl</string>
-    <string name="label_file_path">Daan ng payl</string>
-    <string name="label_file_size">Sukat</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">Higit pa mula sa %s</string>
-    <string name="label_sampling_rate">Halimbawa ng rate</string>
-    <string name="label_track_length">Haba</string>
-    <string name="labeled">Lebelado</string>
-    <string name="last_added">Huling idinagdag</string>
-    <string name="last_song">Huling kanta</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Mga kategorya ng librerya</string>
-    <string name="licenses">Mga lisensya</string>
-    <string name="light_theme_name">Malinaw na Puti</string>
-    <string name="listeners_label">Mga tagapakinig</string>
-    <string name="listing_files">Listahan ng mga payl</string>
-    <string name="loading_products">Naglo-load ng mga produkto…</string>
-    <string name="login">Mag-login</string>
-    <string name="lyrics">Mga liriko</string>
-    <string name="made_with_love">Ginawa gamit ang ❤️ sa India</string>
-    <string name="material">Materyal</string>
-    <string name="md_error_label">Nagka-mali</string>
-    <string name="md_storage_perm_error">Maling permiso</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Pangalan</string>
-    <string name="my_top_tracks">Madalas patugtugin</string>
-    <string name="never">Hindi kailanman</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Bagong playlist</string>
-    <string name="new_start_directory">Ang %s ay ang bagong panimulang direktoryo.</string>
-    <string name="next_song">Susunod na Kanta</string>
-    <string name="no_albums">Wala kang mga album</string>
-    <string name="no_artists">Wala kang mga artista</string>
-    <string name="no_audio_ID">"Magpatugtog muna ng kanta, pagkatapos ay subukang muli."</string>
-    <string name="no_backups_found">Walang Nakitang Backup</string>
-    <string name="no_equalizer">Walang nakitang equalizer</string>
-    <string name="no_genres">Wala kang mga genre</string>
-    <string name="no_lyrics_found">Walang nakitang mga liriko</string>
-    <string name="no_playing_queue">Walang mga kantang tumutugtog</string>
-    <string name="no_playlists">Wala kang mga playlist</string>
-    <string name="no_purchase_found">Walang nakitang binili.</string>
-    <string name="no_results">Walang mga nakita</string>
-    <string name="no_songs">Wala kang mga kanta</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal ang mga liriko</string>
-    <string name="not_listed_in_media_store"><![CDATA[Ang <b>%s</b> ay hindi nakalista sa media store.]]></string>
-    <string name="not_recently_played">Hindi kamakailan naipa-tugtog</string>
-    <string name="nothing_to_scan">Walang ma-scan.</string>
-    <string name="nothing_to_see">Walang makita</string>
-    <string name="notification">Abiso</string>
-    <string name="notification_settings_summary">I-customize ang istilo ng abiso</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">I-customize ang screen sa now playing</string>
-    <string name="now_playing_themes">9+ Themes para sa now playing</string>
-    <string name="only_on_wifi">Sa Wi-Fi lamang</string>
-    <string name="other_settings_summary">Mga tampok na pinapakita</string>
-    <string name="others">Iba pa</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Nakalipas na 3 buwan</string>
-    <string name="paste_lyrics_here">Idikit ang Lyrics Dito</string>
-    <string name="paste_timeframe_lyrics_here">Idikit ang timeframe lyrics dito</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Tinanggihan ang pahintulot na ma-access ang panlabas na storage.</string>
-    <string name="permission_summary">Ang app ay nangangailangan ng permiso upang ma-access ang storage ng iyong device para ma-play ang musika</string>
-    <string name="permission_title">I-access ang storage</string>
-    <string name="permissions_denied">Tinanggihan ang mga permiso.</string>
-    <string name="personalize">I-Personalize</string>
-    <string name="personalize_settings_summary">I-customize ang iyong nagpe-play ngayon at ang UI kontrol</string>
-    <string name="pick_from_local_storage">Kumuha mula sa local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Sundin ang pahina ng Pinterest para sa inspirasyon sa disenyo ng Retro Music</string>
-    <string name="plain">Payak</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">Ang notification sa nagpe-play ay nagbibigay ng mga aksyon para sa play/pause atbp.</string>
-    <string name="playing_notification_name">Notification para sa nagpe-play</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Walang laman ang playlist</string>
-    <string name="playlist_name_empty">Pangalan ng playlist</string>
-    <string name="playlists">Mga Playlist</string>
-    <string name="pref_blur_amount_summary">Dami ng blur na inilapat para sa mga blur themes, mas mabilis ang mas mababa</string>
-    <string name="pref_blur_amount_title">Dami ng blur</string>
-    <string name="pref_filter_song_summary">I-filter ang mga kanta ayon sa haba</string>
-    <string name="pref_filter_song_title">I-filter ang tagal ng kanta</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Estilo ng album</string>
-    <string name="pref_header_audio">Tunog</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Mga kontrol</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Mga larawan</string>
-    <string name="pref_header_library">Librerya</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Mga Playlist</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Ipo-pause ang kanta kapag bumaba ang volume sa zero at magsimulang mag-play pabalik kapag tumaas ang volume level. Gumagana rin sa labas ng app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">I-pause sa zero</string>
-    <string name="pref_keep_screen_on_summary">Tandaan na ang pagpapagana sa feature na ito ay maaaring makaapekto sa buhay ng baterya</string>
-    <string name="pref_keep_screen_on_title">Panatilihing naka-on ang screen</string>
-    <string name="pref_language_name">Pumili ng wika</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Gamitin ang kasalukuyang kanta na nagpe-play sa album cover bilang lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Ipakita ang Mga Album Artists sa kategorya ng Artista</string>
-    <string name="pref_summary_audio_ducking">Hinaan ang volume kapag nag-play ang system sound o natanggap ang notification</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">Nakatago sa iyong librerya ang nilalaman ng mga naka-blacklist na folder.</string>
-    <string name="pref_summary_bluetooth_playback">Magpe-play agad kapag nakakonekta sa bluetooth device</string>
-    <string name="pref_summary_blurred_album_art">I-blur ang album cover sa lockscreen. Maaaring magdulot ng mga problema sa mga third party na app at widget</string>
-    <string name="pref_summary_carousel_effect">Carousel effect para sa album art sa screen na nagpe-play ngayon. Tandaan na ang mga tema ng Card at Blur Card ay hindi gagana</string>
-    <string name="pref_summary_classic_notification">Gamitin ang klasikong disenyo ng notification</string>
-    <string name="pref_summary_colored_app">Ang mga kulay ng background at control button ay nagbabago ayon sa album art mula sa screen ng nagpe-play ngayon</string>
-    <string name="pref_summary_colored_app_shortcuts">Kinukulayan ang mga shortcut ng app sa kulay ng accent. Sa tuwing babaguhin mo ang kulay mangyaring i-toggle ito para magkabisa</string>
-    <string name="pref_summary_colored_notification">"Kinukulayan ang notification sa makulay na kulay ng album cover"</string>
-    <string name="pref_summary_cross_fade">Duration ng crossfade sa pagitan ng mga kanta</string>
-    <string name="pref_summary_desaturated_color">Alinsunod sa mga linya ng gabay sa Material Design sa dark mode na mga kulay ay dapat na desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Ang pag-click sa notification ay deretso sa nagpe-play ngayon ng screen sa halip na sa home screen</string>
-    <string name="pref_summary_extra_controls">Magdagdag ng mga karagdagang kontrol para sa mini player</string>
-    <string name="pref_summary_extra_song_info">Magpakita ng karagdagang impormasyon ng Kanta, gaya ng format file, bitrate at dalas</string>
-    <string name="pref_summary_gapless_playback">"Maaaring magdulot ng mga isyu sa pag-playback sa ilang device."</string>
-    <string name="pref_summary_home_banner">Ipakita o itago ang home banner</string>
-    <string name="pref_summary_ignore_media_store_artwork">Maaaring pataasin ang kalidad ng album cover, ngunit nagiging sanhi ng mas mabagal na oras ng paglo-load ng larawan. Paganahin lamang ito kung mayroon kang mga problema sa mga likhang sining na may mababang resolusyon</string>
-    <string name="pref_summary_library_categories">I-configure ang visibility at pagkakasunud-sunod ng mga kategorya ng librerya.</string>
-    <string name="pref_summary_lock_screen">Gamitin ang Reto Music\'s custom para sa lockscreen controls</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">Mga detalye ng lisensya para sa open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">I-navigate sa huling ginamit na tab sa simula</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Agad magsimula ang kanta pagkatapos maikonekta ang mga headphone</string>
-    <string name="pref_summary_toggle_shuffle">Mag-o-off ang shuffle mode kapag nagpe-play ng bagong listahan ng mga kanta</string>
-    <string name="pref_summary_toggle_volume">Kung may sapat na espasyo, ipakita ang mga kontrol ng volume sa screen ng now playing</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Magpakita lamang ng musika mula sa /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Ipakita ang album cover</string>
-    <string name="pref_title_album_artists_only">I-navigate ayon sa Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Laktawan ang album cover</string>
-    <string name="pref_title_app_shortcuts">May kulay na mga shortcut app</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Bawasan ang volume sa focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download mga larawan ng artista</string>
-    <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Klasikong disenyo ng notification</string>
-    <string name="pref_title_colored_app">Adaptive na kulay</string>
-    <string name="pref_title_colored_notification">May kulay na notification</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated na kulay</string>
-    <string name="pref_title_expand_now_playing_panel">Ipakita ang now playing screen</string>
-    <string name="pref_title_extra_controls">Mga karagdagang kontrol</string>
-    <string name="pref_title_extra_song_info">Impormasyon ng kanta</string>
-    <string name="pref_title_gapless_playback">Walang puwang na pag-playback</string>
-    <string name="pref_title_general_theme">Theme ng app</string>
-    <string name="pref_title_home_album_grid_style">Grid ng Album</string>
-    <string name="pref_title_home_artist_grid_style">Grid ng Artista</string>
-    <string name="pref_title_home_banner">Bandila</string>
-    <string name="pref_title_ignore_media_store_artwork">I-ignore ang mga cover ng Media Store</string>
-    <string name="pref_title_last_added_interval">Huling idinagdag na pagitan ng playlist</string>
-    <string name="pref_title_lock_screen">Mga kontrol sa fullscreen</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pref_title_now_playing_screen_appearance">Theme para sa now playing</string>
-    <string name="pref_title_open_source_licences">Mga lisensyang open source</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Mode sa mga pamagat ng tab</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">I-Fullscreen ang app</string>
-    <string name="pref_title_toggle_toggle_headset">Awto-play</string>
-    <string name="pref_title_toggle_toggle_shuffle">I-Shuffle mode</string>
-    <string name="pref_title_toggle_volume">Mga kontrol sa volume</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Bumili</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Mag rate sa app</string>
-    <string name="rate_on_google_play_summary">Gustung-gusto ang app na ito? Ipaalam sa amin sa Google Play Store kung paano namin ito mapapahusay</string>
-    <string name="recent_albums">Mga kamakailang album</string>
-    <string name="recent_artists">Mga kamakailang artista</string>
-    <string name="remove_action">Alisin</string>
-    <string name="remove_cover">Alisin ang cover</string>
-    <string name="remove_from_blacklist">Alisin sa blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Alisin ang kanta sa playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Alisin ang kantang <b>%1$s</b> mula sa playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Alisin ang mga kanta sa playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Alisin ang <b>%1$d</b> na kanta mula sa playlist?]]></string>
-    <string name="rename_playlist_title">I-rename ang playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Mag-ulat ng isyu</string>
-    <string name="report_bug">Mag-ulat ng bug</string>
-    <string name="reset_action">I-reset</string>
-    <string name="reset_artist_image">I-reset ang larawan ng artista</string>
-    <string name="restore">I-restore</string>
-    <string name="restore_message">Gusto mo bang ibalik ang backup?</string>
-    <string name="restored_previous_purchase_please_restart">Ibinalik ang nakaraang pagbili. Mangyaring i-restart ang app upang magamit ang lahat ng mga tampok.</string>
-    <string name="restored_previous_purchases">Ibinalik ang mga nakaraang pagbili.</string>
-    <string name="restoring_purchase">Ibinabalik ang pagbili…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Ang app ay nangangailangan ng permiso upang ma-access ang mga setting ng iyong device upang maitakda ang musika bilang Ringtone</string>
-    <string name="ringtone_title">Ringtone (Opsyonal)</string>
-    <string name="saf_delete_failed">Nabigo sa pagtanggal ng file: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Hindi makakuha ng SAF URI</string>
-    <string name="saf_guide_slide1_description">Buksan ang navigation drawer</string>
-    <string name="saf_guide_slide1_description_before_o">Paganahin ang \'Ipakita ang SD card\' sa overflow menu</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">Kailangan ng %s ng access sa SD card</string>
-    <string name="saf_guide_slide2_description">Kailangan mong piliin ang root directory sa iyong SD card</string>
-    <string name="saf_guide_slide2_title">Piliin ang iyong SD card sa navigation drawer</string>
-    <string name="saf_guide_slide3_description">Huwag magbukas ng anumang sub-folders</string>
-    <string name="saf_guide_slide3_title">I-tap ang \'select\' button sa ibaba ng screen</string>
-    <string name="saf_write_failed">Nabigo sa pagsulat ng file: %s</string>
-    <string name="save">I-save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">I-save bilang file</string>
-    <string name="save_playlists_title">I-save bilang mga file</string>
-    <string name="saved_playlist_to">Na-save ang playlist sa %s.</string>
-    <string name="saving_changes">Sine-save ang mga pagbabago</string>
-    <string name="scan_media">I-scan ang media</string>
-    <string name="scanned_files">Na-scan ang %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Piliin lahat</string>
-    <string name="selected">Napili na</string>
-    <string name="set">Itakda</string>
-    <string name="set_artist_image">Itakda ang larawan ng artista</string>
-    <string name="share_app">Ibahagi ang app</string>
-    <string name="share_summary">Ibahagi ang app sa iyong mga kaibigan at pamilya</string>
-    <string name="share_to_stories">Ibahagi sa Mga Story</string>
-    <string name="show_album_artists">Ipakita ang mga Album Artist</string>
-    <string name="shuffle">Balasahin</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Nakansel na ang sleep timer.</string>
-    <string name="sleep_timer_set">Nakatakda ang sleep timer sa %d minuto mula ngayon.</string>
-    <string name="social">Sosyal</string>
-    <string name="social_stories">Ibahagi sa story</string>
-    <string name="song">Kanta</string>
-    <string name="song_duration">Duration ng kanta</string>
-    <string name="songs">Mga Kanta</string>
-    <string name="sort_order">Iayos ang order</string>
-    <string name="sort_order_a_z">Paakyat</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Kompositor</string>
-    <string name="sort_order_date">Ang petsa ay nadagdag</string>
-    <string name="sort_order_date_modified">Ang petsa ay nabago</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Bilang ng kanta</string>
-    <string name="sort_order_num_songs_desc">Bilang ng kanta pababa</string>
-    <string name="sort_order_year">Taon</string>
-    <string name="sort_order_z_a">Pababa</string>
-    <string name="speech_not_supported">Paumanhin! Hindi sinusuportahan ng iyong device ang speech input</string>
-    <string name="speech_prompt">Hanapin ang iyong librerya</string>
-    <string name="stack">Salansan</string>
-    <string name="start_play_music">Magsimulang mag-play ng musika.</string>
-    <string name="suggestion_songs">Mga Mungkahi</string>
-    <string name="support_development">Suportahan ang pag-unlad</string>
-    <string name="swipe_to_unlock">I-swipe para ma-unlock</string>
-    <string name="synced_lyrics">Naka-sync na lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Sumali sa Telegram group upang talakayin ang mga bug, magmungkahi, magpakitang gilas at higit pa</string>
-    <string name="thank_you">Salamat sa inyo!</string>
-    <string name="the_audio_file">Ang audio file</string>
-    <string name="this_month">Sa buwang ito</string>
-    <string name="this_week">Sa linggong ito</string>
-    <string name="this_year">Sa taong ito</string>
-    <string name="tiny">Maliit</string>
-    <string name="tiny_card_style">Maliit na card</string>
-    <string name="title">Pamagat</string>
-    <string name="title_new_backup">Bagong Backup</string>
-    <string name="today">Ngayon</string>
-    <string name="top_albums">Mga nangungunang album</string>
-    <string name="top_artists">Nangungunang mga artista</string>
-    <string name="track_hint">"Track (2 para sa track 2 o 3004 para sa CD3 track 4)"</string>
-    <string name="track_list">Numero ng track</string>
-    <string name="translate">Isalin</string>
-    <string name="translate_community">Tulungan kaming isalin ang app sa iyong wika</string>
-    <string name="try_retro_music_premium">Subukan ang Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Ibahagi ang iyong disenyo sa Retro Music</string>
-    <string name="unlabeled">Walang label</string>
-    <string name="unplayable_file">Hindi ma-play ang kantang ito.</string>
-    <string name="up_next">Susunod</string>
-    <string name="update_image">I-update ang larawan</string>
-    <string name="updating">Ina-update…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Bersyon</string>
-    <string name="vertical_flip">Pini-flip ng patayo</string>
-    <string name="view_on_telegram">Tingnan sa Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Maghanap sa web</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Tingnan ang aming Website</string>
-    <string name="welcome">Mabuhay,</string>
-    <string name="what_do_you_want_to_share">Ano ang gusto mong ibahagi?</string>
-    <string name="whats_new">Ano\'ng bago</string>
-    <string name="window">Bintana</string>
-    <string name="window_corner_edges">Bilog ang mga sulok</string>
-    <string name="x_has_been_set_as_ringtone">Itakda ang %1$s bilang iyong ringtone.</string>
-    <string name="x_selected">%1$d ang napili</string>
-    <string name="year">Taon</string>
-    <string name="you_have_to_select_at_least_one_category">Kailangan mong pumili ng kahit isang kategorya.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Ipapasa ka sa website ng tagasubaybay ng isyu.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Ginagamit lang ang iyong account data para sa pagpapatunay.</string>
-</resources>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr/strings.xml
similarity index 54%
rename from app/src/main/res/values-fr-rFR/strings.xml
rename to app/src/main/res/values-fr/strings.xml
index 6e695a840..8a41eb16c 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,103 +1,142 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">À propos de %s</string>
-    <string name="about_settings_summary">Équipe, réseaux sociaux</string>
+    <string name="about_settings_summary">Équipe, liens sociaux</string>
+
     <string name="accent_color">Couleur d\'accentuation</string>
     <string name="accent_color_desc">La couleur d\'accentuation du thème, verte par défaut</string>
+
     <string name="action_about">À propos</string>
-    <string name="action_add_to_blacklist">Ajouter à la liste noire</string>
+
     <string name="action_add_to_favorites">Ajouter aux favoris</string>
     <string name="action_add_to_playing_queue">Ajouter à la file d\'attente</string>
-    <string name="action_add_to_playlist">Ajouter à la liste de lecture</string>
-    <string name="action_cancel">Annuler</string>
-    <string name="action_cast">Diffuser</string>
+    <string name="action_add_to_playlist">Ajouter à la playlist</string>
+
     <string name="action_clear_playing_queue">Vider la file d\'attente</string>
-    <string name="action_cycle_repeat">Mode de répétition</string>
+    <string name="action_clear_playlist">Vider la playlist</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>
-    <string name="action_edit">Modifier</string>
+
     <string name="action_go_to_album">Aller à l\'album</string>
     <string name="action_go_to_artist">Aller à l\'artiste</string>
     <string name="action_go_to_genre">Aller au genre</string>
-    <string name="action_go_to_lyrics">Voir les paroles</string>
     <string name="action_go_to_start_directory">Aller au dossier de départ</string>
+
     <string name="action_grant">Accorder</string>
-    <string name="action_grid_size">Taille de l\'affichage</string>
-    <string name="action_grid_size_land">Taille de l\'affichage (paysage)</string>
-    <string name="action_new_playlist">Nouvelle liste de lecture</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 liste de lecture…</string>
+
     <string name="action_next">Suivant</string>
-    <string name="action_play">Lire</string>
-    <string name="action_play_all">Tout lire</string>
-    <string name="action_play_next">Lire juste après</string>
+
+    <string name="action_play">Lecture</string>
+    <string name="action_play_all">Jouer tous les</string>
+    <string name="action_play_next">Lire après</string>
     <string name="action_play_pause">Lecture / Pause</string>
+
     <string name="action_previous">Précédent</string>
+
     <string name="action_remove_from_favorites">Supprimer des favoris</string>
     <string name="action_remove_from_playing_queue">Supprimer de la file d\'attente</string>
     <string name="action_remove_from_playlist">Supprimer de la liste de lecture</string>
+
     <string name="action_rename">Renommer</string>
+
     <string name="action_save_playing_queue">Enregistrer la file d\'attente</string>
+
     <string name="action_scan">Scanner</string>
+
     <string name="action_search">Rechercher</string>
+
     <string name="action_set">Démarrer</string>
     <string name="action_set_as_ringtone">Définir en tant que sonnerie</string>
     <string name="action_set_as_start_directory">Définir comme dossier de départ</string>
+
     <string name="action_settings">"Paramètres"</string>
+
     <string name="action_share">Partager</string>
-    <string name="action_shuffle_all">Tout en aléatoire</string>
-    <string name="action_shuffle_playlist">Mélanger la liste de lecture</string>
+
+    <string name="action_shuffle_all">Tout aléatoire</string>
+    <string name="action_shuffle_playlist">Playlist en lecture aléatoire</string>
+
     <string name="action_sleep_timer">Minuteur de sommeil</string>
+
     <string name="action_sort_order">Ordre de tri</string>
-    <string name="action_tag_editor">Éditeur de tag</string>
-    <string name="action_toggle_favorite">Activer/désactiver les favoris</string>
-    <string name="action_toggle_shuffle">Activer/désactiver la lecture aléatoire</string>
+
+    <string name="action_tag_editor">Éditeur de tag metadata</string>
+
     <string name="adaptive">Adaptatif</string>
+
     <string name="add_action">Ajouter</string>
-    <string name="add_playlist_title">"Ajouter à la liste de lecture"</string>
-    <string name="add_time_framed_lryics">Ajouter des paroles synchronisées</string>
-    <string name="added_song_count_to_playlist">%1$d chanson(s) ajoutée(s) à %2$s</string>
-    <string name="added_title_to_playing_queue">"1 titre a été ajouté à la file d'attente."</string>
+
+    <string name="add_lyrics">Ajouter paroles</string>
+
+    <string name="add_photo">Ajouter\nune photo</string>
+
+    <string name="add_playlist_title">"Ajouter à playlist"</string>
+
+    <string name="add_time_framed_lryics">Add time frame lyrics</string>
+
+    <string name="added_title_to_playing_queue">"1 titre à été ajoutée à la file d'attente."</string>
+
     <string name="added_x_titles_to_playing_queue">%1$d titres ont été ajoutés à la file d\'attente.</string>
+
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Morceau</item>
-        <item quantity="other">Morceaux</item>
-    </plurals>
+
     <string name="album_artist">Artiste de l\'album</string>
+
+    <string name="album_or_artist_empty">Le titre ou l\'artiste est vide.</string>
+
     <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">Toujours</string>
+
     <string name="app_share">Hey, jetez un coup d\'œil à ce super lecteur de musique : https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
     <string name="app_shortcut_shuffle_all_short">Aléatoire</string>
     <string name="app_shortcut_top_tracks_short">Pistes préférées</string>
-    <string name="app_widget_big_name">Image complète</string>
+
+    <string name="app_widget_big_name">Retro Music – Grand</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_md3_name">MD3</string>
     <string name="app_widget_small_name">Retro Music – Petit</string>
-    <string name="app_widget_text_name">Retro Music – Texte Minimum</string>
+    <string name="app_widget_text_name">Retro music - Texte</string>
+
     <string name="artist">Artiste</string>
+
     <string name="artists">Artistes</string>
-    <string name="audio_fade_duration">Durée du fondu audio</string>
+
     <string name="audio_focus_denied">Focus audio refusé.</string>
+
     <string name="audio_settings_summary">Changer les paramètres audio et ajuster l\'égaliseur</string>
-    <string name="auto">Automatique</string>
-    <string name="backup_restore_settings_summary">Sauvegarder et restaurer vos paramètres, vos listes de lecture</string>
-    <string name="backup_restore_title"><![CDATA[Sauvegarder & Restaurer]]></string>
-    <string name="backup_title">Sauvegardes</string>
+
+    <string name="auto">Auto</string>
+
+    <string name="base_color_theme">Couleur de base du thème</string>
+
+    <string name="bass_boost">Renforcement des basses</string>
+
+    <string name="bio">Biographie</string>
+
     <string name="biography">Biographie</string>
-    <string name="black_theme_name">Noir Complet</string>
+
+    <string name="black_theme_name">Juste noir</string>
+
     <string name="blacklist">Liste noire</string>
-    <string name="bluetooth_summary">L\'application nécessite la permission des appareils à proximité pour vérifier la disponibilité d\'appareils Bluetooth</string>
-    <string name="bluetooth_title">Appareils à proximité</string>
+
     <string name="blur">Flou</string>
+
     <string name="blur_card">Carte floue</string>
+
     <string name="bug_report_failed">Impossible d\'envoyer le rapport de bug</string>
     <string name="bug_report_failed_invalid_token">Jeton d\'accès invalide. Veuillez contacter le développeur de l\'application.</string>
-    <string name="bug_report_failed_issues_not_available">Problèmes non activés pour le dépôt sélectionné. Veuillez contacter le développeur de l\'application.</string>
+    <string name="bug_report_failed_issues_not_available">Les problèmes ne sont pas activés pour le dépôt sélectionné. Veuillez contacter le développeur de l\'application.</string>
     <string name="bug_report_failed_unknown">Erreur inopinée. Veuillez contacter le développeur de l\'application.</string>
     <string name="bug_report_failed_wrong_credentials">Nom d\'utilisateur ou mot de passe invalide</string>
     <string name="bug_report_issue">Problème</string>
@@ -106,98 +145,150 @@
     <string name="bug_report_no_password">Veuillez entrer votre mot de passe GitHub valide</string>
     <string name="bug_report_no_title">Veuillez entrer un titre pour le problème</string>
     <string name="bug_report_no_username">Veuillez entrer votre nom d\'utilisateur GitHub valide</string>
-    <string name="bug_report_success">Le bogue a bien été signalé</string>
-    <string name="bug_report_summary">Une erreur inattendue s\'est produite. Nous sommes désolés que vous ayez rencontré ce bug, si l\'application continue de planter, effacez les données de l\'application </string>
+    <string name="bug_report_summary">Une erreur imprévue s\'est produite. Nous sommes désolé que vous ayez rencontré ce bug, si l\'application continue de planter, effacez les données de l\'application</string>
+    <string name="bug_report_uploading">Envoi du rapport de bug sur GitHub...</string>
     <string name="bug_report_use_account">Envoyer en utilisant un compte GitHub</string>
-    <string name="buy_now">Acheter maintenant</string>
+
     <string name="cancel_current_timer">Annuler</string>
+
     <string name="card">Carte</string>
-    <string name="card_color_style">Carte colorée</string>
-    <string name="card_square">Carte carrée</string>
+
+    <string name="card_circular_style">Circulaire</string>
+
+    <string name="card_color_style">Cartes colorées</string>
+
     <string name="card_style">Carte</string>
-    <string name="carousal_effect_on_now_playing_screen">Effet de carrousel sur l’écran de lecture en cours</string>
+
+    <string name="carousal">Carousel</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Effet carousel sur l\'écran de lecture en cours</string>
+
     <string name="cascading">En cascade</string>
+
+    <string name="cast">Caster</string>
+
     <string name="changelog">Liste des changements</string>
-    <string name="changelog_summary">Découvrez les nouveautés</string>
-    <string name="choose_image">Choisissez l\'image</string>
-    <string name="choose_restore_title">Choisir les éléments à restaurer</string>
-    <string name="circle">Cercle</string>
+
+    <string name="changelog_summary">Liste des changements maintenu sur la canal Telegram</string>
+
     <string name="circular">Circulaire</string>
+
     <string name="classic">Classique</string>
+
     <string name="clear_action">Effacer</string>
+
+    <string name="clear_app_data">Effacer les données d\'application</string>
+
     <string name="clear_blacklist">Effacer la liste noire</string>
-    <string name="clear_history">Vider l\'historique</string>
+
     <string name="clear_playing_queue">Vider la file d\'attente</string>
+
+    <string name="clear_playlist_title">Effacer la liste de lecture</string>
+    <string name="clear_playlist_x"><![CDATA[Effacer la liste <b>%1$s</b> ? Cette action ne pourra pas \u00eatre annul\u00e9e !]]></string>
+
+    <string name="close_notification">Fermer</string>
+
     <string name="color">Couleur</string>
+
+    <string name="color_theme_name">Couleur</string>
+
     <string name="colors">Couleurs</string>
-    <string name="compact">Compacte</string>
+
     <string name="composer">Compositeur</string>
-    <string name="copied_device_info_to_clipboard">Informations sur l’appareil copiées dans le presse-papier.</string>
-    <string name="could_not_create_playlist">La liste de lecture n’a pas pu être créée.</string>
-    <string name="could_not_download_album_cover">"Impossible de télécharger une image d’album correspondante."</string>
+
+    <string name="copied_device_info_to_clipboard">Informations sur l\'appareil copiées dans le presse-papier.</string>
+
+    <string name="could_not_create_playlist">La liste de lecture n\'a pas pu \u00eatre cr\u00e9\u00e9e.</string>
+    <string name="could_not_download_album_cover">"Impossible de t\u00e9l\u00e9charger une image d'album qui corresponde."</string>
     <string name="could_not_restore_purchase">Les achats n\'ont pas pu être restaurés.</string>
     <string name="could_not_scan_files">Les fichiers %d n\'ont pas pu être scanné.</string>
+
     <string name="create_action">Créer</string>
-    <string name="create_new_backup">Créer</string>
+
     <string name="created_playlist_x">Liste de lecture %1$s créée.</string>
-    <string name="credit_title">Membres et contributeurs </string>
+
+    <string name="credit_title">Membres et contributeurs</string>
+
     <string name="currently_listening_to_x_by_x">Vous écoutez actuellement %1$s par %2$s.</string>
-    <string name="custom_artist_images">Images personnalisées pour l\'artiste</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Envoyer les rapports de plantage</string>
+
     <string name="dark_theme_name">Plutôt Sombre</string>
+
+    <string name="default_hint">Pas de Paroles</string>
+
     <string name="delete_playlist_title">Supprimer la liste de lecture</string>
     <string name="delete_playlist_x"><![CDATA[Supprimer la liste <b>%1$s</b> ?]]></string>
+
     <string name="delete_playlists_title">Supprimer les listes de lecture</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 les listes <b>%1$d</b> ?]]></string>
     <string name="delete_x_songs"><![CDATA[Supprimer les morceaux <b>%1$d</b> ?]]></string>
-    <string name="deleted_x_songs">%1$d a été supprimé.</string>
-    <string name="deleting_songs">Suppression des morceaux</string>
+    <string name="deleted_x_songs">%1$d à été supprimé.</string>
+
     <string name="depth">Profondeur</string>
+
     <string name="description">Description</string>
-    <string name="device_info">Informations sur l\'appareil</string>
-    <string name="dialog_message_set_ringtone">Autoriser Retro Music à modifier les paramètres audios</string>
-    <string name="dialog_title_set_ringtone">Définir comme sonnerie</string>
-    <string name="disc_hint">Numéro de disque</string>
-    <string name="do_you_want_to_clear_the_blacklist">Voulez-vous vraiment vider la liste noire ?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Voulez-vous vraiment retirer <b>%1$s</b> de la liste noire ?]]></string>
+
+    <string name="device_info">Infos sur l\'appareil</string>
+
+    <string name="dialog_message_set_ringtone">Autoriser la musique Retro pour modifier les paramètres audio</string>
+
+    <string name="dialog_title_set_ringtone">Set ringtone</string>
+
+    <string name="do_you_want_to_clear_the_blacklist">Voulez vous vraiment vider la liste noire ?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Voulez vous vraiment 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">Offrez-moi :</string>
-    <string name="done">Terminé</string>
-    <string name="drive_mode">Mode conduite</string>
-    <string name="edit_fab">Modifier le bouton</string>
-    <string name="edit_normal_lyrics">Modifier les paroles</string>
-    <string name="edit_synced_lyrics">Modifier les paroles synchronisées</string>
+
+    <string name="donation_header">Achetez moi :</string>
+
+    <string name="download_from_last_fm">Télécharger via Last.fm</string>
+
+    <string name="edit">Modifier</string>
+
+    <string name="edit_cover">Modifier la couverture</string>
+
     <string name="empty">Vide</string>
+
     <string name="equalizer">Égaliseur</string>
-    <string name="error_create_backup">Impossible de créer une sauvegarde</string>
-    <string name="error_delete_backup">Impossible de supprimer une sauvegarde</string>
-    <string name="error_empty_name">Votre nom ne peut pas être vide !</string>
-    <string name="error_load_failed">Échec du chargement</string>
-    <string name="error_share_file">Impossible de partager le fichier</string>
-    <string name="expanded">Développé</string>
-    <string name="faq">Foire aux questions</string>
+
+    <string name="error">Erreur</string>
+
+    <string name="faq">FAQ</string>
+
     <string name="favorites">Favoris</string>
-    <string name="file_already_exists">Le fichier existe déjà</string>
-    <string name="finish_last_song">Finissez le dernier morceau</string>
+
+    <string name="finish_last_song">Finissez la dernière chanson</string>
+
     <string name="fit">Adapter</string>
+
     <string name="flat">Plat</string>
+
     <string name="folders">Dossiers</string>
-    <string name="follow_system">Suivre les paramètres du système</string>
+
     <string name="for_you">Pour vous</string>
-    <string name="free">Gratuit</string>
+
     <string name="full">Plein</string>
+
     <string name="full_card">Carte complète</string>
+
     <string name="general_settings_summary">Changer le thème et les couleurs de l\'application</string>
     <string name="general_settings_title">Apparence</string>
+
     <string name="genre">Genre</string>
+
     <string name="genres">Genres</string>
+
     <string name="git_hub_summary">Cloner le projet sur GitHub</string>
-    <string name="gradient">Dégradé</string>
-    <string name="grant_access">Accorder l\'accès</string>
+
+    <string name="google_plus_community">Rejoignez la communauté Google Plus, où vous pouvez demander de l\'aide ou suivre les mises à jour de Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,356 +297,484 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Style de la grille</string>
-    <string name="help_summary">Encore besoin d\'aide ?</string>
+
+    <string name="grid_style_label"><![CDATA[Les Grilles & Le Style]]></string>
+
     <string name="hinge">Charnière</string>
+
     <string name="history">Historique</string>
-    <string name="history_cleared">Historique effacé</string>
-    <string name="history_undo_button">Annuler</string>
+
     <string name="home">Accueil</string>
+
     <string name="horizontal_flip">Balayage horizontal</string>
+
     <string name="image">Image</string>
-    <string name="image_gradient">Dégradé de l\'image</string>
+
+    <string name="image_gradient">Le Gradient de l\'image</string>
+
     <string name="image_settings_summary">Changer les paramètres de téléchargement des photos d\'artistes</string>
-    <string name="import_label">Importer</string>
-    <string name="import_playlist">Importer la liste de lecture</string>
-    <string name="import_playlist_message">Il importe toutes les listes de lecture listées dans l\'Android Media Store avec des morceaux, si les listes de lecture existent déjà, les morceaux seront fusionnés.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d morceaux ont été insérés dans la liste %2$s.</string>
+
+    <string name="inserted_x_songs_into_playlist_x">%1$d morceaux ont été inséré dans la liste %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Partager votre configuration de Retro Music pour la montrer sur Instagram</string>
+
     <string name="keyboard">Clavier</string>
-    <string name="label_bit_rate">Débit audio</string>
+
+    <string name="label_bit_rate">Débit</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 du fichier</string>
-    <string name="label_last_modified">Dernière modification</string>
-    <string name="label_more_from">Plus de %s</string>
+    <string name="label_file_path">Chemin de fichier</string>
+    <string name="label_file_size">Taille</string>
+
     <string name="label_sampling_rate">Taux d’échantillonnage</string>
-    <string name="label_track_length">Durée</string>
+
+    <string name="label_track_length">Longueur</string>
+
     <string name="labeled">Étiqueté</string>
+
     <string name="last_added">Dernier ajout</string>
-    <string name="last_song">Dernier morceau</string>
-    <string name="lets_go">C\'est parti</string>
+
+    <string name="last_song">Dernière Chanson</string>
+
+    <string name="lets_play_something">Jouons un peu de musique</string>
+
+    <string name="library">Bibliothèque</string>
+
     <string name="library_categories">Catégories</string>
+
     <string name="licenses">Licences</string>
-    <string name="light_theme_name">Blanc</string>
-    <string name="listeners_label">Auditeurs</string>
+
+    <string name="light_theme_name">Clairement blanc</string>
+
     <string name="listing_files">Listage des fichiers</string>
+
     <string name="loading_products">Chargement des produits…</string>
-    <string name="login">Connexion</string>
+
+    <string name="login">Se connecter</string>
+
     <string name="lyrics">Paroles</string>
+
     <string name="made_with_love">Fait avec ❤️ en Inde</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Erreur</string>
+
     <string name="md_storage_perm_error">Erreur d\'autorisation</string>
-    <string name="message_backup_create_success">Sauvegarde créée avec succès.</string>
-    <string name="message_limit_tabs">Pas plus de 5 éléments</string>
-    <string name="message_pro_feature">%s est une fonctionnalité Pro.</string>
-    <string name="message_restore_success">Restauration effectuée avec succès.</string>
-    <string name="message_updated">Mis à jour</string>
-    <string name="message_welcome"><![CDATA[Bonjour ! <br>Bienvenue dans %s]]></string>
-    <string name="my_name">Nom</string>
+
+    <string name="my_name">Mon nom</string>
+
     <string name="my_top_tracks">Plus jouées</string>
-    <string name="never">Jamais</string>
-    <string name="new_music_mix">Nouveau Mix</string>
+
+    <string name="never">jamais</string>
+
+    <string name="new_banner_photo">Nouvelle bannière photo</string>
+
     <string name="new_playlist_title">Nouvelle liste de lecture</string>
+
+    <string name="new_profile_photo">Nouvelle photo de profil</string>
+
     <string name="new_start_directory">%s est le nouveau dossier de départ.</string>
-    <string name="next_song">Prochain morceau</string>
-    <string name="no_albums">Aucuns albums</string>
-    <string name="no_artists">Aucuns artistes</string>
+
+    <string name="next_song">Prochaine Chanson</string>
+
+    <string name="no_albums">Pas d\'albums</string>
+
+    <string name="no_artists">Pas d\'artistes</string>
+
     <string name="no_audio_ID">"Lancez d'abord un morceau, puis réessayez."</string>
-    <string name="no_backups_found">Aucune sauvegarde trouvée</string>
+
     <string name="no_equalizer">Aucun égaliseur trouvé</string>
-    <string name="no_genres">Aucuns genres</string>
+
+    <string name="no_genres">Aucun genre</string>
+
     <string name="no_lyrics_found">Aucune parole trouvée</string>
-    <string name="no_playing_queue">Aucun morceau en cours de lecture</string>
+
     <string name="no_playlists">Aucune liste de lecture</string>
-    <string name="no_purchase_found">Aucun achat trouvé.</string>
+
+    <string name="no_purchase_found">Aucun achat trouvé</string>
+
     <string name="no_results">Aucun résultat</string>
+
     <string name="no_songs">Aucun morceau</string>
+
     <string name="normal">Normal</string>
+
     <string name="normal_lyrics">Paroles normales</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> N\'est pas répertorié dans le stockage des médias.]]></string>
-    <string name="not_recently_played">Non jouée récemment</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> n\'est pas repertorié dans le stockage média.]]></string>
+
     <string name="nothing_to_scan">Rien à scanner.</string>
-    <string name="nothing_to_see">Rien à afficher</string>
+
     <string name="notification">Notification</string>
+
     <string name="notification_settings_summary">Personnaliser le style de notification</string>
+
     <string name="now_playing">Lecture en cours</string>
     <string name="now_playing_queue">File d\'attente</string>
     <string name="now_playing_summary">Personnaliser l\'écran de lecture</string>
     <string name="now_playing_themes">9+ thèmes d\'écran de lecture en cours</string>
+
     <string name="only_on_wifi">Uniquement via Wi-Fi</string>
+
     <string name="other_settings_summary">Fonctions de test avancées</string>
+
     <string name="others">Autre</string>
-    <string name="over_cover">À propos de la pochette</string>
+
     <string name="password">Mot de passe</string>
+
     <string name="past_three_months">3 derniers mois</string>
-    <string name="paste_lyrics_here">Copiez les paroles ici</string>
-    <string name="paste_timeframe_lyrics_here">Collez les paroles de la période ici</string>
-    <string name="peek">Aperçu</string>
-    <string name="permission_bluetooth_denied">Autorisation refusée par les appareils à proximité.</string>
+
+    <string name="paste_lyrics_here">Coller les paroles ici</string>
+
     <string name="permission_external_storage_denied">La permission pour accéder au stockage externe a été refusée.</string>
-    <string name="permission_summary">L\'application a besoin d\'accéder au stockage de votre appareil pour lire votre musique</string>
-    <string name="permission_title">Accès au stockage</string>
+
     <string name="permissions_denied">Permission refusée.</string>
+
     <string name="personalize">Personnaliser</string>
+
     <string name="personalize_settings_summary">Personnalisez le lecteur et l\'interface</string>
+
     <string name="pick_from_local_storage">Sélectionner depuis le stockage</string>
+
+    <string name="pick_image_intent_text">Choisissez l\'image</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Suivez la page Pinterest pour des inspirations de design</string>
+    <string name="pinterest_page_summary">Suivez la page de Pintrest pour la musique Retro.</string>
+
     <string name="plain">Simple</string>
-    <string name="playList_already_exits">La playlist existe déjà</string>
-    <string name="playback_pitch">Hauteur</string>
-    <string name="playback_settings">Paramètres de lecture</string>
-    <string name="playback_speed">Vitesse de lecture</string>
+
     <string name="playing_notification_description">La notification de lecture fournit des actions pour la lecture / pause etc.</string>
-    <string name="playing_notification_name">Notification de lecture</string>
-    <string name="playlist_created_sucessfully">%s a été créé avec succès</string>
+    <string name="playing_notification_name">Lecture de la notification</string>
+
+    <string name="playlist_empty_text">Liste de lecture vide</string>
+
     <string name="playlist_is_empty">Cette liste de lecture est vide</string>
+
     <string name="playlist_name_empty">Nom de la liste de lecture</string>
+
     <string name="playlists">Listes de lecture</string>
-    <string name="pref_blur_amount_summary">Quantité de flou appliqué aux thèmes flous, une valeur faible améliora la vitesse</string>
+
+    <string name="pref_album_detail_style">Style du détail de l\'album</string>
+
+    <string name="pref_blur_amount_summary">Quantité de flou appliqué aux thèmes flous, bas est plus rapide</string>
     <string name="pref_blur_amount_title">Quantité de flou</string>
-    <string name="pref_filter_song_summary">Filtrer les morceaux par durée</string>
-    <string name="pref_filter_song_title">Filtre de durée du morceau</string>
-    <string name="pref_header_advanced">Avancé</string>
-    <string name="pref_header_album">Style de l\'album</string>
+
+    <string name="pref_filter_song_title">Filtre de la durée de la chanson</string>
+
+    <string name="pref_header_album">De style Album</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Liste noir</string>
     <string name="pref_header_controls">Contrôle</string>
     <string name="pref_header_general">Thème</string>
-    <string name="pref_header_images">Illustration</string>
+    <string name="pref_header_images">Images</string>
     <string name="pref_header_library">Bibliothèque</string>
     <string name="pref_header_lockscreen">Écran de verrouillage</string>
     <string name="pref_header_playlists">Listes de lecture</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">La lecture se met en pause lorsque le son est coupé et redémarre lorsque le volume augmente. Fonctionne aussi en dehors de l\'application</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause si muet</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">La lecture se met en pause à zéro et se lance lorsque le volume augmente. Attention, lorsque vous augmentez le volume, la musique se lance même si vous êtes en dehors de l\'app.</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pause sur zéro</string>
     <string name="pref_keep_screen_on_summary">Veuillez garder en tête que l\'activation de cette fonctionnalité peut réduire la durée de vie de la batterie</string>
     <string name="pref_keep_screen_on_title">Garder l\'écran allumé</string>
-    <string name="pref_language_name">Choisir la langue</string>
-    <string name="pref_snow_fall_title">Effet neige qui tombe</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utiliser la couverture d\'album du morceau en cours de lecture comme fond sur l\'écran de verrouillage</string>
-    <string name="pref_summary_album_artists_only">Afficher les artistes de l\'album dans la catégorie Artiste</string>
+
+    <string name="pref_now_playing_screen_summary">Cliquez pour ouvrir avec ou glisser à sans navigation transparente de l\'écran de lecture</string>
+    <string name="pref_now_playing_screen_title">Cliquez ou balayez</string>
+
+    <string name="pref_snow_fall_title">Effet chute de neige</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Utiliser la couverture d\'album de la piste en cours de lecture comme fond sur l\'écran de verrouillage</string>
     <string name="pref_summary_audio_ducking">Baisser le volume quand un son système ou une notification est reçue</string>
-    <string name="pref_summary_audio_fade">Fondu audio lorsque la musique est mise en pause ou recommence</string>
     <string name="pref_summary_blacklist">Le contenu des dossiers en liste noire est masqué de votre bibliothèque.</string>
-    <string name="pref_summary_bluetooth_playback">Commencez à jouer dès que vous êtes connecté à un appareil Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Flouter la couverture de l\'album sur l\'écran de verrouillage. Cela peut poser des problèmes avec des applications et widgets tiers</string>
-    <string name="pref_summary_carousel_effect">Effet carrousel pour les couvertures d\'albums sur l\'écran de lecture en cours. Veuillez noter que les thèmes Carte et Carte floutée ne fonctionneront pas</string>
+    <string name="pref_summary_blurred_album_art">Flouter la couverture de l\'album sur l\'écran de verrouillage. Cela peut poser des problèmes avec des applications et widgets tiers.</string>
+    <string name="pref_summary_carousel_effect">Effet carousel pour les couvertures d\'albums sur l\'écran de lecture en cours. Veuillez noter que les thèmes Carte et Carte floutée ne fonctionneront pas</string>
     <string name="pref_summary_classic_notification">Utiliser le design classique pour les notifications</string>
     <string name="pref_summary_colored_app">La couleur du fond et des boutons de contrôles change en fonction de l\'image d\'album sur l\'écran de lecture en cours</string>
-    <string name="pref_summary_colored_app_shortcuts">Raccourcis de l\'application selon la couleur d\'accent. Chaque fois que vous changez de couleur, veuillez activer ceci afin que le changement soit pris en compte</string>
-    <string name="pref_summary_colored_notification">"Colorer la notification avec la couleur dominante des pochettes d'albums"</string>
-    <string name="pref_summary_cross_fade">Durée du fondu enchaîné entre les morceaux</string>
-    <string name="pref_summary_desaturated_color">Selon les lignes directrices du Material Design, les couleurs devraient être désaturées en mode sombre</string>
-    <string name="pref_summary_expand_now_playing_panel">Toucher la notification affichera l\'écran de lecture en cours au lieu de l\'écran d\'accueil</string>
+    <string name="pref_summary_colored_app_shortcuts">Les raccourcis rapides de l\'application prendront la couleur d\'accent. Chaque fois que vous changez de couleur, veuillez activer ceci afin que le changement soit pris en compte</string>
+    <string name="pref_summary_colored_navigation_bar">Colorer la barre de navigation avec la couleur primaire</string>
+    <string name="pref_summary_colored_notification">"Colorer la notification avec la couleur dominante des couvertures d'albums"</string>
+    <string name="pref_summary_dominant_color">La couleur dominante sera choisie depuis la couverture de l\'album ou de l\'artiste</string>
     <string name="pref_summary_extra_controls">Ajouter des contrôles supplémentaires pour le mini lecteur</string>
-    <string name="pref_summary_extra_song_info">Afficher les informations supplémentaires du morceau, comme le format de fichier, le débit et la fréquence</string>
     <string name="pref_summary_gapless_playback">"Peut causer des problèmes de lecture sur certains appareils."</string>
-    <string name="pref_summary_home_banner">Montrer ou cacher la bannière d\'accueil</string>
-    <string name="pref_summary_ignore_media_store_artwork">Peut améliorer la qualité de la pochette de l\'album, mais ralenti le chargement des images. N\'activez ceci que si vous avez des problèmes avec les images basse résolution</string>
+    <string name="pref_summary_genre_toggle">Activer/désactiver l\'onglet Genres</string>
+    <string name="pref_summary_home_banner">Changer le style de la bannière sur l\'accueil</string>
+    <string name="pref_summary_ignore_media_store_artwork">Peut améliorer la qualité de l\'image d\'album, mais ralenti le chargement des images. N\'activez ceci que si vous avez des problèmes avec les images basse résolution</string>
     <string name="pref_summary_library_categories">Configurer la visibilité et l\'ordre des catégories de la librairie.</string>
     <string name="pref_summary_lock_screen">Utiliser les contrôles personnalisés de Retro Music sur l\'écran de verrouillage</string>
-    <string name="pref_summary_manage_audio_focus">Toujours jouer l\'audio en arrière-plan indépendamment de tout autre élément en cours de lecture</string>
     <string name="pref_summary_open_source_licences">Détails des licences pour les logiciels open source</string>
-    <string name="pref_summary_pause_history">Lorsque cette option est activée, les nouvelles chansons jouées n\'apparaîtront pas dans l\'historique</string>
-    <string name="pref_summary_remember_tab">Afficher le dernier onglet au démarrage</string>
-    <string name="pref_summary_show_lyrics">Afficher les paroles sur la pochette de l\'album</string>
-    <string name="pref_summary_suggestions">Afficher une sélection de nouveaux morceaux sur l\'écran d\'accueil</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Active le changement de morceau en balayant n\'importe où sur l\'écran de lecture en cours</string>
-    <string name="pref_summary_swipe_to_dismiss">Balayer vers le bas pour fermer le lecteur réduit</string>
+    <string name="pref_summary_round_corners">Coins arrondis pour les bords de l\'application</string>
+    <string name="pref_summary_tab_titles">Activer/désactiver les titres des onglets du bas</string>
     <string name="pref_summary_toggle_full_screen">Mode immersif</string>
     <string name="pref_summary_toggle_headset">Commencer immédiatement la lecture lors du branchement d\'un casque</string>
     <string name="pref_summary_toggle_shuffle">Le mode aléatoire se désactivera lors de la lecture d\'une nouvelle liste de morceaux</string>
     <string name="pref_summary_toggle_volume">Si vous avez assez de place, affiche les contrôle du volume sur l\'écran de lecture</string>
-    <string name="pref_summary_wallpaper_accent">Choisir la couleur accentuée suivant le fond d\'écran</string>
-    <string name="pref_summary_whitelist">Afficher uniquement les morceaux du dossier /Musique</string>
+
     <string name="pref_title_album_art_on_lockscreen">Afficher la couverture de l\'album</string>
-    <string name="pref_title_album_artists_only">Naviguer par artiste de l\'album</string>
     <string name="pref_title_album_cover_style">Thème de la couverture d\'album</string>
     <string name="pref_title_album_cover_transform">Style du balayage de l\'image d\'album</string>
+    <string name="pref_title_album_grid_style">Grille d\'albums</string>
     <string name="pref_title_app_shortcuts">Raccourcis d\'application colorés</string>
-    <string name="pref_title_appbar_mode">Style de l\'entête</string>
+    <string name="pref_title_artist_grid_style">Grille d\'artistes</string>
     <string name="pref_title_audio_ducking">Réduire le volume à la perte de focus</string>
-    <string name="pref_title_audio_fade">Fondu audio</string>
     <string name="pref_title_auto_download_artist_images">Télécharger automatiquement les photos des artistes</string>
     <string name="pref_title_blacklist">Liste noire</string>
-    <string name="pref_title_bluetooth_playback">Lecture via Bluetooth</string>
     <string name="pref_title_blurred_album_art">Flouter la couverture d\'album</string>
-    <string name="pref_title_circle_button">Bouton de lecture circulaire</string>
+    <string name="pref_title_choose_equalizer">Choisir l\'égalisateur</string>
     <string name="pref_title_classic_notification">Design de notification classique</string>
     <string name="pref_title_colored_app">Couleur adaptative</string>
     <string name="pref_title_colored_notification">Notification colorée</string>
-    <string name="pref_title_cross_fade">Fondu enchaîné (Beta)</string>
-    <string name="pref_title_custom_font">Utiliser la police Manrope</string>
-    <string name="pref_title_desaturated_color">Couleur désaturée</string>
-    <string name="pref_title_expand_now_playing_panel">Afficher l\'écran de lecture en cours</string>
     <string name="pref_title_extra_controls">Contrôles supplémentaires</string>
-    <string name="pref_title_extra_song_info">Détails sur la musique</string>
     <string name="pref_title_gapless_playback">Lecture sans blanc</string>
     <string name="pref_title_general_theme">Thème de l\'application</string>
-    <string name="pref_title_home_album_grid_style">Grille d\'album</string>
+    <string name="pref_title_genre_toggle">Montrer l\'onglet Genres</string>
     <string name="pref_title_home_artist_grid_style">Disposition de la grille d\'artistes sur l\'accueil</string>
     <string name="pref_title_home_banner">Bannière d\'accueil</string>
     <string name="pref_title_ignore_media_store_artwork">Ignorer les couvertures du stockage média</string>
     <string name="pref_title_last_added_interval">Intervalle de dernière liste de lecture ajoutée</string>
     <string name="pref_title_lock_screen">Contrôles plein-écran</string>
-    <string name="pref_title_lyrics_screen_on">Laisser l\'écran allumé lors de l\'affichage des paroles</string>
-    <string name="pref_title_lyrics_type">Type de paroles</string>
-    <string name="pref_title_manage_audio_focus">Toujours jouer</string>
+    <string name="pref_title_navigation_bar">Barre de navigation colorée</string>
     <string name="pref_title_now_playing_screen_appearance">Thème d\'écran de lecture</string>
     <string name="pref_title_open_source_licences">Licences open source</string>
-    <string name="pref_title_pause_history">Mettre l\'historique en pause</string>
-    <string name="pref_title_remember_tab">Se souvenir du dernier onglet</string>
-    <string name="pref_title_show_lyrics">Afficher les paroles</string>
-    <string name="pref_title_suggestions">Afficher les suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Balayer n\'importe où pour changer de morceau</string>
-    <string name="pref_title_swipe_to_dismiss">Ignorer en balayant vers le bas</string>
+    <string name="pref_title_round_corners">Angles arrondis</string>
     <string name="pref_title_tab_text_mode">Mode Titres onglets</string>
     <string name="pref_title_toggle_carousel_effect">Effet carousel</string>
+    <string name="pref_title_toggle_dominant_color">Couleur dominante</string>
     <string name="pref_title_toggle_full_screen">App en plein écran</string>
+    <string name="pref_title_toggle_tab_titles">Titres onglets</string>
     <string name="pref_title_toggle_toggle_headset">Lecture automatique</string>
     <string name="pref_title_toggle_toggle_shuffle">Mode aléatoire</string>
-    <string name="pref_title_toggle_volume">Contrôles du volume</string>
-    <string name="pref_title_wallpaper_accent">Couleur d\'accentuation du fond d\'écran</string>
-    <string name="pref_title_whitelist">Liste blanche</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Thème noir, thèmes en cours de lecture, effet carrousel, et plus encore...</string>
+    <string name="pref_title_toggle_volume">Contrôles de volume</string>
+    <string name="pref_title_user_info">Informations utilisateur</string>
+
+    <string name="primary_color">Couleur primaire</string>
+    <string name="primary_color_desc">La couleur de thème primaire, par défaut bleu-gris, fonctionne maintenant avec les couleurs sombres</string>
+
+    <string name="pro_summary">Maintenant les thèmes de jeu, L\'effet de carrousel, thème de couleur et plus..</string>
+
     <string name="profile">Profil</string>
+
     <string name="purchase">Acheter</string>
-    <string name="queue">File de lecture</string>
+
+    <string name="purchase_summary">* Veuillez bien réfléchir avant d\'acheter ! Ne demandez pas de remboursement.</string>
+
+    <string name="queue">File d\'attente</string>
+
     <string name="rate_app">Noter l\'application</string>
-    <string name="rate_on_google_play_summary">Vous aimez cette application ? Dites-nous sur Google Play Store comment nous pourrions l\'améliorer davantage</string>
+
+    <string name="rate_on_google_play_summary">Vous aimez l\'application ? Faites-le nous savoir sur le Play Store afin que nous puissions l\'améliorer davantage</string>
+
     <string name="recent_albums">Albums récents</string>
+
     <string name="recent_artists">Artistes récents</string>
+
     <string name="remove_action">Supprimer</string>
-    <string name="remove_cover">Supprimer la pochette</string>
+
+    <string name="remove_banner_photo">Retirer la bannière photo</string>
+
+    <string name="remove_cover">Supprimer la couverture</string>
+
     <string name="remove_from_blacklist">Retirer de la liste noire</string>
-    <string name="remove_image">Supprimer l\'image</string>
+
+    <string name="remove_profile_photo">Supprimer la photo de profil</string>
+
     <string name="remove_song_from_playlist_title">Supprimer le morceau de la liste de lecture</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Retirer le morceau <b>%1$s</b> de la liste de lecture ?]]></string>
-    <string name="remove_songs_from_playlist_title">Retirer les morceaux de la liste de lecture</string>
+
+    <string name="remove_songs_from_playlist_title">Retirer le morceau de la liste de lecture</string>
+
     <string name="remove_x_songs_from_playlist"><![CDATA[Retirer <b>%1$d</b> morceaux de la liste de lecture ?]]></string>
+
     <string name="rename_playlist_title">Renommer la liste de lecture</string>
-    <string name="replace_cover">Remplacer la pochette</string>
+
     <string name="report_an_issue">Signaler un problème</string>
+
     <string name="report_bug">Signaler un bug</string>
+
     <string name="reset_action">Réinitialiser</string>
+
     <string name="reset_artist_image">Réinitialiser la photo de l\'artiste</string>
+
     <string name="restore">Restaurer</string>
-    <string name="restore_message">Voulez-vous restaurer cette sauvegarde ?</string>
-    <string name="restored_previous_purchase_please_restart">Achat restauré. Veuillez redémarrer l\'application pour utiliser toutes les fonctionnalités.</string>
+
+    <string name="restored_previous_purchase_please_restart">Achat précédent restauré. Veuillez redémarrer l\'application pour utiliser toutes les fonctionnalités.</string>
     <string name="restored_previous_purchases">Achats précédents restaurés.</string>
+
     <string name="restoring_purchase">Restauration de l\'achat…</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Égaliseur Retro Music</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">L\'application a besoin d\'accéder au stockage de votre appareil pour configurer un morceau comme sonnerie</string>
-    <string name="ringtone_title">Sonnerie (optionnel)</string>
-    <string name="saf_delete_failed">La suppression du fichier a échoué : %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Impossible d\'obtenir l\'URI SAF</string>
-    <string name="saf_guide_slide1_description">Ouvrir le tiroir de navigation</string>
-    <string name="saf_guide_slide1_description_before_o">Activer \'Afficher la carte SD\' dans le menu de débordement</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électionner le répertoire racine de votre carte SD</string>
-    <string name="saf_guide_slide2_title">Sélectionnez votre carte SD dans la fenêtre de navigation</string>
-    <string name="saf_guide_slide3_description">N\'ouvrez aucun sous-dossier</string>
-    <string name="saf_guide_slide3_title">Appuyez sur le bouton \'sélectionner\' en bas de l\'écran</string>
-    <string name="saf_write_failed">Échec de l\'écriture du fichier : %s</string>
+
     <string name="save">Enregistrer</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Enregistrer en tant que fichier</string>
+
     <string name="save_playlists_title">Enregistrer en tant que fichiers</string>
+
     <string name="saved_playlist_to">Liste de lecture enregistrée vers %s</string>
+
     <string name="saving_changes">Enregistrement des changements</string>
+
     <string name="scan_media">Scanner le média</string>
+
     <string name="scanned_files">Fichier %1$d sur %2$d scanné</string>
-    <string name="scrobbles_label">Scrobble</string>
+
+    <string name="search_hint">Recherche dans votre bibliothèque…</string>
+
     <string name="select_all">Tout sélectionner</string>
+
+    <string name="select_banner_photo">Choisir la bannière photo</string>
+
     <string name="selected">Sélectionné</string>
+
+    <string name="send_crash_log">Envoyer le journal du crash</string>
+
     <string name="set">Définir</string>
+
     <string name="set_artist_image">Définir photo de l\'artiste</string>
+
+    <string name="set_photo">Définir une photo de profil</string>
+
     <string name="share_app">Partager l\'app</string>
-    <string name="share_summary">Partagez l\'application avec vos amis et votre famille</string>
-    <string name="share_to_stories">Partager en Story</string>
-    <string name="show_album_artists">Afficher les artistes de l\'album</string>
+
     <string name="shuffle">Aléatoire</string>
+
     <string name="simple">Simple</string>
+
     <string name="sleep_timer_canceled">Minuteur d\'extinction annulé.</string>
     <string name="sleep_timer_set">Extinction dans %d minutes.</string>
+
+    <string name="slide">Diapositive</string>
+
+    <string name="small">Petit album</string>
+
     <string name="social">Social</string>
-    <string name="social_stories">Partager une Story</string>
+
     <string name="song">Morceau</string>
+
     <string name="song_duration">Durée du morceau</string>
+
     <string name="songs">Morceaux</string>
+
     <string name="sort_order">Ordre de classement</string>
     <string name="sort_order_a_z">Ascendant</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artiste</string>
     <string name="sort_order_composer">Compositeur</string>
     <string name="sort_order_date">Date</string>
-    <string name="sort_order_date_modified">Date de modification</string>
-    <string name="sort_order_default">Par défaut</string>
-    <string name="sort_order_num_songs">Nombre de morceaux</string>
-    <string name="sort_order_num_songs_desc">Nombre de morceaux décroissant</string>
     <string name="sort_order_year">Année</string>
     <string name="sort_order_z_a">Descendant</string>
+
     <string name="speech_not_supported">Désolé, votre appareil ne supporte pas l\'entrée vocale</string>
+
     <string name="speech_prompt">Rechercher dans votre bibliothèque</string>
+
     <string name="stack">Pile</string>
+
     <string name="start_play_music">Commencer à jouer de la musique.</string>
+
     <string name="suggestion_songs">Suggestions</string>
+
+    <string name="summary_user_info">N\'afficher que votre nom sur l\'écran d\'accueil</string>
+
     <string name="support_development">Aider le développement</string>
+
     <string name="swipe_to_unlock">Glisser pour déverrouiller</string>
+
     <string name="synced_lyrics">Paroles synchronisées</string>
+
+    <string name="system_equalizer">Égalisateur système</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Rejoignez le groupe Telegram pour discuter des bugs, faire des suggestions, montrer votre configuration, etc.</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="tiny_card_style">Petite carte</string>
+
     <string name="title">Titre</string>
-    <string name="title_new_backup">Nouvelle sauvegarde</string>
+
+    <string name="title_dashboard">Tableau de bord</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">Bonsoir</string>
+    <string name="title_good_morning">Bonne journée</string>
+    <string name="title_good_night">Bonne soirée</string>
+
+    <string name="title_user_info">Quel est ton nom</string>
+
     <string name="today">Aujourd\'hui</string>
-    <string name="top_albums">Meilleurs albums</string>
+
+    <string name="top_albums">Top albums</string>
+
     <string name="top_artists">Top artistes</string>
+
     <string name="track_hint">"Morceau (2 pour morceau 2, 3004 pour morceau 4 du CD 3)"</string>
+
     <string name="track_list">Numéro du morceau</string>
+
     <string name="translate">Traduction</string>
+
     <string name="translate_community">Aidez-nous à traduire l\'application dans votre langue</string>
-    <string name="try_retro_music_premium">Essayer Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Partager votre design avec Retro Music</string>
+
     <string name="unlabeled">Non étiqueté</string>
+
     <string name="unplayable_file">Impossible de lire ce morceau.</string>
+
     <string name="up_next">À suivre</string>
+
     <string name="update_image">Mettre à jour l\'image</string>
+
     <string name="updating">Mise à jour...</string>
-    <string name="user_images_description">Images de l\'utilisateur</string>
-    <string name="user_name">Nom d\'utilisateur</string>
+
     <string name="username">Nom d\'utilisateur</string>
+
     <string name="version">version</string>
+
     <string name="vertical_flip">Balayage vertical</string>
-    <string name="view_on_telegram">Afficher sur Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Recherche internet</string>
-    <string name="website">Site web</string>
-    <string name="website_summary">Découvrez notre site Web</string>
-    <string name="welcome">Bienvenue,</string>
+
+    <string name="virtualizer">Virtualisateur</string>
+
+    <string name="web_search">"Recherche internet
+"</string>
+
+    <string name="welcome">Accueillir,</string>
+
     <string name="what_do_you_want_to_share">Que souhaitez-vous partager ?</string>
+
     <string name="whats_new">Quoi de neuf</string>
+
     <string name="window">Fenêtre</string>
-    <string name="window_corner_edges">Coins arrondis</string>
+
+    <string name="window_corner_edges">Bords arrondis</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>
+
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vous allez être redirigé vers le site web de suivi des problèmes.</string>
+
     <string name="your_account_data_is_only_used_for_authentication">Vos données de compte sont utilisées uniquement pour vous authentifier.</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index ec2519436..fd7af8a71 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -1,561 +1,113 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">%s के बारे में</string>
-    <string name="about_settings_summary">टीम, सामाजिक लिंक</string>
     <string name="accent_color">एक्सेंट रंग</string>
-    <string name="accent_color_desc">The theme accent color, defaults to purple</string>
-    <string name="action_about">जानकारी</string>
-    <string name="action_add_to_blacklist">कालीसूची में जोड़ें</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_playing_queue">कतार में जोड़ें</string>
     <string name="action_add_to_playlist">प्लेलिस्ट में जोड़ें</string>
-    <string name="action_cancel">वर्तमान टाइमर को रद्द करें</string>
-    <string name="action_cast">प्रसारित करें</string>
-    <string name="action_clear_playing_queue">बजने वाली कतार साफ़ करें</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</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_edit">Edit</string>
+
     <string name="action_go_to_album">एल्बम पर जाएं</string>
     <string name="action_go_to_artist">कलाकार पर जाएं</string>
-    <string name="action_go_to_genre">शैली पर जाएं</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</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_all">सभी को बजाएं</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_sort_order">क्रमबद्ध आदेश</string>
+
     <string name="action_tag_editor">टैग एडिटर</string>
-    <string name="action_toggle_favorite">पसंदीदा टॉगल करें</string>
-    <string name="action_toggle_shuffle">शफल मोड को टॉगल करें</string>
-    <string name="adaptive">अनुकूली</string>
+
     <string name="add_action">जोड़ें</string>
+
+    <string name="add_photo">फ़ोटो\nजोड़ें</string>
+
     <string name="add_playlist_title">"प्लेलिस्ट में जोड़ें"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
+
     <string name="added_title_to_playing_queue">"कतार मे 1 शीर्षक जोड़ा गया है।"</string>
+
     <string name="added_x_titles_to_playing_queue">कतार मे %1$d शीर्षक जोड़ा गया है।</string>
+
     <string name="album">एल्बम</string>
-    <plurals name="albumSongs">
-        <item quantity="one">गाना</item>
-        <item quantity="other">Songs</item>
-    </plurals>
+
     <string name="album_artist">एल्बम कलाकार</string>
+
+    <string name="album_or_artist_empty">शीर्षक या कलाकार खाली है</string>
+
     <string name="albums">एल्बम</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
+
     <string name="always">हमेशा</string>
+
     <string name="app_share">इस बढ़िया म्यूजिक प्लेयर को यहां देखें:https://play.google.com/store/apps/details?id=%s</string>
+
     <string name="app_shortcut_shuffle_all_short">शफ़ल</string>
     <string name="app_shortcut_top_tracks_short">टॉप गीत</string>
-    <string name="app_widget_big_name">Full Image</string>
+
+    <string name="app_widget_big_name">रेट्रो म्यूजिक - बिग</string>
     <string name="app_widget_card_name">रेट्रो म्यूजिक - कार्ड</string>
     <string name="app_widget_classic_name">रेट्रो म्यूजिक - क्लासिक</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">छोटा</string>
-    <string name="app_widget_text_name">Minimal Text</string>
+
     <string name="artist">कलाकार</string>
+
     <string name="artists">कलाकार</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">ऑडियो फोकस से इनकार किया।</string>
-    <string name="audio_settings_summary">ध्वनि सेटिंग्स बदलें और तुल्यकारक नियंत्रण समायोजित करें</string>
-    <string name="auto">ऑटो</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
+
     <string name="biography">जीवनी</string>
+
     <string name="black_theme_name">सिर्फ काला</string>
+
     <string name="blacklist">ब्लैकलिस्ट</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">कलंक</string>
-    <string name="blur_card">ब्लर कार्ड</string>
-    <string name="bug_report_failed">रिपोर्ट भेजने में असमर्थ</string>
-    <string name="bug_report_failed_invalid_token">अमान्य प्रवेश टोकन। कृपया ऐप डेवलपर से संपर्क करें।</string>
-    <string name="bug_report_failed_issues_not_available">चयनित रिपॉजिटरी के लिए समस्याएँ सक्षम नहीं हैं। कृपया ऐप डेवलपर से संपर्क करें।</string>
-    <string name="bug_report_failed_unknown">एक अप्रत्याशित त्रुटि हुई। कृपया ऐप डेवलपर से संपर्क करें।</string>
-    <string name="bug_report_failed_wrong_credentials">उपयोगकर्ता का गलत नाम और पासवर्ड</string>
-    <string name="bug_report_issue">मुद्दा</string>
-    <string name="bug_report_manual">मैन्युअल भेजें</string>
-    <string name="bug_report_no_description">कृपया एक समस्या विवरण दर्ज करें</string>
-    <string name="bug_report_no_password">कृपया अपना वैध GitHub पासवर्ड दर्ज करें</string>
-    <string name="bug_report_no_title">कृपया एक समस्या शीर्षक दर्ज करें</string>
-    <string name="bug_report_no_username">कृपया अपना वैध GitHub उपयोगकर्ता नाम दर्ज करें</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">एक अप्रत्याशित त्रुटि हुई। क्षमा करें, आपको यह बग मिल गया है, अगर यह \"क्लियर ऐप डेटा\" को क्रैश करता है या ईमेल भेजता है </string>
-    <string name="bug_report_use_account">GitHub खाते का उपयोग करके भेजें</string>
-    <string name="buy_now">अभी खरीदें</string>
+
     <string name="cancel_current_timer">वर्तमान टाइमर को रद्द करें</string>
-    <string name="card">कार्ड</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">रेट्रो म्यूजिक - कार्ड</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
+
     <string name="changelog">चेंजलाग</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">वृताकार</string>
-    <string name="classic">रेट्रो म्यूजिक - क्लासिक</string>
+
+    <string name="changelog_summary">साफ़</string>
+
     <string name="clear_action">साफ़</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">रंग</string>
-    <string name="colors">Colors</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">बनाएं</string>
-    <string name="create_new_backup">बनाएं</string>
-    <string name="created_playlist_x">Created playlist %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Kinda Dark</string>
-    <string name="delete_playlist_title">Delete playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Delete playlists</string>
-    <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="depth">Depth</string>
-    <string name="description">Description</string>
-    <string name="device_info">Device info</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Donate</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Buy me a:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Empty</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favorites</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Folders</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">For you</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Look and feel</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genres</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Grid style</string>
-    <string name="help_summary">Need more help?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">History</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
+
     <string name="home">Ghar</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_file_size">Size</string>
-    <string name="label_last_modified">Last Modified</string>
     <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Length</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Last added</string>
-    <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licenses</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">Listeners</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Lyrics</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Most played</string>
-    <string name="never">Never</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">नई प्लेलिस्ट</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Next Song</string>
-    <string name="no_albums">You have no albums</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Permissions denied.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">ब्लैकलिस्ट</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">ब्लैकलिस्ट</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">शफ़ल</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">क्रमबद्ध आदेश</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">एल्बम</string>
-    <string name="sort_order_artist">कलाकार</string>
-    <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Year</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
 </resources>
diff --git a/app/src/main/res/values-hr-rHR/strings.xml b/app/src/main/res/values-hr-rHR/strings.xml
deleted file mode 100644
index f9f8d2093..000000000
--- a/app/src/main/res/values-hr-rHR/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">O %s</string>
-    <string name="about_settings_summary">Tim, društvene poveznice</string>
-    <string name="accent_color">Accent color</string>
-    <string name="accent_color_desc">The theme accent color, defaults to purple</string>
-    <string name="action_about">Više informacija</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Dodaj u favorite</string>
-    <string name="action_add_to_playing_queue">Dodaj u red čekanja</string>
-    <string name="action_add_to_playlist">Dodaj na popis</string>
-    <string name="action_cancel">Odustani</string>
-    <string name="action_cast">Emitiraj</string>
-    <string name="action_clear_playing_queue">Očisti red čekanja</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">Izbriši</string>
-    <string name="action_delete_from_device">Izbriši s uređaja</string>
-    <string name="action_details">Detalji</string>
-    <string name="action_edit">Uredi</string>
-    <string name="action_go_to_album">Idi na album</string>
-    <string name="action_go_to_artist">Idi na izvođača</string>
-    <string name="action_go_to_genre">Idi na žanr</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <string name="action_grant">Odobri</string>
-    <string name="action_grid_size">Veličina mreže</string>
-    <string name="action_grid_size_land">Grid size (land)</string>
-    <string name="action_new_playlist">Novi popis</string>
-    <string name="action_next">Sljedeće</string>
-    <string name="action_play">Reproduciraj</string>
-    <string name="action_play_all">Reproduciraj sve</string>
-    <string name="action_play_next">Reproduciraj sljedeće</string>
-    <string name="action_play_pause">Reprodukcija/Pauza</string>
-    <string name="action_previous">Prethodno</string>
-    <string name="action_remove_from_favorites">Ukloni iz favorita</string>
-    <string name="action_remove_from_playing_queue">Ukloni iz reda čekanja</string>
-    <string name="action_remove_from_playlist">Ukloni s popisa</string>
-    <string name="action_rename">Preimenuj</string>
-    <string name="action_save_playing_queue">Spremi red čekanja</string>
-    <string name="action_scan">Skeniraj</string>
-    <string name="action_search">Pretraži</string>
-    <string name="action_set">Start</string>
-    <string name="action_set_as_ringtone">Postavi kao zvuk zvona</string>
-    <string name="action_set_as_start_directory">Set as start directory</string>
-    <string name="action_settings">"Postavke"</string>
-    <string name="action_share">Podijeli</string>
-    <string name="action_shuffle_all">Shuffle all</string>
-    <string name="action_shuffle_playlist">Shuffle playlist</string>
-    <string name="action_sleep_timer">Sleep timer</string>
-    <string name="action_sort_order">Redoslijed sortiranja</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>
-    <string name="add_action">Dodaj</string>
-    <string name="add_playlist_title">"Dodaj na popis"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="few">Songs</item>
-        <item quantity="other">Songs</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="few">Albums</item>
-        <item quantity="other">Albums</item>
-    </plurals>
-    <string name="always">Always</string>
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
-    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Artist</string>
-    <string name="artists">Artists</string>
-    <string name="audio_fade_duration">Audio fade duration</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="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">Biography</string>
-    <string name="black_theme_name">Just Black</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Kupi sada</string>
-    <string name="cancel_current_timer">Odustani</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Popis promjena</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Classic</string>
-    <string name="clear_action">Očisti</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Očisti red čekanja</string>
-    <string name="color">Boja</string>
-    <string name="colors">Boje</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">Create</string>
-    <string name="create_new_backup">Create</string>
-    <string name="created_playlist_x">Created playlist %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Kinda Dark</string>
-    <string name="delete_playlist_title">Delete playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Delete playlists</string>
-    <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="depth">Depth</string>
-    <string name="description">Opis</string>
-    <string name="device_info">Informacije o uređaju</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Postavi zvuk zvona</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Donate</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Buy me a:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Empty</string>
-    <string name="equalizer">Ekvalizator</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favoriti</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Folders</string>
-    <string name="follow_system">Slijedi sustav</string>
-    <string name="for_you">Za vas</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Look and feel</string>
-    <string name="genre">Žanr</string>
-    <string name="genres">Žanrovi</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Stil mreže</string>
-    <string name="help_summary">Trebate još pomoći?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">History</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">Home</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">Naziv datoteke</string>
-    <string name="label_file_path">Putanja datoteke</string>
-    <string name="label_file_size">Veličina</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Trajanje</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Last added</string>
-    <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licenses</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">Listeners</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Lyrics</string>
-    <string name="made_with_love">Stvoreno sa ❤️ u Indiji</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Most played</string>
-    <string name="never">Never</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Novi popis</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Next Song</string>
-    <string name="no_albums">You have no albums</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Permissions denied.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">Brisanje datoteke nije uspjelo: %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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">Pisanje datoteke nije uspjelo: %s</string>
-    <string name="save">Spremi</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Spremi kao datoteku</string>
-    <string name="save_playlists_title">Spremi kao datoteke</string>
-    <string name="saved_playlist_to">Popis spremljen u %s.</string>
-    <string name="saving_changes">Spremanje izmjena</string>
-    <string name="scan_media">Skeniraj medije</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Odaberi sve</string>
-    <string name="selected">Odabrano</string>
-    <string name="set">Postavi</string>
-    <string name="set_artist_image">Postavi sliku izvođača</string>
-    <string name="share_app">Podijeli aplikaciju</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Društveno</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Pjesma</string>
-    <string name="song_duration">Trajanje pjesme</string>
-    <string name="songs">Pjesme</string>
-    <string name="sort_order">Redoslijed sortiranja</string>
-    <string name="sort_order_a_z">Uzlazno</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Izvođač</string>
-    <string name="sort_order_composer">Skladatelj</string>
-    <string name="sort_order_date">Datum dodavanja</string>
-    <string name="sort_order_date_modified">Datum izmjene</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Broj pjesama</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Godina</string>
-    <string name="sort_order_z_a">Silazno</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Hvala Vam!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Broj pjesme</string>
-    <string name="translate">Prevedite</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Ažuriranje…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">Korisničko ime</string>
-    <string name="username">Korisničko ime</string>
-    <string name="version">Verzija</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">Vidi na Telegramu</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">Što je novo</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Godina</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
new file mode 100644
index 000000000..3863ba96f
--- /dev/null
+++ b/app/src/main/res/values-hr/strings.xml
@@ -0,0 +1,703 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Naglašena boja</string>
+    <string name="accent_color_desc">Naglašena boja teme, zadana je plavo zelena</string>
+
+    <string name="action_about">O aplikaciji</string>
+
+    <string name="action_add_to_favorites">Dodaj u omiljene</string>
+    <string name="action_add_to_playing_queue">Dodaj u red čekanja</string>
+    <string name="action_add_to_playlist">Dodaj na popis naslova</string>
+
+    <string name="action_clear_playing_queue">Očisti red čekanja</string>
+    <string name="action_clear_playlist">Očisti popis naslova</string>
+
+    <string name="action_delete">Izbriši</string>
+    <string name="action_delete_from_device">Izbriši s uređaja</string>
+
+    <string name="action_details">Detalji</string>
+
+    <string name="action_go_to_album">Odi na album</string>
+    <string name="action_go_to_artist">Idi na izvođača</string>
+    <string name="action_go_to_genre">Idi na žanr</string>
+    <string name="action_go_to_start_directory">Idi na početni direktorij</string>
+
+    <string name="action_grant">Dopusti</string>
+
+    <string name="action_grid_size">Veličina rešetke</string>
+    <string name="action_grid_size_land">Veličina rešetke (polja)</string>
+
+    <string name="action_next">Dalje</string>
+
+    <string name="action_play">Reproduciraj</string>
+    <string name="action_play_next">Reproduciraj sljedeće</string>
+    <string name="action_play_pause">Reproduciraj/pauziraj</string>
+
+    <string name="action_previous">Prethodno</string>
+
+    <string name="action_remove_from_favorites">Ukloni iz favorita</string>
+    <string name="action_remove_from_playing_queue">Ukloni iz reda reprodukcije</string>
+    <string name="action_remove_from_playlist">Ukloni sa popisa naslova</string>
+
+    <string name="action_rename">Preimenuj</string>
+
+    <string name="action_save_playing_queue">Spremi red reproduciranja</string>
+
+    <string name="action_scan">Skeniraj</string>
+
+    <string name="action_search">Traži</string>
+
+    <string name="action_set">Započni</string>
+    <string name="action_set_as_ringtone">Postavi kao zvuk zvona</string>
+    <string name="action_set_as_start_directory">Postavi kao početni direktorij</string>
+
+    <string name="action_settings">"Postavke"</string>
+
+    <string name="action_share">Podijeli</string>
+
+    <string name="action_shuffle_all">Izmješaj sve</string>
+    <string name="action_shuffle_playlist">Izmiješaj popis naslova</string>
+
+    <string name="action_sleep_timer">Brojač za spavanje</string>
+
+    <string name="action_sort_order">Način sortiranja</string>
+
+    <string name="action_tag_editor">Uređivač oznaka</string>
+
+    <string name="adaptive">Prilagodljivo</string>
+
+    <string name="add_action">Dodaj</string>
+
+    <string name="add_photo">Dodaj\nsliku</string>
+
+    <string name="add_playlist_title">"Dodaj na popis naslova"</string>
+
+    <string name="added_title_to_playing_queue">"Dodana 1 pjesma na red reprodukcije."</string>
+
+    <string name="added_x_titles_to_playing_queue">Dodano %1$d pjesama na red reprodukcije.</string>
+
+    <string name="album">Album</string>
+
+    <string name="album_artist">Izvođač albuma</string>
+
+    <string name="album_or_artist_empty">Naziv ili izvođač su prazni.</string>
+
+    <string name="albums">Albumi</string>
+
+    <!-- Android Auto -->
+    <string name="always">Uvijek</string>
+
+    <string name="app_share">Hej, pogledajte ovaj cool reproduktor glazbe: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Izmiješaj</string>
+    <string name="app_shortcut_top_tracks_short">Najslušanije pjesme</string>
+
+    <string name="app_widget_big_name">Retro Music - Velik</string>
+    <string name="app_widget_card_name">Retro Music - Kartica</string>
+    <string name="app_widget_classic_name">Retro Music - Klasičan</string>
+    <string name="app_widget_small_name">Retro Music - Malen</string>
+    <string name="app_widget_text_name">Retro Music - Tekst</string>
+
+    <string name="artist">Izvođač</string>
+
+    <string name="artists">Izvođači</string>
+
+    <string name="audio_focus_denied">Fokus zvuka je odbijen.</string>
+
+    <string name="audio_settings_summary">Promijenite postavke zvuka i kontrole ekvalizatora</string>
+
+    <string name="auto">Automatski</string>
+
+    <string name="base_color_theme">Temeljna boja teme</string>
+
+    <string name="bass_boost">Pojačalo Bassa</string>
+
+    <string name="bio">Biografija</string>
+
+    <string name="biography">Biografija</string>
+
+    <string name="black_theme_name">Samo crna</string>
+
+    <string name="blacklist">Crni popis</string>
+
+    <string name="blur">Zamagljenje</string>
+
+    <string name="blur_card">Zamagljena kartica</string>
+
+    <string name="bug_report_failed">Nije moguće poslati izvješće</string>
+    <string name="bug_report_failed_invalid_token">Pristupni token nije valjan. Molimo kontaktirajte razvojnog programera aplikacije.</string>
+    <string name="bug_report_failed_issues_not_available">Problemi nisu omogućeni za odabrani repozitorij. Molimo kontaktirajte razvojnog programera aplikacije.</string>
+    <string name="bug_report_failed_unknown">Dogodila se neočekivana pogreška. Molimo kontaktirajte razvojnog programera aplikacije.</string>
+    <string name="bug_report_failed_wrong_credentials">Krivo korisničko ime ili lozinka</string>
+    <string name="bug_report_issue">Problem</string>
+    <string name="bug_report_manual">Pošalji ručno</string>
+    <string name="bug_report_no_description">Molimo unesite opis problema</string>
+    <string name="bug_report_no_password">Molimo unesite vašu valjanu GitHub lozinku</string>
+    <string name="bug_report_no_title">Molimo unesite naslov problema</string>
+    <string name="bug_report_no_username">Molimo unesite vaše valjano GitHub korisničko ime</string>
+    <string name="bug_report_summary">Dogodila se neočekivana pogreška. Žao nam je što ste pronašli ovu pogrešku, ako se aplikacija
+    nastavi rušiti \"Očisti podatke aplikacije\"</string>
+    <string name="bug_report_uploading">Učitavanje izvješća na GitHub...</string>
+    <string name="bug_report_use_account">Pošalji putem GitHub računa</string>
+
+    <string name="cancel_current_timer">Odustani</string>
+
+    <string name="card">Kartica</string>
+
+    <string name="card_circular_style">Kružno</string>
+
+    <string name="card_color_style">Obojena kartica</string>
+
+    <string name="card_style">Kartica</string>
+
+    <string name="carousal">Vrtuljak</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Efekt ringišpila za zaslon reprodukcije</string>
+
+    <string name="cascading">Kaskadno</string>
+
+    <string name="cast">Emitiraj</string>
+
+    <string name="changelog">Popis promjena</string>
+
+    <string name="changelog_summary">Popis promjena održavan na Telegramu</string>
+
+    <string name="circular">Kružno</string>
+
+    <string name="clear_action">Očisti</string>
+
+    <string name="clear_app_data">Očisti podatke aplikacije</string>
+
+    <string name="clear_blacklist">Očisti crnu popis</string>
+
+    <string name="clear_playing_queue">Očisti red čekanja</string>
+
+    <string name="clear_playlist_title">Očisti popis naslova</string>
+    <string name="clear_playlist_x"><![CDATA[O\u010distiti popis naslova<b>%1$s</b>? Ovo se ne mo\u017ee poni\u0161titi!]]></string>
+
+    <string name="close_notification">Zatvori</string>
+
+    <string name="color">Boja</string>
+
+    <string name="color_theme_name">Boja</string>
+
+    <string name="colors">Boje</string>
+
+    <string name="copied_device_info_to_clipboard">Informacije o uređaju su kopirane u međuspremnik.</string>
+
+    <string name="could_not_create_playlist">Stvaranje popisa naslova nije uspjelo.</string>
+    <string name="could_not_download_album_cover">"Preuzimanje odgovaraju\u0107eg omota albuma nije uspjelo."</string>
+    <string name="could_not_restore_purchase">Vraćanje kupnje nije uspjelo.</string>
+    <string name="could_not_scan_files">Skeniranje %d datoteke nije uspjelo.</string>
+
+    <string name="create_action">Stvori</string>
+
+    <string name="created_playlist_x">Popis naslova %1$s je stvoren.</string>
+
+    <string name="credit_title">Članovi i dobrinositelji</string>
+
+    <string name="currently_listening_to_x_by_x">Trenutno slušaš %1$s od %2$s.</string>
+
+    <string name="dark_theme_name">Otprilike mračna</string>
+
+    <string name="default_hint">Nema Teksta</string>
+
+    <string name="delete_playlist_title">Izbriši popis naslova</string>
+    <string name="delete_playlist_x"><![CDATA[Izbrisati popis naslova <b>%1$s</b>?]]></string>
+
+    <string name="delete_playlists_title">Izbriši popise naslova</string>
+
+    <string name="delete_song_x"><![CDATA[Izbriši pjesmu <b>%1$s</b>?]]></string>
+
+    <string name="delete_x_playlists"><![CDATA[Izbriši <b>%1$d</b> popisa naslova?]]></string>
+    <string name="delete_x_songs"><![CDATA[Izbriši <b>%1$d</b> pjesama?]]></string>
+    <string name="deleted_x_songs">Izbrisano je %1$d pjesama.</string>
+
+    <string name="depth">Dubina</string>
+
+    <string name="description">Opis</string>
+
+    <string name="device_info">Informacije o uređaju</string>
+
+    <string name="do_you_want_to_clear_the_blacklist">Želite li očistiti crni popis?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Želite li ukloniti <b>%1$s</b> sa crnog popisa?]]></string>
+
+    <string name="donate">Doniraj</string>
+
+    <string name="donate_summary">Ako mislite da zaslužujem biti plaćen za svoj posao, možete mi ostaviti nešto
+    novca ovdje</string>
+
+    <string name="donation_header">Kupite mi:</string>
+
+    <string name="download_from_last_fm">Preuzmi sa Last.fm-a</string>
+
+    <string name="edit">Uredi</string>
+
+    <string name="edit_cover">Uredi omot</string>
+
+    <string name="empty">Prazno</string>
+
+    <string name="equalizer">Ekvalizator</string>
+
+    <string name="error">Pogreška</string>
+
+    <string name="faq">Često postavljena pitanja</string>
+
+    <string name="favorites">Favoriti</string>
+
+    <string name="fit">Podesi</string>
+
+    <string name="flat">Ravno</string>
+
+    <string name="folders">Mape</string>
+
+    <string name="for_you">Za vas</string>
+
+    <string name="full">Puno</string>
+
+    <string name="full_card">Potpuna kartica</string>
+
+    <string name="general_settings_summary">Promijenite temu i boje aplikacije</string>
+    <string name="general_settings_title">Izgled i osjećaj</string>
+
+    <string name="genre">Žanr</string>
+
+    <string name="genres">Žanri</string>
+
+    <string name="git_hub_summary">Forkaj projekt na GitHubu</string>
+
+    <string name="google_plus_community">Pridružite se Google plus zajednici, gdje možete pitati za pomoć ili pratiti ažuriranja Retro Musica</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="hinge">Šarka</string>
+
+    <string name="history">Povijest</string>
+
+    <string name="home">Početna</string>
+
+    <string name="horizontal_flip">Horizontalni okret</string>
+
+    <string name="image">Slika</string>
+
+    <string name="image_settings_summary">Promijenite postavke preuzimanja slika izvođača</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Dodano je %1$d pjesama na popis naslova %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Podjelite svoju Retro Music postavu na Instagramu</string>
+
+    <string name="label_bit_rate">Brzina prijenosa</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">Brzina uzorkovanja</string>
+
+    <string name="label_track_length">Dužina</string>
+
+    <string name="labeled">Označeno</string>
+
+    <string name="last_added">Posljednje dodano</string>
+
+    <string name="lets_play_something">Reproducirajmo malo glazbe</string>
+
+    <string name="library">Biblioteka</string>
+
+    <string name="licenses">Licence</string>
+
+    <string name="light_theme_name">Jasno bijela</string>
+
+    <string name="listing_files">Popisivanje datoteka</string>
+
+    <string name="loading_products">Učitavanje proizvoda...</string>
+
+    <string name="login">Prijava</string>
+
+    <string name="lyrics">Tekst</string>
+
+    <string name="made_with_love">Napravljeno sa ❤️ u Indiji</string>
+
+    <string name="material">Materijal</string>
+
+    <string name="my_name">Moje ime</string>
+
+    <string name="my_top_tracks">Najslušanije</string>
+
+    <string name="never">Nikad</string>
+
+    <string name="new_banner_photo">Nova slika naslovnice</string>
+
+    <string name="new_playlist_title">Novi popis naslova</string>
+
+    <string name="new_profile_photo">Nova slika profila</string>
+
+    <string name="new_start_directory">%s je novi početni direktorij.</string>
+
+    <string name="no_albums">Nema albuma</string>
+
+    <string name="no_artists">Nema izvođača</string>
+
+    <string name="no_audio_ID">"Prvo reproducirajte pjesmu, zatim pokušajte ponovo."</string>
+
+    <string name="no_equalizer">Ekvalizator nije pronađen</string>
+
+    <string name="no_genres">Nema žanrova</string>
+
+    <string name="no_lyrics_found">Tekst nije pronađen</string>
+
+    <string name="no_playlists">Nema popisa naslova</string>
+
+    <string name="no_purchase_found">Kupnja nije pronađena.</string>
+
+    <string name="no_results">Nema rezultata</string>
+
+    <string name="no_songs">Nema pjesama</string>
+
+    <string name="normal">Normalno</string>
+
+    <string name="normal_lyrics">Normalni tekst</string>
+
+    <string name="normal_style">Normalno</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nije na popisu medijske pohrane.]]></string>
+
+    <string name="nothing_to_scan">Nema stavki za skeniranje.</string>
+
+    <string name="notification">Obavijest</string>
+
+    <string name="notification_settings_summary">Prilagodite stil obavijesti</string>
+
+    <string name="now_playing">Zaslon reprodukcije</string>
+    <string name="now_playing_queue">Red reprodukcije</string>
+    <string name="now_playing_summary">Prilagodite zaslon reprodukcije</string>
+    <string name="now_playing_themes">9+ tema za zaslon reprodukcije</string>
+
+    <string name="only_on_wifi">Samo na Wi-Fi-u</string>
+
+    <string name="others">Ostalo</string>
+
+    <string name="password">Lozinka</string>
+
+    <string name="past_three_months">Prošla 3 mjeseca</string>
+
+    <string name="permission_external_storage_denied">Dopuštenje za pristup eksternoj memoriji odbijeno.</string>
+
+    <string name="permissions_denied">Dopuštenja odbijena.</string>
+
+    <string name="personalize">Prilagodba</string>
+
+    <string name="personalize_settings_summary">Prilagodite vaš zaslon reprodukcije i kontrole sučelja</string>
+
+    <string name="pick_from_local_storage">Odaberi sa lokalne pohrane</string>
+
+    <string name="plain">Jasno</string>
+
+    <string name="playing_notification_description">Obavijest reprodukcije pruža mogućnosti reprodukcije/pauziranja itd.</string>
+    <string name="playing_notification_name">Obavijest reprodukcije</string>
+
+    <string name="playlist_empty_text">Prazan popis naslova</string>
+
+    <string name="playlist_is_empty">Popis naslova je prazan</string>
+
+    <string name="playlist_name_empty">Naziv popisa naslova</string>
+
+    <string name="playlists">Popisi naslova</string>
+
+    <string name="pref_album_detail_style">Stil detalja albuma</string>
+
+    <string name="pref_blur_amount_summary">Količina zamagljenja koja se primjenjuje na teme, manje je brže</string>
+    <string name="pref_blur_amount_title">Količina zamagljenja</string>
+
+    <string name="pref_header_audio">Zvuk</string>
+    <string name="pref_header_general">Tema</string>
+    <string name="pref_header_images">Slike</string>
+    <string name="pref_header_lockscreen">Zaključani zaslon</string>
+    <string name="pref_header_playlists">Playliste</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Pauzirajte reprodukciju na nuli i započnite ju nakon podizanja glasnoće. Budite oprezni prilikom podizanja glasnoće jer se reprodukcija nastavlja čak i izvan aplikacije</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pauziraj na nuli</string>
+    <string name="pref_keep_screen_on_summary">Imajte na umu da omogućavanje ove značajke može utjecati na trajanje baterije</string>
+    <string name="pref_keep_screen_on_title">Drži zaslon uključenim</string>
+
+    <string name="pref_now_playing_screen_summary">Dodirnite za otvaranje ili klizanje bez prozirne navigacije zaslona za reprodukciju</string>
+    <string name="pref_now_playing_screen_title">Klik ili klizanje</string>
+
+    <string name="pref_snow_fall_title">Efekt padanja snijega</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Koristite omot albuma trenutne pjesme kao pozadinu zaključanog zaslona.</string>
+    <string name="pref_summary_audio_ducking">Smanjuje glasnoću kada je reproduciran zvuk sustava ili kad je stigla obavijest</string>
+    <string name="pref_summary_blacklist">Sadržaj mapa na crnom popisu će biti skriven iz vaše biblioteke.</string>
+    <string name="pref_summary_blurred_album_art">Zamagljuje omot albuma na zaključanom zaslonu. Može uzrokovati probleme s widgetima i aplikacijama treće strane.</string>
+    <string name="pref_summary_carousel_effect">Efekt ringišpila za omot albuma na zaslonu reprodukcije. Zapamtite da teme Kartica i Zamagljena Kartica neće raditi</string>
+    <string name="pref_summary_classic_notification">Koristite klasični dizajn obavijesti</string>
+    <string name="pref_summary_colored_app">Pozadina i kontrolne tipke se mijenjaju prema omotu albuma na zaslonu reprodukcije</string>
+    <string name="pref_summary_colored_app_shortcuts">Boja prečace aplikacije u naglašenu boju. Svaki put kad promijenite boju molimo ponovno uključite ovo</string>
+    <string name="pref_summary_colored_navigation_bar">Boja navigacijsku traku u primarnu boju</string>
+    <string name="pref_summary_colored_notification">"Boja obavijest u istaknutu boju albuma"</string>
+    <string name="pref_summary_dominant_color">Najdominantnija boja će biti odabrana iz omota albuma ili izvođača.</string>
+    <string name="pref_summary_extra_controls">Dodajte dodatne kontrole za mini reproduktor</string>
+    <string name="pref_summary_gapless_playback">"Može uzrokovati probleme sa reprodukcijom na nekim uređajima."</string>
+    <string name="pref_summary_genre_toggle">Uključite/isključite karticu žanra</string>
+    <string name="pref_summary_home_banner">Uključite/isključite način naslovnice na početnoj stranici</string>
+    <string name="pref_summary_ignore_media_store_artwork">Može povećati kvalitetu omota albuma, ali uzrokuje sporije učitavanje slika. Omogućite ovo samo ako imate problema sa omotima niske rezolucije</string>
+    <string name="pref_summary_lock_screen">Koristite Retro Music prilagođene kontrole zaklj. zaslona</string>
+    <string name="pref_summary_open_source_licences">Detalji o licenci za softver otvorenog koda</string>
+    <string name="pref_summary_round_corners">Zaoblite rubove aplikacije</string>
+    <string name="pref_summary_tab_titles">Uključi/isključi nazive kartica pri dnu</string>
+    <string name="pref_summary_toggle_full_screen">Uvjerljivi način</string>
+    <string name="pref_summary_toggle_headset">Započni reprodukciju odmah nakon što su slušalice povezane</string>
+    <string name="pref_summary_toggle_shuffle">Nasumični naćin će biti isključen prilikom sviranja novog popisa pjesama</string>
+    <string name="pref_summary_toggle_volume">Ako ima dovoljno prostora, prikazati će se kontrole glasnoće na zaslonu reprodukcije</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Prikaži omot albuma</string>
+    <string name="pref_title_album_cover_style">Teme omota albuma</string>
+    <string name="pref_title_album_cover_transform">Preskakanje omota albuma</string>
+    <string name="pref_title_album_grid_style">Rešetka albuma</string>
+    <string name="pref_title_app_shortcuts">Obojeni prečaci aplikacije</string>
+    <string name="pref_title_artist_grid_style">Rešetka izvođača</string>
+    <string name="pref_title_audio_ducking">Smanji glasnoću pri gubitku fokusa</string>
+    <string name="pref_title_auto_download_artist_images">Automatsko preuzimanje slika izvođača</string>
+    <string name="pref_title_blacklist">Crni popis</string>
+    <string name="pref_title_blurred_album_art">Zamagli prevlaku albuma</string>
+    <string name="pref_title_choose_equalizer">Odaberi ekvalizator</string>
+    <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">Obojena obavijest</string>
+    <string name="pref_title_extra_controls">Dodatne kontrole</string>
+    <string name="pref_title_gapless_playback">Reprodukcija bez prekida</string>
+    <string name="pref_title_general_theme">Tema aplikacije</string>
+    <string name="pref_title_genre_toggle">Prikaži karticu žanra</string>
+    <string name="pref_title_home_artist_grid_style">Rešetka izvođača na početnoj stranici</string>
+    <string name="pref_title_home_banner">Naslovnica na početnoj stranici</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignoriraj omote iz medijske pohrane</string>
+    <string name="pref_title_last_added_interval">Interval zadnje dodanih popisa naslova</string>
+    <string name="pref_title_lock_screen">Kontrole preko cjelog zaslona</string>
+    <string name="pref_title_navigation_bar">Obojena navigacijska traka</string>
+    <string name="pref_title_now_playing_screen_appearance">Tema zaslona reprodukcije</string>
+    <string name="pref_title_open_source_licences">Licence otvorenog koda</string>
+    <string name="pref_title_round_corners">Rubovi uglova</string>
+    <string name="pref_title_tab_text_mode">Način oznaka na karticama</string>
+    <string name="pref_title_toggle_carousel_effect">Efekt ringišpila</string>
+    <string name="pref_title_toggle_dominant_color">Dominantna boja</string>
+    <string name="pref_title_toggle_full_screen">Aplikacija preko cijelog zaslona</string>
+    <string name="pref_title_toggle_tab_titles">Nazivi kartica</string>
+    <string name="pref_title_toggle_toggle_headset">Automatska reprodukcija</string>
+    <string name="pref_title_toggle_toggle_shuffle">Način mješanja</string>
+    <string name="pref_title_toggle_volume">Kontrole glasnoće</string>
+    <string name="pref_title_user_info">Informacije o Korisniku</string>
+
+    <string name="primary_color">Primarna boja</string>
+    <string name="primary_color_desc">Primarna boja teme, zadano je plavo-siva, zasad radi s tamnim bojama</string>
+
+    <string name="profile">Profil</string>
+
+    <string name="purchase">Kupi</string>
+
+    <string name="purchase_summary">*Razmisli prije kupnje, ne pitaj za povrat novca.</string>
+
+    <string name="queue">Red</string>
+
+    <string name="rate_app">Ocijeni aplikaciju</string>
+
+    <string name="rate_on_google_play_summary">Volite ovu aplikaciju? Javite nam to na Google Play trgovini kako bi smo vam poboljšali iskustvo</string>
+
+    <string name="recent_albums">Nedavni albumi</string>
+
+    <string name="recent_artists">Nedavni izvođači</string>
+
+    <string name="remove_action">Ukloni</string>
+
+    <string name="remove_banner_photo">Ukloni sliku naslovnice</string>
+
+    <string name="remove_cover">Ukloni omot</string>
+
+    <string name="remove_from_blacklist">Ukloni sa crnog popisa</string>
+
+    <string name="remove_profile_photo">Ukloni sliku profila</string>
+
+    <string name="remove_song_from_playlist_title">Ukloni pjesmu s popisa naslova</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Ukloniti pjesmu <b>%1$s</b> sa popisa naslova?]]></string>
+
+    <string name="remove_songs_from_playlist_title">Ukloni pjesme sa popisa naslova</string>
+
+    <string name="remove_x_songs_from_playlist"><![CDATA[Ukloniti <b>%1$d</b> pjesama sa popisa naslova?]]></string>
+
+    <string name="rename_playlist_title">Preimenuj popis naslova</string>
+
+    <string name="report_an_issue">Prijavi pogrešku</string>
+
+    <string name="report_bug">Prijavi pogrešku</string>
+
+    <string name="reset_artist_image">Resetiraj sliku izvođača</string>
+
+    <string name="restore">Vrati</string>
+
+    <string name="restored_previous_purchase_please_restart">Vrati prošlu kupnju. Molimo vas ponovno pokrenite aplikaciju da biste koristili sve značajke.</string>
+    <string name="restored_previous_purchases">Bivše kupnje vraćene.</string>
+
+    <string name="restoring_purchase">Vraćanje kupnje...</string>
+
+    <string name="retro_equalizer">Retro Music Ekvalizator</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Spremi kao datoteku</string>
+
+    <string name="save_playlists_title">Spremi kao datoteke</string>
+
+    <string name="saved_playlist_to">Popis naslova je spremljen u %s.</string>
+
+    <string name="saving_changes">Spremanje promjena</string>
+
+    <string name="scan_media">Skeniraj medije</string>
+
+    <string name="scanned_files">Skenirano %1$d od %2$d datoteka.</string>
+
+    <string name="search_hint">Pretraži svoju biblioteku...</string>
+
+    <string name="select_all">Odaberi sve</string>
+
+    <string name="select_banner_photo">Odaberi sliku naslovnice</string>
+
+    <string name="selected">Odabrano</string>
+
+    <string name="set_artist_image">Postavi sliku izvođača</string>
+
+    <string name="share_app">Podijeli aplikaciju</string>
+
+    <string name="shuffle">Izmiješaj</string>
+
+    <string name="simple">Jednostavno</string>
+
+    <string name="sleep_timer_canceled">Brojač za spavanje je otkazan.</string>
+    <string name="sleep_timer_set">Brojač za spavanje je postavljen za %d minuta od sada.</string>
+
+    <string name="small">Mali album</string>
+
+    <string name="social">Društveno</string>
+
+    <string name="song">Pjesma</string>
+
+    <string name="song_duration">Trajanje pjesme</string>
+
+    <string name="songs">Pjesme</string>
+
+    <string name="sort_order">Red sortiranja</string>
+    <string name="sort_order_a_z">Uzlazno</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_artist">Izvođač</string>
+    <string name="sort_order_date">Datum</string>
+    <string name="sort_order_year">Godina</string>
+    <string name="sort_order_z_a">Silazno</string>
+
+    <string name="speech_not_supported">Žao mi je! Tvoj uređaj ne podržava unos govora</string>
+
+    <string name="speech_prompt">Pretraži svoju biblioteku</string>
+
+    <string name="suggestion_songs">Preporuke</string>
+
+    <string name="summary_user_info">Prikažite samo svoje ime na početnoj stranici</string>
+
+    <string name="support_development">Podrži razvijanje</string>
+
+    <string name="synced_lyrics">Sinkroniziran tekst</string>
+
+    <string name="system_equalizer">Sustavski ekvalizator</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Pridružite se Telegram grupi da biste raspravili o pogreškama, dali preporuke, te još mnogo toga</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">Ove godine</string>
+
+    <string name="tiny">Sitno</string>
+
+    <string name="title">Naziv</string>
+
+    <string name="title_dashboard">Kontrolna ploča</string>
+
+    <string name="title_good_afternoon">Dobar dan</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_user_info">Kako se zoveš</string>
+
+    <string name="today">Danas</string>
+
+    <string name="top_albums">Najslušaniji albumi</string>
+
+    <string name="top_artists">Najslušaniji izvođači</string>
+
+    <string name="track_hint">"Pjesma (2 za 2. pjesmu ili 3004 za 3. CD 4. pjesmu)"</string>
+
+    <string name="track_list">Broj pjesme</string>
+
+    <string name="translate">Prevedi</string>
+
+    <string name="translate_community">Pomozite nam prevesti našu aplikaciju na svoj jezik</string>
+
+    <string name="twitter_page">Twitter</string>
+    <string name="twitter_page_summary">Podjeli svoj dizajn sa Retro Music-om</string>
+
+    <string name="unlabeled">Neoznačeno</string>
+
+    <string name="unplayable_file">Nije mogu\u0107e reproducirati ovu pjesmu.</string>
+
+    <string name="up_next">Sljedeće</string>
+
+    <string name="update_image">Ažuriraj sliku</string>
+
+    <string name="updating">Ažuriranje...</string>
+
+    <string name="username">Korisničko ime</string>
+
+    <string name="version">Verzija</string>
+
+    <string name="vertical_flip">Vertikalni okret</string>
+
+    <string name="virtualizer">Virtualizator</string>
+
+    <string name="web_search">Web pretraživanje</string>
+
+    <string name="what_do_you_want_to_share">Što želite podijeliti?</string>
+
+    <string name="whats_new">Što je novo</string>
+
+    <string name="window">Prozor</string>
+
+    <string name="window_corner_edges">Zaobljeni kutovi</string>
+
+    <string name="x_has_been_set_as_ringtone">Postavi %1$s kao zvuk zvona.</string>
+
+    <string name="x_selected">%1$d odabran</string>
+
+    <string name="year">Godina</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Biti će te preusmjereni na web stranicu za praćenje pogrešaka.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Vaši podatci o računu su korišteni samo za autentikaciju.</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu/strings.xml
similarity index 53%
rename from app/src/main/res/values-hu-rHU/strings.xml
rename to app/src/main/res/values-hu/strings.xml
index bf89c2c75..9c7aea114 100644
--- a/app/src/main/res/values-hu-rHU/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,26 +1,21 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">%s -ról</string>
-    <string name="about_settings_summary">Csapat, közösségi oldalak</string>
-    <string name="accent_color">Kiemelő szín</string>
-    <string name="accent_color_desc">A kiemelő téma színe, alapértelmezés szerint lila</string>
+    <string name="about_settings_summary">Csapat, társadalmi kapcsolatok</string>
+    <string name="accent_color">A hangsúly színe</string>
+    <string name="accent_color_desc">Az akcentus téma színe alapértelmezés szerint színtiszta</string>
     <string name="action_about">Rólunk</string>
-    <string name="action_add_to_blacklist">Hozzáadás a tiltólistához</string>
     <string name="action_add_to_favorites">Hozzáadás a kedvencekhez</string>
-    <string name="action_add_to_playing_queue">Hozzáadás a lejátszási sorhoz</string>
+    <string name="action_add_to_playing_queue">Hozzáadás a lejátszási kvótához.</string>
     <string name="action_add_to_playlist">Hozzáadás lejátszási listához</string>
-    <string name="action_cancel">Mégse</string>
-    <string name="action_cast">Tartalomátküldés</string>
-    <string name="action_clear_playing_queue">Lejátszási sor törlése</string>
-    <string name="action_cycle_repeat">Ciklus ismétlési üzemmód</string>
+    <string name="action_clear_playing_queue">Lejátszási kvóta törlése</string>
+    <string name="action_clear_playlist">Lejátszási lista törlése</string>
+    <string name="action_cycle_repeat">Ciklus 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>
-    <string name="action_edit">Szerkesztés</string>
     <string name="action_go_to_album">Ugrás az albumhoz</string>
     <string name="action_go_to_artist">Ugrás az előadóhoz</string>
     <string name="action_go_to_genre">Ugrás a műfajhoz</string>
-    <string name="action_go_to_lyrics">Ugrás a dalszövegre</string>
     <string name="action_go_to_start_directory">Ugrás a kiindulási könyvtárhoz</string>
     <string name="action_grant">Engedélyezés</string>
     <string name="action_grid_size">Rácsméret</string>
@@ -33,13 +28,13 @@
     <string name="action_play_pause">Lejátszás / Szünet</string>
     <string name="action_previous">Előző</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_playing_queue">Lejátszási kvóta törlése</string>
     <string name="action_remove_from_playlist">Eltávolítás a lejátszási listáról</string>
     <string name="action_rename">Átnevezés</string>
-    <string name="action_save_playing_queue">Lejátszási sor mentése</string>
+    <string name="action_save_playing_queue">Lejátszási kvóta mentése</string>
     <string name="action_scan">Keresés</string>
     <string name="action_search">Keresés</string>
-    <string name="action_set">Indítás</string>
+    <string name="action_set">Start</string>
     <string name="action_set_as_ringtone">Beállítás csengőhangként</string>
     <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>
@@ -49,102 +44,92 @@
     <string name="action_sleep_timer">Elalvás időzítő</string>
     <string name="action_sort_order">Rendezési sorrend</string>
     <string name="action_tag_editor">Címkeszerkesztő</string>
-    <string name="action_toggle_favorite">A kedvenc bekapcsolása/kikapcsolása</string>
-    <string name="action_toggle_shuffle">A véletlenszerű lejátszás bekapcsolása/kikapcsolása</string>
-    <string name="adaptive">Adaptív</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="adaptive">AdaptÍv</string>
     <string name="add_action">Hozzáad</string>
-    <string name="add_playlist_title">"Hozzáadás lejátszási listához"</string>
-    <string name="add_time_framed_lryics">Időzített dalszöveg hozzáadása</string>
-    <string name="added_song_count_to_playlist">%1$d zene hozzáadva a %2$s</string>
-    <string name="added_title_to_playing_queue">"1 cím lett hozzáadva a lejátszási sorhoz."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d cím hozzáadva a lejátszási sorhoz.</string>
+    <string name="add_lyrics">Dalszöveg hozzáadása</string>
+    <string name="add_photo">Fénykép\nhozzáadása</string>
+    <string name="add_playlist_title">"Lejátszási listához adni"</string>
+    <string name="add_time_framed_lryics">Adjon hozzá időkeretet dalszövegeket</string>
+    <string name="added_title_to_playing_queue">"1 cím lett hozzáadva a lejátszási kvótához."</string>
+    <string name="added_x_titles_to_playing_queue">%1$d cím hozzáadva a lejátszási kvótához.</string>
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Dal</item>
-        <item quantity="other">Dalok</item>
-    </plurals>
     <string name="album_artist">Album előadó</string>
+    <string name="album_or_artist_empty">A cím vagy az előadó üres.</string>
     <string name="albums">Albumok</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albumok</item>
-    </plurals>
     <string name="always">Mindig</string>
     <string name="app_share">Hé, nézd meg ezt a menő zenelejátszót itt: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Keverés</string>
     <string name="app_shortcut_top_tracks_short">Legjobb zeneszámok</string>
-    <string name="app_widget_big_name">Teljes kép</string>
-    <string name="app_widget_card_name">Kártya</string>
-    <string name="app_widget_classic_name">Klasszikus</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Kicsi</string>
-    <string name="app_widget_text_name">Minimális szöveg</string>
+    <string name="app_widget_big_name">Retro music - Nagy</string>
+    <string name="app_widget_card_name">Retro music - Kártya</string>
+    <string name="app_widget_classic_name">Retro zene - Klasszikus</string>
+    <string name="app_widget_small_name">Retro zene - Kicsi</string>
+    <string name="app_widget_text_name">Retro zene - Szöveg</string>
     <string name="artist">Előadó</string>
     <string name="artists">Előadók</string>
-    <string name="audio_fade_duration">Hangáttűnés hossza</string>
     <string name="audio_focus_denied">Az audiofókusz megtagadva.</string>
-    <string name="audio_settings_summary">Módosítsd a hangbeállításokat és állítsd be a hangszínszabályzó vezérlőit</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Beállításaid, lejátszási listáid biztonsági mentése és visszaállítása</string>
-    <string name="backup_restore_title"><![CDATA[Biztonsági mentés & Visszaállítás]]></string>
-    <string name="backup_title">Biztonsági mentések</string>
+    <string name="audio_settings_summary">Módosítsa a hangbeállításokat és állítsa be a hangszínszabályzó irányítását</string>
+    <string name="auto">Autó</string>
+    <string name="base_color_theme">Kiinduló szín témája</string>
+    <string name="bass_boost">Basszuskiemelés</string>
+    <string name="bio">Bio</string>
     <string name="biography">Életrajz</string>
     <string name="black_theme_name">Csak Fekete</string>
     <string name="blacklist">Feketelista</string>
-    <string name="bluetooth_summary">Az alkalmazásnak szüksége van a \'Közeli eszközök\' engedélyre, hogy Bluetooth eszközöket kereshessen</string>
-    <string name="bluetooth_title">Közeli eszközök</string>
     <string name="blur">Homályosítás</string>
-    <string name="blur_card">Homályosított kártya</string>
+    <string name="blur_card">Kártya homályosítása</string>
     <string name="bug_report_failed">Nem sikerült elküldeni a jelentést</string>
     <string name="bug_report_failed_invalid_token">Érvénytelen belépési azonosító. Kérem, lépjen kapcsolatba az alkalmazás fejlesztőjével.</string>
     <string name="bug_report_failed_issues_not_available">A problémák jelentése nincs engedélyezve a repository-ban. Kérem, lépjen kapcsolatba az alkalmazás fejlesztőjével.</string>
     <string name="bug_report_failed_unknown">Váratlan hiba történt. Kérem, lépjen kapcsolatba az alkalmazás fejlesztőjével.</string>
-    <string name="bug_report_failed_wrong_credentials">Hibás felhasználónév vagy jelszó</string>
+    <string name="bug_report_failed_wrong_credentials">Nem sikerült elküldeni a jelentést</string>
     <string name="bug_report_issue">Probléma</string>
     <string name="bug_report_manual">Küldés manuálisan</string>
-    <string name="bug_report_no_description">Kérem, adja meg a probléma leírását</string>
+    <string name="bug_report_no_description">Kérem, adja meg a leírást</string>
     <string name="bug_report_no_password">Kérem, adja meg az érvényes GitHub jelszavát</string>
-    <string name="bug_report_no_title">Kérem, nevezze meg a probléma címét</string>
+    <string name="bug_report_no_title">Kérem, adjon meg egy címet</string>
     <string name="bug_report_no_username">Kérem, adja meg az érvényes GitHub felhasználónevét</string>
-    <string name="bug_report_success">Sikeres hibajelentés</string>
     <string name="bug_report_summary">Egy váratlan hiba történt. Sajnáljuk, hogy hibába botlottál, ha folyton összeomlik, töröld az alkalmazásadatokat, vagy küldj nekünk E-Mailt.</string>
+    <string name="bug_report_uploading">Jelentés feltöltése GitHub-ra...</string>
     <string name="bug_report_use_account">Küldés a GitHub fiókkal</string>
-    <string name="buy_now">Vedd meg most</string>
+    <string name="buy_now">Vásárolj most</string>
     <string name="cancel_current_timer">Mégse</string>
     <string name="card">Kártya</string>
+    <string name="card_circular_style">Kör</string>
     <string name="card_color_style">Színes Kártya</string>
-    <string name="card_square">Négyzetes Kártya</string>
     <string name="card_style">Kártya</string>
-    <string name="carousal_effect_on_now_playing_screen">Körhinta effekt a \"most játszott\" képernyőn</string>
+    <string name="carousal">Körhinta</string>
+    <string name="carousal_effect_on_now_playing_screen">Kőrhinta effekt a most játszik képernyőn</string>
     <string name="cascading">Növelés</string>
+    <string name="cast">Cast</string>
     <string name="changelog">Változtatási napló</string>
-    <string name="changelog_summary">Nézd meg az újdonságokat</string>
-    <string name="choose_image">Válasszon képet</string>
-    <string name="choose_restore_title">Visszaállítandó elemek kiválasztása</string>
-    <string name="circle">Kör</string>
+    <string name="changelog_summary">A Változtatási napló a Telegram csatornán működik</string>
     <string name="circular">Kör alakú</string>
     <string name="classic">Klasszikus</string>
     <string name="clear_action">Kiürítés</string>
+    <string name="clear_app_data">App adat törlése</string>
     <string name="clear_blacklist">Feketelista kiürítése</string>
-    <string name="clear_history">Előzmények törlése</string>
     <string name="clear_playing_queue">Lejátszási sor törlése</string>
+    <string name="clear_playlist_title">Lejátszási lista kiürítése</string>
+    <string name="clear_playlist_x"><![CDATA[T\u00f6r\u00f6li a <b>%1$s</b> lej\u00e1tsz\u00e1si list\u00e1t? Ezt nem lehet visszavonni!]]></string>
+    <string name="close_notification">Bezárás</string>
     <string name="color">Szín</string>
+    <string name="color_theme_name">Szín</string>
     <string name="colors">Színek</string>
-    <string name="compact">Kompakt</string>
     <string name="composer">Zeneszerző</string>
     <string name="copied_device_info_to_clipboard">Eszköz információk a vágólapra másolva.</string>
-    <string name="could_not_create_playlist">Lejátszási lista létrehozása nem sikerült.</string>
-    <string name="could_not_download_album_cover">"Nem sikerült letölteni a megfelelő albumborítót."</string>
+    <string name="could_not_create_playlist">Lej\u00e1tsz\u00e1si lista l\u00e9trehoz\u00e1sa nem siker\u00fclt.</string>
+    <string name="could_not_download_album_cover">"Nem siker\u00fclt lek\u00e9rni a megfelel\u0151 albumbor\u00edt\u00f3t."</string>
     <string name="could_not_restore_purchase">A vásárlást nem sikerült visszaállítani.</string>
     <string name="could_not_scan_files">Nem sikerült beolvasni %d fájlt.</string>
     <string name="create_action">Létrehozás</string>
-    <string name="create_new_backup">Létrehozás</string>
-    <string name="created_playlist_x">Létrehozott lejátszási lista %1$s.</string>
+    <string name="created_playlist_x">Létrehozott lejátszási lista %1$s</string>
     <string name="credit_title">Tagok és támogatók</string>
-    <string name="currently_listening_to_x_by_x">Jelenleg %1$s hallgatása %2$s által.</string>
-    <string name="custom_artist_images">Egyedi művészképek</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Hibajelentés megosztása</string>
+    <string name="currently_listening_to_x_by_x">Jelenleg hallgat %1$s által %2$s</string>
     <string name="dark_theme_name">Kissé sötét</string>
+    <string name="default_hint">Nincs dalszöveg</string>
     <string name="delete_playlist_title">Lejátszási lista törlése</string>
     <string name="delete_playlist_x"><![CDATA[Törli a <b>%1$s</b> lejátszási listát?]]></string>
     <string name="delete_playlists_title">Lejátszási listák törlése</string>
@@ -154,41 +139,31 @@
     <string name="delete_x_playlists"><![CDATA[Törli a <b>%1$d</b> lejátszási listát?]]></string>
     <string name="delete_x_songs"><![CDATA[Törli a <b>%1$d</b> zenéket?]]></string>
     <string name="deleted_x_songs">Törölte a %1$d zenét.</string>
-    <string name="deleting_songs">Zenék törlése</string>
+    <string name="deleting_songs">Dalok törlése</string>
     <string name="depth">Mélység</string>
     <string name="description">Leírás</string>
     <string name="device_info">Eszköz információ</string>
-    <string name="dialog_message_set_ringtone">Engedélyezed, hogy a Retro Music módosítsa az audiobeállításokat</string>
+    <string name="dialog_message_set_ringtone">Hagyja, hogy a Retro Music módosítsa az audiobeállításokat</string>
     <string name="dialog_title_set_ringtone">Csengőhang beállítás</string>
-    <string name="disc_hint">Lemez száma</string>
-    <string name="do_you_want_to_clear_the_blacklist">Szeretné kiüríteni a feketelistát?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Szeretné eltávolítani a <b>%1$s</b> elemet a feketelistáról?]]></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 a <b>%1$s</b> a feketelistáról?]]></string>
     <string name="donate">Támogatás</string>
-    <string name="donate_summary">Ha úgy gondolod, hogy megérdemlem, hogy fizess a munkámért, hagyhatsz egy kis pénzt itt</string>
+    <string name="donate_summary">Ha úgy gondolja, hogy megérdemlem fizetni a munkámért, hagyhatsz néhányat pénzt itt</string>
     <string name="donation_header">Vegyél nekem egy:</string>
-    <string name="done">Kész</string>
-    <string name="drive_mode">Vezetés mód</string>
-    <string name="edit_fab">Szerkesztés gomb</string>
-    <string name="edit_normal_lyrics">Dalszöveg szerkesztése</string>
-    <string name="edit_synced_lyrics">Szinkronizált dalszöveg szerkesztése</string>
+    <string name="download_from_last_fm">Letöltés a Last.fm-ről</string>
+    <string name="edit">Szerkesztés</string>
+    <string name="edit_cover">Borító szerkesztése</string>
     <string name="empty">Üres</string>
     <string name="equalizer">Hangszínszabályzó</string>
-    <string name="error_create_backup">Biztonsági mentés sikertelen</string>
-    <string name="error_delete_backup">Biztonsági mentés törlése sikertelen</string>
-    <string name="error_empty_name">A neved nem lehet üres!</string>
-    <string name="error_load_failed">Betöltés sikertelen</string>
-    <string name="error_share_file">Nem sikerült megosztani a fájlt</string>
-    <string name="expanded">Kibővített</string>
+    <string name="error">Hiba</string>
     <string name="faq">GYIK</string>
     <string name="favorites">Kedvencek</string>
-    <string name="file_already_exists">A fájl már létezik</string>
     <string name="finish_last_song">Fejezze be az utolsó dalt</string>
-    <string name="fit">Illeszkedő</string>
+    <string name="fit">Fit</string>
     <string name="flat">Lapos</string>
     <string name="folders">Mappák</string>
     <string name="follow_system">Kövesse a rendszert</string>
     <string name="for_you">Neked</string>
-    <string name="free">Ingyenes</string>
     <string name="full">Teljes</string>
     <string name="full_card">Teljes kártya</string>
     <string name="general_settings_summary">Módosítsa az alkalmazás témáját és színeit</string>
@@ -196,8 +171,7 @@
     <string name="genre">Műfaj</string>
     <string name="genres">Műfajok</string>
     <string name="git_hub_summary">Szerezd meg a projektet a githubon</string>
-    <string name="gradient">Színátmenet</string>
-    <string name="grant_access">Hozzáférés engedélyezése</string>
+    <string name="google_plus_community">Csatlakozzon a Google Plus közösséghez ahol segítséget kérhet, vagy követheti a Retro Zene Alkalmazás frissítéseit</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,123 +180,99 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Rács stílusa</string>
-    <string name="help_summary">További segítségre van szüksége?</string>
+    <string name="grid_style_label"><![CDATA[Rácsok és stílus]]></string>
     <string name="hinge">Zsanér</string>
     <string name="history">Előzmény</string>
-    <string name="history_cleared">Előzmények törölve</string>
-    <string name="history_undo_button">Visszavonás</string>
     <string name="home">Kezdőlap</string>
-    <string name="horizontal_flip">Vízszintes forgatás</string>
+    <string name="horizontal_flip">Vízszintes flip</string>
     <string name="image">Kép</string>
-    <string name="image_gradient">Színátmenetes kép</string>
-    <string name="image_settings_summary">A művészképek letöltési beállításainak megváltoztatása</string>
-    <string name="import_label">Importálás</string>
-    <string name="import_playlist">Lejátszólista importálása</string>
-    <string name="import_playlist_message">Importálja az Android Media Store-ban lévő összes lejátszási listát a zenékkel együtt. Ha a lejátszási lista már létezik, a zeneszámok össze lesznek vonva.</string>
+    <string name="image_gradient">Színátmenet kép</string>
+    <string name="image_settings_summary">A művészképek letöltésének megváltoztatása.</string>
     <string name="inserted_x_songs_into_playlist_x">%1$d dalt betett a %2$s lejátszási listába.</string>
-    <string name="instagram_page_summary">Osszd meg Retro Music beállításaid, mutasd meg a Instagram-on</string>
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Ossza meg Retro Music beállításait, hogy bemutassa a Instagram-on</string>
     <string name="keyboard">Billentyűzet</string>
-    <string name="label_bit_rate">Bitráta</string>
+    <string name="label_bit_rate">Bitrát</string>
     <string name="label_file_format">Formátum</string>
     <string name="label_file_name">Fájl név</string>
     <string name="label_file_path">Fájl elérési út</string>
     <string name="label_file_size">Méret</string>
-    <string name="label_last_modified">Utoljára módosított</string>
-    <string name="label_more_from">Több a következőtől: %s</string>
     <string name="label_sampling_rate">Mintavételi arány</string>
     <string name="label_track_length">Hossz</string>
     <string name="labeled">Címkézve</string>
     <string name="last_added">Utoljára hozzáadva</string>
     <string name="last_song">Utolsó dal</string>
-    <string name="lets_go">Vágjunk neki!</string>
+    <string name="lets_play_something">Játsszunk le egy zenét</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="listeners_label">Hallgatók</string>
-    <string name="listing_files">Fájlok listázása</string>
+    <string name="listing_files">Listázási fájlok</string>
     <string name="loading_products">A termékek betöltése ...</string>
-    <string name="login">Bejelentkezés</string>
+    <string name="login">Bjelentkezés</string>
     <string name="lyrics">Dalszöveg</string>
     <string name="made_with_love">❤️-el készítve Indiából</string>
     <string name="material">Materiál</string>
     <string name="md_error_label">Hiba</string>
     <string name="md_storage_perm_error">Engedély hiba</string>
-    <string name="message_backup_create_success">Biztonsági mentés sikeresen létrehozva</string>
-    <string name="message_limit_tabs">Nem lehet több 5 elemnél</string>
-    <string name="message_pro_feature">%s egy prémium funkció</string>
-    <string name="message_restore_success">A visszaállítás sikeresen befejeződött</string>
-    <string name="message_updated">Frissítve</string>
-    <string name="message_welcome"><![CDATA[Szia! <br>Üdv a %s-ban]]></string>
     <string name="my_name">Név</string>
     <string name="my_top_tracks">Legjobb számok</string>
     <string name="never">Soha</string>
-    <string name="new_music_mix">Új Zene Mix</string>
+    <string name="new_banner_photo">Új banner fotó</string>
     <string name="new_playlist_title">Új lejátszási lista</string>
+    <string name="new_profile_photo">Új profilfotó</string>
     <string name="new_start_directory">%s az új indítókönyvtár.</string>
     <string name="next_song">Következő dal</string>
     <string name="no_albums">Nincsenek albumok</string>
     <string name="no_artists">Nincs előadó</string>
-    <string name="no_audio_ID">"Először játssz le egy dalt, majd próbálkozz újra."</string>
-    <string name="no_backups_found">Nem található biztonsági mentés</string>
-    <string name="no_equalizer">Nem találtunk hangszínszabályzót</string>
+    <string name="no_audio_ID">"Először játssz le egy dalt, majd próbálkozzon újra."</string>
+    <string name="no_equalizer">Nem találtunk hangszínszabályzott.</string>
     <string name="no_genres">Nincsenek műfajok</string>
     <string name="no_lyrics_found">Nem található dalszöveg</string>
-    <string name="no_playing_queue">Nincs lejátszandó dal</string>
     <string name="no_playlists">Nincs lejátszási lista</string>
-    <string name="no_purchase_found">Nem található korábbi vásárlás.</string>
+    <string name="no_purchase_found">Nincs vásárlás.</string>
     <string name="no_results">Nincs eredmény</string>
     <string name="no_songs">Nincs dal</string>
     <string name="normal">Normál</string>
     <string name="normal_lyrics">Normál dalszövegek</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nem szerepel a média tárban.]]></string>
-    <string name="not_recently_played">Nem mostanában játszott</string>
-    <string name="nothing_to_scan">Nincs mit beolvasni.</string>
-    <string name="nothing_to_see">Nincs mit látni</string>
+    <string name="normal_style">Normál</string>
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nem szerepel a médiában.]]></string>
+    <string name="nothing_to_scan">Nincs szkennelve.</string>
     <string name="notification">Értesítés</string>
     <string name="notification_settings_summary">Értesítési stílus testreszabása</string>
-    <string name="now_playing">Most játszott</string>
+    <string name="now_playing">Most lejátszott</string>
     <string name="now_playing_queue">Sorban áll</string>
-    <string name="now_playing_summary">Most játszott képernyő személyre szabása</string>
-    <string name="now_playing_themes">9+ most játszott téma</string>
+    <string name="now_playing_summary">Most játszik képernyő személyre szabása</string>
+    <string name="now_playing_themes">9+ most játszik témák</string>
     <string name="only_on_wifi">Csak Wi-Fi-n</string>
-    <string name="other_settings_summary">Speciális tesztelési funkciók</string>
+    <string name="other_settings_summary">Speciális tesztelési szolgáltatások</string>
     <string name="others">Egyéb</string>
-    <string name="over_cover">Albumborító helyett</string>
     <string name="password">Jelszó</string>
-    <string name="past_three_months">Elmúlt 3 hónap</string>
-    <string name="paste_lyrics_here">Dalszöveg beillesztése ide</string>
-    <string name="paste_timeframe_lyrics_here">Időzített dalszöveg beillesztése ide</string>
-    <string name="peek">Kandikál</string>
-    <string name="permission_bluetooth_denied">\'Közeli eszközök\' engedély megtagadva</string>
+    <string name="past_three_months">3 hónapnál túl</string>
+    <string name="paste_lyrics_here">Ide illessze be a dalszövegeket</string>
+    <string name="peak">Csúcs</string>
     <string name="permission_external_storage_denied">A külső tárolási hozzáférés engedélyezése tiltva.</string>
-    <string name="permission_summary">Az alkalmazásnak engedélyre van szüksége az eszköz tárhelyéhez a zenék lejátszásához</string>
-    <string name="permission_title">Tárhely engedély</string>
     <string name="permissions_denied">Engedélyek megtagadva.</string>
-    <string name="personalize">Személyre szabás</string>
+    <string name="personalize">Megszemélyesít</string>
     <string name="personalize_settings_summary">Szabd személyre a jelenleg játszott felületet és a kezelőfelületet</string>
     <string name="pick_from_local_storage">Válasszon a helyi tárolóból</string>
+    <string name="pick_image_intent_text">Válasszon képet</string>
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Kövesse a Pinterest oldalt a Retro Music design ötletekért</string>
-    <string name="plain">Letisztult</string>
-    <string name="playList_already_exits">A lejátszási lista már létezik</string>
-    <string name="playback_pitch">Hangmagasság</string>
-    <string name="playback_settings">Visszajátszás beállításai</string>
-    <string name="playback_speed">Visszajátszási sebesség</string>
-    <string name="playing_notification_description">A lejátszási értesítés lejátszási/szüneteltetési akciógombokat tartalmazzon.</string>
-    <string name="playing_notification_name">Lejátszási értesítés</string>
-    <string name="playlist_created_sucessfully">%s sikeresen létrehozva</string>
+    <string name="pinterest_page_summary">Kövesse a Pinterest oldalt a Retro Music design inspirációjához</string>
+    <string name="plain">Egyszerű</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">Értesítés lejátszása</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="pref_album_detail_style">Albumrészletek stílusa</string>
     <string name="pref_blur_amount_summary">Homályosítás mértéke homályos témákhoz, az alacsonyabb gyorsabb</string>
     <string name="pref_blur_amount_title">Homályosítás mértéke</string>
-    <string name="pref_filter_song_summary">A dalok szűrése hossz szerint</string>
-    <string name="pref_filter_song_title">Dal időtartamának szűrése</string>
-    <string name="pref_header_advanced">Haladó</string>
+    <string name="pref_dialog_corner_title">Párbeszéd sarok</string>
+    <string name="pref_filter_song_title">Szűrje a dal időtartamát</string>
     <string name="pref_header_album">Album stílusa</string>
     <string name="pref_header_audio">Hang</string>
-    <string name="pref_header_blacklist">Feketelista</string>
     <string name="pref_header_controls">Vezérlők</string>
     <string name="pref_header_general">Téma</string>
     <string name="pref_header_images">Képek</string>
@@ -330,137 +280,115 @@
     <string name="pref_header_lockscreen">Zárképernyő</string>
     <string name="pref_header_playlists">Lejátszási listák</string>
     <string name="pref_keep_pause_on_zero_volume_summary">Szünetelteti a dalt, amikor a hangerő nullára csökken, és elindítja a lejátszást, ha a hangerő emelkedik. Az alkalmazáson kívül is működik</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Szünet nulla hangerőn</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Szünet a nullára</string>
     <string name="pref_keep_screen_on_summary">Vedd figyelembe, hogy ezen funkció engedélyezése hatással lehet az akkuidőre</string>
     <string name="pref_keep_screen_on_title">Tartsa bekapcsolva a képernyőt</string>
-    <string name="pref_language_name">Válasszon nyelvet</string>
-    <string name="pref_snow_fall_title">Hóesés effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">A jelenlegi zeneszám albumborítóját zárolt háttérképként használja.</string>
-    <string name="pref_summary_album_artists_only">Album előadók mutatása az Előadók kategóriában</string>
+    <string name="pref_now_playing_screen_summary">Kattintson a megnyitáshoz vagy a csúsztatáshoz a most játszott képernyő átlátható navigálása nélkül</string>
+    <string name="pref_now_playing_screen_title">Kattintson vagy Csúsztatson</string>
+    <string name="pref_snow_fall_title">Hóesés hatás</string>
+    <string name="pref_summary_album_art_on_lockscreen">A jelenlegi zeneszámok albumborítóját zárolt háttérképként használja.</string>
     <string name="pref_summary_audio_ducking">Hangerő csökkentése rendszerhang vagy értesítés érkezik</string>
-    <string name="pref_summary_audio_fade">A hang fokozatos elhalkítása/hangosítása amikor a zene megáll/elindul</string>
     <string name="pref_summary_blacklist">A feketelistán szereplő mappák tartalma el van rejtve a könyvtárban.</string>
-    <string name="pref_summary_bluetooth_playback">Amint csatlakoztatta a bluetooth készüléket, kezdje el a lejátszást</string>
     <string name="pref_summary_blurred_album_art">Elhomályosítja az album borítóját a zárolás képernyőjén. Problémákat okozhat harmadik féltől származó alkalmazásokkal és widgetekkel.</string>
     <string name="pref_summary_carousel_effect">Körhinta effektus a most játszott képernyőn lévő albumborítón. Ne feledje, hogy a Kártya és a Homályosított Kártya téma nem fog működni</string>
     <string name="pref_summary_classic_notification">Használja a klasszikus értesítési kinézetet.</string>
     <string name="pref_summary_colored_app">A háttér és a vezérlőgombok színe a most játszott képernyőn megjelenő albumborító szerint változik</string>
-    <string name="pref_summary_colored_app_shortcuts">Beszínezi az alkalmazás parancsikonjait a kijelölő színére. Minden alkalommal, amikor megváltoztattad a kijelölő színt, kérjük, kapcsold be ezt az opciót, hogy érvényesüljön.</string>
-    <string name="pref_summary_colored_notification">"Értesítések színezése az albumborító domináns színei alapján."</string>
-    <string name="pref_summary_cross_fade">Zeneszámok közötti átfedések időtartama</string>
-    <string name="pref_summary_desaturated_color">A Material Design irányelv szerint a sötét módban a színeket deszaturálni kell</string>
-    <string name="pref_summary_expand_now_playing_panel">Az értesítésre kattintva a kezdőképernyő helyett a lejátszási képernyő jelenik meg</string>
-    <string name="pref_summary_extra_controls">Extra vezérlők hozzáadása a mini lejátszóhoz</string>
-    <string name="pref_summary_extra_song_info">Mutasson további dalinformációkat, például a fájl formátumát, bitrátáját és frekvenciáját</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">Színezi a navigációs sávot az elsődleges színben.</string>
+    <string name="pref_summary_colored_notification">"Sz\u00ednek az \u00e9rtes\u00edt\u00e9st az albumbor\u00edt\u00f3 \u00e9l\u00e9nk sz\u00edn\u00e9ben."</string>
+    <string name="pref_summary_desaturated_color">Az Anyagtervezés szerint a sötét módban a színeket deszaturálni kell</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_extra_controls">Extra irányítás a mini lejátszóhoz</string>
     <string name="pref_summary_gapless_playback">"Egyes eszközökön lejátszási problémákat okozhat."</string>
-    <string name="pref_summary_home_banner">Kezdőlap banner mutatása/elrejtése</string>
-    <string name="pref_summary_ignore_media_store_artwork">Növelheti az albumborító minőségét, de lassabb kép betöltési időt eredményez. Csak akkor engedélyezze ezt, ha problémái vannak az alacsony felbontású borítókkal kapcsolatban.</string>
-    <string name="pref_summary_library_categories">A könyvtári kategóriák sorrendjének és láthatóságának beállítása.</string>
-    <string name="pref_summary_lock_screen">Retro Music egyéni vezérlőinek a használata zárolási képernyőn.</string>
-    <string name="pref_summary_manage_audio_focus">Mindig játssza le a hangot a háttérben, függetlenül attól, hogy bármi más megy a háttérben</string>
+    <string name="pref_summary_genre_toggle">Műfaj lap kapcsolása</string>
+    <string name="pref_summary_home_banner">Kezdőlap banner stílusának kapcsolása</string>
+    <string name="pref_summary_ignore_media_store_artwork">Növelheti az album borításminőségét, de lassabb kép betöltési időt eredményez. Csak akkor engedélyezze ezt, ha problémái vannak az alacsony felbontású művekkel kapcsolatban.</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 zeneszámok zárolása a 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_pause_history">Ha engedélyezve van, akkor az újonnan lejátszott dalok nem jelennek meg az előzményekben</string>
-    <string name="pref_summary_remember_tab">Lépjen az utoljára használt fülre az alkalmazás indításakor</string>
-    <string name="pref_summary_show_lyrics">Szinkronizált dalszövegek megjelenítése albumborító helyett</string>
-    <string name="pref_summary_suggestions">Új zene mix mutatása kezdőoldalon</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Engedélyezi a zenék váltását a \'Jelenleg játszott\' képernyőn, akárhova is húzza az ujját</string>
-    <string name="pref_summary_swipe_to_dismiss">A mini lejátszó eltüntetéséhez húzza lefele az ujját</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_full_screen">Kiterjesztett üzemmód</string>
-    <string name="pref_summary_toggle_headset">Indítsa el a lejátszást azonnal, amikor a fejhallgató csatlakoztatva van.</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_shuffle">A véletlen sorrendű mód kikapcsol, ha új számlistát játszik le</string>
-    <string name="pref_summary_toggle_volume">Ha van elég szabad hely, mutassa a hangerőszabályzókat a most játszott képernyőn</string>
-    <string name="pref_summary_wallpaper_accent">A kiemelő szín kinyerése a háttérképből</string>
-    <string name="pref_summary_whitelist">Csak a /Music mappában lévő zenék mutatása</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 album borítójának megjelenítése</string>
-    <string name="pref_title_album_artists_only">Album előadók szerinti navigálás</string>
     <string name="pref_title_album_cover_style">Album borító téma</string>
-    <string name="pref_title_album_cover_transform">Albumborító stílusa váltáskor</string>
+    <string name="pref_title_album_cover_transform">Most játszik album borító stílusa</string>
+    <string name="pref_title_album_grid_style">Album rács stílusa</string>
     <string name="pref_title_app_shortcuts">Színes alkalmazás parancsikonok</string>
-    <string name="pref_title_appbar_mode">Fejléc stílusa</string>
-    <string name="pref_title_audio_ducking">Hangerőcsökkentés fókusz vesztés esetén</string>
-    <string name="pref_title_audio_fade">Hang elhalkítása/felerősítése</string>
-    <string name="pref_title_auto_download_artist_images">Automatikusan letölti az előadók képeit</string>
+    <string name="pref_title_artist_grid_style">Előadói rács stílusa</string>
+    <string name="pref_title_audio_ducking">Csökkentse a fókuszvesztés hangerejét</string>
+    <string name="pref_title_auto_download_artist_images">Automatikus letölti képeket</string>
     <string name="pref_title_blacklist">Feketelista</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth lejátszás</string>
     <string name="pref_title_blurred_album_art">Elhomályosított albumborító</string>
-    <string name="pref_title_circle_button">Kerek lejátszási gomb</string>
-    <string name="pref_title_classic_notification">Klasszikus értesítés design</string>
+    <string name="pref_title_choose_equalizer">Válasszon Hangszínszabélyzott</string>
+    <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ínes értesítés</string>
-    <string name="pref_title_cross_fade">Átfedés (Béta)</string>
-    <string name="pref_title_custom_font">Manrope betűtípus használata</string>
     <string name="pref_title_desaturated_color">Deszaturált szín</string>
-    <string name="pref_title_expand_now_playing_panel">Most játszott képernyő mutatása</string>
     <string name="pref_title_extra_controls">Extra vezérlők</string>
-    <string name="pref_title_extra_song_info">Dalinformáció</string>
-    <string name="pref_title_gapless_playback">Szünetmentes lejátszás</string>
-    <string name="pref_title_general_theme">Alkalmazás téma</string>
-    <string name="pref_title_home_album_grid_style">Album rács</string>
+    <string name="pref_title_gapless_playback">Gapless lejátszás</string>
+    <string name="pref_title_general_theme">Általános téma</string>
+    <string name="pref_title_genre_toggle">Mutasd a műfaj lapot</string>
     <string name="pref_title_home_artist_grid_style">Kezdőlapi előadó rács</string>
     <string name="pref_title_home_banner">Kezdőlap banner</string>
-    <string name="pref_title_ignore_media_store_artwork">A médiatár albumborítóinak figyelmen kívül hagyása</string>
-    <string name="pref_title_last_added_interval">Az utoljára hozzáadott lejátszási lista hossza</string>
+    <string name="pref_title_ignore_media_store_artwork">Figyelmen kívül hagyja a médiatárolók fedelét</string>
+    <string name="pref_title_last_added_interval">Utoljára hozzáadott lejátszási lista intervallum</string>
     <string name="pref_title_lock_screen">Teljes képernyős vezérlők</string>
-    <string name="pref_title_lyrics_screen_on">Képernyő bekapcsolva tartása, amikor meg van jelenítve a dalszöveg</string>
-    <string name="pref_title_lyrics_type">Dalszöveg típusa</string>
-    <string name="pref_title_manage_audio_focus">Folyamatos lejátszás</string>
-    <string name="pref_title_now_playing_screen_appearance">Most játszott felület megjelenése</string>
+    <string name="pref_title_navigation_bar">Színes navigációs sáv</string>
+    <string name="pref_title_now_playing_screen_appearance">Megjelenés</string>
     <string name="pref_title_open_source_licences">Nyílt forráskódú licencek</string>
-    <string name="pref_title_pause_history">Megállítás előzmények</string>
-    <string name="pref_title_remember_tab">Jegyezze meg a legutóbbi lapot</string>
-    <string name="pref_title_show_lyrics">Dalszöveg megjelenítése</string>
-    <string name="pref_title_suggestions">Javaslatok megjelenítése</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Húzd az ujjad bárhova, hogy zenét válts</string>
-    <string name="pref_title_swipe_to_dismiss">Elvetés lefele húzásra</string>
+    <string name="pref_title_round_corners">Sarokélek</string>
     <string name="pref_title_tab_text_mode">Lap címek módja</string>
     <string name="pref_title_toggle_carousel_effect">Carousel hatás</string>
+    <string name="pref_title_toggle_dominant_color">Domináns szín</string>
     <string name="pref_title_toggle_full_screen">Teljes képernyős alkalmazás</string>
+    <string name="pref_title_toggle_tab_titles">Alcímek</string>
     <string name="pref_title_toggle_toggle_headset">Automatikus lejátszás</string>
     <string name="pref_title_toggle_toggle_shuffle">Kevert mód</string>
     <string name="pref_title_toggle_volume">Hangerőszabályzók</string>
-    <string name="pref_title_wallpaper_accent">Háttérkép kiemelő szín</string>
-    <string name="pref_title_whitelist">Engedélyezett zenelisták</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Fekete téma, Most lejátszott téma, Carousel effekt és több..</string>
+    <string name="pref_title_user_info">Felhasználói adatok</string>
+    <string name="primary_color">Elsődleges szín</string>
+    <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="pro_summary">Jelenleg témákat játszik, körhinta effektus és még sok más ..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Vásárlás</string>
+    <string name="purchase_summary">*Gondolja vásárolása előtt, ne kérjen visszatérítést.</string>
     <string name="queue">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? Tudasd velünk a Google Play áruházban, hogyan tehetnénk még jobbá!</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_albums">Legutóbbi albumok</string>
     <string name="recent_artists">Legújabb előadók</string>
     <string name="remove_action">Eltávolítás</string>
+    <string name="remove_banner_photo">Banner fotó törlése</string>
     <string name="remove_cover">Borító eltávolítása</string>
     <string name="remove_from_blacklist">Eltávolítás a feketelistáról</string>
-    <string name="remove_image">Kép eltávolítása</string>
+    <string name="remove_profile_photo">Profilfotó eltávolítása</string>
     <string name="remove_song_from_playlist_title">Távolítsa el a dalt a lejátszási listáról</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Eltávolítja a <b>%1$s</b> dalt a lejátszási listából?]]></string>
     <string name="remove_songs_from_playlist_title">A dalok eltávolítása a lejátszási listáról</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Eltávolítja a <b>%1$d</b> dalokat a lejátszási listából?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Eltávolítja a <b>%1$d</b> dalt a lejátszási listából?]]></string>
     <string name="rename_playlist_title">Lejátszási lista átnevezése</string>
-    <string name="replace_cover">Borító cserélése</string>
     <string name="report_an_issue">Hibajelentés</string>
     <string name="report_bug">Hibajelentés</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="restore_message">Vissza szeretnéd állítani a biztonsági mentést?</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ítása.</string>
     <string name="restoring_purchase">A vásárlás visszaállítása ...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+    <string name="retro_equalizer">Retro Zene Hangszínszabályzó</string>
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Az alkalmazásnak engedélyre van szüksége a készülék beállításaihoz a zeneszám csengőhangként való beállításához</string>
-    <string name="ringtone_title">Csengőhang (Opcionális)</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">Oldalsáv megnyitása</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 SD kártya hozzáférést igényel</string>
-    <string name="saf_guide_slide2_description">Ki 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 az oldalsávban</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 \"select\" gombot a képernyő alján</string>
     <string name="saf_write_failed">A fájl írása sikertelen: %s</string>
@@ -472,22 +400,23 @@
     <string name="saved_playlist_to">Mentett lejátszási lista a következőhöz: %s</string>
     <string name="saving_changes">A változtatások mentése</string>
     <string name="scan_media">Média szkennelés</string>
-    <string name="scanned_files">%1$d / %2$d fájl beolvasva.</string>
-    <string name="scrobbles_label">Scrobblek</string>
+    <string name="scanned_files">%2$d fájlt %1$d szkennelt.</string>
+    <string name="search_hint">Keresés a könyvtárban ...</string>
     <string name="select_all">Minden kiválasztása</string>
-    <string name="selected">Kijelölve</string>
+    <string name="select_banner_photo">Banner fotó kiválasztása</string>
+    <string name="selected">Kiválaszott</string>
+    <string name="send_crash_log">Küldjön összeomlási naplót</string>
     <string name="set">Beállít</string>
-    <string name="set_artist_image">Előadó képének beállítása</string>
+    <string name="set_artist_image">Állítsa be az előadó képét</string>
+    <string name="set_photo">Profilfotó beállítása</string>
     <string name="share_app">Alkalmazás megosztása</string>
-    <string name="share_summary">Az alkalmazás megosztása a barátaiddal és családoddal</string>
-    <string name="share_to_stories">Ossza meg a Történet-ben</string>
-    <string name="show_album_artists">Album előadók mutatása</string>
     <string name="shuffle">Keverés</string>
     <string name="simple">Egyszerű</string>
-    <string name="sleep_timer_canceled">Az elalvás időzítő kikapcsolva.</string>
-    <string name="sleep_timer_set">Elalvásidőzítés beállítva, mostantól számított %d percre.</string>
+    <string name="sleep_timer_canceled">Az elalváskapcsoló kikapcsolva.</string>
+    <string name="sleep_timer_set">Az elalvási időzítő beállítása %d perc múlva.</string>
+    <string name="slide">Csúsztatás</string>
+    <string name="small">Kis album</string>
     <string name="social">Közösségi</string>
-    <string name="social_stories">Történet megosztása</string>
     <string name="song">Dal</string>
     <string name="song_duration">A dal időtartama</string>
     <string name="songs">Dalok</string>
@@ -496,64 +425,62 @@
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Előadó</string>
     <string name="sort_order_composer">Zeneszerző</string>
-    <string name="sort_order_date">Hozzáadás dátuma</string>
-    <string name="sort_order_date_modified">Módosítás dátuma</string>
-    <string name="sort_order_default">Alapértelmezett</string>
-    <string name="sort_order_num_songs">Zenék darabszáma</string>
-    <string name="sort_order_num_songs_desc">Zenék darabszáma szerint csökkenő sorrendben</string>
+    <string name="sort_order_date">Dátum</string>
     <string name="sort_order_year">Év</string>
     <string name="sort_order_z_a">Csökkenő</string>
-    <string name="speech_not_supported">Sajnálom! A készülék nem támogatja a beszéd alapú bevitelt.</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="stack">Halom</string>
+    <string name="stack">Rakás</string>
     <string name="start_play_music">Kezdje el lejátszani a zenét</string>
     <string name="suggestion_songs">Javaslatok</string>
+    <string name="summary_user_info">Csak mutassa meg a nevét a kezdőképernyőn</string>
     <string name="support_development">Támogatás fejlesztése</string>
     <string name="swipe_to_unlock">Csúsztasd fel a feloldáshoz</string>
     <string name="synced_lyrics">Szinkronizált dalszövegek</string>
+    <string name="system_equalizer">Rendszer kiegyenlítő</string>
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Csatlakozz a Telegram csoporthoz hogy megbeszélhesd a hibákat, ajánlásokat tegyél, bemutass valamit stb...</string>
     <string name="thank_you">Köszönöm!</string>
-    <string name="the_audio_file">Az audió fájl</string>
+    <string name="the_audio_file">Az audio fájl</string>
     <string name="this_month">Ebben a hónapban</string>
     <string name="this_week">Ezen a héten</string>
-    <string name="this_year">Ebben az évben</string>
+    <string name="this_year">Egy éve</string>
     <string name="tiny">Apró</string>
-    <string name="tiny_card_style">Apró kártya</string>
     <string name="title">Cím</string>
-    <string name="title_new_backup">Új biztonsági mentés</string>
+    <string name="title_dashboard">Irányítópult</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_user_info">Mi a neved?</string>
     <string name="today">Ma</string>
     <string name="top_albums">Legjobb albumok</string>
     <string name="top_artists">Legjobb előadok</string>
     <string name="track_hint">"Sáv (2 a 2. vagy a 3004-es számhoz a CD3 4. sávjához)"</string>
     <string name="track_list">Sáv száma</string>
     <string name="translate">Fordítás</string>
-    <string name="translate_community">Segítsen lefordítani az alkalmazást az Ön nyelvére</string>
-    <string name="try_retro_music_premium">Próbálja ki a Retro Music Premium alkalmazást</string>
+    <string name="translate_community">Segítsen nekünk az alkalmazás nyelvének fordításához</string>
     <string name="twitter_page">Twitter oldal</string>
-    <string name="twitter_page_summary">Osszd meg kinézeted a Retro Music App segítségével</string>
+    <string name="twitter_page_summary">Ossza meg tervét a RetroMusicApp segítségével</string>
     <string name="unlabeled">Címkézetlen</string>
-    <string name="unplayable_file">Nem lehetett lejátszani ezt a dalt.</string>
+    <string name="unplayable_file">Nem lehetett j\u00e1tszani ezt a dalt.</string>
     <string name="up_next">A következő</string>
     <string name="update_image">Kép frissítése</string>
     <string name="updating">Frissítés...</string>
-    <string name="user_images_description">Felhasználó képei</string>
-    <string name="user_name">Felhasználónév</string>
     <string name="username">Felhasználónév</string>
     <string name="version">Verzió</string>
-    <string name="vertical_flip">Függőleges forgatás</string>
-    <string name="view_on_telegram">Megtekintés Telegramon</string>
-    <string name="volume">Hangerő</string>
+    <string name="vertical_flip">Függőleges flip</string>
+    <string name="virtualizer">Virtualizáló</string>
     <string name="web_search">Webes keresés</string>
-    <string name="website">Weboldal</string>
-    <string name="website_summary">Nézd meg a weboldalunkat</string>
     <string name="welcome">Üdvözöljük,</string>
     <string name="what_do_you_want_to_share">Mit szeretne megosztani?</string>
     <string name="whats_new">Mi az újdonság?</string>
     <string name="window">Ablak</string>
     <string name="window_corner_edges">Lekerekített sarkak</string>
-    <string name="x_has_been_set_as_ringtone">Állítsd be a(z) %1$s számot csengőhangnak.</string>
-    <string name="x_selected">%1$d kiválasztva</string>
+    <string name="x_has_been_set_as_ringtone">Állítsa be a (z) %1$s csengőhangot.</string>
+    <string name="x_selected">%1$d kiválasztása</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>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Továbbítani fogjuk a problémakezelő weboldalra.</string>
diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml
new file mode 100644
index 000000000..c4994251f
--- /dev/null
+++ b/app/src/main/res/values-id/strings.xml
@@ -0,0 +1,764 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="about_settings_summary">Tim, link sosial</string>
+
+    <string name="accent_color">Warna Aksen</string>
+    <string name="accent_color_desc">Warna tema aksen, Default adalah biru kehijauan</string>
+
+    <string name="action_about">Tentang</string>
+
+    <string name="action_add_to_favorites">Tambahkan ke favorit</string>
+    <string name="action_add_to_playing_queue">Tambahkan ke antrean pemutar</string>
+    <string name="action_add_to_playlist">Tambahkan ke daftar putar</string>
+
+    <string name="action_clear_playing_queue">Bersihkan antrean pemutar</string>
+    <string name="action_clear_playlist">Bersihkan daftar putar</string>
+
+    <string name="action_delete">Hapus</string>
+    <string name="action_delete_from_device">Hapus dari perangkat</string>
+
+    <string name="action_details">Rincian</string>
+
+    <string name="action_go_to_album">Ke album</string>
+    <string name="action_go_to_artist">Ke artis</string>
+    <string name="action_go_to_genre">Pergi ke Genre</string>
+    <string name="action_go_to_start_directory">Pergi ke direktori awal</string>
+
+    <string name="action_grant">Izinkan</string>
+
+    <string name="action_grid_size">Jumlah kisi</string>
+    <string name="action_grid_size_land">Ukuran kisi (lanskap)</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_remove_from_favorites">Hapus dari favorit</string>
+    <string name="action_remove_from_playing_queue">Hapus dari antrean pemutar</string>
+    <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
+
+    <string name="action_rename">Ganti nama</string>
+
+    <string name="action_save_playing_queue">Simpan antrean pemutar</string>
+
+    <string name="action_scan">Pindai</string>
+
+    <string name="action_search">Cari</string>
+
+    <string name="action_set">Mulai</string>
+    <string name="action_set_as_ringtone">Setel sebagai nada dering</string>
+    <string name="action_set_as_start_directory">Setel sebagai direktori awal</string>
+
+    <string name="action_settings">"Pengaturan"</string>
+
+    <string name="action_share">Bagikan</string>
+
+    <string name="action_shuffle_all">Acak semua</string>
+    <string name="action_shuffle_playlist">Acak daftar putar</string>
+
+    <string name="action_sleep_timer">Pengatur waktu tidur</string>
+
+    <string name="action_sort_order">Sortir</string>
+
+    <string name="action_tag_editor">Editor tag</string>
+
+    <string name="adaptive">Adaptif</string>
+
+    <string name="add_action">Tambah</string>
+
+    <string name="add_lyrics">Tambah lirik</string>
+
+    <string name="add_photo">Tambah\nFoto</string>
+
+    <string name="add_playlist_title">"Tambahkan ke daftar putar"</string>
+
+    <string name="add_time_framed_lryics">Tambah frame waktu lirik</string>
+
+    <string name="added_title_to_playing_queue">"1 judul ditambahkan ke antrian pemutar"</string>
+
+    <string name="added_x_titles_to_playing_queue">%1$d ditambahkan ke antrean putar</string>
+
+    <string name="album">Album</string>
+
+    <string name="album_artist">Album artis</string>
+
+    <string name="album_or_artist_empty">Judul atau artis kosong</string>
+
+    <string name="albums">Album</string>
+
+    <!-- Android Auto -->
+    <string name="always">Selalu</string>
+
+    <string name="app_share">Hei lihat pemutar musik keren ini di:
+https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Acak</string>
+    <string name="app_shortcut_top_tracks_short">Lagu teratas</string>
+
+    <string name="app_widget_big_name">Retro Musik - Besar</string>
+    <string name="app_widget_card_name">Retro musik - Kartu</string>
+    <string name="app_widget_classic_name">Retro musik - Klasik</string>
+    <string name="app_widget_small_name">Retro music - kecil</string>
+    <string name="app_widget_text_name">Retro music - Teks</string>
+
+    <string name="artist">Artis</string>
+
+    <string name="artists">Artis</string>
+
+    <string name="audio_focus_denied">Fokus audio ditolak</string>
+
+    <string name="audio_settings_summary">Ubah pengaturan suara dan sesuaikan equalizer</string>
+
+    <string name="auto">Otomatis</string>
+
+    <string name="base_color_theme">Berdasarkan warna tema</string>
+
+    <string name="bass_boost">Bass boost</string>
+
+    <string name="bio">Bio</string>
+
+    <string name="biography">Biografi</string>
+
+    <string name="black_theme_name">Hanya Hitam</string>
+
+    <string name="blacklist">Daftar hitam</string>
+
+    <string name="blur">Buram</string>
+
+    <string name="blur_card">Kartu blur</string>
+
+    <string name="bug_report_failed">Tidak dapat mengirimkan laporan</string>
+    <string name="bug_report_failed_invalid_token">Token akses tidak valid. Mohon hubungi pengembang apl.</string>
+    <string name="bug_report_failed_issues_not_available">Masalah tidak diaktifkan untuk repositori yang dipilih. Mohon hubungi pengembang apl.</string>
+    <string name="bug_report_failed_unknown">Terjadi kesalahan tak terduga. Mohon hubungi pengembang apl.</string>
+    <string name="bug_report_failed_wrong_credentials">Nama pengguna atau kata sandi salah</string>
+    <string name="bug_report_issue">Isu</string>
+    <string name="bug_report_manual">Kirimkan secara manual</string>
+    <string name="bug_report_no_description">Mohon masukkan deskripsi dari isu tersebut</string>
+    <string name="bug_report_no_password">Mohon masukkan kata sandi GitHub yang valid</string>
+    <string name="bug_report_no_title">Mohon masukkan judul isu</string>
+    <string name="bug_report_no_username">Mohon masukkan nama akun GitHub yang valid</string>
+    <string name="bug_report_summary">Terjadi kesalahan tidak terduga. Maaf kamu mengalami masalah ini, jika
+tetap bermasalah, \"Hapus data Aplikasi\"</string>
+    <string name="bug_report_uploading">Mengunggah laporan ke GitHub</string>
+    <string name="bug_report_use_account">Kirim menggunakan akun GitHub</string>
+
+    <string name="cancel_current_timer">Batalkan</string>
+
+    <string name="card">Kartu</string>
+
+    <string name="card_circular_style">Bulat</string>
+
+    <string name="card_color_style">Kartu Berwarna</string>
+
+    <string name="card_style">Kartu</string>
+
+    <string name="carousal">Carousal</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Efek carousel pada layar sedang diputar</string>
+
+    <string name="cascading">Tersusun kebawah</string>
+
+    <string name="cast">Cast</string>
+
+    <string name="changelog">Catatan perubahan</string>
+
+    <string name="changelog_summary">Catatan perubahan ada di aplikasi Telegram</string>
+
+    <string name="circular">Melengkung</string>
+
+    <string name="classic">Klasik</string>
+
+    <string name="clear_action">Bersihkan</string>
+
+    <string name="clear_app_data">Hapus data aplikasi</string>
+
+    <string name="clear_blacklist">Bersihkan daftar hitam</string>
+
+    <string name="clear_playing_queue">Hapus antrian</string>
+
+    <string name="clear_playlist_title">Bersihkan daftar putar</string>
+    <string name="clear_playlist_x"><![CDATA[Bersihkan daftar putar  <b>%1$s</b>? Ini tidak bisa dibatalkan]]></string>
+
+    <string name="close_notification">Tutup</string>
+
+    <string name="color">Warna</string>
+
+    <string name="color_theme_name">Warna</string>
+
+    <string name="colors">Warna</string>
+
+    <string name="composer">Komposer</string>
+
+    <string name="copied_device_info_to_clipboard">Info perangkat telah disalin ke clipboard.</string>
+
+    <string name="could_not_create_playlist">Tidak dapat membuat daftar putar</string>
+    <string name="could_not_download_album_cover">"Tidak dapat mengunduh sampul album yang Cocok"</string>
+    <string name="could_not_restore_purchase">Tidak dapat mengembalikan pembelian</string>
+    <string name="could_not_scan_files">Tidak dapat memindai %d file</string>
+
+    <string name="create_action">Buat</string>
+
+    <string name="created_playlist_x">Daftar putar %1$s dibuat</string>
+
+    <string name="credit_title">Member dan kontribusi</string>
+
+    <string name="currently_listening_to_x_by_x">Sedang mendengarkan</string>
+
+    <string name="dark_theme_name">Agak gelap</string>
+
+    <string name="default_hint">Tidak ada lirik</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 <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>
+    <string name="deleted_x_songs">Lagu %1$d dihapus</string>
+
+    <string name="depth">Kedalaman</string>
+
+    <string name="description">Deskripsi</string>
+
+    <string name="device_info">Info perangkat</string>
+
+    <string name="dialog_message_set_ringtone">Izinkan Retro Music untuk mengubah pengaturan suara</string>
+
+    <string name="dialog_title_set_ringtone">Atur nada dering</string>
+
+    <string name="do_you_want_to_clear_the_blacklist">Bersihkan daftar hitam?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Hapus <b>%1$s</b> dari
+Daftar hitam?]]></string>
+
+    <string name="donate">Donasi</string>
+
+    <string name="donate_summary">Jika anda rasa saya berhak dibayar untuk karya saya, 
+anda dapat berdonasi disini</string>
+
+    <string name="donation_header">Belikan saya:</string>
+
+    <string name="download_from_last_fm">Unduh dari Last.fm</string>
+
+    <string name="edit">Edit</string>
+
+    <string name="edit_cover">Ubah sampul</string>
+
+    <string name="empty">Kosong</string>
+
+    <string name="equalizer">Ekualiser</string>
+
+    <string name="error">Error</string>
+
+    <string name="faq">Tanya-Jawab</string>
+
+    <string name="favorites">Favorit</string>
+
+    <string name="fit">Pas</string>
+
+    <string name="flat">Datar</string>
+
+    <string name="folders">Folder</string>
+
+    <string name="for_you">Untuk anda</string>
+
+    <string name="full">Penuh</string>
+
+    <string name="full_card">Kartu penuh</string>
+
+    <string name="general_settings_summary">Ubah tema dan warna dari aplikasi</string>
+    <string name="general_settings_title">Tampilan</string>
+
+    <string name="genre">Aliran</string>
+
+    <string name="genres">Genre</string>
+
+    <string name="git_hub_summary">Fork the project on github</string>
+
+    <string name="google_plus_community">Gabung di komunitas Google plus, anda dapat bertanya ataupun mengikuti pembaruan dari aplikasi Retro Music</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="hinge">Engsel</string>
+
+    <string name="history">Riwayat</string>
+
+    <string name="home">Beranda</string>
+
+    <string name="horizontal_flip">Balik horizontal</string>
+
+    <string name="image">Gambar</string>
+
+    <string name="image_settings_summary">Ubah pengaturan pengunduhan gambar artis</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Lagu %1$d dimasukan ke daftar putar %2$s</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Bagikan pengaturan Retro Musicmu di Instagram untuk menunjukannya</string>
+
+    <string name="label_bit_rate">Bitrate</string>
+
+    <string name="label_file_format">Format</string>
+    <string name="label_file_name">Nama berkas</string>
+    <string name="label_file_path">Direktori berkas</string>
+    <string name="label_file_size">Ukuran</string>
+
+    <string name="label_sampling_rate">Tingkat pengambilan sampel</string>
+
+    <string name="label_track_length">Durasi</string>
+
+    <string name="labeled">Berlabel</string>
+
+    <string name="last_added">Terakhir ditambahkan</string>
+
+    <string name="last_song">Lagu terakhir</string>
+
+    <string name="lets_play_something">Mari putar sebuah lagu</string>
+
+    <string name="library">Pustaka</string>
+
+    <string name="library_categories">Kategori pustaka</string>
+
+    <string name="licenses">Lisensi</string>
+
+    <string name="light_theme_name">Putih jelas</string>
+
+    <string name="listing_files">Pengurutan berkas</string>
+
+    <string name="loading_products">Memuat produk...</string>
+
+    <string name="login">Masuk</string>
+
+    <string name="lyrics">Lirik</string>
+
+    <string name="made_with_love">Dibuat dengan cinta ❤️ di India</string>
+
+    <string name="material">Material</string>
+
+    <string name="md_error_label">Kesalahan</string>
+
+    <string name="md_storage_perm_error">Kesalahan perizinan</string>
+
+    <string name="my_name">Nama saya</string>
+
+    <string name="my_top_tracks">Sering dimainkan</string>
+
+    <string name="never">Jangan pernah</string>
+
+    <string name="new_banner_photo">Banner foto baru</string>
+
+    <string name="new_playlist_title">Daftar putar baru</string>
+
+    <string name="new_profile_photo">Foto profil baru</string>
+
+    <string name="new_start_directory">%s adalah direktori awal yang baru.</string>
+
+    <string name="next_song">Lagu selanjutnya</string>
+
+    <string name="no_albums">Tidak ada album</string>
+
+    <string name="no_artists">Tidak ada artis</string>
+
+    <string name="no_audio_ID">"Putar lagu lebih dahulu, lalu coba lagi"</string>
+
+    <string name="no_equalizer">Equalizer tidak ditemukan</string>
+
+    <string name="no_genres">Tidak ada genre</string>
+
+    <string name="no_lyrics_found">Lirik tidak ditemukan</string>
+
+    <string name="no_playlists">Tidak ada daftar putar</string>
+
+    <string name="no_purchase_found">Pembelian tidak ditemukan</string>
+
+    <string name="no_results">Tidak ada hasil</string>
+
+    <string name="no_songs">Tidak ada lagu</string>
+
+    <string name="normal">Normal</string>
+
+    <string name="normal_lyrics">Lirik normal</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> tidak ada di daftar media]]></string>
+
+    <string name="nothing_to_scan">Tak ada apapun untuk dipindai</string>
+
+    <string name="notification">Pemberitahuan</string>
+
+    <string name="notification_settings_summary">Sesuaikan gaya pemberitahuan</string>
+
+    <string name="now_playing">Sedang diputar</string>
+    <string name="now_playing_queue">Sedang memutar antrean</string>
+    <string name="now_playing_summary">Kostumisasi layar sedang diputar</string>
+    <string name="now_playing_themes">9+ gaya sedang diputar</string>
+
+    <string name="only_on_wifi">Hanya melalui Wi-Fi</string>
+
+    <string name="other_settings_summary">Fitur percobaan lanjutan</string>
+
+    <string name="others">Lainnya</string>
+
+    <string name="password">Kata sandi</string>
+
+    <string name="past_three_months">3 bulan lalu</string>
+
+    <string name="paste_lyrics_here">Tempel lirik di sini</string>
+
+    <string name="permission_external_storage_denied">Izin untuk mengakses penyimpanan eksternal ditolak.</string>
+
+    <string name="permissions_denied">Izin ditolak.</string>
+
+    <string name="personalize">Personalisasi</string>
+
+    <string name="personalize_settings_summary">Sesuaikan sedang diputar dan tampilan kontrol</string>
+
+    <string name="pick_from_local_storage">Pilih dari penyimpanan lokal</string>
+
+    <string name="pick_image_intent_text">Pilih gambar</string>
+
+    <string name="pinterest_page">Pinterest</string>
+    <string name="pinterest_page_summary">Ikuti laman Pinterest untuk inspirasi desain Retro Music</string>
+
+    <string name="plain">Plain</string>
+
+    <string name="playing_notification_description">Notifikasi pemutar menyediakan tindakan untuk mainkan/jeda, dll.</string>
+    <string name="playing_notification_name">Notifikasi pemutar</string>
+
+    <string name="playlist_empty_text">Kosongkan daftar putar</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="pref_album_detail_style">Gaya detail album</string>
+
+    <string name="pref_blur_amount_summary">Tingkat blur diaplikasikan pada tema blur, lebih rendah membuat lebih cepat</string>
+    <string name="pref_blur_amount_title">Tingkat blur</string>
+
+    <string name="pref_filter_song_title">Saring durasi lagu</string>
+
+    <string name="pref_header_audio">Audio</string>
+    <string name="pref_header_general">Tema</string>
+    <string name="pref_header_images">Gambar</string>
+    <string name="pref_header_lockscreen">Layar kunci</string>
+    <string name="pref_header_playlists">Daftar putar</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Jeda saat volume sedang nol dan putar setelah menaikan volume. Peringatan, ketika anda menaikan volume, musik akan mulai berputar, bahkan jika anda berada di luar aplikasi</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Jeda saat volume nol</string>
+    <string name="pref_keep_screen_on_summary">Membiarkan fitur ini aktif mungkin akan berpengaruh pada daya baterai</string>
+    <string name="pref_keep_screen_on_title">Biarkan layar tetap menyala</string>
+
+    <string name="pref_now_playing_screen_summary">Klik atau geser untuk membuka layar sedang diputar</string>
+    <string name="pref_now_playing_screen_title">Klik atau geser</string>
+
+
+    <string name="pref_snow_fall_title">Efek salju jatuh</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Menggunakan sampul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
+    <string name="pref_summary_audio_ducking">Volume lebih rendah ketika suara sistem diputar atau terdapat notifikasi baru</string>
+    <string name="pref_summary_blacklist">Konten folder yang telah di blacklist disembunyikan dari pustaka.</string>
+    <string name="pref_summary_blurred_album_art">Blur sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi pihak ketiga dan widget.</string>
+    <string name="pref_summary_carousel_effect">Efek carousel di sampul album yang sedang diputar. Ingat bahwa Kartu dan Kartu Blur takkan bekerja.</string>
+    <string name="pref_summary_classic_notification">Gunakan desain notifikasi klasik</string>
+    <string name="pref_summary_colored_app">Latar belakang, Warna tombol kontrol berubah sesuai sampul album lagu yang diputar</string>
+    <string name="pref_summary_colored_app_shortcuts">Warna pintasan aplikasi dalam warna aksen. Setiap kali anda mengubahnya, restart aplikasi untuk menerapkan efek</string>
+    <string name="pref_summary_colored_navigation_bar">Warna bar navigasi primer</string>
+    <string name="pref_summary_colored_notification">"Warna notifikasi berdasarkan warna dominan sampul album"</string>
+    <string name="pref_summary_dominant_color">Warna paling dominan akan dipilih sampul album atau artis.</string>
+    <string name="pref_summary_extra_controls">Tambahkan kontrol tambahan untuk pemutar mini</string>
+    <string name="pref_summary_gapless_playback">"Dapat menyebabkan masalah pemutaran pada beberapa perangkat."</string>
+    <string name="pref_summary_genre_toggle">Toggle tab genre</string>
+    <string name="pref_summary_home_banner">Toggle gaya banner beranda</string>
+    <string name="pref_summary_ignore_media_store_artwork">Dapat meningkatkan kualitas sampul album tetapi menyebabkan waktu pemuatan gambar lebih lambat. Hanya aktifkan ini jika Anda memiliki masalah dengan gambar resolusi rendah.</string>
+    <string name="pref_summary_library_categories">Atur visibilitas dan perintah dari kategori pustaka.</string>
+    <string name="pref_summary_lock_screen">Kontrol layar kunci Retro Music.</string>
+    <string name="pref_summary_open_source_licences">Rincian Lisensi untuk sumber terbuka aplikasi</string>
+    <string name="pref_summary_round_corners">Tepi pojok untuk jendela, album seni dll.</string>
+    <string name="pref_summary_tab_titles">Aktifkan/Non-Aktifkan tab judul di bawah.</string>
+    <string name="pref_summary_toggle_full_screen">Mode immersif</string>
+    <string name="pref_summary_toggle_headset">Putar segera setelah headphones terhubung.</string>
+    <string name="pref_summary_toggle_shuffle">Mode acak akan non-aktif ketika memutar lagu baru dari daftar</string>
+    <string name="pref_summary_toggle_volume">Jika ada ruang di layar yang sedang diputar, aktifkan kontrol volume</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
+    <string name="pref_title_album_cover_style">Tema sampul album</string>
+    <string name="pref_title_album_cover_transform">Gaya sampul album ketika memainkan</string>
+    <string name="pref_title_album_grid_style">Gaya grid album</string>
+    <string name="pref_title_app_shortcuts">Pintasan aplikasi berwarna</string>
+    <string name="pref_title_artist_grid_style">Gaya grid artis</string>
+    <string name="pref_title_audio_ducking">Kurangi volume ketika hilang fokus</string>
+    <string name="pref_title_auto_download_artist_images">Otomatis unduh gambar artis</string>
+    <string name="pref_title_blacklist">Blacklist</string>
+    <string name="pref_title_blurred_album_art">Blur sampul album</string>
+    <string name="pref_title_choose_equalizer">Pilih equalizer</string>
+    <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">Notifikasi berwarna</string>
+    <string name="pref_title_extra_controls">Kontrol tambahan</string>
+    <string name="pref_title_gapless_playback">Pemutaran tanpa jeda</string>
+    <string name="pref_title_general_theme">Tema Umum</string>
+    <string name="pref_title_genre_toggle">Tampilkan tab genre</string>
+    <string name="pref_title_home_artist_grid_style">Grid artis pada beranda</string>
+    <string name="pref_title_home_banner">Banner beranda</string>
+    <string name="pref_title_ignore_media_store_artwork">Abaikan sampul Media Store</string>
+    <string name="pref_title_last_added_interval">Interval daftar putar terbaru</string>
+    <string name="pref_title_lock_screen">Kontrol layar penuh</string>
+    <string name="pref_title_navigation_bar">Bar navigasi berwarna</string>
+    <string name="pref_title_now_playing_screen_appearance">Tampilan</string>
+    <string name="pref_title_open_source_licences">Lisensi sumber terbuka</string>
+    <string name="pref_title_round_corners">Tepi pojok</string>
+    <string name="pref_title_tab_text_mode">Mode tab judul</string>
+    <string name="pref_title_toggle_carousel_effect">Efek Carousel</string>
+    <string name="pref_title_toggle_dominant_color">Warna dominan</string>
+    <string name="pref_title_toggle_full_screen">Layar penuh aplikasi</string>
+    <string name="pref_title_toggle_tab_titles">Tab judul</string>
+    <string name="pref_title_toggle_toggle_headset">Putar otomatis</string>
+    <string name="pref_title_toggle_toggle_shuffle">Mode acak</string>
+    <string name="pref_title_toggle_volume">Kontrol volume</string>
+    <string name="pref_title_user_info">Info pengguna</string>
+
+    <string name="primary_color">Warna primer</string>
+    <string name="primary_color_desc">Warna tema utama, warna baku biru abu-abu, untuk saat ini berfungsi dengan warna gelap</string>
+
+    <string name="profile">Profil</string>
+
+    <string name="purchase">Beli</string>
+
+    <string name="purchase_summary">*Pikirkan sebelum membeli, jangan minta pengembalian uang.</string>
+
+    <string name="queue">Antrean</string>
+
+    <string name="rate_app">Nilai aplikasi</string>
+
+    <string name="rate_on_google_play_summary">Sukai aplikasi ini, beri tahu kami di Google Play Store untuk memberikan pengalaman yang lebih baik</string>
+
+    <string name="recent_albums">Album terbaru</string>
+
+    <string name="recent_artists">Artis terbaru</string>
+
+    <string name="remove_action">Hapus</string>
+
+    <string name="remove_banner_photo">Hapus foto banner</string>
+
+    <string name="remove_cover">Hapus sampul</string>
+
+    <string name="remove_from_blacklist">Hapus dari daftar hitam</string>
+
+    <string name="remove_profile_photo">Hapus foto profil</string>
+
+    <string name="remove_song_from_playlist_title">Hapus lagu dari daftar putar</string>
+    <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> dari daftar putar?]]></string>
+
+    <string name="rename_playlist_title">Ganti nama daftar putar</string>
+
+    <string name="report_an_issue">Laporkan isu</string>
+
+    <string name="report_bug">Laporkan bug</string>
+
+    <string name="reset_action">Setel ulang</string>
+
+    <string name="reset_artist_image">Setel ulang gambar artis</string>
+
+    <string name="restore">Pulihkan</string>
+
+    <string name="restored_previous_purchase_please_restart">Pembelian dipulihkan. Mulai kembali aplikasi agar semua fitur dapat digunakan</string>
+    <string name="restored_previous_purchases">Pembelian dipulihkan.</string>
+
+    <string name="restoring_purchase">Memulihkan pembelian...</string>
+
+    <string name="retro_equalizer">Retro Music Equalizer</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <string name="save">Simpan</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Simpan berkas sebagai</string>
+
+    <string name="save_playlists_title">Simpan file sebagai</string>
+
+    <string name="saved_playlist_to">Daftar putar disimpan ke %s.</string>
+
+    <string name="saving_changes">Menyimpan perubahan</string>
+
+    <string name="scan_media">Pindai media</string>
+
+    <string name="scanned_files">%1$d dari %2$d selesai dipindai.</string>
+
+    <string name="search_hint">Cari di pustaka...</string>
+
+    <string name="select_all">Pilih semua</string>
+
+    <string name="select_banner_photo">Pilih foto banner</string>
+
+    <string name="selected">Terpilih</string>
+
+    <string name="send_crash_log">Kirim catatan kerusakan</string>
+
+    <string name="set">Atur</string>
+
+    <string name="set_artist_image">Setel gambar artis</string>
+
+    <string name="set_photo">Atur foto profil</string>
+
+    <string name="share_app">Bagikan Apl</string>
+
+    <string name="shuffle">Acak</string>
+
+    <string name="simple">Sederhana</string>
+
+    <string name="sleep_timer_canceled">Waktu tidur dibatalkan.</string>
+    <string name="sleep_timer_set">Pewaktu tidur diatur %d menit dari sekarang.</string>
+
+    <string name="slide">Slide</string>
+
+    <string name="small">Album kecil</string>
+
+    <string name="social">Sosial</string>
+
+    <string name="song">Lagu</string>
+
+    <string name="song_duration">Durasi lagu</string>
+
+    <string name="songs">Lagu</string>
+
+    <string name="sort_order">Sortir</string>
+    <string name="sort_order_a_z">Meningkat</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_artist">Artis</string>
+    <string name="sort_order_composer">Komposer</string>
+    <string name="sort_order_date">Tanggal</string>
+    <string name="sort_order_year">Tahun</string>
+    <string name="sort_order_z_a">Menurun</string>
+
+    <string name="speech_not_supported">Maaf! Perangkat anda tidak mendukung input suara</string>
+
+    <string name="speech_prompt">Cari</string>
+
+    <string name="suggestion_songs">Saran</string>
+
+    <string name="summary_user_info">Hanya tampilkan nama anda di beranda</string>
+
+    <string name="support_development">Dukung kami</string>
+
+    <string name="swipe_to_unlock">Geser untuk membuka</string>
+
+    <string name="synced_lyrics">Lirik yang disinkronkan</string>
+
+    <string name="system_equalizer">Equalizer Sistem</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Gabung ke grup Telegram untuk mendiskusikan maslah, membuat permintaan, memamerkan dan lainnya</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">Pekan ini</string>
+
+    <string name="this_year">Tahun ini</string>
+
+    <string name="tiny">Kecil</string>
+
+    <string name="title">Judul</string>
+
+    <string name="title_dashboard">Dasbor</string>
+
+    <string name="title_good_afternoon">Selamat sore</string>
+    <string name="title_good_day">Selamat siang</string>
+    <string name="title_good_evening">Selamat malam</string>
+    <string name="title_good_morning">Selamat pagi</string>
+    <string name="title_good_night">Selamat malam</string>
+
+    <string name="title_user_info">Siapa namamu</string>
+
+    <string name="today">Hari ini</string>
+
+    <string name="top_albums">Album teratas</string>
+
+    <string name="top_artists">Artis 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">Terjemahkan</string>
+
+    <string name="translate_community">Help us translating app to your language</string>
+
+    <string name="twitter_page">Halaman Twitter</string>
+    <string name="twitter_page_summary">Bagikan desain anda dengan RetroMusicApp</string>
+
+    <string name="unlabeled">Tidak berlabel</string>
+
+    <string name="unplayable_file">Tidak dapat memutar lagu ini.</string>
+
+    <string name="up_next">Selanjutnya</string>
+
+    <string name="update_image">Perbarui gambar</string>
+
+    <string name="updating">Memperbarui…</string>
+
+    <string name="username">Nama pengguna</string>
+
+    <string name="version">Versi</string>
+
+    <string name="vertical_flip">Balik vertikal</string>
+
+    <string name="virtualizer">Virtualisasi</string>
+
+    <string name="web_search">Pencarian web</string>
+
+    <string name="what_do_you_want_to_share">Apa yang ingin anda bagikan?</string>
+
+    <string name="whats_new">Apa yang baru</string>
+
+    <string name="window">Jendela</string>
+
+    <string name="window_corner_edges">Sudut melengkung</string>
+
+    <string name="x_has_been_set_as_ringtone">Atur %1$s sebagai nada dering.</string>
+
+    <string name="x_selected">%1$d dipilih</string>
+
+    <string name="year">Tahun</string>
+
+    <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan diteruskan ke situs web pelacak masalah.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Data akun anda hanya digunakan untuk otentikasi</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
deleted file mode 100644
index da7443799..000000000
--- a/app/src/main/res/values-in-rID/strings.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Tentang %s</string>
-    <string name="about_settings_summary">Tim, tautan sosial</string>
-    <string name="accent_color">Warna aksen</string>
-    <string name="accent_color_desc">Warna aksen tema, default ke ungu</string>
-    <string name="action_about">Tentang</string>
-    <string name="action_add_to_blacklist">Tambahkan ke Daftar Hitam</string>
-    <string name="action_add_to_favorites">Tambah ke Favorit</string>
-    <string name="action_add_to_playing_queue">Tambahkan ke antrean putar</string>
-    <string name="action_add_to_playlist">Tambah ke daftar putar</string>
-    <string name="action_cancel">Batal</string>
-    <string name="action_cast">Transmisi</string>
-    <string name="action_clear_playing_queue">Kosongkan antrean pemutaran</string>
-    <string name="action_cycle_repeat">Mode pengulangan siklus</string>
-    <string name="action_delete">Hapus</string>
-    <string name="action_delete_from_device">Hapus dari perangkat</string>
-    <string name="action_details">Detail</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">Pergi ke album</string>
-    <string name="action_go_to_artist">Pergi ke artis</string>
-    <string name="action_go_to_genre">Pergi ke genre</string>
-    <string name="action_go_to_lyrics">Pergi ke lirik</string>
-    <string name="action_go_to_start_directory">Ke direktori awal</string>
-    <string name="action_grant">Izinkan</string>
-    <string name="action_grid_size">Ukuran kisi</string>
-    <string name="action_grid_size_land">Ukuran kisi (lanskap)</string>
-    <string name="action_new_playlist">Daftar putar baru</string>
-    <string name="action_next">Berikutnya</string>
-    <string name="action_play">Putar</string>
-    <string name="action_play_all">Putar semua</string>
-    <string name="action_play_next">Putar selanjutnya</string>
-    <string name="action_play_pause">Putar/Berhenti</string>
-    <string name="action_previous">Sebelumnya</string>
-    <string name="action_remove_from_favorites">Hapus dari favorit</string>
-    <string name="action_remove_from_playing_queue">Hapus dari antrean putaran</string>
-    <string name="action_remove_from_playlist">Hapus dari daftar putar</string>
-    <string name="action_rename">Ganti nama</string>
-    <string name="action_save_playing_queue">Simpan daftar putar</string>
-    <string name="action_scan">Pindai</string>
-    <string name="action_search">Cari</string>
-    <string name="action_set">Mulai</string>
-    <string name="action_set_as_ringtone">Atur sebagai nada dering</string>
-    <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_shuffle_all">Acak semua</string>
-    <string name="action_shuffle_playlist">Acak daftar putar</string>
-    <string name="action_sleep_timer">Pengatur waktu tidur</string>
-    <string name="action_sort_order">Urut berdasarkan</string>
-    <string name="action_tag_editor">Pengubah label</string>
-    <string name="action_toggle_favorite">Aktifkan/nonaktifkan favorit</string>
-    <string name="action_toggle_shuffle">Aktifkan/nonaktifkan mode acak</string>
-    <string name="adaptive">Adaptif</string>
-    <string name="add_action">Tambah</string>
-    <string name="add_playlist_title">"Tambah ke daftar putar"</string>
-    <string name="add_time_framed_lryics">Tambah kerangka waktu pada lirik</string>
-    <string name="added_song_count_to_playlist">Menambah %1$d lagu ke %2$s</string>
-    <string name="added_title_to_playing_queue">"1 lagu ditambah ke antrean."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d lagu telah ditambah ke antrean.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="other">Lagu</item>
-    </plurals>
-    <string name="album_artist">Artis Album</string>
-    <string name="albums">Album</string>
-    <plurals name="albums">
-        <item quantity="other">Album</item>
-    </plurals>
-    <string name="always">Selalu</string>
-    <string name="app_share">Hai, cobalah pemutar musik keren ini di: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Acak</string>
-    <string name="app_shortcut_top_tracks_short">Lagu Teratas</string>
-    <string name="app_widget_big_name">Gambar penuh</string>
-    <string name="app_widget_card_name">Kartu</string>
-    <string name="app_widget_classic_name">Klasik</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Kecil</string>
-    <string name="app_widget_text_name">Teks minimal</string>
-    <string name="artist">Artis</string>
-    <string name="artists">Artis</string>
-    <string name="audio_fade_duration">Durasi audio memudar</string>
-    <string name="audio_focus_denied">Fokus suara ditolak.</string>
-    <string name="audio_settings_summary">Ubah pengaturan suara dan atur equalizer</string>
-    <string name="auto">Otomatis</string>
-    <string name="backup_restore_settings_summary">Cadangkan dan pulihkan pengaturan, daftar putar Anda</string>
-    <string name="backup_restore_title"><![CDATA[Cadangkan & Pulihkan]]></string>
-    <string name="backup_title">Cadangkan</string>
-    <string name="biography">Biografi</string>
-    <string name="black_theme_name">Hitam Pekat</string>
-    <string name="blacklist">Daftar hitam</string>
-    <string name="bluetooth_summary">Aplikasi butuh izin ke perangkat terdekat untuk memeriksa perangkat bluetooth</string>
-    <string name="bluetooth_title">Perangkat terdekat</string>
-    <string name="blur">Keburaman</string>
-    <string name="blur_card">Kartu buram</string>
-    <string name="bug_report_failed">Tidak dapat mengirim laporan</string>
-    <string name="bug_report_failed_invalid_token">Token akses tidak valid. Silakan hubungi pengembang aplikasi.</string>
-    <string name="bug_report_failed_issues_not_available">Masalah tidak diaktifkan untuk repositori yang dipilih. Silakan hubungi pengembang aplikasi.</string>
-    <string name="bug_report_failed_unknown">Terjadi kesalahan tak terduga. Silakan hubungi pengembang aplikasi.</string>
-    <string name="bug_report_failed_wrong_credentials">Nama pengguna atau kata sandi salah</string>
-    <string name="bug_report_issue">Masalah</string>
-    <string name="bug_report_manual">Kirim secara manual</string>
-    <string name="bug_report_no_description">Silakan masukkan deskripsi masalah</string>
-    <string name="bug_report_no_password">Mohon masukkan kata sandi Github Anda dengan benar</string>
-    <string name="bug_report_no_title">Harap masukkan judul masalah</string>
-    <string name="bug_report_no_username">Mohon masukkan nama pengguna Github Anda dengan benar</string>
-    <string name="bug_report_success">Lapor bug sukses</string>
-    <string name="bug_report_summary">Terjadi kesalahan tak terduga. Maaf jika Anda menemukan bug ini, jika terus terjadi maka \"Hapus data aplikasi\" atau kirim Email </string>
-    <string name="bug_report_use_account">Kirim dengan menggunakan akun Github</string>
-    <string name="buy_now">Beli sekarang</string>
-    <string name="cancel_current_timer">Batal</string>
-    <string name="card">Kartu</string>
-    <string name="card_color_style">Kartu Berwarna</string>
-    <string name="card_square">Kartu Persegi</string>
-    <string name="card_style">Kartu</string>
-    <string name="carousal_effect_on_now_playing_screen">Efek korsel pada layar pemutaran</string>
-    <string name="cascading">Bergerak</string>
-    <string name="changelog">Log Pembaruan</string>
-    <string name="changelog_summary">Lihat Apa Yang Baru</string>
-    <string name="choose_image">Pilih Gambar</string>
-    <string name="choose_restore_title">Pilih apa yang akan dipulihkan</string>
-    <string name="circle">Bulat</string>
-    <string name="circular">Melingkar</string>
-    <string name="classic">Klasik</string>
-    <string name="clear_action">Bersihkan</string>
-    <string name="clear_blacklist">Bersihkan daftar hitam</string>
-    <string name="clear_history">Bersihkan Riwayat</string>
-    <string name="clear_playing_queue">Bersihkan antrean</string>
-    <string name="color">Warna</string>
-    <string name="colors">Warna</string>
-    <string name="compact">Ringkas</string>
-    <string name="composer">Komposer</string>
-    <string name="copied_device_info_to_clipboard">Info perangkat tersalin ke papan klip.</string>
-    <string name="could_not_create_playlist">Tidak dapat membuat daftar putar.</string>
-    <string name="could_not_download_album_cover">"Tidak dapat mengunduh sampul album yang cocok."</string>
-    <string name="could_not_restore_purchase">Tidak dapat mengembalikan pembelian.</string>
-    <string name="could_not_scan_files">Tidak dapat memindai %d berkas.</string>
-    <string name="create_action">Buat</string>
-    <string name="create_new_backup">Buat</string>
-    <string name="created_playlist_x">%1$s daftar putar telah dibuat.</string>
-    <string name="credit_title">Member dan kontributor </string>
-    <string name="currently_listening_to_x_by_x">Saat ini mendengarkan %1$s oleh %2$s.</string>
-    <string name="custom_artist_images">Gambar Artis Kustom</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Bagikan Laporan Kerusakan</string>
-    <string name="dark_theme_name">Agak Gelap</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>
-    <string name="deleted_x_songs">Menghapus %1$d lagu.</string>
-    <string name="deleting_songs">Menghapus Lagu</string>
-    <string name="depth">Kedalaman</string>
-    <string name="description">Keterangan</string>
-    <string name="device_info">Info perangkat</string>
-    <string name="dialog_message_set_ringtone">Izinkan Retro Music untuk mengubah pengaturan audio</string>
-    <string name="dialog_title_set_ringtone">Setel nada dering</string>
-    <string name="disc_hint">Nomor disk</string>
-    <string name="do_you_want_to_clear_the_blacklist">Apakah Anda ingin menghapus daftar hitam?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Apakah Anda ingin menghapus <b>%1$s</b> dari daftar hitam?]]></string>
-    <string name="donate">Donasi</string>
-    <string name="donate_summary">Jika Anda pikir saya pantas dibayar untuk pekerjaan saya, Anda dapat meninggalkan sejumlah uang di sini</string>
-    <string name="donation_header">Belikan saya:</string>
-    <string name="done">Selesai</string>
-    <string name="drive_mode">Mode mengemudi</string>
-    <string name="edit_fab">Tombol Edit</string>
-    <string name="edit_normal_lyrics">Edit Lirik</string>
-    <string name="edit_synced_lyrics">Edit Lirik Yang Disinkronkan</string>
-    <string name="empty">Kosong</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Tidak dapat membuat cadangan</string>
-    <string name="error_delete_backup">Tidak dapat menghapus cadangan</string>
-    <string name="error_empty_name">Namamu tidak boleh kosong!</string>
-    <string name="error_load_failed">Gagal memuat</string>
-    <string name="error_share_file">Tidak dapat berbagi berkas</string>
-    <string name="expanded">Diperluas</string>
-    <string name="faq">Pertanyaan Umum (FAQ)</string>
-    <string name="favorites">Favorit</string>
-    <string name="file_already_exists">Berkas sudah ada</string>
-    <string name="finish_last_song">Selesaikan lagu terakhir</string>
-    <string name="fit">Paskan</string>
-    <string name="flat">Datar</string>
-    <string name="folders">Folder</string>
-    <string name="follow_system">Ikuti sistem</string>
-    <string name="for_you">Untukmu</string>
-    <string name="free">Gratis</string>
-    <string name="full">Penuh</string>
-    <string name="full_card">Kartu penuh</string>
-    <string name="general_settings_summary">Ubah tema dan warna aplikasi</string>
-    <string name="general_settings_title">Tampilan dan nuansa</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genre</string>
-    <string name="git_hub_summary">Beri fork pada proyek di GitHub</string>
-    <string name="gradient">Gradasi</string>
-    <string name="grant_access">Izinkan akses</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="grid_style_label">Gaya kisi</string>
-    <string name="help_summary">Butuh bantuan lebih?</string>
-    <string name="hinge">Engsel</string>
-    <string name="history">Riwayat</string>
-    <string name="history_cleared">Riwayat dibersihkan</string>
-    <string name="history_undo_button">Batalkan pilihan</string>
-    <string name="home">Beranda</string>
-    <string name="horizontal_flip">Balik horisontal</string>
-    <string name="image">Gambar</string>
-    <string name="image_gradient">Gambar bergradasi</string>
-    <string name="image_settings_summary">Ubah pengaturan unduhan gambar artis</string>
-    <string name="import_label">Impor</string>
-    <string name="import_playlist">Impor daftar putar</string>
-    <string name="import_playlist_message">Ini mengimpor semua daftar putar yang terdaftar di Media Penyimpanan Android dengan lagu, jika daftar putar sudah ada, lagu akan digabungkan.</string>
-    <string name="inserted_x_songs_into_playlist_x">Memasukkan %1$d lagu ke dalam daftar putar %2$s.</string>
-    <string name="instagram_page_summary">Bagikan pengaturan Retro Music Anda untuk dipamerkan di Instagram</string>
-    <string name="keyboard">Papan ketik</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">Nama berkas</string>
-    <string name="label_file_path">Lokasi File</string>
-    <string name="label_file_size">Ukuran</string>
-    <string name="label_last_modified">Terakhir Diubah</string>
-    <string name="label_more_from">Lainnya dari %s</string>
-    <string name="label_sampling_rate">Tingkat Sampling</string>
-    <string name="label_track_length">Durasi</string>
-    <string name="labeled">Berlabel</string>
-    <string name="last_added">Terakhir ditambah</string>
-    <string name="last_song">Lagu terakhir</string>
-    <string name="lets_go">Ayo mulai</string>
-    <string name="library_categories">Kategori perpustakaan</string>
-    <string name="licenses">Lisensi</string>
-    <string name="light_theme_name">Putih Terang</string>
-    <string name="listeners_label">Pendengar</string>
-    <string name="listing_files">Daftar berkas</string>
-    <string name="loading_products">Memuat produk…</string>
-    <string name="login">Masuk</string>
-    <string name="lyrics">Lirik</string>
-    <string name="made_with_love">Dibuat dengan ❤️ di India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Kesalahan</string>
-    <string name="md_storage_perm_error">Kesalahan izin</string>
-    <string name="message_backup_create_success">Cadangan berhasil dibuat.</string>
-    <string name="message_limit_tabs">Tidak lebih dari 5 item</string>
-    <string name="message_pro_feature">%s adalah fitur Pro.</string>
-    <string name="message_restore_success">Restorasi sukses.</string>
-    <string name="message_updated">Diperbarui</string>
-    <string name="message_welcome"><![CDATA[Halo! <br> Selamat datang ke %s]]></string>
-    <string name="my_name">Nama</string>
-    <string name="my_top_tracks">Sering diputar</string>
-    <string name="never">Tidak pernah</string>
-    <string name="new_music_mix">Acak Musik Baru</string>
-    <string name="new_playlist_title">Daftar putar baru</string>
-    <string name="new_start_directory">%s adalah direktori awal yang baru.</string>
-    <string name="next_song">Lagu berikutnya</string>
-    <string name="no_albums">Tidak ada album</string>
-    <string name="no_artists">Tidak ada artis</string>
-    <string name="no_audio_ID">"Putar lagu terlebih dahulu, lalu coba lagi."</string>
-    <string name="no_backups_found">Tidak ada cadangan yang ditemukan</string>
-    <string name="no_equalizer">Equalizer tidak ditemukan</string>
-    <string name="no_genres">Tidak ada genre</string>
-    <string name="no_lyrics_found">Lirik tidak ditemukan</string>
-    <string name="no_playing_queue">Tidak ada lagu yang diputar</string>
-    <string name="no_playlists">Tidak ada daftar putar</string>
-    <string name="no_purchase_found">Tidak ada pembelian yang ditemukan.</string>
-    <string name="no_results">Tidak ada hasil</string>
-    <string name="no_songs">Tidak ada lagu</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Lirik normal</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> tidak terdaftar di penyimpanan media.]]></string>
-    <string name="not_recently_played">Tidak baru-baru ini dimainkan</string>
-    <string name="nothing_to_scan">Tidak ada yang dipindai.</string>
-    <string name="nothing_to_see">Tidak ada yang bisa dilihat</string>
-    <string name="notification">Notifikasi</string>
-    <string name="notification_settings_summary">Sesuaikan gaya notifikasi</string>
-    <string name="now_playing">Sedang diputar</string>
-    <string name="now_playing_queue">Sekarang memutar antrean</string>
-    <string name="now_playing_summary">Sesuaikan tampilan layar yang sedang diputar</string>
-    <string name="now_playing_themes">9+ tema pemutar sekarang</string>
-    <string name="only_on_wifi">Hanya Wi-Fi</string>
-    <string name="other_settings_summary">Fitur pengujian lanjutan</string>
-    <string name="others">Lainnya</string>
-    <string name="over_cover">Di Atas Sampul</string>
-    <string name="password">Kata sandi</string>
-    <string name="past_three_months">3 bulan terakhir</string>
-    <string name="paste_lyrics_here">Tempel Lirik Disini</string>
-    <string name="paste_timeframe_lyrics_here">Tempel kerangka waktu lirik di sini</string>
-    <string name="peek">Mengintip</string>
-    <string name="permission_bluetooth_denied">Izin perangkat terdekat ditolak.</string>
-    <string name="permission_external_storage_denied">Izin untuk mengakses penyimpanan eksternal ditolak.</string>
-    <string name="permission_summary">Aplikasi memerlukan izin untuk mengakses penyimpanan perangkat Anda untuk memutar musik</string>
-    <string name="permission_title">Akses Penyimpanan</string>
-    <string name="permissions_denied">Izin ditolak.</string>
-    <string name="personalize">Personalisasi</string>
-    <string name="personalize_settings_summary">Sesuaikan pemutar dan antarmuka Anda</string>
-    <string name="pick_from_local_storage">Pilih dari penyimpanan lokal</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Ikuti halaman Pinterest untuk inspirasi desain Retro Music</string>
-    <string name="plain">Polos</string>
-    <string name="playList_already_exits">Daftar putar sudah ada</string>
-    <string name="playback_pitch">Nada</string>
-    <string name="playback_settings">Setelan Pemutaran</string>
-    <string name="playback_speed">Kecepatan Pemutaran</string>
-    <string name="playing_notification_description">Notifikasi pemutaran memberikan tindakan untuk putar/jeda dll.</string>
-    <string name="playing_notification_name">Memutar notifikasi</string>
-    <string name="playlist_created_sucessfully">%s berhasil dibuat</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="pref_blur_amount_summary">Jumlah blur yang diterapkan untuk tema blur, lebih rendah lebih cepat</string>
-    <string name="pref_blur_amount_title">Jumlah blur</string>
-    <string name="pref_filter_song_summary">Filter lagu berdasarkan durasi</string>
-    <string name="pref_filter_song_title">Filter berdasarkan durasi</string>
-    <string name="pref_header_advanced">Tingkat lanjut</string>
-    <string name="pref_header_album">Gaya album</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Daftar hitam</string>
-    <string name="pref_header_controls">Kontrol</string>
-    <string name="pref_header_general">Tema</string>
-    <string name="pref_header_images">Gambar</string>
-    <string name="pref_header_library">Pustaka</string>
-    <string name="pref_header_lockscreen">Layar kunci</string>
-    <string name="pref_header_playlists">Daftar Putar</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Menjeda lagu saat volume nol dan mulai memutar ulang saat level volume naik. Ini juga berfungsi di luar aplikasi</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Jeda saat nol</string>
-    <string name="pref_keep_screen_on_summary">Perlu diingat bahwa mengaktifkan fitur ini dapat memengaruhi masa pakai baterai</string>
-    <string name="pref_keep_screen_on_title">Biarkan layar tetap menyala</string>
-    <string name="pref_language_name">Pilih bahasa</string>
-    <string name="pref_snow_fall_title">Efek hujan salju</string>
-    <string name="pref_summary_album_art_on_lockscreen">Gunakan sampul album lagu yang sedang diputar sebagai wallpaper layar kunci</string>
-    <string name="pref_summary_album_artists_only">Tampilkan Album Artis dalam kategori Artis</string>
-    <string name="pref_summary_audio_ducking">Turunkan volume saat ada pemberitahuan</string>
-    <string name="pref_summary_audio_fade">Audio memudar saat lagu dijeda atau diputar</string>
-    <string name="pref_summary_blacklist">Konten folder daftar hitam disembunyikan dari perpustakaan Anda.</string>
-    <string name="pref_summary_bluetooth_playback">Mainkan segera setelah terhubung ke perangkat bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Mengaburkan sampul album di layar kunci. Dapat menyebabkan masalah dengan aplikasi dan widget pihak ketiga</string>
-    <string name="pref_summary_carousel_effect">Efek korsel untuk sampul album di layar yang sedang diputar. Perhatikan bahwa tema Kartu dan Kartu Blur tidak akan berfungsi</string>
-    <string name="pref_summary_classic_notification">Pakai desain notifikasi klasik</string>
-    <string name="pref_summary_colored_app">Warna latar belakang dan tombol kontrol berubah sesuai dengan sampul album dari layar yang sedang diputar</string>
-    <string name="pref_summary_colored_app_shortcuts">Warnai pintasan aplikasi dalam warna aksen. Setiap kali Anda mengubah warna, harap aktifkan ini untuk diterapkan</string>
-    <string name="pref_summary_colored_notification">"Mewarnai notifikasi di sampul album\u2019 dengan warna cerah"</string>
-    <string name="pref_summary_cross_fade">Durasi crossfade antar lagu</string>
-    <string name="pref_summary_desaturated_color">Desaturasi warna aksen dalam mode gelap</string>
-    <string name="pref_summary_expand_now_playing_panel">Menekan notifikasi akan menampilkan layar putar sekarang daripada layar beranda</string>
-    <string name="pref_summary_extra_controls">Tambahkan kontrol ekstra untuk pemutar mini</string>
-    <string name="pref_summary_extra_song_info">Tampilkan informasi Lagu tambahan seperti format berkas, kecepatan bit, dan frekuensi</string>
-    <string name="pref_summary_gapless_playback">"Dapat menyebabkan masalah pemutaran pada beberapa perangkat."</string>
-    <string name="pref_summary_home_banner">Tampilkan atau sembunyikan spanduk beranda</string>
-    <string name="pref_summary_ignore_media_store_artwork">Dapat meningkatkan kualitas sampul album, namun menyebabkan waktu pemuatan lebih lambat. Aktifkan jika Anda bermasalah dengan resolusi gambar album yang rendah</string>
-    <string name="pref_summary_library_categories">Mengkonfigurasi visibilitas dan susunan kategori perpustakaan.</string>
-    <string name="pref_summary_lock_screen">Gunakan kontrol layar kunci khusus Musik Retro</string>
-    <string name="pref_summary_manage_audio_focus">Selalu putar audio di latar belakang tanpa pedulikan apapun lainnya yang diputar</string>
-    <string name="pref_summary_open_source_licences">Detail lisensi untuk perangkat lunak sumber terbuka</string>
-    <string name="pref_summary_pause_history">Saat diaktifkan, lagu yang baru diputar tidak akan muncul di riwayat</string>
-    <string name="pref_summary_remember_tab">Arahkan ke tab yang terakhir digunakan saat memulai</string>
-    <string name="pref_summary_show_lyrics">Tampilkan lirik yang disinkronkan di atas sampul album</string>
-    <string name="pref_summary_suggestions">Tampilkan Campuran Musik Baru di layar beranda</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Memungkinkan mengubah lagu dengan menggeser di mana saja di layar yang sedang diputar</string>
-    <string name="pref_summary_swipe_to_dismiss">Usap ke bawah untuk hentikan pemutar mini</string>
-    <string name="pref_summary_toggle_full_screen">Mode Layar Penuh</string>
-    <string name="pref_summary_toggle_headset">Mulai memutar segera setelah headphone terhubung</string>
-    <string name="pref_summary_toggle_shuffle">Mode acak akan mati saat memutar daftar lagu baru</string>
-    <string name="pref_summary_toggle_volume">Jika tersedia cukup ruang, tampilkan kontrol volume di layar pemutaran</string>
-    <string name="pref_summary_wallpaper_accent">Ambil warna aksen dari wallpaper</string>
-    <string name="pref_summary_whitelist">Tampilkan musik hanya dari folder /Music</string>
-    <string name="pref_title_album_art_on_lockscreen">Tampilkan sampul album</string>
-    <string name="pref_title_album_artists_only">Navigasi berdasarkan Album Artis</string>
-    <string name="pref_title_album_cover_style">Tema sampul album</string>
-    <string name="pref_title_album_cover_transform">Lewati sampul album</string>
-    <string name="pref_title_app_shortcuts">Pintasan Berwarna</string>
-    <string name="pref_title_appbar_mode">Gaya header</string>
-    <string name="pref_title_audio_ducking">Kurangi volume saat ada notifikasi</string>
-    <string name="pref_title_audio_fade">Suara Memudar</string>
-    <string name="pref_title_auto_download_artist_images">Unduh otomatis gambar artis</string>
-    <string name="pref_title_blacklist">Daftar hitam</string>
-    <string name="pref_title_bluetooth_playback">Pemutaran Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Buramkan sampul album</string>
-    <string name="pref_title_circle_button">Tombol putar melingkar</string>
-    <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">Notifikasi berwarna</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Gunakan fon Manrope</string>
-    <string name="pref_title_desaturated_color">Desaturasi warna</string>
-    <string name="pref_title_expand_now_playing_panel">Tampilkan layar pemutaran</string>
-    <string name="pref_title_extra_controls">Kontrol tambahan</string>
-    <string name="pref_title_extra_song_info">Info lagu</string>
-    <string name="pref_title_gapless_playback">Pemutaran tanpa jeda</string>
-    <string name="pref_title_general_theme">Tema aplikasi</string>
-    <string name="pref_title_home_album_grid_style">Kisi album</string>
-    <string name="pref_title_home_artist_grid_style">Kisi artis</string>
-    <string name="pref_title_home_banner">Spanduk</string>
-    <string name="pref_title_ignore_media_store_artwork">Abaikan sampul dari Media Penyimpanan</string>
-    <string name="pref_title_last_added_interval">Interval daftar putar yang terakhir ditambahkan</string>
-    <string name="pref_title_lock_screen">Kontrol layar penuh</string>
-    <string name="pref_title_lyrics_screen_on">Tetap aktifkan layar saat menampilkan lirik</string>
-    <string name="pref_title_lyrics_type">Tipe lirik</string>
-    <string name="pref_title_manage_audio_focus">Selalu putar</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema Pemutaran</string>
-    <string name="pref_title_open_source_licences">Lisensi sumber terbuka</string>
-    <string name="pref_title_pause_history">Jeda riwayat</string>
-    <string name="pref_title_remember_tab">Ingat tab terakhir</string>
-    <string name="pref_title_show_lyrics">Tampilkan lirik</string>
-    <string name="pref_title_suggestions">Tampilkan Saran</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Geser ke mana saja untuk mengubah lagu</string>
-    <string name="pref_title_swipe_to_dismiss">Hentikan dengan usap ke bawah</string>
-    <string name="pref_title_tab_text_mode">Mode judul tab</string>
-    <string name="pref_title_toggle_carousel_effect">Efek korsel</string>
-    <string name="pref_title_toggle_full_screen">Aplikasi layar penuh</string>
-    <string name="pref_title_toggle_toggle_headset">Putar otomatis</string>
-    <string name="pref_title_toggle_toggle_shuffle">Mode acak</string>
-    <string name="pref_title_toggle_volume">Kontrol volume</string>
-    <string name="pref_title_wallpaper_accent">Warna aksen wallpaper</string>
-    <string name="pref_title_whitelist">Musik daftar putih</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema hitam, tema yang sedang diputar, efek korsel, dan lainnya...</string>
-    <string name="profile">Profil</string>
-    <string name="purchase">Pembelian</string>
-    <string name="queue">Antrean Putar</string>
-    <string name="rate_app">Beri nilai aplikasi</string>
-    <string name="rate_on_google_play_summary">Suka aplikasi ini? Beritahu kami di Google Play Store agar kami bisa membuatnya lebih baik</string>
-    <string name="recent_albums">Album terbaru</string>
-    <string name="recent_artists">Artis terbaru</string>
-    <string name="remove_action">Hapus</string>
-    <string name="remove_cover">Hapus sampul</string>
-    <string name="remove_from_blacklist">Hapus dari daftar hitam</string>
-    <string name="remove_image">Hapus Gambar</string>
-    <string name="remove_song_from_playlist_title">Hapus lagu dari daftar putar</string>
-    <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-lagu dari daftar putar</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Hapus <b>%1$d</b> dari daftar putar?]]></string>
-    <string name="rename_playlist_title">Ubah nama daftar putar</string>
-    <string name="replace_cover">Ganti Sampul</string>
-    <string name="report_an_issue">Laporkan masalah</string>
-    <string name="report_bug">Laporkan bug</string>
-    <string name="reset_action">Setel ulang</string>
-    <string name="reset_artist_image">Muat ulang gambar artis</string>
-    <string name="restore">Pulihkan</string>
-    <string name="restore_message">Apakah Anda ingin memulihkan cadangan?</string>
-    <string name="restored_previous_purchase_please_restart">Memulihkan pembelian sebelumnya. Silakan mulai ulang aplikasi untuk menggunakan semua fitur.</string>
-    <string name="restored_previous_purchases">Memulihkan pembelian sebelumnya.</string>
-    <string name="restoring_purchase">Memulihkan pembelian…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Aplikasi memerlukan izin untuk mengakses setelan perangkat Anda untuk mengatur musik sebagai Nada Dering</string>
-    <string name="ringtone_title">Nada Dering (Opsional)</string>
-    <string name="saf_delete_failed">Penghapusan file gagal: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Tidak bisa mendapatkan SAF URI</string>
-    <string name="saf_guide_slide1_description">Buka laci navigasi</string>
-    <string name="saf_guide_slide1_description_before_o">Aktifkan \'Tampilkan kartu SD\' di menu tambahan</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s membutuhkan akses kartu SD</string>
-    <string name="saf_guide_slide2_description">Anda perlu memilih direktori root kartu SD Anda</string>
-    <string name="saf_guide_slide2_title">Pilih kartu SD Anda di laci navigasi</string>
-    <string name="saf_guide_slide3_description">Jangan buka sub-folder apa pun</string>
-    <string name="saf_guide_slide3_title">Ketuk tombol \'pilih\' di bagian bawah layar</string>
-    <string name="saf_write_failed">Penulisan file gagal: %s</string>
-    <string name="save">Simpan</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Simpan sebagai berkas</string>
-    <string name="save_playlists_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="scan_media">Pindai media</string>
-    <string name="scanned_files">%1$d dari %2$d berkas terpindai.</string>
-    <string name="scrobbles_label">Scrobble</string>
-    <string name="select_all">Pilih semua</string>
-    <string name="selected">Terpilih</string>
-    <string name="set">Setel</string>
-    <string name="set_artist_image">Setel gambar artis</string>
-    <string name="share_app">Bagikan aplikasi</string>
-    <string name="share_summary">Bagikan aplikasi dengan teman dan keluarga Anda</string>
-    <string name="share_to_stories">Bagikan ke Cerita</string>
-    <string name="show_album_artists">Tampilkan Artis Album</string>
-    <string name="shuffle">Acak</string>
-    <string name="simple">Sederhana</string>
-    <string name="sleep_timer_canceled">Pewaktu tidur dibatalkan.</string>
-    <string name="sleep_timer_set">Pewaktu tidur diatur selama %d menit dari sekarang.</string>
-    <string name="social">Sosial</string>
-    <string name="social_stories">Bagikan cerita</string>
-    <string name="song">Lagu</string>
-    <string name="song_duration">Durasi lagu</string>
-    <string name="songs">Lagu</string>
-    <string name="sort_order">Urut berdasarkan</string>
-    <string name="sort_order_a_z">Sortir naik</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artis</string>
-    <string name="sort_order_composer">Komposer</string>
-    <string name="sort_order_date">Tanggal ditambahkan</string>
-    <string name="sort_order_date_modified">Tanggal diubah</string>
-    <string name="sort_order_default">Bawaan</string>
-    <string name="sort_order_num_songs">Jumlah lagu</string>
-    <string name="sort_order_num_songs_desc">Desc jumlah lagu</string>
-    <string name="sort_order_year">Tahun</string>
-    <string name="sort_order_z_a">Sortir turun</string>
-    <string name="speech_not_supported">Maaf! Perangkat Anda tidak mendukung input suara</string>
-    <string name="speech_prompt">Cari pustaka Anda</string>
-    <string name="stack">Tumpukan</string>
-    <string name="start_play_music">Mulai mainkan musik.</string>
-    <string name="suggestion_songs">Saran</string>
-    <string name="support_development">Dukung pengembangan</string>
-    <string name="swipe_to_unlock">Geser untuk membuka</string>
-    <string name="synced_lyrics">Lirik yang tersinkron</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Gabung grup telegram untuk diskusikan bug, buat saran, pamer dan lainnya</string>
-    <string name="thank_you">Terima kasih!</string>
-    <string name="the_audio_file">File 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="tiny_card_style">Kartu kecil</string>
-    <string name="title">Judul</string>
-    <string name="title_new_backup">Cadangan Baru</string>
-    <string name="today">Hari ini</string>
-    <string name="top_albums">Album teratas</string>
-    <string name="top_artists">Artis papan atas</string>
-    <string name="track_hint">"Trek (2 untuk trek ke-2 atau 3004 untuk CD3 trek ke-4)"</string>
-    <string name="track_list">Nomor trek</string>
-    <string name="translate">Terjemahan</string>
-    <string name="translate_community">Bantu kami terjemahkan aplikasi ke dalam bahasa Anda</string>
-    <string name="try_retro_music_premium">Coba Retro Musik Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Bagikan desain Anda dengan Musik Retro</string>
-    <string name="unlabeled">Tidak berlabel</string>
-    <string name="unplayable_file">Tidak dapat\u2019 memutar lagu ini.</string>
-    <string name="up_next">Berikutnya</string>
-    <string name="update_image">Perbarui gambar</string>
-    <string name="updating">Memperbarui…</string>
-    <string name="user_images_description">Gambar Pengguna</string>
-    <string name="user_name">Nama Pengguna</string>
-    <string name="username">Nama pemakai</string>
-    <string name="version">Versi</string>
-    <string name="vertical_flip">Vertikal</string>
-    <string name="view_on_telegram">Lihat di Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Pencarian web</string>
-    <string name="website">Situs web</string>
-    <string name="website_summary">Lihat situs web kami</string>
-    <string name="welcome">Selamat datang,</string>
-    <string name="what_do_you_want_to_share">Apa yang ingin Anda bagikan?</string>
-    <string name="whats_new">Apa yang baru</string>
-    <string name="window">Jendela</string>
-    <string name="window_corner_edges">Sudut lengkung</string>
-    <string name="x_has_been_set_as_ringtone">Atur %1$s sebagai nada dering Anda.</string>
-    <string name="x_selected">%1$d dipilih</string>
-    <string name="year">Tahun</string>
-    <string name="you_have_to_select_at_least_one_category">Anda harus memilih setidaknya satu kategori.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Anda akan diteruskan ke situs web pelacak galat.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Data akun Anda hanya digunakan untuk autentikasi.</string>
-</resources>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
new file mode 100644
index 000000000..7e3bce450
--- /dev/null
+++ b/app/src/main/res/values-in/strings.xml
@@ -0,0 +1,296 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Warna aksen</string>
+    <string name="accent_color_desc">Warna aksen, warna bawaan adalah pink.</string>
+
+    <string name="action_about">Tentang</string>
+
+    <string name="action_add_to_favorites">Tambahkan sebagai favorit</string>
+    <string name="action_add_to_playing_queue">Tambahkan ke antrian</string>
+    <string name="action_add_to_playlist">Tambahkan ke daftar putar...</string>
+
+    <string name="action_clear_playing_queue">Bersihkan antrian</string>
+
+    <string name="action_delete">Hapus</string>
+    <string name="action_delete_from_device">Hapus dari perangkat</string>
+
+    <string name="action_details">Rincian</string>
+
+    <string name="action_go_to_album">Lihat album</string>
+    <string name="action_go_to_artist">Lihat artis</string>
+    <string name="action_go_to_start_directory">Lihat direktori awal</string>
+
+    <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_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_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>
+
+    <string name="action_rename">Ubah nama</string>
+
+    <string name="action_scan">Pindai</string>
+
+    <string name="action_search">Cari</string>
+
+    <string name="action_set">Atur</string>
+    <string name="action_set_as_ringtone">Atur sebagai nada dering</string>
+    <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_shuffle_all">Acak semua</string>
+    <string name="action_shuffle_playlist">Acak daftar putar</string>
+
+    <string name="action_tag_editor">Sunting Tag</string>
+
+    <string name="add_playlist_title">"Tambahkan ke daftar putar"</string>
+
+    <string name="added_title_to_playing_queue">"1 judul ditambahkan ke antrian."</string>
+
+    <string name="added_x_titles_to_playing_queue">%1$d judul ditambahkan ke antrian.</string>
+
+    <string name="album">Album</string>
+
+    <string name="album_artist">Artis album</string>
+
+    <string name="album_or_artist_empty">Judul atau artis kosong.</string>
+
+    <string name="albums">Album</string>
+
+    <string name="always">Selalu</string>
+
+    <!-- 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_classic_name">Retro music - Klasik</string>
+
+    <string name="artist">Artis</string>
+
+    <string name="artists">Artis</string>
+
+    <string name="audio_focus_denied">Fokus suara ditolak.</string>
+
+    <string name="biography">Biografi</string>
+
+    <string name="black_theme_name">Hitam</string>
+
+    <string name="changelog">Catatan ubahan</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">"Gagal mengunduh gambar album."</string>
+    <string name="could_not_scan_files">Tidak dapat memindai %d fail.</string>
+
+    <string name="create_action">Tambahkan</string>
+
+    <string name="created_playlist_x">Daftar putar %1$s ditambahkan.</string>
+
+    <string name="currently_listening_to_x_by_x">Saat ini mendengarkan %1$s oleh %2$s.</string>
+
+    <string name="dark_theme_name">Gelap</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_x"><![CDATA[Hapus lagu <b>%1$s</b>?]]></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>
+    <string name="deleted_x_songs">%1$d lagu dihapus.</string>
+
+    <string name="donate">Donasi</string>
+
+    <string name="download_from_last_fm">Unduh dari Last.fm</string>
+
+    <string name="empty">Kosong</string>
+
+    <string name="equalizer">Ekualizer</string>
+
+    <string name="favorites">Favorit</string>
+
+    <string name="folders">Direktori</string>
+
+    <string name="genre">Genre</string>
+
+    <string name="history">Riwayat</string>
+
+    <string name="home">Beranda</string>
+
+    <string name="inserted_x_songs_into_playlist_x">%1$d lagu dimasukkan ke daftar putar %2$s.</string>
+
+    <string name="label_bit_rate">Birate</string>
+
+    <string name="label_file_format">Format</string>
+    <string name="label_file_name">Nama fail</string>
+    <string name="label_file_path">Lokasi fail</string>
+    <string name="label_file_size">Ukuran</string>
+
+    <string name="label_sampling_rate">Rasio sampling</string>
+
+    <string name="label_track_length">Durasi</string>
+
+    <string name="last_added">Terakhir ditambahkan</string>
+
+    <string name="library">Pustaka</string>
+
+    <string name="licenses">Lisensi</string>
+
+    <string name="light_theme_name">Putih</string>
+
+    <string name="listing_files">Daftar fail</string>
+
+    <string name="loading_products">Memuat produk...</string>
+
+    <string name="lyrics">Lirik</string>
+
+    <string name="my_top_tracks">Lagu teratas</string>
+
+    <string name="never">Tidak pernah</string>
+
+    <string name="new_playlist_title">Daftar putar baru...</string>
+
+    <string name="new_start_directory">%s adalah direktori awal</string>
+
+    <string name="no_albums">Tidak ada album</string>
+
+    <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_playlists">Tidak ada daftar putar</string>
+
+    <string name="no_results">Tak ada hasil</string>
+
+    <string name="no_songs">Tidak ada lagu</string>
+
+    <string name="notification">Pemberitahuan</string>
+
+    <string name="now_playing_queue">Antrian daftar putar saat ini</string>
+
+    <string name="only_on_wifi">Hanya dengan Wi-Fi</string>
+
+    <string name="permission_external_storage_denied">Izin akses penyimpanan eksternal ditolak.</string>
+
+    <string name="permissions_denied">Izin ditolak.</string>
+
+    <string name="pick_from_local_storage">Pilih dari penyimpanan lokal</string>
+
+    <string name="playlist_empty_text">Daftar putar kosong</string>
+
+    <string name="playlist_name_empty">Nama daftar putar</string>
+
+    <string name="playlists">Daftar putar</string>
+
+    <string name="pref_header_audio">Suara</string>
+    <string name="pref_header_images">Gambar</string>
+    <string name="pref_header_lockscreen">Layarkunci</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>
+    <string name="pref_summary_colored_app">Warna latar, tombol kontrol berubah sesuai gambar album</string>
+    <string name="pref_summary_colored_app_shortcuts">Warnai pintasan apl 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">"Warnai pemberitahuan dengan warna gambar album."</string>
+    <string name="pref_summary_gapless_playback">"Dapat menyebabkan masalah pada beberapa perangkat."</string>
+    <string name="pref_summary_ignore_media_store_artwork">Meningkatkan kualitas gambar album namun memperlambat waktu muat. Aktifkan ini hanya jika ada masalah dengan gambar album resolusi rendah.</string>
+    <string name="pref_summary_round_corners">Lengkungan pojok jendela dan gambar album.</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Perlihatkan gambar album</string>
+    <string name="pref_title_app_shortcuts">Pintasan apl berwarna</string>
+    <string name="pref_title_audio_ducking">Kurangi volume saat kehilangan fokus</string>
+    <string name="pref_title_auto_download_artist_images">Unduh otomatis gambar artis</string>
+    <string name="pref_title_blurred_album_art">Kaburkan gambar album</string>
+    <string name="pref_title_colored_app">Warna adaptif</string>
+    <string name="pref_title_colored_notification">Pemberitahuan berwarna</string>
+    <string name="pref_title_gapless_playback">Putar tanpa jeda</string>
+    <string name="pref_title_general_theme">Tema utama</string>
+    <string name="pref_title_ignore_media_store_artwork">Abaikan gambar Media Store</string>
+    <string name="pref_title_navigation_bar">Bilah navigasi berwarna</string>
+    <string name="pref_title_round_corners">Lengkungan pojok</string>
+
+    <string name="primary_color">Warna utama</string>
+
+    <string name="queue">Antrian</string>
+
+    <string name="rate_app">Nilai aplikasi</string>
+
+    <string name="remove_action">Hapus</string>
+
+    <string name="remove_cover">Hapus gambar album</string>
+
+    <string name="remove_song_from_playlist_title">Hapus lagu dari daftar putar</string>
+    <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_playlist_title">Ubah nama daftar putar</string>
+    <string name="save_playlist_title">Simpan sebagai fail</string>
+    <string name="saved_playlist_to">Daftar putar tersimpan ke %s.</string>
+
+    <string name="saving_changes">Menyimpan perubahan</string>
+
+    <string name="scanned_files">Terpindai %1$d dari %2$d fail.</string>
+
+    <string name="search_hint">Cari di perpustakaan anda...</string>
+
+    <string name="shuffle">Acak</string>
+
+    <string name="song">Lagu</string>
+
+    <string name="songs">Lagu</string>
+
+    <string name="sort_order">Urutan sortir</string>
+
+    <string name="speech_not_supported">Maaf! Perangkat anda tidak mendukung input suara</string>
+
+    <string name="speech_prompt">Cari di perpustakaan</string>
+
+    <string name="support_development">Dukungan pengembangan</string>
+
+    <string name="thank_you">Terima kasih!</string>
+
+    <string name="the_audio_file">Fail audio</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>
+
+    <string name="up_next">Selanjutnya</string>
+
+    <string name="update_image">Perbarui gambar</string>
+
+    <string name="updating">Memperbarui...</string>
+
+    <string name="web_search">Pencarian Web</string>
+
+    <string name="what_do_you_want_to_share">Apa yang ingin anda bagikan?</string>
+
+    <string name="x_has_been_set_as_ringtone">Atur %1$s sebagai nada dering.</string>
+
+    <string name="x_selected">%1$d dipilh</string>
+
+    <string name="year">Tahun</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it/strings.xml
similarity index 67%
rename from app/src/main/res/values-it-rIT/strings.xml
rename to app/src/main/res/values-it/strings.xml
index 2bc3f795b..047024fa6 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1,105 +1,147 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Info su %s</string>
     <string name="about_settings_summary">Team e pagine social</string>
-    <string name="accent_color">Colore in rilievo</string>
-    <string name="accent_color_desc">Il colore in rilievo del tema, il predefinito è viola</string>
+
+    <string name="accent_color">Accento colore</string>
+    <string name="accent_color_desc">Il colore di accento del tema, il predefinito é verde acqua</string>
+
     <string name="action_about">Informazioni</string>
-    <string name="action_add_to_blacklist">Aggiungi alla blacklist</string>
+
     <string name="action_add_to_favorites">Aggiungi ai preferiti</string>
     <string name="action_add_to_playing_queue">Aggiungi alla coda</string>
     <string name="action_add_to_playlist">Aggiungi alla playlist</string>
-    <string name="action_cancel">Annulla</string>
-    <string name="action_cast">Trasmetti</string>
+
     <string name="action_clear_playing_queue">Cancella coda</string>
+    <string name="action_clear_playlist">Svuota la playlist</string>
+
     <string name="action_cycle_repeat">Modalità ripetizione continua</string>
+
     <string name="action_delete">Elimina</string>
     <string name="action_delete_from_device">Elimina dal dispositivo</string>
+
     <string name="action_details">Dettagli</string>
-    <string name="action_edit">Modifica</string>
+
     <string name="action_go_to_album">Vai all\'album</string>
     <string name="action_go_to_artist">Vai all\'artista</string>
     <string name="action_go_to_genre">Vai al genere</string>
-    <string name="action_go_to_lyrics">Vai al testo</string>
     <string name="action_go_to_start_directory">Torna al percorso iniziale</string>
+
     <string name="action_grant">Concedi</string>
+
     <string name="action_grid_size">Dimensione griglia</string>
     <string name="action_grid_size_land">Dimensione 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_all">Riproduci tutti</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_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>
+
     <string name="action_rename">Rinomina</string>
+
     <string name="action_save_playing_queue">Salva coda di riproduzione</string>
+
     <string name="action_scan">Scansiona</string>
+
     <string name="action_search">Cerca</string>
+
     <string name="action_set">Inizia</string>
     <string name="action_set_as_ringtone">Imposta come suoneria</string>
     <string name="action_set_as_start_directory">Imposta come percorso iniziale</string>
+
     <string name="action_settings">"Impostazioni"</string>
+
     <string name="action_share">Condividi</string>
+
     <string name="action_shuffle_all">Riproduzione casuale</string>
     <string name="action_shuffle_playlist">Riproduzione casuale playlist</string>
+
     <string name="action_sleep_timer">Timer sonno</string>
+
     <string name="action_sort_order">Ordina per</string>
+
     <string name="action_tag_editor">Modifica tag</string>
+
     <string name="action_toggle_favorite">Seleziona preferito</string>
     <string name="action_toggle_shuffle">Seleziona modalità di riproduzione casuale</string>
+
     <string name="adaptive">Adattivo</string>
+
     <string name="add_action">Aggiungi</string>
+
+    <string name="add_lyrics">Aggiungi testi</string>
+
+    <string name="add_photo">Aggiungi foto</string>
+
     <string name="add_playlist_title">"Aggiungi alla playlist"</string>
+
     <string name="add_time_framed_lryics">Aggiungi testi sincronizzati</string>
-    <string name="added_song_count_to_playlist">Aggiunte %1$d canzoni a %2$s</string>
+
     <string name="added_title_to_playing_queue">"Aggiunto un brano alla coda."</string>
-    <string name="added_x_titles_to_playing_queue">Aggiunti %1$d brani alla coda.</string>
+
+    <string name="added_x_titles_to_playing_queue">Aggiungi %1$d brani alla coda.</string>
+
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Brano</item>
-        <item quantity="other">Brani</item>
-    </plurals>
-    <string name="album_artist">Artista album</string>
+
+    <string name="album_artist">Artista dell\'album</string>
+
+    <string name="album_or_artist_empty">Il titolo o l\'artista sono vuoti</string>
+
     <string name="albums">Album</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Album</item>
-    </plurals>
+
     <string name="always">Sempre</string>
+
     <string name="app_share">Hey, dai un\'occhiata a questo fantastico lettore musicale:
 https://play.google.com/store/apps/details?id=%s</string>
+
     <string name="app_shortcut_shuffle_all_short">Casuale</string>
     <string name="app_shortcut_top_tracks_short">Tracce migliori</string>
-    <string name="app_widget_big_name">Immagine intera</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Piccolo</string>
-    <string name="app_widget_text_name">Testo minimale</string>
+
+    <string name="app_widget_big_name">Retro music - Grande</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="app_widget_text_name">Retro music - Testo</string>
+
     <string name="artist">Artista</string>
+
     <string name="artists">Artisti</string>
-    <string name="audio_fade_duration">Durata dissolvenza audio</string>
+
     <string name="audio_focus_denied">Focalizzazione audio negata.</string>
+
     <string name="audio_settings_summary">Modifica le impostazioni audio e regola i controlli dell\'equalizzatore</string>
-    <string name="auto">Automatico</string>
-    <string name="backup_restore_settings_summary">Backup e ripristino impostazioni e playlist</string>
-    <string name="backup_restore_title"><![CDATA[Backup e ripristino]]></string>
-    <string name="backup_title">Backup</string>
+
+    <string name="auto">Auto</string>
+
+    <string name="base_color_theme">Colore base del tema</string>
+
+    <string name="bass_boost">Bass Boost</string>
+
+    <string name="bio">Bio</string>
+
     <string name="biography">Biografia</string>
+
     <string name="black_theme_name">Solo nero</string>
+
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">L\'app richiede l\'autorizzazione dei dispositivi nelle vicinanze per verificare la presenza di dispositivi Bluetooth</string>
-    <string name="bluetooth_title">Dispositivi nelle vicinanze</string>
+
     <string name="blur">Sfocatura</string>
+
     <string name="blur_card">Card sfocata</string>
+
     <string name="bug_report_failed">Impossibile inviare il rapporto</string>
-    <string name="bug_report_failed_invalid_token">Token di accesso non valido. Contatta lo sviluppatore dell\'app.</string>
-    <string name="bug_report_failed_issues_not_available">I problemi non sono abilitati per la repository selezionata. Contatta lo sviluppatore dell\'app.</string>
-    <string name="bug_report_failed_unknown">Si è verificato un errore imprevisto. Contatta lo sviluppatore dell\'app.</string>
+    <string name="bug_report_failed_invalid_token">Accesso fallito. Per favore contatta lo sviluppatore dell\'app.</string>
+    <string name="bug_report_failed_issues_not_available">I problemi non sono abilitati per la repository selezionata. Per favore contatta lo sviluppatore dell\'app.</string>
+    <string name="bug_report_failed_unknown">Si è verificato un errore inaspettato. Per favore contatta lo sviluppatore dell\'app.</string>
     <string name="bug_report_failed_wrong_credentials">Nome utente o password errati</string>
     <string name="bug_report_issue">Problema</string>
     <string name="bug_report_manual">Invia manualmente</string>
@@ -107,98 +149,156 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="bug_report_no_password">Inserisci la tua password GitHub</string>
     <string name="bug_report_no_title">Inserisci un titolo al problema</string>
     <string name="bug_report_no_username">Inserisci il tuo nome utente GitHub</string>
-    <string name="bug_report_success">Segnalazione bug riuscita</string>
     <string name="bug_report_summary">Si è verificato un errore imprevisto. Mi dispiace, se continua a bloccarsi \"Cancella i dati\" dell\'app o inviami un\'email</string>
+    <string name="bug_report_uploading">Caricando il rapporto su GitHub...</string>
     <string name="bug_report_use_account">Invia con l\'account GitHub</string>
+
     <string name="buy_now">Acquista ora</string>
+
     <string name="cancel_current_timer">Annulla</string>
+
     <string name="card">Card</string>
+
+    <string name="card_circular_style">Circolare</string>
+
     <string name="card_color_style">Card colorata</string>
-    <string name="card_square">Card quadrata</string>
+
     <string name="card_style">Card</string>
+
+    <string name="carousal">Carosello</string>
+
     <string name="carousal_effect_on_now_playing_screen">Effetto scorrimento sulla schermata di riproduzione</string>
+
     <string name="cascading">Cascata</string>
+
+    <string name="cast">Forma</string>
+
     <string name="changelog">Ultime modifiche</string>
-    <string name="changelog_summary">Scopri le novità</string>
-    <string name="choose_image">Scegli Immagine</string>
-    <string name="choose_restore_title">Scegli cosa ripristinare</string>
-    <string name="circle">Cerchio</string>
+
+    <string name="changelog_summary">Per visualizzare le ultime modifiche, entra nel canale Telegram</string>
+
     <string name="circular">Circolare</string>
+
     <string name="classic">Classico</string>
+
     <string name="clear_action">Vuoto</string>
+
+    <string name="clear_app_data">Cancella i dati dell\'app</string>
+
     <string name="clear_blacklist">Cancella blacklist</string>
-    <string name="clear_history">Cancella Cronologia</string>
+
     <string name="clear_playing_queue">Cancella coda</string>
+
+    <string name="clear_playlist_title">Cancella playlist</string>
+    <string name="clear_playlist_x"><![CDATA[Cancella la playlist <b>% 1 $ s </ b>? Questo non pu\u00f2 essere annullato!]]></string>
+
+    <string name="close_notification">Chiudi</string>
+
     <string name="color">Colore</string>
+
+    <string name="color_theme_name">Colore</string>
+
     <string name="colors">Colori</string>
-    <string name="compact">Compatto</string>
+
     <string name="composer">Compositore</string>
+
     <string name="copied_device_info_to_clipboard">Info dispositivo copiate negli appunti.</string>
+
     <string name="could_not_create_playlist">Impossibile creare la playlist.</string>
-    <string name="could_not_download_album_cover">"Impossibile scaricare la copertina dell'album corrispondente."</string>
+    <string name="could_not_download_album_cover">"Impossibile scaricare una copertina di album corrispondente."</string>
     <string name="could_not_restore_purchase">Impossibile ripristinare l\'acquisto.</string>
     <string name="could_not_scan_files">Impossibile scansionare %d file.</string>
+
     <string name="create_action">Crea</string>
-    <string name="create_new_backup">Crea</string>
-    <string name="created_playlist_x">Playlist %1$s creata.</string>
-    <string name="credit_title">Membri e collaboratori</string>
+
+    <string name="created_playlist_x">Playlist creata</string>
+
+    <string name="credit_title">Membri e contributori</string>
+
     <string name="currently_listening_to_x_by_x">Ascoltando attualmente %1$s di %2$s.</string>
-    <string name="custom_artist_images">Immagini dell\'Artista Personalizzate</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Condividi il rapporto sull\'arresto anomalo</string>
+
     <string name="dark_theme_name">Scuro</string>
+
+    <string name="default_hint">Nessun testo</string>
+
     <string name="delete_playlist_title">Elimina playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Eliminare la playlist <b>%1$s</b>?]]></string>
+    <string name="delete_playlist_x"><![CDATA[Elimina 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_playlists"><![CDATA[Elimina <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">Eliminazione brani</string>
+
+    <string name="deleting_songs">Eliminando i brani</string>
+
     <string name="depth">Profondità</string>
+
     <string name="description">Descrizione</string>
+
     <string name="device_info">Info dispositivo</string>
+
     <string name="dialog_message_set_ringtone">Consenti a Retro Music di modificare le impostazioni audio</string>
+
     <string name="dialog_title_set_ringtone">Imposta suoneria</string>
-    <string name="disc_hint">Numero del disco</string>
+
     <string name="do_you_want_to_clear_the_blacklist">Vuoi cancellare la blacklist?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Vuoi rimuovere <b>%1$s</b> dalla blacklist?]]></string>
+
     <string name="donate">Dona</string>
+
     <string name="donate_summary">Se pensi che io meriti di essere pagato per il mio lavoro, puoi lasciarmi qualche soldo qui</string>
+
     <string name="donation_header">Pagami un:</string>
-    <string name="done">Fatto</string>
-    <string name="drive_mode">Modalità alla guida</string>
-    <string name="edit_fab">Pulsante modifica</string>
-    <string name="edit_normal_lyrics">Modifica testi</string>
-    <string name="edit_synced_lyrics">Modifica testi sincronizzati</string>
+
+    <string name="download_from_last_fm">Scarica da Last.fm</string>
+
+    <string name="edit">Modifica</string>
+
+    <string name="edit_cover">Modifica copertina</string>
+
     <string name="empty">Vuoto</string>
+
     <string name="equalizer">Equalizzatore</string>
-    <string name="error_create_backup">Impossibile creare il backup</string>
-    <string name="error_delete_backup">Impossibile eliminare il backup</string>
-    <string name="error_empty_name">Il tuo nome non può essere vuoto!</string>
-    <string name="error_load_failed">Caricamento fallito</string>
-    <string name="error_share_file">Impossibile condividere il file</string>
-    <string name="expanded">Esteso</string>
+
+    <string name="error">Errore</string>
+
     <string name="faq">FAQ</string>
+
     <string name="favorites">Preferiti</string>
-    <string name="file_already_exists">Il file esiste già</string>
+
     <string name="finish_last_song">Termina ultimo brano</string>
+
     <string name="fit">Adatta</string>
+
     <string name="flat">Piatto</string>
+
     <string name="folders">Cartelle</string>
+
     <string name="follow_system">Sistema</string>
+
     <string name="for_you">Per te</string>
-    <string name="free">Gratis</string>
+
     <string name="full">Pieno</string>
-    <string name="full_card">Card intera</string>
+
+    <string name="full_card">Scheda intera</string>
+
     <string name="general_settings_summary">Cambia il tema e i colori dell\'app</string>
     <string name="general_settings_title">Aspetto</string>
+
     <string name="genre">Genere</string>
+
     <string name="genres">Generi</string>
+
     <string name="git_hub_summary">Sviluppa il progetto su GitHub</string>
-    <string name="gradient">Sfumatura</string>
-    <string name="grant_access">Concedi accesso</string>
+
+    <string name="google_plus_community">Unisciti alla community di Google Plus, dove puoi chiedere aiuto o seguire gli aggiornamenti di Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -207,255 +307,325 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Griglie e stile</string>
-    <string name="help_summary">Serve altro aiuto?</string>
+
+    <string name="grid_style_label"><![CDATA[Griglie e stile]]></string>
+
     <string name="hinge">Cerniera</string>
+
     <string name="history">Cronologia</string>
-    <string name="history_cleared">Cronologia cancellata</string>
-    <string name="history_undo_button">Annulla</string>
-    <string name="home">Homepage</string>
+
+    <string name="home">Home</string>
+
     <string name="horizontal_flip">Flip orizzontale</string>
+
     <string name="image">Immagine</string>
+
     <string name="image_gradient">Immagine sfumata</string>
+
     <string name="image_settings_summary">Modifica le impostazioni di download delle immagini</string>
-    <string name="import_label">Importa</string>
-    <string name="import_playlist">Importa playlist</string>
-    <string name="import_playlist_message">Importa tutte le playlist elencate nell\'Android Media Store con le canzoni. Se le playlist già esistono, le canzoni verranno unite.</string>
+
     <string name="inserted_x_songs_into_playlist_x">Inseriti %1$d brani nella playlist %2$s.</string>
-    <string name="instagram_page_summary">Condividi la tua configurazione di Retro Music per mostrarla su Instagram</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Condividi la tua configurazione di RetroMusic per mostrarla su Instagram</string>
+
     <string name="keyboard">Tastiera</string>
+
     <string name="label_bit_rate">Bitrate</string>
+
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nome del file</string>
     <string name="label_file_path">Percorso del file</string>
     <string name="label_file_size">Dimensione</string>
-    <string name="label_last_modified">Ultima Modifica</string>
-    <string name="label_more_from">Altro da %s</string>
+
     <string name="label_sampling_rate">Frequenza di campionamento</string>
+
     <string name="label_track_length">Lunghezza</string>
+
     <string name="labeled">Etichettato</string>
+
     <string name="last_added">Ultimi aggiunti</string>
+
     <string name="last_song">Ultimo brano</string>
-    <string name="lets_go">Andiamo</string>
+
+    <string name="lets_play_something">Suoniamo un po\' di musica</string>
+
+    <string name="library">Raccolta</string>
+
     <string name="library_categories">Categorie della raccolta</string>
+
     <string name="licenses">Licenze</string>
+
     <string name="light_theme_name">Chiaro</string>
-    <string name="listeners_label">Ascoltatori</string>
+
     <string name="listing_files">Elenco dei file</string>
+
     <string name="loading_products">Caricamento prodotti...</string>
+
     <string name="login">Accedi</string>
+
     <string name="lyrics">Testi</string>
-    <string name="made_with_love">Creato con ❤ in India</string>
+
+    <string name="made_with_love">Made with ❤️ in India</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Errore</string>
+
     <string name="md_storage_perm_error">Errore di autorizzazione</string>
-    <string name="message_backup_create_success">Backup creato con successo.</string>
-    <string name="message_limit_tabs">Non più di 5 elementi</string>
-    <string name="message_pro_feature">%s è una funzionalità Pro.</string>
-    <string name="message_restore_success">Ripristino completato con successo.</string>
-    <string name="message_updated">Aggiornato</string>
-    <string name="message_welcome"><![CDATA[Ciao! <br> Benvenuto su %s]]></string>
+
     <string name="my_name">Nome</string>
+
     <string name="my_top_tracks">I più riprodotti</string>
+
     <string name="never">Mai</string>
-    <string name="new_music_mix">Nuovo mix musicale</string>
+
+    <string name="new_banner_photo">Nuova immagine copertina</string>
+
     <string name="new_playlist_title">Nuova playlist</string>
+
+    <string name="new_profile_photo">Nuova foto del profilo</string>
+
     <string name="new_start_directory">%s è la nuova directory di avvio</string>
+
     <string name="next_song">Brano successivo</string>
+
     <string name="no_albums">Nessun album</string>
+
     <string name="no_artists">Nessun artista</string>
+
     <string name="no_audio_ID">"Prima riproduci un brano, poi riprova."</string>
-    <string name="no_backups_found">Nessun backup trovato</string>
+
     <string name="no_equalizer">Nessun equalizzatore trovato</string>
+
     <string name="no_genres">Nessun genere</string>
+
     <string name="no_lyrics_found">Nessun testo trovato</string>
-    <string name="no_playing_queue">Nessun brano in riproduzione</string>
+
     <string name="no_playlists">Nessuna playlist</string>
+
     <string name="no_purchase_found">Nessun acquisto trovato.</string>
+
     <string name="no_results">Nessun risultato</string>
+
     <string name="no_songs">Nessun brano</string>
+
     <string name="normal">Normale</string>
+
     <string name="normal_lyrics">Testi normali</string>
+
+    <string name="normal_style">Normale</string>
+
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> non è presente nel Media Store.]]></string>
-    <string name="not_recently_played">Non riprodotto recentemente</string>
+
     <string name="nothing_to_scan">Niente da rilevare</string>
-    <string name="nothing_to_see">Non c\'è niente da vedere</string>
+
     <string name="notification">Notifica</string>
+
     <string name="notification_settings_summary">Modifica lo stile delle notifiche</string>
+
     <string name="now_playing">In riproduzione</string>
     <string name="now_playing_queue">Coda in riproduzione</string>
     <string name="now_playing_summary">Personalizza la schermata riproduzione</string>
     <string name="now_playing_themes">Più di 9 schermate di riproduzione</string>
+
     <string name="only_on_wifi">Solo tramite Wi-fi</string>
-    <string name="other_settings_summary">Funzionalità sperimentali</string>
+
+    <string name="other_settings_summary">Funzionalità avanzate</string>
+
     <string name="others">Altro</string>
-    <string name="over_cover">Sulla copertina</string>
+
     <string name="password">Password</string>
+
     <string name="past_three_months">Ultimi 3 mesi</string>
+
     <string name="paste_lyrics_here">Incolla i testi qui</string>
-    <string name="paste_timeframe_lyrics_here">Incolla i testi sincronizzati qui</string>
-    <string name="peek">Sbirciata</string>
-    <string name="permission_bluetooth_denied">Autorizzazione dispositivi nelle vicinanze negata.</string>
+
     <string name="permission_external_storage_denied">Autorizzazione ad accedere all\'archiviazione esterna negata.</string>
-    <string name="permission_summary">L\'app necessita dell\'autorizzazione ad accedere all\'archiviazione del dispositivo per riprodurre musica</string>
-    <string name="permission_title">Accesso all\'archiviazione</string>
+
     <string name="permissions_denied">Autorizzazione negata.</string>
+
     <string name="personalize">Personalizza</string>
+
     <string name="personalize_settings_summary">Personalizza i comandi riproduzione</string>
+
     <string name="pick_from_local_storage">Scegli dalla memoria locale</string>
+
+    <string name="pick_image_intent_text">Scegli immagine</string>
+
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">Segui la pagina Pinterest per ispirazioni sul design di Retro Music</string>
+
     <string name="plain">Piatto</string>
-    <string name="playList_already_exits">Playlist già esistente</string>
-    <string name="playback_pitch">Tono</string>
-    <string name="playback_settings">Impostazioni riproduzione</string>
-    <string name="playback_speed">Velocità di riproduzione</string>
+
     <string name="playing_notification_description">La notifica di riproduzione fornisce azioni per riproduzione/pausa ecc.</string>
     <string name="playing_notification_name">Notifica di riproduzione</string>
-    <string name="playlist_created_sucessfully">%s creata correttamente</string>
+
+    <string name="playlist_empty_text">Playlist vuota</string>
+
     <string name="playlist_is_empty">La playlist è vuota</string>
+
     <string name="playlist_name_empty">Nome playlist</string>
+
     <string name="playlists">Playlist</string>
+
+    <string name="pref_album_detail_style">Stile dettagli album</string>
+
     <string name="pref_blur_amount_summary">Quantità di sfocatura applicata per i temi con sfocatura, minore è più veloce</string>
     <string name="pref_blur_amount_title">Quantità di sfocatura</string>
-    <string name="pref_filter_song_summary">Filtra brani per durata</string>
+
+    <string name="pref_dialog_corner_title">Angoli finestra</string>
+
     <string name="pref_filter_song_title">Filtro durata brano</string>
-    <string name="pref_header_advanced">Avanzate</string>
+
     <string name="pref_header_album">Stile album</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
     <string name="pref_header_controls">Controlli</string>
     <string name="pref_header_general">Tema</string>
     <string name="pref_header_images">Immagini</string>
     <string name="pref_header_library">Raccolta</string>
     <string name="pref_header_lockscreen">Schermata di blocco</string>
     <string name="pref_header_playlists">Playlist</string>
+
     <string name="pref_keep_pause_on_zero_volume_summary">Mette in pausa la riproduzione quando il volume scende a zero e riprende aumentando il volume. Funziona anche al di fuori dell\'app</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pausa a zero</string>
-    <string name="pref_keep_screen_on_summary">Ricorda che abilitando questa opzione l\'autonomia del tuo dispositivo potrebbe risentirne </string>
+    <string name="pref_keep_screen_on_summary">"Ricorda che abilitando questa opzione l'autonomia del tuo dispositivo potrebbe risentirne "</string>
     <string name="pref_keep_screen_on_title">Mantieni lo schermo acceso</string>
-    <string name="pref_language_name">Seleziona lingua</string>
+
+    <string name="pref_now_playing_screen_summary">Premi per aprire o scorri nella schermata di riproduzione</string>
+    <string name="pref_now_playing_screen_title">Premi o scorri</string>
+
     <string name="pref_snow_fall_title">Effetto neve</string>
+
     <string name="pref_summary_album_art_on_lockscreen">Imposta la copertina del brano riprodotto come sfondo del blocco schermo</string>
-    <string name="pref_summary_album_artists_only">Mostra gli artisti degli album nella categoria Artista</string>
     <string name="pref_summary_audio_ducking">Riduce il volume quando viene riprodotto un suono di sistema o viene ricevuta una notifica</string>
-    <string name="pref_summary_audio_fade">Dissolvenza audio quando il brano è in pausa o riprodotto</string>
-    <string name="pref_summary_blacklist">Il contenuto delle cartelle nella blacklist non compare nella raccolta</string>
-    <string name="pref_summary_bluetooth_playback">Avvia la riproduzione non appena connesso al dispositivo bluetooth</string>
+    <string name="pref_summary_blacklist">Il contenuto delle cartelle nella blacklist non compare nella raccolta.</string>
     <string name="pref_summary_blurred_album_art">Sfoca la copertina dell\'album sulla 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 in riproduzione. Non funziona con i temi Card e Card sfocata</string>
+    <string name="pref_summary_carousel_effect">Effetto scorrimento della copertina nella schermata in riproduzione. Non funziona con i temi Scheda e Scheda sfocata</string>
     <string name="pref_summary_classic_notification">Usa il design classico delle notifiche</string>
     <string name="pref_summary_colored_app">Lo sfondo e il pulsante di riproduzione cambiano colore in base alla copertina dell\'album in riproduzione</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_cross_fade">Durata della dissolvenza tra brani</string>
     <string name="pref_summary_desaturated_color">Secondo le linee guida del Material Design, in modalità scura i colori devono essere desaturati</string>
-    <string name="pref_summary_expand_now_playing_panel">Cliccando sulla notifica verrà visualizzata la schermata di riproduzione invece della homepage</string>
+    <string name="pref_summary_dominant_color">Il colore dominante verrà selezionato dall\'album o dalla copertina dell\'artista</string>
     <string name="pref_summary_extra_controls">Aggiungi controlli extra nel mini player</string>
-    <string name="pref_summary_extra_song_info">Mostra informazioni extra sul brano come formato del file, bitrate e frequenza</string>
     <string name="pref_summary_gapless_playback">"Può causare problemi di riproduzione su alcuni dispositivi"</string>
-    <string name="pref_summary_home_banner">Mostra/nascondi banner nella homepage</string>
+    <string name="pref_summary_genre_toggle">Attiva la scheda Genere</string>
+    <string name="pref_summary_home_banner">Attiva banner nella home</string>
     <string name="pref_summary_ignore_media_store_artwork">Può aumentare la qualità delle copertine degli album, ma causa un rallentamento nel caricamento delle immagini. Abilita solo se hai problemi con la bassa qualità delle copertine</string>
     <string name="pref_summary_library_categories">Configura la visibilità e l\'ordine delle categorie</string>
     <string name="pref_summary_lock_screen">Usa i comandi di Retro Music nella schermata di blocco</string>
-    <string name="pref_summary_manage_audio_focus">Riproduci sempre l\'audio in background indipendentemente da qualsiasi altra cosa in riproduzione</string>
     <string name="pref_summary_open_source_licences">Dettagli licenza per il software open source</string>
-    <string name="pref_summary_pause_history">Se abilitato, i brani appena riprodotti non verranno visualizzati nella cronologia</string>
-    <string name="pref_summary_remember_tab">All\'avvio apri l\'ultima scheda usata</string>
-    <string name="pref_summary_show_lyrics">Mostra i testi sincronizzati sulla copertina dell\'album</string>
-    <string name="pref_summary_suggestions">Mostra il nuovo mix musicale nella homepage</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Cambia brano scorrendo dovunque sulla schermata di riproduzione</string>
-    <string name="pref_summary_swipe_to_dismiss">Scorri verso il basso per chiudere il mini player</string>
+    <string name="pref_summary_round_corners">Arrotonda i bordi dell\'app</string>
+    <string name="pref_summary_tab_titles">Attiva i titoli delle schede</string>
     <string name="pref_summary_toggle_full_screen">Modalità immersiva</string>
     <string name="pref_summary_toggle_headset">Inizia la riproduzione subito dopo aver collegato le cuffie</string>
     <string name="pref_summary_toggle_shuffle">La modalità casuale viene disattivata quando si riproduce un nuovo elenco di brani</string>
     <string name="pref_summary_toggle_volume">Se c\'è spazio sufficiente, mostra i controlli del volume nella schermata in riproduzione</string>
-    <string name="pref_summary_wallpaper_accent">Estrai il colore in rilievo dallo sfondo</string>
-    <string name="pref_summary_whitelist">Mostra solo i brani dalla cartella /Music</string>
+
     <string name="pref_title_album_art_on_lockscreen">Mostra la copertina dell\'album</string>
-    <string name="pref_title_album_artists_only">Naviga per artista album</string>
     <string name="pref_title_album_cover_style">Tema copertina dell\'album</string>
     <string name="pref_title_album_cover_transform">Modalità cambio copertina dell\'album</string>
+    <string name="pref_title_album_grid_style">Griglia album</string>
     <string name="pref_title_app_shortcuts">Scorciatoie app colorate</string>
-    <string name="pref_title_appbar_mode">Stile header</string>
-    <string name="pref_title_audio_ducking">Riduci il volume alla perdita di focalizzazione</string>
-    <string name="pref_title_audio_fade">Dissolvenza audio</string>
+    <string name="pref_title_artist_grid_style">Griglia artista</string>
+    <string name="pref_title_audio_ducking">Riduzione volume con perdita di focalizzazione audio</string>
     <string name="pref_title_auto_download_artist_images">Scarica automaticamente immagini artista</string>
     <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Riproduzione bluetooth</string>
     <string name="pref_title_blurred_album_art">Copertina dell\'album sfocata</string>
-    <string name="pref_title_circle_button">Pulsante riproduzione circolare</string>
+    <string name="pref_title_choose_equalizer">Scegli un equalizzatore</string>
     <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_cross_fade">Dissolvenza (beta)</string>
-    <string name="pref_title_custom_font">Usa il carattere Manrope</string>
     <string name="pref_title_desaturated_color">Colori desaturati</string>
-    <string name="pref_title_expand_now_playing_panel">Mostra la schermata riproduzione</string>
     <string name="pref_title_extra_controls">Controlli extra</string>
-    <string name="pref_title_extra_song_info">Informazioni brano</string>
     <string name="pref_title_gapless_playback">Riproduzione senza interruzioni</string>
     <string name="pref_title_general_theme">Tema generale</string>
-    <string name="pref_title_home_album_grid_style">Griglia schermata album</string>
+    <string name="pref_title_genre_toggle">Mostra scheda Genere</string>
     <string name="pref_title_home_artist_grid_style">Griglia schermata artista</string>
-    <string name="pref_title_home_banner">Banner</string>
+    <string name="pref_title_home_banner">Home banner</string>
     <string name="pref_title_ignore_media_store_artwork">Ignora le copertine del Media Store</string>
     <string name="pref_title_last_added_interval">Intervallo playlist ultimi aggiunti</string>
     <string name="pref_title_lock_screen">Controlli a schermo intero</string>
-    <string name="pref_title_lyrics_screen_on">Schermo sempre acceso con i testi</string>
-    <string name="pref_title_lyrics_type">Tipo di testi</string>
-    <string name="pref_title_manage_audio_focus">Riproduci sempre</string>
+    <string name="pref_title_navigation_bar">Barra di navigazione colorata</string>
     <string name="pref_title_now_playing_screen_appearance">Tema schermata riproduzione</string>
     <string name="pref_title_open_source_licences">Licenze open source</string>
-    <string name="pref_title_pause_history">Metti in pausa la cronologia</string>
-    <string name="pref_title_remember_tab">Ricorda ultima scheda</string>
-    <string name="pref_title_show_lyrics">Mostra testi</string>
-    <string name="pref_title_suggestions">Mostra suggerimenti</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Scorri per cambiare brano</string>
-    <string name="pref_title_swipe_to_dismiss">Chiudi con scorrimento verso il basso</string>
+    <string name="pref_title_round_corners">Angoli arrotondati</string>
     <string name="pref_title_tab_text_mode">Modalità titoli schede</string>
     <string name="pref_title_toggle_carousel_effect">Effetto scorrimento</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_tab_titles">Titoli schede</string>
     <string name="pref_title_toggle_toggle_headset">Riproduzione automatica</string>
     <string name="pref_title_toggle_toggle_shuffle">Modalità casuale</string>
     <string name="pref_title_toggle_volume">Controlli volume</string>
-    <string name="pref_title_wallpaper_accent">Colore in rilievo sfondo</string>
-    <string name="pref_title_whitelist">Whitelist</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema nero, temi schermata riproduzione, effetto scorrimento e molto altro..</string>
+    <string name="pref_title_user_info">Info utente</string>
+
+    <string name="primary_color">Colore primario</string>
+    <string name="primary_color_desc">Il colore primario del tema, blu-grigio di default, per ora funziona con colori scuri</string>
+
+    <string name="pro_summary">Temi in riproduzione, effetto scorrimento e molto altro...</string>
+
     <string name="profile">Profilo</string>
+
     <string name="purchase">Acquista</string>
+
+    <string name="purchase_summary">* Pensaci prima di acquistare, non chiedere il rimborso.</string>
+
     <string name="queue">Coda</string>
+
     <string name="rate_app">Valuta l\'app</string>
+
     <string name="rate_on_google_play_summary">Adori quest\'app? Facci sapere sul Play Store come possiamo renderla ancora migliore</string>
+
     <string name="recent_albums">Album recenti</string>
+
     <string name="recent_artists">Artisti recenti</string>
+
     <string name="remove_action">Rimuovi</string>
+
+    <string name="remove_banner_photo">Rimuovi la foto del banner</string>
+
     <string name="remove_cover">Rimuovi copertina</string>
+
     <string name="remove_from_blacklist">Rimuovi dalla blacklist</string>
-    <string name="remove_image">Rimuovi Immagine</string>
+
+    <string name="remove_profile_photo">Rimuovi la foto profilo</string>
+
     <string name="remove_song_from_playlist_title">Rimuovi il brano dalla playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Rimuovere il brano <b>%1$s</b> dalla playlist?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Rimuovi 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[Rimuovere i brani <b>%1$d</b> dalla playlist?]]></string>
+
+    <string name="remove_x_songs_from_playlist"><![CDATA[Rimuovi i brani <b>%1$d</b> dalla playlist?]]></string>
+
     <string name="rename_playlist_title">Rinomina playlist</string>
-    <string name="replace_cover">Sostituisci copertina</string>
+
     <string name="report_an_issue">Segnala un problema</string>
+
     <string name="report_bug">Segnala bug</string>
+
     <string name="reset_action">Ripristina</string>
+
     <string name="reset_artist_image">Ripristina immagine artista</string>
+
     <string name="restore">Ripristina</string>
-    <string name="restore_message">Vuoi ripristinare il backup?</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">Acquisti precedenti ripristinati.</string>
+
     <string name="restoring_purchase">Ripristino acquisto...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Equalizzatore di Retro Music</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">L\'app necessita dell\'autorizzazione ad accedere alle impostazioni del dispositivo per impostare musica come suoneria</string>
-    <string name="ringtone_title">Suoneria (opzionale)</string>
+
     <string name="saf_delete_failed">Eliminazione file fallita: %s</string>
+
     <!-- SAF -->
     <string name="saf_error_uri">Impossibile ottenere l\'URI dal SAF</string>
+
     <string name="saf_guide_slide1_description">Apri il pannello di navigazione</string>
     <string name="saf_guide_slide1_description_before_o">Abilita \'Mostra scheda SD\' nel menu a comparsa</string>
     <!-- SAF guide -->
@@ -464,99 +634,175 @@ https://play.google.com/store/apps/details?id=%s</string>
     <string name="saf_guide_slide2_title">Seleziona la tua scheda SD nel pannello di navigazione</string>
     <string name="saf_guide_slide3_description">Non aprire alcuna sottocartella</string>
     <string name="saf_guide_slide3_title">Tocca \'seleziona\' nella parte inferiore dello schermo</string>
+
     <string name="saf_write_failed">Scrittura file fallita: %s</string>
+
     <string name="save">Salva</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Salva come file</string>
+
     <string name="save_playlists_title">Salva come file</string>
+
     <string name="saved_playlist_to">Playlist salvata in %s.</string>
+
     <string name="saving_changes">Salvataggio modifiche</string>
+
     <string name="scan_media">Scansiona media</string>
+
     <string name="scanned_files">Scansionati %1$d di %2$d file.</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="search_hint">Cerca nella tua raccolta...</string>
+
     <string name="select_all">Seleziona tutto</string>
+
+    <string name="select_banner_photo">Seleziona la foto del banner</string>
+
     <string name="selected">Selezionato</string>
+
+    <string name="send_crash_log">Invia registro errori</string>
+
     <string name="set">Imposta</string>
+
     <string name="set_artist_image">Imposta immagine artista</string>
+
+    <string name="set_photo">Imposta una foto profilo</string>
+
     <string name="share_app">Condividi app</string>
-    <string name="share_summary">Condividi l\'app con amici e familiari</string>
-    <string name="share_to_stories">Condividi nelle Storie</string>
-    <string name="show_album_artists">Mostra artisti album</string>
+
     <string name="shuffle">Casuale</string>
+
     <string name="simple">Semplice</string>
+
     <string name="sleep_timer_canceled">Timer sonno cancellato.</string>
     <string name="sleep_timer_set">Timer sonno impostato per %d minuti da ora.</string>
+
+    <string name="slide">Scorri</string>
+
+    <string name="small">Album piccolo</string>
+
     <string name="social">Social</string>
-    <string name="social_stories">Condividi storia</string>
+
     <string name="song">Brano</string>
+
     <string name="song_duration">Durata brano</string>
+
     <string name="songs">Brani</string>
+
     <string name="sort_order">Ordina per</string>
     <string name="sort_order_a_z">Crescente</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artista</string>
     <string name="sort_order_composer">Compositore</string>
     <string name="sort_order_date">Data</string>
-    <string name="sort_order_date_modified">Ultima modifica</string>
-    <string name="sort_order_default">Predefinito</string>
-    <string name="sort_order_num_songs">Numero brani</string>
-    <string name="sort_order_num_songs_desc">Numero brani decrescente</string>
     <string name="sort_order_year">Anno</string>
     <string name="sort_order_z_a">Decrescente</string>
+
     <string name="speech_not_supported">Il tuo dispositivo non supporta l\'input vocale</string>
+
     <string name="speech_prompt">Cerca nella tua raccolta</string>
+
     <string name="stack">Pila</string>
+
     <string name="start_play_music">Inizia a riprodurre musica.</string>
+
     <string name="suggestion_songs">Suggerimenti</string>
+
+    <string name="summary_user_info">Mostra il tuo nome nella schermata home</string>
+
     <string name="support_development">Sostieni lo sviluppo</string>
+
     <string name="swipe_to_unlock">Scorri per sbloccare</string>
+
     <string name="synced_lyrics">Testi sincronizzati</string>
+
+    <string name="system_equalizer">Equalizzatore di sistema</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Unisciti al gruppo Telegram per discutere dei bug, dare suggerimenti e molto altro</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="tiny_card_style">Card piccola</string>
+
     <string name="title">Titolo</string>
-    <string name="title_new_backup">Nuovo backup</string>
+
+    <string name="title_dashboard">Dashboard</string>
+
+    <string name="title_good_afternoon">Buon pomeriggio</string>
+    <string name="title_good_day">Buona giornata</string>
+    <string name="title_good_evening">Buonasera</string>
+    <string name="title_good_morning">Buongiorno</string>
+    <string name="title_good_night">Buonanotte</string>
+
+    <string name="title_user_info">Qual è il tuo nome</string>
+
     <string name="today">Oggi</string>
+
     <string name="top_albums">Album migliori</string>
+
     <string name="top_artists">Artisti migliori</string>
+
     <string name="track_hint">"Traccia (2 per traccia 2 o 3004 per CD3 traccia 4)"</string>
+
     <string name="track_list">Numero traccia</string>
+
     <string name="translate">Traduci</string>
+
     <string name="translate_community">Aiutaci traducendo l\'app nella tua lingua</string>
-    <string name="try_retro_music_premium">Prova Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Condividi il tuo design con Retro Music</string>
+
     <string name="unlabeled">Senza etichetta</string>
+
     <string name="unplayable_file">Impossibile riprodurre il brano.</string>
+
     <string name="up_next">Prossimo</string>
+
     <string name="update_image">Aggiorna immagine</string>
+
     <string name="updating">Aggiornamento...</string>
-    <string name="user_images_description">Immagini dell\'utente</string>
-    <string name="user_name">Nome utente</string>
+
     <string name="username">Nome utente</string>
+
     <string name="version">Versione</string>
+
     <string name="vertical_flip">Flip verticale</string>
-    <string name="view_on_telegram">Visualizza su Telegram</string>
-    <string name="volume">Volume</string>
+
+    <string name="virtualizer">Virtualizer</string>
+
     <string name="web_search">Ricerca web</string>
-    <string name="website">Sito web</string>
-    <string name="website_summary">Visita il nostro sito</string>
-    <string name="welcome">Benvenuto,</string>
+
+    <string name="welcome">Benvenuto.</string>
+
     <string name="what_do_you_want_to_share">Cosa vuoi condividere?</string>
+
     <string name="whats_new">Novità</string>
+
     <string name="window">Finestra</string>
+
     <string name="window_corner_edges">Angoli arrotondati</string>
+
     <string name="x_has_been_set_as_ringtone">%1$s impostata 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">Seleziona almeno una categoria.</string>
+
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Verrai reindirizzato al sito web dei problemi.</string>
+
     <string name="your_account_data_is_only_used_for_authentication">I dati del tuo account vengono utilizzati solo per l\'autenticazione.</string>
 </resources>
diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja/strings.xml
similarity index 61%
rename from app/src/main/res/values-ja-rJP/strings.xml
rename to app/src/main/res/values-ja/strings.xml
index 91fd054ad..71226c042 100644
--- a/app/src/main/res/values-ja-rJP/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -1,98 +1,136 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">%s について</string>
     <string name="about_settings_summary">我々のチームとソーシャルリンク</string>
+
     <string name="accent_color">アクセントカラー</string>
-    <string name="accent_color_desc">テーマのアクセントカラー、既定は紫色です。</string>
+    <string name="accent_color_desc">テーマのアクセントカラー、既定は青緑色です。</string>
+
     <string name="action_about">このアプリについて</string>
-    <string name="action_add_to_blacklist">ブラックリストに追加</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_cancel">キャンセル</string>
-    <string name="action_cast">キャスト</string>
+    <string name="action_add_to_playlist">プレイリストに追加…</string>
+
     <string name="action_clear_playing_queue">再生キューをクリア</string>
-    <string name="action_cycle_repeat">サイクルリピートモード</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_edit">編集</string>
+
     <string name="action_go_to_album">アルバムに移動</string>
     <string name="action_go_to_artist">アーティストに移動</string>
     <string name="action_go_to_genre">ジャンルに移動</string>
-    <string name="action_go_to_lyrics">歌詞を表示</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_all">全て再生</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_sort_order">順番をソート</string>
+
     <string name="action_tag_editor">音楽タグエディター</string>
-    <string name="action_toggle_favorite">お気に入りを切り替え</string>
-    <string name="action_toggle_shuffle">シャッフル モードを有効にする</string>
+
     <string name="adaptive">アダプティブ</string>
+
     <string name="add_action">追加</string>
+
+    <string name="add_lyrics">歌詞を追加</string>
+
+    <string name="add_photo">写真を\n追加</string>
+
     <string name="add_playlist_title">"プレイリストに追加"</string>
-    <string name="add_time_framed_lryics">時間指定の歌詞を追加</string>
-    <string name="added_song_count_to_playlist">%2$s に%1$d曲追加しました</string>
+
+    <string name="add_time_framed_lryics">歌詞に時間枠を組み入れる</string>
+
     <string name="added_title_to_playing_queue">"1曲が再生キューに追加されました"</string>
+
     <string name="added_x_titles_to_playing_queue">%1$d 曲が再生キューに追加されました</string>
+
     <string name="album">アルバム</string>
-    <plurals name="albumSongs">
-        <item quantity="other">楽曲</item>
-    </plurals>
-    <string name="album_artist">アルバムアーティスト</string>
+
+    <string name="album_artist">アルバム アーティスト</string>
+
+    <string name="album_or_artist_empty">不明なタイトルまたはアーティスト</string>
+
     <string name="albums">アルバム</string>
-    <plurals name="albums">
-        <item quantity="other">アルバム</item>
-    </plurals>
-    <string name="always">常時</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_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">レトロミュージック - ビッグ</string>
     <string name="app_widget_card_name">レトロミュージック - カード</string>
     <string name="app_widget_classic_name">レトロミュージック - クラシック</string>
-    <string name="app_widget_md3_name">MD3</string>
     <string name="app_widget_small_name">レトロミュージック - 小</string>
-    <string name="app_widget_text_name">最小のテキスト</string>
+    <string name="app_widget_text_name">Retro music - テキスト</string>
+
     <string name="artist">アーティスト</string>
+
     <string name="artists">アーティスト</string>
-    <string name="audio_fade_duration">オーディオフェードの長さ</string>
+
     <string name="audio_focus_denied">オーディオのフォーカスが拒否されました。</string>
+
     <string name="audio_settings_summary">サウンド設定を変更し、イコライザーコントロールを調整する</string>
+
     <string name="auto">自動</string>
-    <string name="backup_restore_settings_summary">設定、プレイリストのバックアップと復元</string>
-    <string name="backup_restore_title"><![CDATA[バックアップと復元]]></string>
-    <string name="backup_title">バックアップ</string>
-    <string name="biography">説明</string>
-    <string name="black_theme_name">ダークテーマ時に漆黒にする</string>
+
+    <string name="base_color_theme">ベースカラーテーマ</string>
+
+    <string name="bass_boost">低音ブースト</string>
+
+    <string name="bio">バイオグラフィー</string>
+
+    <string name="biography">バイオグラフィー</string>
+
+    <string name="black_theme_name">黒</string>
+
     <string name="blacklist">ブラックリスト</string>
-    <string name="bluetooth_summary">付近の Bluetooth デバイスを確認するために Nearby デバイス権限が必要です</string>
-    <string name="bluetooth_title">付近のデバイス</string>
+
     <string name="blur">ぼかし</string>
-    <string name="blur_card">ブラーカード</string>
+
+    <string name="blur_card">ブラーとカード</string>
+
     <string name="bug_report_failed">レポートを送信できませんでした</string>
     <string name="bug_report_failed_invalid_token">無効なトークン:アプリの開発者に連絡してください</string>
     <string name="bug_report_failed_issues_not_available">選択されたリポジトリで問題が有効になっていません。開発者に連絡してください</string>
@@ -104,99 +142,146 @@
     <string name="bug_report_no_password">有効なGitHubのパスワードを入力してください</string>
     <string name="bug_report_no_title">問題のタイトルを入力してください</string>
     <string name="bug_report_no_username">有効なGitHubアカウントのユーザー名を入力してください</string>
-    <string name="bug_report_success">バグ報告に成功しました</string>
     <string name="bug_report_summary">予期しないエラーが発生しました。申し訳ございません。
 このバグが何度も発生する場合は、端末のアプリ設定より「データを削除する(Androidバージョンによって異なります)」を実行するか、概要をメールで送信してください。</string>
+    <string name="bug_report_uploading">GitHubにレポートをアップロード中...</string>
     <string name="bug_report_use_account">GitHubアカウントを使って送信</string>
-    <string name="buy_now">今すぐ購入</string>
+
     <string name="cancel_current_timer">キャンセル</string>
+
     <string name="card">カード</string>
+
+    <string name="card_circular_style">円</string>
+
     <string name="card_color_style">色付きのカード</string>
-    <string name="card_square">スクエアカード</string>
+
     <string name="card_style">カード</string>
+
+    <string name="carousal">カルーセル</string>
+
     <string name="carousal_effect_on_now_playing_screen">再生中画面でのカルーセル効果</string>
+
     <string name="cascading">重ねて表示</string>
+
+    <string name="cast">キャスト</string>
+
     <string name="changelog">パッチノート</string>
-    <string name="changelog_summary">新機能をチェック</string>
-    <string name="choose_image">画像を選択</string>
-    <string name="choose_restore_title">復元するアイテムを選択</string>
-    <string name="circle">サークル</string>
+
+    <string name="changelog_summary">電報チャネルで変更ログが維持されています</string>
+
     <string name="circular">円</string>
+
     <string name="classic">クラシック</string>
+
     <string name="clear_action">削除</string>
+
+    <string name="clear_app_data">アプリのデータを削除</string>
+
     <string name="clear_blacklist">ブラックリストを削除</string>
-    <string name="clear_history">履歴を消去</string>
+
     <string name="clear_playing_queue">キューを削除</string>
+
+    <string name="clear_playlist_title">プレイリストを削除</string>
+    <string name="clear_playlist_x"><![CDATA[\u30d7\u30ec\u30a4\u30ea\u30b9\u30c8 <b>%1$s</b> \u3092\u524a\u9664\u3057\u307e\u3059\u304b? \u3053\u306e\u64cd\u4f5c\u306f\u5fa9\u5143\u3067\u304d\u307e\u305b\u3093!]]></string>
+
+    <string name="close_notification">閉じる</string>
+
     <string name="color">カラフル</string>
+
+    <string name="color_theme_name">カラフル</string>
+
     <string name="colors">色</string>
-    <string name="compact">コンパクト</string>
+
     <string name="composer">作曲家</string>
+
     <string name="copied_device_info_to_clipboard">端末情報をコピー</string>
+
     <string name="could_not_create_playlist">\u30d7\u30ec\u30a4\u30ea\u30b9\u30c8\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002</string>
     <string name="could_not_download_album_cover">"\u9069\u5207\u306a\u30a2\u30eb\u30d0\u30e0\u30a2\u30fc\u30c8\u3092\u30c0\u30a6\u30f3\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f"</string>
     <string name="could_not_restore_purchase">購入の復元に失敗しました</string>
     <string name="could_not_scan_files">%d のファイルをスキャンできませんでした</string>
+
     <string name="create_action">作成</string>
-    <string name="create_new_backup">作成</string>
+
     <string name="created_playlist_x">プレイリストを作成しました %1$s</string>
+
     <string name="credit_title">メンバーと貢献者</string>
-    <string name="currently_listening_to_x_by_x">現在、 %2$s で %1$s を聴いています。</string>
-    <string name="custom_artist_images">カスタムアーティスト画像</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">クラッシュレポートを共有</string>
-    <string name="dark_theme_name">ダーク</string>
+
+    <string name="currently_listening_to_x_by_x">現在、 %1$s によって %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_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="depth">深さ</string>
+
     <string name="description">説明</string>
+
     <string name="device_info">端末の情報</string>
+
     <string name="dialog_message_set_ringtone">Retro Musicにオーディオ設定の変更を許可する</string>
+
     <string name="dialog_title_set_ringtone">着信音に設定</string>
-    <string name="disc_hint">ディスクナンバー</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">寄付します</string>
+
     <string name="donate_summary">私が自分の仕事に払う価値があると思うなら、あなたはここにお金を残すことができます</string>
+
     <string name="donation_header">俺を購入：</string>
-    <string name="done">完了</string>
-    <string name="drive_mode">運転モード</string>
-    <string name="edit_fab">ボタンを編集</string>
-    <string name="edit_normal_lyrics">歌詞を編集</string>
-    <string name="edit_synced_lyrics">同期された歌詞を編集</string>
+
+    <string name="download_from_last_fm">Last.fm からダウンロード</string>
+
+    <string name="edit">編集</string>
+
+    <string name="edit_cover">カバーを編集</string>
+
     <string name="empty">空の</string>
+
     <string name="equalizer">イコライザー</string>
-    <string name="error_create_backup">バックアップを作成できませんでした</string>
-    <string name="error_delete_backup">バックアップを削除できませんでした</string>
-    <string name="error_empty_name">名前を空欄にはできません。</string>
-    <string name="error_load_failed">読み込み失敗</string>
-    <string name="error_share_file">ファイルを共有できませんでした</string>
-    <string name="expanded">展開</string>
+
+    <string name="error">エラー</string>
+
     <string name="faq">よくある質問</string>
+
     <string name="favorites">お気に入り</string>
-    <string name="file_already_exists">ファイルは既に存在します</string>
-    <string name="finish_last_song">最後の曲の終了を待つ</string>
+
     <string name="fit">フィット</string>
+
     <string name="flat">フラット</string>
+
     <string name="folders">フォルダ</string>
-    <string name="follow_system">システムに従う</string>
-    <string name="for_you">おすすめ</string>
-    <string name="free">なし</string>
-    <string name="full">フル</string>
+
+    <string name="for_you">あなたのために</string>
+
+    <string name="full">いっぱい</string>
+
     <string name="full_card">全体のカード</string>
+
     <string name="general_settings_summary">このアプリのテーマや色を変更します</string>
     <string name="general_settings_title">見た目と操作感</string>
+
     <string name="genre">ジャンル</string>
+
     <string name="genres">ジャンル</string>
+
     <string name="git_hub_summary">GitHubでプロジェクトにフォークする</string>
-    <string name="gradient">グラデーション</string>
-    <string name="grant_access">アクセスを許可</string>
+
+    <string name="google_plus_community">Google Plus コミュニティに参加してヘルプや Retro Music のアップデート情報を受け取ろう</string>
+
     <string name="grid_size_1">１</string>
     <string name="grid_size_2">２</string>
     <string name="grid_size_3">３</string>
@@ -205,356 +290,460 @@
     <string name="grid_size_6">６</string>
     <string name="grid_size_7">７</string>
     <string name="grid_size_8">８</string>
-    <string name="grid_style_label">表示スタイル</string>
-    <string name="help_summary">さらにヘルプが必要ですか？</string>
+
     <string name="hinge">ヒンジ</string>
+
     <string name="history">履歴</string>
-    <string name="history_cleared">履歴を消去しました</string>
-    <string name="history_undo_button">元に戻す</string>
+
     <string name="home">ホーム</string>
+
     <string name="horizontal_flip">水平方向に反転</string>
+
     <string name="image">画像</string>
-    <string name="image_gradient">傾斜イメージ</string>
+
     <string name="image_settings_summary">アーティスト画像のダウンロード設定を変更する</string>
-    <string name="import_label">インポート</string>
-    <string name="import_playlist">プレイリストをインポート</string>
-    <string name="import_playlist_message">Android Media Storeにリストされているすべてのプレイリストを読み込み、プレイリストがすでに存在する場合は、曲がマージされます。</string>
+
     <string name="inserted_x_songs_into_playlist_x">プレイリスト %2$s に %1$d 曲を追加しました</string>
-    <string name="instagram_page_summary">あなたのRetro Music設定を共有してInstagramにショーケースしましょう</string>
-    <string name="keyboard">キーボードを表示</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">君のRetro Music設定を共有してInstagramにショーケースしましょう</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_last_modified">更新日時</string>
-    <string name="label_more_from">%s の詳細</string>
+
     <string name="label_sampling_rate">サンプリングレート</string>
+
     <string name="label_track_length">長さ</string>
-    <string name="labeled">ラベルを表示する</string>
-    <string name="last_added">最近追加</string>
+
+    <string name="labeled">ラベル付き</string>
+
+    <string name="last_added">最後に追加された</string>
+
     <string name="last_song">前の曲</string>
-    <string name="lets_go">はじめよう</string>
-    <string name="library_categories">ライブラリの表示項目</string>
+
+    <string name="lets_play_something">何か再生しよう</string>
+
+    <string name="library">ライブラリ</string>
+
     <string name="licenses">ライセンス</string>
-    <string name="light_theme_name">ライト</string>
-    <string name="listeners_label">リスナー</string>
+
+    <string name="light_theme_name">はっきり白</string>
+
     <string name="listing_files">リスティングファイル</string>
+
     <string name="loading_products">商品の読み込み中...</string>
+
     <string name="login">ログイン</string>
+
     <string name="lyrics">歌詞</string>
-    <string name="made_with_love">インドにて、❤をこめて開発</string>
+
+    <string name="made_with_love">Made with ❤️ in India</string>
+
     <string name="material">マテリアル</string>
+
     <string name="md_error_label">エラー</string>
+
     <string name="md_storage_perm_error">権限が付与されていません</string>
-    <string name="message_backup_create_success">バックアップは正常に作成されました。</string>
-    <string name="message_limit_tabs">5 アイテムまで</string>
-    <string name="message_pro_feature">%s はプロ版の機能です。</string>
-    <string name="message_restore_success">復元が正常に完了しました。</string>
-    <string name="message_updated">更新しました</string>
-    <string name="message_welcome"><![CDATA[こんにちは！ <br> %s へようこそ]]></string>
+
     <string name="my_name">名前</string>
-    <string name="my_top_tracks">最近のお気に入り</string>
+
+    <string name="my_top_tracks">最も再生された</string>
+
     <string name="never">決して</string>
-    <string name="new_music_mix">新曲ミックス</string>
+
+    <string name="new_banner_photo">新しいバナー画像</string>
+
     <string name="new_playlist_title">新しいプレイリスト</string>
+
+    <string name="new_profile_photo">新しいプロフィール画像</string>
+
     <string name="new_start_directory">%s は新しい開始ディレクトリです。</string>
+
     <string name="next_song">次の曲</string>
+
     <string name="no_albums">アルバムがありません</string>
+
     <string name="no_artists">アーティストがありません</string>
+
     <string name="no_audio_ID">"音楽再生してから、再度お試しください"</string>
-    <string name="no_backups_found">バックアップが見つかりませんでした</string>
+
     <string name="no_equalizer">イコライザが見つかりませんでした</string>
+
     <string name="no_genres">ジャンルがありません</string>
+
     <string name="no_lyrics_found">歌詞が見つかりませんでした</string>
-    <string name="no_playing_queue">再生中の曲がありません</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="normal_lyrics">通常の歌詞</string>
+
+    <string name="normal_style">通常</string>
+
     <string name="not_listed_in_media_store"><![CDATA[メディアストアに <b>%s</b> がリストされたされていません。]]></string>
-    <string name="not_recently_played">最近再生されていない曲</string>
+
     <string name="nothing_to_scan">スキャン対象がありません</string>
-    <string name="nothing_to_see">表示するものがありません</string>
+
     <string name="notification">通知</string>
+
     <string name="notification_settings_summary">通知スタイルを変更</string>
-    <string name="now_playing">再生画面</string>
+
+    <string name="now_playing">再生中</string>
     <string name="now_playing_queue">再生中のキュー</string>
     <string name="now_playing_summary">再生中の画面をカスタマイズ</string>
     <string name="now_playing_themes">9種類以上の再生中テーマ</string>
+
     <string name="only_on_wifi">Wi-Fi時のみ</string>
+
     <string name="other_settings_summary">高度な試験的機能</string>
+
     <string name="others">その他</string>
-    <string name="over_cover">カバーに重ねて表示</string>
+
     <string name="password">パスワード</string>
+
     <string name="past_three_months">過去3ヶ月</string>
-    <string name="paste_lyrics_here">ここに歌詞を貼り付け</string>
-    <string name="paste_timeframe_lyrics_here">時間指定の歌詞をペースト</string>
-    <string name="peek">ピーク</string>
-    <string name="permission_bluetooth_denied">近くのデバイスにアクセスできません。</string>
+
+    <string name="paste_lyrics_here">ここに歌詞を入力してください</string>
+
     <string name="permission_external_storage_denied">外部ストレージへのアクセスが拒否されました</string>
-    <string name="permission_summary">音楽を再生するために、デバイスのストレージにアクセスする権限が必要です</string>
-    <string name="permission_title">ストレージへのアクセス</string>
+
     <string name="permissions_denied">許可が拒否されました</string>
-    <string name="personalize">個人設定</string>
+
+    <string name="personalize">個人用設定</string>
+
     <string name="personalize_settings_summary">再生中のUI画面をカスタマイズ</string>
+
     <string name="pick_from_local_storage">ローカルストレージから選択</string>
+
+    <string name="pick_image_intent_text">画像を選択</string>
+
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">PintrestでRetro Musicのデザインのインスピレーションを感じましょう！</string>
+
     <string name="plain">プレーン</string>
-    <string name="playList_already_exits">プレイリストは既に存在します</string>
-    <string name="playback_pitch">音程</string>
-    <string name="playback_settings">再生設定</string>
-    <string name="playback_speed">再生速度</string>
+
     <string name="playing_notification_description">再生中の通知は再生/停止の操作が利用できます</string>
     <string name="playing_notification_name">再生中の通知</string>
-    <string name="playlist_created_sucessfully">%s の作成に成功しました</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_album_detail_style">アルバムのディテールスタイル</string>
+
     <string name="pref_blur_amount_summary">ブラーを使用するテーマを使用した際のブラーの強さを設定します。低いほど処理が早くなります</string>
     <string name="pref_blur_amount_title">ぼかしの強さ</string>
-    <string name="pref_filter_song_summary">楽曲を長さで並び替え</string>
+
     <string name="pref_filter_song_title">曲の長さをフィルター</string>
-    <string name="pref_header_advanced">高度な設定</string>
-    <string name="pref_header_album">アルバムのスタイル</string>
+
     <string name="pref_header_audio">オーディオ</string>
-    <string name="pref_header_blacklist">ブラックリスト</string>
-    <string name="pref_header_controls">コントロール</string>
     <string name="pref_header_general">テーマ</string>
     <string name="pref_header_images">画像</string>
-    <string name="pref_header_library">ライブラリ</string>
     <string name="pref_header_lockscreen">ロック画面</string>
     <string name="pref_header_playlists">プレイリスト</string>
+
     <string name="pref_keep_pause_on_zero_volume_summary">音量がゼロになると自動的に音楽が一時停止し、再び音量を上げると音楽が再生されます。※あなたがアプリ外で音量を上げると、Retro Musicも再生を開始します。</string>
     <string name="pref_keep_pause_on_zero_volume_title">音量をゼロで一時停止</string>
     <string name="pref_keep_screen_on_summary">この機能をオンにすると、バッテリー寿命に影響する可能性があります</string>
     <string name="pref_keep_screen_on_title">画面をオンのままにする</string>
-    <string name="pref_language_name">言語を選択</string>
-    <string name="pref_snow_fall_title">雪エフェクト</string>
+
+    <string name="pref_now_playing_screen_summary">現在再生中の画面に移動せずに、クリックまたはスライドして開く</string>
+    <string name="pref_now_playing_screen_title">クリックもしくはスライド</string>
+
+    <string name="pref_snow_fall_title">スノーフォールエフェクト</string>
+
     <string name="pref_summary_album_art_on_lockscreen">再生中のジャケットをロック画面の壁紙に適用する</string>
-    <string name="pref_summary_album_artists_only">アーティストカテゴリ内にアルバムのアーティストを表示する</string>
     <string name="pref_summary_audio_ducking">システムでサウンドが再生されたとき、または通知が受信されたときに一時的に音量を下げる</string>
-    <string name="pref_summary_audio_fade">曲を一時停止または再生するときにオーディオをフェードします</string>
     <string name="pref_summary_blacklist">ブラックリストに登録されたフォルダの内容はコレクションには表示されません。</string>
-    <string name="pref_summary_bluetooth_playback">端末にBluetoothデバイスが接続されたとき、再生を開始する</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">"\u30b8\u30e3\u30b1\u30c3\u30c8\u304b\u3089\u62bd\u51fa\u3055\u308c\u305f\u8272\u3067\u901a\u77e5\u3092\u7740\u8272\u3059\u308b"</string>
-    <string name="pref_summary_cross_fade">曲間でクロスフェードする時間</string>
-    <string name="pref_summary_desaturated_color">マテリアルデザインのガイドラインに従いダークモードで彩度の低い色を使用する</string>
-    <string name="pref_summary_expand_now_playing_panel">通知をタップすることでアプリのトップ画面ではなく、再生画面を表示するようにする</string>
+    <string name="pref_summary_dominant_color">全体の色はアルバムジャケットまたはアーティストの画像から選択されます</string>
     <string name="pref_summary_extra_controls">ミニプレイヤー専用のコントロールボタンを追加する</string>
-    <string name="pref_summary_extra_song_info">ファイル形式、ビットレート、サンプリング周波数などの曲のメタデータを再生画面に表示する</string>
     <string name="pref_summary_gapless_playback">"一部のデバイスでは再生に問題が発生する場合があります"</string>
+    <string name="pref_summary_genre_toggle">ジャンルタブを切り替える</string>
     <string name="pref_summary_home_banner">ホーム画面を切り替える</string>
     <string name="pref_summary_ignore_media_store_artwork">アルバムジャケットのクオリティを上げますが、読み込みに時間がかかる場合があります。低解像度の画像で問題がある場合に有効です。</string>
-    <string name="pref_summary_library_categories">ライブラリに表示される項目と、順番を変更する</string>
     <string name="pref_summary_lock_screen">Retro Musicのカスタムされたロック画面を使用する</string>
-    <string name="pref_summary_manage_audio_focus">ほかのアプリでの再生に関わらず再生し続けます</string>
     <string name="pref_summary_open_source_licences">オープンソースライセンスの詳細</string>
-    <string name="pref_summary_pause_history">有効にすると、新たに再生された曲は履歴に表示されません</string>
-    <string name="pref_summary_remember_tab">開始時に最後に表示したタブに移動します</string>
-    <string name="pref_summary_show_lyrics">同期歌詞をアルバムカバーに重ねて表示します</string>
-    <string name="pref_summary_suggestions">新曲ミックスをホーム画面に表示する</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">再生中画面のどこかをスワイプして、楽曲の変更を行います</string>
-    <string name="pref_summary_swipe_to_dismiss">下にスワイプしてミニプレイヤーを閉じます</string>
-    <string name="pref_summary_toggle_full_screen">アプリをフルスクリーン表示にする</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_shuffle">新しいリストの楽曲を再生する時にシャッフルは自動的にオフになります</string>
     <string name="pref_summary_toggle_volume">再生画面に十分なスペースがある場合に音量コントロールを追加する</string>
-    <string name="pref_summary_wallpaper_accent">壁紙からアクセントカラーを抽出します</string>
-    <string name="pref_summary_whitelist">/Music フォルダからの音楽のみ表示します</string>
+
     <string name="pref_title_album_art_on_lockscreen">アルバムジャケットを表示</string>
-    <string name="pref_title_album_artists_only">アルバムのアーティストを表示</string>
     <string name="pref_title_album_cover_style">アルバムカバーのテーマ</string>
     <string name="pref_title_album_cover_transform">アルバムジャケットをスキップ</string>
+    <string name="pref_title_album_grid_style">アルバムの間隔</string>
     <string name="pref_title_app_shortcuts">色のついたアプリショートカット</string>
-    <string name="pref_title_appbar_mode">ヘッダーのスタイル</string>
+    <string name="pref_title_artist_grid_style">アーティストの間隔</string>
     <string name="pref_title_audio_ducking">フォーカスロス時に音量を下げる</string>
-    <string name="pref_title_audio_fade">オーディオをフェードする</string>
-    <string name="pref_title_auto_download_artist_images">アーティスト画像を自動でダウンロード</string>
+    <string name="pref_title_auto_download_artist_images">アーティスト画像を自動でダウンロードする</string>
     <string name="pref_title_blacklist">ブラックリスト</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth接続時に再生</string>
     <string name="pref_title_blurred_album_art">アルバムジャケットにぼかしを適用する</string>
-    <string name="pref_title_circle_button">丸い再生ボタン</string>
+    <string name="pref_title_choose_equalizer">イコライザーを選択</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_cross_fade">クロスフェード (ベータ版)</string>
-    <string name="pref_title_custom_font">フォントに Manrope を使用する</string>
-    <string name="pref_title_desaturated_color">彩度の低い色</string>
-    <string name="pref_title_expand_now_playing_panel">通知から再生画面を開く</string>
-    <string name="pref_title_extra_controls">追加コントロール</string>
-    <string name="pref_title_extra_song_info">曲の情報を表示</string>
+    <string name="pref_title_extra_controls">追加のコントロール</string>
     <string name="pref_title_gapless_playback">ギャップレス再生</string>
     <string name="pref_title_general_theme">アプリのテーマ</string>
-    <string name="pref_title_home_album_grid_style">アルバムの表示</string>
-    <string name="pref_title_home_artist_grid_style">アーティストの表示</string>
+    <string name="pref_title_genre_toggle">ジャンルタブを表示</string>
+    <string name="pref_title_home_artist_grid_style">アーティストの間隔</string>
     <string name="pref_title_home_banner">ホーム画面</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_lyrics_screen_on">歌詞の表示時に画面を点灯し続ける</string>
-    <string name="pref_title_lyrics_type">歌詞の種類</string>
-    <string name="pref_title_manage_audio_focus">常に再生する</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_pause_history">視聴履歴を一時停止</string>
-    <string name="pref_title_remember_tab">最後に開いたタブを記憶する</string>
-    <string name="pref_title_show_lyrics">歌詞を表示する</string>
-    <string name="pref_title_suggestions">提案を表示する</string>
-    <string name="pref_title_swipe_anywhere_now_playing">画面のどこかをスワイプして曲変更する</string>
-    <string name="pref_title_swipe_to_dismiss">下スワイプで閉じる</string>
-    <string name="pref_title_tab_text_mode">タブのラベル</string>
+    <string name="pref_title_round_corners">コーナーと角</string>
+    <string name="pref_title_tab_text_mode">タブのラベルモード</string>
     <string name="pref_title_toggle_carousel_effect">カルーセルエフェクト</string>
-    <string name="pref_title_toggle_full_screen">フルスクリーン表示</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_toggle_shuffle">シャッフルモード</string>
     <string name="pref_title_toggle_volume">ボリュームコントロール</string>
-    <string name="pref_title_wallpaper_accent">壁紙の色を使用する</string>
-    <string name="pref_title_whitelist">楽曲のホワイトリスト</string>
-    <string name="pro">プロ版</string>
-    <string name="pro_summary">ダークモード、「再生中」スキン、カルーセルエフェクトなど…</string>
+    <string name="pref_title_user_info">ユーザー情報</string>
+
+    <string name="primary_color">プライマリカラー</string>
+    <string name="primary_color_desc">"プライマリカラーはデフォルトではブルーグレーに設定されています。現在はダークモードでのみ動作します。
+"</string>
+
     <string name="profile">プロフィール</string>
+
     <string name="purchase">購入</string>
+
+    <string name="purchase_summary">購入後に返金を求めないようにお願い申し上げます。</string>
+
     <string name="queue">キュー</string>
+
     <string name="rate_app">アプリを評価する</string>
-    <string name="rate_on_google_play_summary">このアプリを気に入りましたか？アプリをより良いものにするために、Google Playストアで問題の報告と意見をよろしくお願いします。</string>
+
+    <string name="rate_on_google_play_summary">このアプリを気に入りましたか？アプリをより良いものにするために、Google Play Storeで問題の報告と意見をよろしくお願いします。</string>
+
     <string name="recent_albums">最近のアルバム</string>
+
     <string name="recent_artists">最近のアーティスト</string>
+
     <string name="remove_action">削除</string>
+
+    <string name="remove_banner_photo">バナー画像を削除する</string>
+
     <string name="remove_cover">ジャケットを削除</string>
+
     <string name="remove_from_blacklist">ブラックリストから削除</string>
-    <string name="remove_image">画像を削除する</string>
+
+    <string name="remove_profile_photo">プロフィール画像を削除</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="replace_cover">カバーを交換する</string>
+
     <string name="report_an_issue">問題を報告</string>
+
     <string name="report_bug">不具合を報告する</string>
-    <string name="reset_action">リセット</string>
+
     <string name="reset_artist_image">アーティスト画像をリセット</string>
+
     <string name="restore">復元</string>
-    <string name="restore_message">バックアップを復元しますか？</string>
+
     <string name="restored_previous_purchase_please_restart">購入を復元しました。アプリを再起動してフルバージョンをご堪能ください！</string>
     <string name="restored_previous_purchases">購入を復元しました</string>
+
     <string name="restoring_purchase">購入を復元しています...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Retro Music イコライザ</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">音楽を着信音に設定するには、端末の設定にアクセスする権限が必要です</string>
-    <string name="ringtone_title">着信音（オプション）</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_write_failed">ファイルの書き込みに失敗しました: %s</string>
+
     <string name="save">保存</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">ファイルとして保存</string>
+
     <string name="save_playlists_title">ファイルとして保存</string>
+
     <string name="saved_playlist_to">%s にプレイリストを保存しました</string>
+
     <string name="saving_changes">変更を保存中</string>
+
     <string name="scan_media">メディアをスキャン</string>
+
     <string name="scanned_files">%2$d のうち、%1$d がスキャンされました</string>
-    <string name="scrobbles_label">Scrobble 機能</string>
+
+    <string name="search_hint">ライブラリを検索しています...</string>
+
     <string name="select_all">すべて選択</string>
+
+    <string name="select_banner_photo">バナー画像を選択してください</string>
+
     <string name="selected">選択された</string>
+
+    <string name="send_crash_log">クラッシュログを送信する</string>
+
     <string name="set">決定</string>
+
     <string name="set_artist_image">アーティスト画像を設定</string>
+
+    <string name="set_photo">プロフィール画像を設定</string>
+
     <string name="share_app">アプリを共有する</string>
-    <string name="share_summary">アプリを友達や家族と共有する</string>
-    <string name="share_to_stories">ストーリーに共有</string>
-    <string name="show_album_artists">アルバムアーティストを表示</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">スライド</string>
+
+    <string name="small">小さなアルバム</string>
+
     <string name="social">ソーシャル</string>
-    <string name="social_stories">ストーリーを共有</string>
+
     <string name="song">曲</string>
+
     <string name="song_duration">曲の長さ</string>
+
     <string name="songs">曲</string>
+
     <string name="sort_order">順番をソート</string>
     <string name="sort_order_a_z">昇順</string>
     <string name="sort_order_album">アルバム</string>
     <string name="sort_order_artist">アーティスト</string>
     <string name="sort_order_composer">作曲家</string>
     <string name="sort_order_date">日付</string>
-    <string name="sort_order_date_modified">最後の編集日</string>
-    <string name="sort_order_default">デフォルト</string>
-    <string name="sort_order_num_songs">曲数順（昇順）</string>
-    <string name="sort_order_num_songs_desc">曲数順（降順）</string>
     <string name="sort_order_year">年</string>
     <string name="sort_order_z_a">降順</string>
+
     <string name="speech_not_supported">ごめんなさい! このデバイスは音声入力に対応しておりません</string>
+
     <string name="speech_prompt">ライブラリを検索</string>
-    <string name="stack">スタック</string>
-    <string name="start_play_music">音楽を再生する</string>
+
     <string name="suggestion_songs">改善を提案</string>
+
+    <string name="summary_user_info">ホームに名前が表示されます</string>
+
     <string name="support_development">開発を支援</string>
+
     <string name="swipe_to_unlock">スワイプしてアンロック</string>
+
     <string name="synced_lyrics">連動した歌詞</string>
-    <string name="telegram_group">テレグラム</string>
+
+    <string name="system_equalizer">システムのイコライザ</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Telegram のグループに参加して、バグについて話し合ったり、提案したりしましょう</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="tiny_card_style">小さいカード</string>
+
+    <string name="tiny">小さい</string>
+
     <string name="title">主題</string>
-    <string name="title_new_backup">新規バックアップ</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の場合は「truck 2」、CD3でtruck4の場合は 「3004」)"</string>
+
     <string name="track_list">トラック番号</string>
+
     <string name="translate">翻訳</string>
+
     <string name="translate_community">翻訳を手伝ってください！</string>
-    <string name="try_retro_music_premium">Retro Music Premium を試す</string>
+
     <string name="twitter_page">ツイッター</string>
     <string name="twitter_page_summary">あなたのデザインを皆に共有しましょう</string>
-    <string name="unlabeled">ラベルを表示しない</string>
+
+    <string name="unlabeled">ラベル付きでない</string>
+
     <string name="unplayable_file">\u3053\u306e\u66f2\u3092\u518d\u751f\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f</string>
+
     <string name="up_next">次</string>
+
     <string name="update_image">画像を更新</string>
+
     <string name="updating">更新中...</string>
-    <string name="user_images_description">ユーザーイメージ</string>
-    <string name="user_name">ユーザー名</string>
+
     <string name="username">ユーザー名</string>
+
     <string name="version">バージョン</string>
+
     <string name="vertical_flip">垂直方向に反転</string>
-    <string name="view_on_telegram">Telegramで表示</string>
-    <string name="volume">音量</string>
+
+    <string name="virtualizer">バーチャライザー</string>
+
     <string name="web_search">ウェブで検索</string>
-    <string name="website">Webサイト</string>
-    <string name="website_summary">私たちのウェブサイトをチェック</string>
-    <string name="welcome">ようこそ,</string>
+
     <string name="what_do_you_want_to_share">何を共有しますか?</string>
+
     <string name="whats_new">更新内容</string>
+
     <string name="window">ウィンドウ</string>
+
     <string name="window_corner_edges">角を丸める</string>
-    <string name="x_has_been_set_as_ringtone">%1$s を着信音として設定しました</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">少なくとも 1 つのカテゴリを選択する必要があります。</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">issue trackerのウェブサイトに移動します</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">issue trackerのウェブサイトに転送されます</string>
+
     <string name="your_account_data_is_only_used_for_authentication">あなたのアカウントは認証にのみ使用されます</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-kmr-rTR/strings.xml b/app/src/main/res/values-kmr-rTR/strings.xml
deleted file mode 100644
index 20ac63491..000000000
--- a/app/src/main/res/values-kmr-rTR/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Derbarê %s</string>
-    <string name="about_settings_summary">Kom, girêdanên civakî</string>
-    <string name="accent_color">Rengê devokê</string>
-    <string name="accent_color_desc">Rengê devokê ya rûkarê, bi rengê binefşî berdest dibe</string>
-    <string name="action_about">Derbar</string>
-    <string name="action_add_to_blacklist">Tevlî rêzoka reş bike</string>
-    <string name="action_add_to_favorites">Tevlî bijarteyan bike</string>
-    <string name="action_add_to_playing_queue">Tevlî rêzê stranên têne lêdan bike</string>
-    <string name="action_add_to_playlist">Tevlî rêzoka lêdanê bike</string>
-    <string name="action_cancel">Têk bibe</string>
-    <string name="action_cast">Biweşîne</string>
-    <string name="action_clear_playing_queue">Rêzê stranên têne lêdan pak bike</string>
-    <string name="action_cycle_repeat">Awaya dubarekirinê</string>
-    <string name="action_delete">Jê bibe</string>
-    <string name="action_delete_from_device">Ji amûrê jê bibe</string>
-    <string name="action_details">Hûrgilî</string>
-    <string name="action_edit">Serrast bike</string>
-    <string name="action_go_to_album">Biçe bo albumê</string>
-    <string name="action_go_to_artist">Biçe bo hunermend</string>
-    <string name="action_go_to_genre">Biçe bo cureyê</string>
-    <string name="action_go_to_lyrics">Biçe bo peyvên stranê</string>
-    <string name="action_go_to_start_directory">Biçe rêberiya destpêkê</string>
-    <string name="action_grant">Piştgirî bike</string>
-    <string name="action_grid_size">Mezinahiya torê</string>
-    <string name="action_grid_size_land">Mezinahiya torê (erd)</string>
-    <string name="action_new_playlist">Rêzoka lêdanê ya nû</string>
-    <string name="action_next">Pêş</string>
-    <string name="action_play">Lêde</string>
-    <string name="action_play_all">Hemûyan lêde</string>
-    <string name="action_play_next">Strana pêş lêde</string>
-    <string name="action_play_pause">Lêde/Rawestîne</string>
-    <string name="action_previous">Paş</string>
-    <string name="action_remove_from_favorites">Ji bijarteyan rake</string>
-    <string name="action_remove_from_playing_queue">Ji rêzê stranên têne lêdan rake</string>
-    <string name="action_remove_from_playlist">Ji rêzoka lêdanê rake</string>
-    <string name="action_rename">Ji nû ve bi nav bike</string>
-    <string name="action_save_playing_queue">Rêzê stranên têne lêdan tomar bike</string>
-    <string name="action_scan">Venêre</string>
-    <string name="action_search">Bigere</string>
-    <string name="action_set">Dest pê bike</string>
-    <string name="action_set_as_ringtone">Wekî dengê zengilê saz bike</string>
-    <string name="action_set_as_start_directory">Wek rêberiya destpêkê saz bike</string>
-    <string name="action_settings">"Sazkarî"</string>
-    <string name="action_share">Parve bike</string>
-    <string name="action_shuffle_all">Hemûyan tevlîhev bike</string>
-    <string name="action_shuffle_playlist">Rêzoka lêdanê tevlîhev bike</string>
-    <string name="action_sleep_timer">Demkera xewê</string>
-    <string name="action_sort_order">Rêzkirin bi</string>
-    <string name="action_tag_editor">Zanyariyên stranê serrast bike</string>
-    <string name="action_toggle_favorite">Bijarteyan biguherîne</string>
-    <string name="action_toggle_shuffle">Awaya tevlîhevkirinê çalak bike</string>
-    <string name="adaptive">Guncav</string>
-    <string name="add_action">Tevlî bike</string>
-    <string name="add_playlist_title">"Tevlî rêzoka lêdanê bike"</string>
-    <string name="add_time_framed_lryics">Dema peyvên stranê têxe</string>
-    <string name="added_song_count_to_playlist">%1$d stran tevlî %2$s bû</string>
-    <string name="added_title_to_playing_queue">"1 sernav li rêzeya lêdanê hate tevlîkirin."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d sernav li rêzeya lêdanê hate tevlîkirin.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Stran</item>
-        <item quantity="other">Stran</item>
-    </plurals>
-    <string name="album_artist">Hunermendê albumê</string>
-    <string name="albums">Album</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Album</item>
-    </plurals>
-    <string name="always">Her dem</string>
-    <string name="app_share">Silav ev lêdera muzîkê ya xweşik li vir binêre:
-https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Tevlîhev bike</string>
-    <string name="app_shortcut_top_tracks_short">Baştirîn stran</string>
-    <string name="app_widget_big_name">Wêneya tijî</string>
-    <string name="app_widget_card_name">Kert</string>
-    <string name="app_widget_classic_name">Klasîk</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Biçûk</string>
-    <string name="app_widget_text_name">Nivîsa herî kêm</string>
-    <string name="artist">Hunermend</string>
-    <string name="artists">Hunermend</string>
-    <string name="audio_fade_duration">Dema wendabûna dengê</string>
-    <string name="audio_focus_denied">Çalakkirina dengê hate têkbirin.</string>
-    <string name="audio_settings_summary">Sazkariyên dengê û kontrolên yeksaneker biguherîne</string>
-    <string name="auto">Xweber</string>
-    <string name="backup_restore_settings_summary">Sazkariyên xwe, rêzokên lêdanê hilîne û vegerîne</string>
-    <string name="backup_restore_title"><![CDATA[Hilanîn & Vegerandin]]></string>
-    <string name="backup_title">Hilanîn</string>
-    <string name="biography">Jînborî</string>
-    <string name="black_theme_name">Tenê reş</string>
-    <string name="blacklist">Rêzoka reş</string>
-    <string name="bluetooth_summary">Sepanê mafê gihîştinê ji bo amûrên bluetooth nêzîk daxwaz dike</string>
-    <string name="bluetooth_title">Amûrên nêzîk</string>
-    <string name="blur">Mijbarî</string>
-    <string name="blur_card">Kerta mijbarî</string>
-    <string name="bug_report_failed">Nikare ragihandinê bişîne</string>
-    <string name="bug_report_failed_invalid_token">Têketin nederbasdar e. Ji kerema xwe bi pêşdebirê sepanê re têkeve têkiliyê.</string>
-    <string name="bug_report_failed_issues_not_available">Pirsgirêk ji bo embara hilbijartî ne çalak in. Ji kerema xwe bi pêşdebirê sepanê re têkeve têkiliyê.</string>
-    <string name="bug_report_failed_unknown">Çewtiyeke nehêvîkirî derket. Jkx bi pêşdebirê sepanê re têkeve têkiliyê.</string>
-    <string name="bug_report_failed_wrong_credentials">Navê bikarhêner an borînpeyv çewt e</string>
-    <string name="bug_report_issue">Pirsgirêk</string>
-    <string name="bug_report_manual">Bi destan bişîne</string>
-    <string name="bug_report_no_description">Jkx danasîneke pirsgirêkê binivisîne</string>
-    <string name="bug_report_no_password">Jkx borînpeyva derbasdar a xwe ya Github binivisîne</string>
-    <string name="bug_report_no_title">Jkx sernaveke pirsgirêkê binivisîne</string>
-    <string name="bug_report_no_username">Jkx navê bikarhêner a derbasdar a xwe ya Github binivisîne</string>
-    <string name="bug_report_success">Ragihandina çewtiyê serkeftî bû</string>
-    <string name="bug_report_summary">Çewtiyeke nehêvîkirî derket. Bibore, ku ev bidome \"Daneyên sepanê pak bike\" an jî E-nameyekê bişîne </string>
-    <string name="bug_report_use_account">Bi riya karanîna ajimêra GitHub bişîne</string>
-    <string name="buy_now">Niha bikire</string>
-    <string name="cancel_current_timer">Têk bibe</string>
-    <string name="card">Kert</string>
-    <string name="card_color_style">Kerta rengîn</string>
-    <string name="card_square">Kerta çargoşe</string>
-    <string name="card_style">Kert</string>
-    <string name="carousal_effect_on_now_playing_screen">Bandora gilover li ser dîmendera niha tê lêdan</string>
-    <string name="cascading">Pêlik</string>
-    <string name="changelog">Rêzoka guhertinan</string>
-    <string name="changelog_summary">Binêre ka çi nû ye</string>
-    <string name="choose_image">Wêneyê hilbijêre</string>
-    <string name="choose_restore_title">Hilbijêre ka bila çi werê vegerandin</string>
-    <string name="circle">Gilover</string>
-    <string name="circular">Gilover</string>
-    <string name="classic">Klasîk</string>
-    <string name="clear_action">Pak bike</string>
-    <string name="clear_blacklist">Rêzoka reş pak bike</string>
-    <string name="clear_history">Dîrokê pak bike</string>
-    <string name="clear_playing_queue">Rêzê pak bike</string>
-    <string name="color">Reng</string>
-    <string name="colors">Reng</string>
-    <string name="compact">Pêkhatî</string>
-    <string name="composer">Awazvan</string>
-    <string name="copied_device_info_to_clipboard">Zanyariyên amûrê ji bo tûrikê hate jêgirtin.</string>
-    <string name="could_not_create_playlist">Nikare rêzoka lêdanê çê bike\u2019.</string>
-    <string name="could_not_download_album_cover">"Nikare berga albumê ya lihevhatî daxîne\u2019."</string>
-    <string name="could_not_restore_purchase">Nikare kirînê vegerînê.</string>
-    <string name="could_not_scan_files">Nekare pelên %d venêrê.</string>
-    <string name="create_action">Çê bike</string>
-    <string name="create_new_backup">Çê bike</string>
-    <string name="created_playlist_x">Rêzoka lêdanê ya bi navê %1$s hate çêkirin.</string>
-    <string name="credit_title">Endam û beşdar </string>
-    <string name="currently_listening_to_x_by_x">Niha li strana %1$s ji %2$s guhdarî dike.</string>
-    <string name="custom_artist_images">Wêneyên hunermend ên kesanekirî</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Ragihandina têkçûna sepanê parve bike</string>
-    <string name="dark_theme_name">Tarî</string>
-    <string name="delete_playlist_title">Rêzoka lêdanê jê bibe</string>
-    <string name="delete_playlist_x"><![CDATA[Rêzoka lêdanê ya <b>%1$s</b> jê bibe?]]></string>
-    <string name="delete_playlists_title">Rêzokên lêdanê jê bibe</string>
-    <string name="delete_song_title">Stranê jê bibe</string>
-    <string name="delete_song_x"><![CDATA[Stranê <b>%1$s</b> jê bibe?]]></string>
-    <string name="delete_songs_title">Stranan jê bibe</string>
-    <string name="delete_x_playlists"><![CDATA[Rêzokên lêdanê ya <b>%1$d</b> jê bibe?]]></string>
-    <string name="delete_x_songs"><![CDATA[Stranên <b>%1$d</b> jê bibe?]]></string>
-    <string name="deleted_x_songs">%1$d stran hatin jêbirin.</string>
-    <string name="deleting_songs">Jêbirina stranan</string>
-    <string name="depth">Kurahî</string>
-    <string name="description">Danasîn</string>
-    <string name="device_info">Zanyariyên amûrê</string>
-    <string name="dialog_message_set_ringtone">Mafê bide Retro Music da ku sazkariyên dengî biguherîne</string>
-    <string name="dialog_title_set_ringtone">Dengê zengilê saz bike</string>
-    <string name="disc_hint">Jimara diskê</string>
-    <string name="do_you_want_to_clear_the_blacklist">Tu dixwazî rêzoka reş pak bikî?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Tu dixwazî <b>%1$s</b> ji rêzoka reş rakî?]]></string>
-    <string name="donate">Bexş bike</string>
-    <string name="donate_summary">Ku tu raman dibî ez maf distînim ku ji ber karê xwe pere bistînim, tu dikarî hinek pere li vir bihêlî</string>
-    <string name="donation_header">Ji min re tiştekî bikire:</string>
-    <string name="done">Qediya</string>
-    <string name="drive_mode">Awaya ajotinê</string>
-    <string name="edit_fab">Bişkoka serrastkirinê</string>
-    <string name="edit_normal_lyrics">Peyvên stranê serrast bike</string>
-    <string name="edit_synced_lyrics">Peyvên stranê yên hevdemkirî serrast bike</string>
-    <string name="empty">Vala</string>
-    <string name="equalizer">Yeksaneker</string>
-    <string name="error_create_backup">Nikare hîlanîna\u2019 çê bikê</string>
-    <string name="error_delete_backup">Nikare hîlanîna\u2019 jê bibê</string>
-    <string name="error_empty_name">Navê te nabe ku vala be!</string>
-    <string name="error_load_failed">Barkirin têk çû</string>
-    <string name="error_share_file">Pel nayê parvekirin</string>
-    <string name="expanded">Dirêjkirî</string>
-    <string name="faq">Pirsên pir têne pirsîn (PPP)</string>
-    <string name="favorites">Bijarte</string>
-    <string name="file_already_exists">Pel jixwe heye</string>
-    <string name="finish_last_song">Strana dawî biqedîne</string>
-    <string name="fit">Lihevhatî</string>
-    <string name="flat">Dûz</string>
-    <string name="folders">Peldank</string>
-    <string name="follow_system">Pergalê bişopîne</string>
-    <string name="for_you">Ji bo te</string>
-    <string name="free">Belaş</string>
-    <string name="full">Tijî</string>
-    <string name="full_card">Kerta tije</string>
-    <string name="general_settings_summary">Rûkar û rengên sepanê biguherîne</string>
-    <string name="general_settings_title">Xuyang</string>
-    <string name="genre">Cure</string>
-    <string name="genres">Cure</string>
-    <string name="git_hub_summary">Kodê li ser GitHub bibîne</string>
-    <string name="gradient">Gradyan</string>
-    <string name="grant_access">Mafê bide</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="grid_style_label">Awaya torê</string>
-    <string name="help_summary">Bêtir alîkarî dixwazî?</string>
-    <string name="hinge">Mofirk</string>
-    <string name="history">Dîrok</string>
-    <string name="history_cleared">Dîrok hate pakkirin</string>
-    <string name="history_undo_button">Vegerîne</string>
-    <string name="home">Serrûpel</string>
-    <string name="horizontal_flip">Asoyî bizivirîne</string>
-    <string name="image">Wêne</string>
-    <string name="image_gradient">Wêneya gradyan</string>
-    <string name="image_settings_summary">Sazkariyên daxistina wêneya hunermend biguherîne</string>
-    <string name="import_label">Têxistin</string>
-    <string name="import_playlist">Rêzoka lêdanê têxe</string>
-    <string name="import_playlist_message">Ew têxistina hemû rêzokên lêdanê yên ku di Android Media Store de hatine rêzkirin bi stranan re pêk tîne, ku rêzokên lêdanê jixwe hebin, wê stran werin yekkirin.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d stran ketin nav rêzokên lêdanê ya %2$s.</string>
-    <string name="instagram_page_summary">Sazkiriyên rûkarê Retro Music ya xwe li ser Instagram parve bike</string>
-    <string name="keyboard">Kilîtdank</string>
-    <string name="label_bit_rate">Leza bit</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">Navê pelê</string>
-    <string name="label_file_path">Rêgeha pelê</string>
-    <string name="label_file_size">Mezinahî</string>
-    <string name="label_last_modified">Guhertina herî dawî</string>
-    <string name="label_more_from">Bêtir ji %s</string>
-    <string name="label_sampling_rate">Rêjeya mînakî</string>
-    <string name="label_track_length">Dirêjî</string>
-    <string name="labeled">Nîşankirî</string>
-    <string name="last_added">Tevlîkirinên dawî</string>
-    <string name="last_song">Strana dawî</string>
-    <string name="lets_go">Em hernê</string>
-    <string name="library_categories">Beşên pirtûkxaneyê</string>
-    <string name="licenses">Lîsans</string>
-    <string name="light_theme_name">Ron</string>
-    <string name="listeners_label">Guhdarvan</string>
-    <string name="listing_files">Rêzoka pelan</string>
-    <string name="loading_products">Berhem têne barkirin…</string>
-    <string name="login">Têkeve</string>
-    <string name="lyrics">Peyvên stranê</string>
-    <string name="made_with_love">Li Hindistanê bi ❤️ hatiye çêkirin</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Çewtî</string>
-    <string name="md_storage_perm_error">Çewtiya mafdayînê</string>
-    <string name="message_backup_create_success">Hîlanîn bi serkeftî hate çêkirin.</string>
-    <string name="message_limit_tabs">Ji 5 hêmanan ne bêtir e</string>
-    <string name="message_pro_feature">%s taybetmendiyeke Pro ye.</string>
-    <string name="message_restore_success">Vegerandin bi serkeftî qediya.</string>
-    <string name="message_updated">Rojanekirî ye</string>
-    <string name="message_welcome"><![CDATA[Silav! <br>Tu bi xêr hatî %s]]></string>
-    <string name="my_name">Nav</string>
-    <string name="my_top_tracks">Herî pir lêdayî</string>
-    <string name="never">Tu car</string>
-    <string name="new_music_mix">Muzîka nû tevlîhev bike</string>
-    <string name="new_playlist_title">Rêzoka lêdanê ya nû</string>
-    <string name="new_start_directory">%s reberiya destpêkê ya nû ye.</string>
-    <string name="next_song">Strana pêş</string>
-    <string name="no_albums">Albumên te tune ne</string>
-    <string name="no_artists">Hunermend tune ne</string>
-    <string name="no_audio_ID">"Pêşî stranekê bide lêdan, paşê dîsa binêre."</string>
-    <string name="no_backups_found">Hilanîn nehate dîtin</string>
-    <string name="no_equalizer">Yeksaneker nehate dîtin</string>
-    <string name="no_genres">Cure tune ne</string>
-    <string name="no_lyrics_found">Peyên stranê nehatin dîtin</string>
-    <string name="no_playing_queue">Tu stran nayên lêdan</string>
-    <string name="no_playlists">Rêzokên lêdanê tune ne</string>
-    <string name="no_purchase_found">Kirîn nehate dîtin.</string>
-    <string name="no_results">Encam tune</string>
-    <string name="no_songs">Stran tune ne</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Peyvên stranê yên normal</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> di marketa medyayê de nehatiye rêzkirin.]]></string>
-    <string name="not_recently_played">Nehatiye lêdan di vê dawiyê de</string>
-    <string name="nothing_to_scan">Tiştek bo venêrînê tune ye.</string>
-    <string name="nothing_to_see">Tiştek bo dîtinê tune ye</string>
-    <string name="notification">Agahî</string>
-    <string name="notification_settings_summary">Awaya agahiyan kesane bike</string>
-    <string name="now_playing">Niha tê lêdan</string>
-    <string name="now_playing_queue">Rêzeya niha tê lêdan</string>
-    <string name="now_playing_summary">Dîmendera niha tê lêdan kesane bike</string>
-    <string name="now_playing_themes">9+ rûkara niha tê lêdan</string>
-    <string name="only_on_wifi">Tenê li ser Wi-Fi</string>
-    <string name="other_settings_summary">Taybetmendiyên testkirina pêşketî</string>
-    <string name="others">Ên din</string>
-    <string name="over_cover">Li ser bergê</string>
-    <string name="password">Borînpeyv</string>
-    <string name="past_three_months">3 mehên borî</string>
-    <string name="paste_lyrics_here">Peyvên stranê Li vir pêve bike</string>
-    <string name="paste_timeframe_lyrics_here">Peyvên stranê demsazkirî li vir binivisîne</string>
-    <string name="peek">Serî</string>
-    <string name="permission_bluetooth_denied">Daxwaza gihîştina amûrên nêzîk hate têkbirin.</string>
-    <string name="permission_external_storage_denied">Mafa gihiştînê bo bîrgeha derveyî hate têkbirin.</string>
-    <string name="permission_summary">Pêdiviya sepanê bi gihiştîna bîrgeha derveyî ya amûra te heye ji bo lêdana muzîkê</string>
-    <string name="permission_title">Gihîştina bergehê</string>
-    <string name="permissions_denied">Mafdayîn hate têkbirin.</string>
-    <string name="personalize">Kesanekirin</string>
-    <string name="personalize_settings_summary">Kontrolên lêdanê û navrûya bikarhêneriyê xwe kesane bike</string>
-    <string name="pick_from_local_storage">Ji bîrgeha herêmî hilbijêre</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Ji bo ramanên dîzayn ên Retro Music rûpela Pinterest bişopîne</string>
-    <string name="plain">Sade</string>
-    <string name="playList_already_exits">Rêzoka lêdanê jixwe heye</string>
-    <string name="playback_pitch">Awaz</string>
-    <string name="playback_settings">Sazkariyên lêdanê</string>
-    <string name="playback_speed">Leza lêdanê</string>
-    <string name="playing_notification_description">Agahiyên lêdanê çalakiyên ji bo lêdan/rawestandin hwd peyda dike.</string>
-    <string name="playing_notification_name">Agahiya lêdanê</string>
-    <string name="playlist_created_sucessfully">%s bi serkeftî hate çêkirin</string>
-    <string name="playlist_is_empty">Rêzoka lêdanê vala ye</string>
-    <string name="playlist_name_empty">Navê rêzoka lêdanê</string>
-    <string name="playlists">Rêzoka lêdanan</string>
-    <string name="pref_blur_amount_summary">Rêjeya mijbariya ku ji bo rûkaran hatiye sepandin, çiqas kêm be ewqas baş e</string>
-    <string name="pref_blur_amount_title">Rêjeya mijbariyê</string>
-    <string name="pref_filter_song_summary">Stranan bi ya dirêjahiyê parzûn bike</string>
-    <string name="pref_filter_song_title">Dema stranê parzûn bike</string>
-    <string name="pref_header_advanced">Pêşketî</string>
-    <string name="pref_header_album">Awaya albumê</string>
-    <string name="pref_header_audio">Deng</string>
-    <string name="pref_header_blacklist">Rêzoka reş</string>
-    <string name="pref_header_controls">Kontrol</string>
-    <string name="pref_header_general">Rûkar</string>
-    <string name="pref_header_images">Wêne</string>
-    <string name="pref_header_library">Pirtûkxane</string>
-    <string name="pref_header_lockscreen">Dîmendera kilîtkirinê</string>
-    <string name="pref_header_playlists">Rêzoka lêdanan</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Dema deng dakeve sifirê stranê rawestîne û gava ku deng bilind dibe dest bi lêdanê bike. Di heman demê de li derveyî sepanê jî dixebite</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Li ser sifirê rawestîne</string>
-    <string name="pref_keep_screen_on_summary">Bîne bîra xwe ku çalakkirina vê taybetmendiyê dibe ku bandorê li jiyana bateriyê bike</string>
-    <string name="pref_keep_screen_on_title">Dîmenderê vêketî bihêle</string>
-    <string name="pref_language_name">Ziman hilbijêre</string>
-    <string name="pref_snow_fall_title">Bandora barîna berfê</string>
-    <string name="pref_summary_album_art_on_lockscreen">Berga albûma strana ku niha tê lêdan wekî paşrûyê dîmenera kilîtkirinê bi kar bîne</string>
-    <string name="pref_summary_album_artists_only">Hunermendên albumê di beşa hunermend de nîşan bide</string>
-    <string name="pref_summary_audio_ducking">Dema ku dengek pergalê tê lêdan an jî agahiyek tê wergirtin dengê kêm bike</string>
-    <string name="pref_summary_audio_fade">Dema ku stran tê rawestandin an jî lêdan dengê qut bike</string>
-    <string name="pref_summary_blacklist">Naveroka peldankên rêzoka reş ji pirtûkxaneya te veşartî ye.</string>
-    <string name="pref_summary_bluetooth_playback">Dema ku bi amûra bluetooth ve girêdayî be dest bi lêdanê bike</string>
-    <string name="pref_summary_blurred_album_art">Berga albumê li ser dîmendera kilîtkirinê mijbarî bike. Ev yek dikare bi sepanên partiya sêyemîn û widgetan re bibe sedema pirsgirêkan</string>
-    <string name="pref_summary_carousel_effect">Bandora carousel ji bo berga albumê di dîmendera ku niha tê lêdan. Bizanibe ku rûkarên kert û kertên mijbar wê nexebitin</string>
-    <string name="pref_summary_classic_notification">Dîzayna agahiyên klasîk bi kar bîne</string>
-    <string name="pref_summary_colored_app">Rengên paşrûyê û bişkoka kontrolê li gorî wêneya albumê ya ji dîmendera niha tê lêdan 
-têne guhertin</string>
-    <string name="pref_summary_colored_app_shortcuts">Kurteyên sepanê bi rengê devokê reng dike. Her dema ku tu rengê diguherînî, ji kerema xwe vê yekê biguherîne da ku bandor bike</string>
-    <string name="pref_summary_colored_notification">"Rengê agahiyan di berga albumê de bi \u2019 rengê jîndar reng bide"</string>
-    <string name="pref_summary_cross_fade">Dema rawestandinê di navbera stranan de</string>
-    <string name="pref_summary_desaturated_color">Li gorî rêzikên rêbernameya materyalê, divê reng di awaya tarî de têrkirî bin</string>
-    <string name="pref_summary_expand_now_playing_panel">Tikandina li ser agahiyan wê niha tê lêdan li şûna dîmendera sereke nîşan bidê</string>
-    <string name="pref_summary_extra_controls">Bêtir kontrol ji bo lêdera biçûk tevlî bike</string>
-    <string name="pref_summary_extra_song_info">Bêtir zanyariyên stranê, wekî formata pelê, leza bitê û frekansê nîşan bide</string>
-    <string name="pref_summary_gapless_playback">"Dibe ku li ser hinek amûran bibe sedema pirsgirêkên lêdanê."</string>
-    <string name="pref_summary_home_banner">Wêneya navrûyê veşêre an jî nîşan bide</string>
-    <string name="pref_summary_ignore_media_store_artwork">Dikare kalîteya bergê albûmê bilind bike, lê dibe sedema ku demên barkirina wêneyê hêdî bibe. Tenê ku pirsgirêkên te bi bergê albumên bi çareseriya kêm re hebin vê yekê çalak bike</string>
-    <string name="pref_summary_library_categories">Dîtin û rêzkirina beşên pirtûkxaneyê pevsaz bike.</string>
-    <string name="pref_summary_lock_screen">Kontrolên dîmendera kilîtkirinê yên kesanekirî yên Retro Music bi kar bîne</string>
-    <string name="pref_summary_manage_audio_focus">Her dem dengê li paşrûyê bide lêdan tevî ku tiştek din hatibe lêdan</string>
-    <string name="pref_summary_open_source_licences">Hûrguliyên Lîsansê ji bo nermalava çavkaniya vekirî</string>
-    <string name="pref_summary_pause_history">Dema ku çalak be, stranên ku nû hatine lêdan wê di dîrokê de neyên xuyakirin</string>
-    <string name="pref_summary_remember_tab">Dema ku dest pê dike, biçe rûgera herî dawî ya ku hatiye bikaranîn</string>
-    <string name="pref_summary_show_lyrics">Peyvên stranê hevdemkirî li ser berga albumê nîşan bide</string>
-    <string name="pref_summary_suggestions">Bişkoka tevlîhevkirina Muzîka nû li ser dîmenera sereke nîşan bide</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Bi kişandina li her derê li ser dîmendera lêdanê stranan biguherîne</string>
-    <string name="pref_summary_swipe_to_dismiss">Berjêr kaş bike da ku lêdera mini paşguh bikî</string>
-    <string name="pref_summary_toggle_full_screen">Awaya dîmendera tije çalak bike</string>
-    <string name="pref_summary_toggle_headset">Piştî ku guhik hate girêdan tavilê dest bi lêdanê bike</string>
-    <string name="pref_summary_toggle_shuffle">Dema ku ji rêzeyeke stran were lêdan wê awaya tevlîhevkirinê were neçalakkirin</string>
-    <string name="pref_summary_toggle_volume">Ku şûn hebe, di dîmendera ku niha tê lêdan de kontrolên dengê nîşan bide</string>
-    <string name="pref_summary_wallpaper_accent">Renga çarçoveyê ji paşrûyê derxîne</string>
-    <string name="pref_summary_whitelist">Muzîkê tenê ji /Peldanka muzîkê nîşan bide</string>
-    <string name="pref_title_album_art_on_lockscreen">Bergê albumê nîşan bide</string>
-    <string name="pref_title_album_artists_only">Geran bi riya albuma hunermend</string>
-    <string name="pref_title_album_cover_style">Rûkara bergê albumê</string>
-    <string name="pref_title_album_cover_transform">Berga albumê derbas bike</string>
-    <string name="pref_title_app_shortcuts">Kurteyên sepanê yên rengîn</string>
-    <string name="pref_title_appbar_mode">Awayê sernav</string>
-    <string name="pref_title_audio_ducking">Dengê kêm bike di dema hatina agahiyan de</string>
-    <string name="pref_title_audio_fade">Wendabûna dengê</string>
-    <string name="pref_title_auto_download_artist_images">Wêneyên hunermendan bixweber daxe</string>
-    <string name="pref_title_blacklist">Rêzoka reş</string>
-    <string name="pref_title_bluetooth_playback">Bi riya Bluetooth lêde</string>
-    <string name="pref_title_blurred_album_art">Berga albumê mijbarî bike</string>
-    <string name="pref_title_circle_button">Bişkoka lêdana gilover nîşan bide</string>
-    <string name="pref_title_classic_notification">Dîzayna agahiyên klasîk</string>
-    <string name="pref_title_colored_app">Rengê guncav</string>
-    <string name="pref_title_colored_notification">Agahiyên rengîn</string>
-    <string name="pref_title_cross_fade">Derbasbûn (Beta)</string>
-    <string name="pref_title_custom_font">Cure nivîsa Manrope bi kar bîne</string>
-    <string name="pref_title_desaturated_color">Rengên têrkirî</string>
-    <string name="pref_title_expand_now_playing_panel">Dîmendera lêdanê nîşan bide</string>
-    <string name="pref_title_extra_controls">Bêtir kontrol</string>
-    <string name="pref_title_extra_song_info">Zanyariyên stranê</string>
-    <string name="pref_title_gapless_playback">Lêdana bê navber</string>
-    <string name="pref_title_general_theme">Rûkara sepanê</string>
-    <string name="pref_title_home_album_grid_style">Berga albumê</string>
-    <string name="pref_title_home_artist_grid_style">Tora sereke ya hunermend</string>
-    <string name="pref_title_home_banner">Wêneya navrûyê</string>
-    <string name="pref_title_ignore_media_store_artwork">Bergên bîrgeha medya paşguh bike</string>
-    <string name="pref_title_last_added_interval">Navbera rêzoka lêdanê dawî ya tevlîkirî</string>
-    <string name="pref_title_lock_screen">Kontrolên dîmendera tije</string>
-    <string name="pref_title_lyrics_screen_on">Dema ku peyvên stranê têne nîşandan dîmenderê vêketî bihêle</string>
-    <string name="pref_title_lyrics_type">Cureya peyvên stranê</string>
-    <string name="pref_title_manage_audio_focus">Her dem lêde</string>
-    <string name="pref_title_now_playing_screen_appearance">Rûkara niha tê lêdan</string>
-    <string name="pref_title_open_source_licences">Lîsansên çavkaniya vekirî</string>
-    <string name="pref_title_pause_history">Dîrokê rawestîne</string>
-    <string name="pref_title_remember_tab">Rûgera dawî bi bîr bîne</string>
-    <string name="pref_title_show_lyrics">Peyvên stranê nîşan bide</string>
-    <string name="pref_title_suggestions">Pêşniyaran nîşan bide</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Ji bo guhertina stranê li her derê kaş bike</string>
-    <string name="pref_title_swipe_to_dismiss">Paşguh bike bi riya kaşandina berjêr</string>
-    <string name="pref_title_tab_text_mode">Awaya sernavê rûgeran</string>
-    <string name="pref_title_toggle_carousel_effect">Bandora gilover</string>
-    <string name="pref_title_toggle_full_screen">Sepanê di dîmendera tije bide xebitandin</string>
-    <string name="pref_title_toggle_toggle_headset">Lêdana xweber</string>
-    <string name="pref_title_toggle_toggle_shuffle">Awaya tevlîhevkirinê</string>
-    <string name="pref_title_toggle_volume">Kontrola dengê</string>
-    <string name="pref_title_wallpaper_accent">Rengê devokê paşrûyê</string>
-    <string name="pref_title_whitelist">Rêzoka stranên spî</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Rûkara reş, rûkara stranên niha têne lêdan, bandora gilover û bêtir..</string>
-    <string name="profile">Profîl</string>
-    <string name="purchase">Bikire</string>
-    <string name="queue">Rêzkirin</string>
-    <string name="rate_app">Sepanê binirxîne</string>
-    <string name="rate_on_google_play_summary">Ji vê sepanê hez dikî? Di Google Play Store de binirxîne û ji me re bêje ka em çawa dikarin sepanê hîn çêtir bikin</string>
-    <string name="recent_albums">Albumên dawî</string>
-    <string name="recent_artists">Hunermendên dawî</string>
-    <string name="remove_action">Rake</string>
-    <string name="remove_cover">Bergê rake</string>
-    <string name="remove_from_blacklist">Ji rêzoka reş rake</string>
-    <string name="remove_image">Wêneyê rake</string>
-    <string name="remove_song_from_playlist_title">Stranê ji rêzoka lêdanê rake</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Stranê <b>%1$s</b> ji rêzoka lêdanê rake?]]></string>
-    <string name="remove_songs_from_playlist_title">Stranan ji rêzoka lêdanê rake</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Stranên <b>%1$d</b> ji rêzoka lêdanê rake?]]></string>
-    <string name="rename_playlist_title">Rêzoka lêdanê ji nû ve bi nav bike</string>
-    <string name="replace_cover">Bergê biguherîne</string>
-    <string name="report_an_issue">Pirsgirêkê ragihîne</string>
-    <string name="report_bug">Çewtiyê ragihîne</string>
-    <string name="reset_action">Ji nû ve saz bike</string>
-    <string name="reset_artist_image">Wêneyê hunermend ji nû ve saz bike</string>
-    <string name="restore">Vegerîne</string>
-    <string name="restore_message">Tu dixwazî hilanînê vegerînî?</string>
-    <string name="restored_previous_purchase_please_restart">Kirîna berê hate vegerandin. Ji kerema xwe sepanê ji nû ve bide destpêkirin da ku hemû taybetmendiyan bi kar bînî.</string>
-    <string name="restored_previous_purchases">Kirînên berê hatin vegerandin.</string>
-    <string name="restoring_purchase">Kirîn tê vegerandin…</string>
-    <string name="retro_music_player">Lêdera muzîkê ya Retro</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Ji bo ku muzîkê wekî dengê zengilê saz bikî pêdivî bi mafdayînê heye ku bigihîje sazkariyên amûra te</string>
-    <string name="ringtone_title">Dengê zengilê (Vebijêrkî)</string>
-    <string name="saf_delete_failed">Jêbirina pelê bi ser neket: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Nikare girêdana SAF bi dest bixe</string>
-    <string name="saf_guide_slide1_description">Menuya geranê veke</string>
-    <string name="saf_guide_slide1_description_before_o">Di menuya tevlîhev de \'Kerta SD nîşan bide\' çalak bike</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s pêdivî bi gihiştina karta SD heye</string>
-    <string name="saf_guide_slide2_description">Pêdivî ye ku tu rêberiya rehê kerta SD hilbijêrî</string>
-    <string name="saf_guide_slide2_title">Kerta SD a xwe di rûgera geranê de hilbijêre</string>
-    <string name="saf_guide_slide3_description">Tu binpeldankan veneke</string>
-    <string name="saf_guide_slide3_title">Bişkoka \'hilbijêre\' li binê dîmenderê bitikîne</string>
-    <string name="saf_write_failed">Nivîsandina pelê têk çû: %s</string>
-    <string name="save">Tomar bike</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Wekî pel tomar bike</string>
-    <string name="save_playlists_title">Wekî pelan tomar bike</string>
-    <string name="saved_playlist_to">Rêzoka lêdanê li %s hate tomarkirin.</string>
-    <string name="saving_changes">Guhertinan tomar bike</string>
-    <string name="scan_media">Medya venêre</string>
-    <string name="scanned_files">%1$d ji %2$d pel hate guhertin.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Hemûyan hilbijêre</string>
-    <string name="selected">Hilbijartî</string>
-    <string name="set">Saz bike</string>
-    <string name="set_artist_image">Wêneyê hunermend saz bike</string>
-    <string name="share_app">Sepanê parve bike</string>
-    <string name="share_summary">Sepanê bi heval û malbata xwe re parve bike</string>
-    <string name="share_to_stories">Di çîrokan de parve bike</string>
-    <string name="show_album_artists">Hunermendê albumê nîşan bide</string>
-    <string name="shuffle">Tevlîhev bike</string>
-    <string name="simple">Hêsan</string>
-    <string name="sleep_timer_canceled">Demkera xewê hate têkbirin.</string>
-    <string name="sleep_timer_set">Demkera xewê ji bo %d xulek hate sazkirin.</string>
-    <string name="social">Civakî</string>
-    <string name="social_stories">Çîrokê parve bike</string>
-    <string name="song">Stran</string>
-    <string name="song_duration">Dirêjahiya stranê</string>
-    <string name="songs">Stran</string>
-    <string name="sort_order">Rêzkirin bi</string>
-    <string name="sort_order_a_z">Berjor (A-Z)</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Hunermend</string>
-    <string name="sort_order_composer">Awazvan</string>
-    <string name="sort_order_date">Dîroka tevlîkirinê</string>
-    <string name="sort_order_date_modified">Dîroka guhertinê</string>
-    <string name="sort_order_default">Berdest</string>
-    <string name="sort_order_num_songs">Jimara stranan</string>
-    <string name="sort_order_num_songs_desc">Jimara stranan (berjêr)</string>
-    <string name="sort_order_year">Sal</string>
-    <string name="sort_order_z_a">Berjêr (Z-A)</string>
-    <string name="speech_not_supported">Bibore! Amûra te piştgiriya têketina axaftinê nake</string>
-    <string name="speech_prompt">Di pirtûkxaneya xwe de bigere</string>
-    <string name="stack">Lodkirin</string>
-    <string name="start_play_music">Lêdana muzîkê bide destpêkirin.</string>
-    <string name="suggestion_songs">Pêşniyar</string>
-    <string name="support_development">Piştgiriya pêşdebirinê bike</string>
-    <string name="swipe_to_unlock">Kaş bike ji bo vekirinê</string>
-    <string name="synced_lyrics">Peyvên hevdemkirî</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Beşdarî koma Telegram bibe da ku li ser çewtiyan gotûbêj bikî, pêşniyar bikî, û bêtir</string>
-    <string name="thank_you">Spas!</string>
-    <string name="the_audio_file">Pela dengî</string>
-    <string name="this_month">Vê mehê</string>
-    <string name="this_week">Vê hefteyê</string>
-    <string name="this_year">Vê salê</string>
-    <string name="tiny">Biçûk</string>
-    <string name="tiny_card_style">Kerta biçûk</string>
-    <string name="title">Sernav</string>
-    <string name="title_new_backup">Hilanîna nû</string>
-    <string name="today">Îro</string>
-    <string name="top_albums">Baştirîn album</string>
-    <string name="top_artists">Baştirîn hunermend</string>
-    <string name="track_hint">"Herik (2 bo herika 2 an jî 3004 bo herika CD3 4)"</string>
-    <string name="track_list">Jimara herikê</string>
-    <string name="translate">Wergerandin</string>
-    <string name="translate_community">Alîkariya me bike ku em sepanê wergerînin zimanê te</string>
-    <string name="try_retro_music_premium">Retro Music Premium biceribîne</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Dîzayna xwe bi Retro Music re parve bike</string>
-    <string name="unlabeled">Nenîşankirî</string>
-    <string name="unplayable_file">Nikare vê stranê\u2019 lêdê.</string>
-    <string name="up_next">Pêş</string>
-    <string name="update_image">Wêneyê rojane bike</string>
-    <string name="updating">Tê rojanekirin…</string>
-    <string name="user_images_description">Wêneyên bikarhêner</string>
-    <string name="user_name">Navê bikarhêner</string>
-    <string name="username">Navê bikarhêner</string>
-    <string name="version">Guherto</string>
-    <string name="vertical_flip">Stûnî bizivirîne</string>
-    <string name="view_on_telegram">Li ser Telegramê nîşan bide</string>
-    <string name="volume">Deng</string>
-    <string name="web_search">Lêgerîna tevnê</string>
-    <string name="website">Malpera tevnê</string>
-    <string name="website_summary">Serdana malpera me bike</string>
-    <string name="welcome">Silav,</string>
-    <string name="what_do_you_want_to_share">Tu dixwazî çi parve bikî?</string>
-    <string name="whats_new">Çi nû ye</string>
-    <string name="window">Çarçove</string>
-    <string name="window_corner_edges">Quncikên gilover</string>
-    <string name="x_has_been_set_as_ringtone">%1$s wekî dengê zengilê xwe saz bike.</string>
-    <string name="x_selected">%1$d hate hilbijartin</string>
-    <string name="year">Sal</string>
-    <string name="you_have_to_select_at_least_one_category">Divê tu herî kêm yek beş hilbijêrî.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Tu yê ji bo malpera şopandina pirsgirêkê werî beralîkirin.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Daneyên ajimêra te tenê ji bo pejirandinê têne bikaranîn.</string>
-</resources>
diff --git a/app/src/main/res/values-kn-rIN/strings.xml b/app/src/main/res/values-kn-rIN/strings.xml
deleted file mode 100644
index c95ad0b7e..000000000
--- a/app/src/main/res/values-kn-rIN/strings.xml
+++ /dev/null
@@ -1,562 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">%s ನ ಬಗ್ಗೆ</string>
-    <string name="about_settings_summary">ತಂಡ, ಸಾಮಾಜಿಕ ಮಾಧ್ಯಮ ಲಿಂಕ್‌ಗಳು</string>
-    <string name="accent_color">ಪ್ರಧಾನ ಬಣ್ಣ</string>
-    <string name="accent_color_desc">ಪ್ರಧಾನ ಬಣ್ಣ, ಇದು ನೇರಳೆ ಬಣ್ಣಕ್ಕೆ ಪೂರ್ವನಿಯೋಜಿತವಾಗಿರುತ್ತದೆ</string>
-    <string name="action_about">ಕುರಿತು</string>
-    <string name="action_add_to_blacklist">ಕಪ್ಪುಪಟ್ಟಿಗೆ ಸೇರಿಸಿ</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_cancel">ರದ್ದುಮಾಡಿ</string>
-    <string name="action_cast">ಕ್ಯಾಸ್ಟ್</string>
-    <string name="action_clear_playing_queue">ಚಲಿಸುವ ಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಿ</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_edit">ತಿದ್ದು</string>
-    <string name="action_go_to_album">ಆಲ್ಬಮ್ ಗೆ ಹೋಗಿ</string>
-    <string name="action_go_to_artist">ಈ ಕಲಾವಿದರಿಗೆ ಹೋಗಿ</string>
-    <string name="action_go_to_genre">ಈ ಪ್ರಕಾರಕ್ಕೆ ಹೋಗಿ</string>
-    <string name="action_go_to_lyrics">ಈ ಸಾಹಿತ್ಯಕ್ಕೆ ಹೋಗಿ</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_all">ಎಲ್ಲಾವನ್ನು ಪ್ಲೇ ಮಾಡಿ</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_sort_order">ವಿಂಗಡಣಾ ಕ್ರಮ</string>
-    <string name="action_tag_editor">ಟ್ಯಾಗ್ ಗಳನ್ನು ತಿದ್ದಿ</string>
-    <string name="action_toggle_favorite">ಮೆಚ್ಚಿನವುಗಳನ್ನು ಟಾಗಲ್ ಮಾಡಿ</string>
-    <string name="action_toggle_shuffle">ಷಫಲ್ ಮೋಡ್ ಅನ್ನು ಟಾಗಲ್ ಮಾಡಿ</string>
-    <string name="adaptive">ಹೊಂದಿಕೊಳ್ಳುವ</string>
-    <string name="add_action">ಸೇರಿಸಿ</string>
-    <string name="add_playlist_title">"ಪ್ಲೇಲಿಸ್ಟ್‌ಗೆ ಸೇರಿಸಿ"</string>
-    <string name="add_time_framed_lryics">ಸಮಯದ ಚೌಕಟ್ಟಿನ ಸಾಹಿತ್ಯವನ್ನು ಸೇರಿಸಿ</string>
-    <string name="added_song_count_to_playlist">%1$d ಹಾಡು(ಗಳನ್ನು) %2$s ಗೆ ಸೇರಿಸಲಾಗಿದೆ</string>
-    <string name="added_title_to_playing_queue">"ಚಲಿಸುತ್ತಿರುವ ಪಟ್ಟಿಯಲ್ಲಿ 1 ಶಿರ್ಷೀಕೆಯನ್ನು ಸೇರಿಸಲಾಗಿದೆ."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d ಶಿರ್ಷೀಕೆಗಳನ್ನು ಚಲಿಸುತ್ತಿರುವ ಪಟ್ಟಿಯಲ್ಲಿ ಸೇರಿಸಲಾಗಿದೆ.</string>
-    <string name="album">ಆಲ್ಬಮ್</string>
-    <plurals name="albumSongs">
-        <item quantity="one">ಹಾಡು</item>
-        <item quantity="other">ಹಾಡುಗಳು</item>
-    </plurals>
-    <string name="album_artist">ಆಲ್ಬಮ್ ನ ಕಲಾವಿದ</string>
-    <string name="albums">ಆಲ್ಬಮ್ಗಳು</string>
-    <plurals name="albums">
-        <item quantity="one">ಆಲ್ಬಮ್</item>
-        <item quantity="other">ಆಲ್ಬಮ್ಗಳು</item>
-    </plurals>
-    <string name="always">ಯಾವಾಗಲೂ</string>
-    <string name="app_share">ಈ ಉತ್ತಮ ಮ್ಯೂಸಿಕ್ ಪ್ಲೇಯರ್ ಅನ್ನು ಇಲ್ಲಿ ನೋಡಿ: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">ಷಫಲ್</string>
-    <string name="app_shortcut_top_tracks_short">ಉನ್ನತ ಹಾಡುಗಳು</string>
-    <string name="app_widget_big_name">ಪೂರ್ಣ ಚಿತ್ರ</string>
-    <string name="app_widget_card_name">ಕಾರ್ಡ್</string>
-    <string name="app_widget_classic_name">ಕ್ಲಾಸಿಕ್‌</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">ಸ್ಮಾಲ್</string>
-    <string name="app_widget_text_name">ಮಿನಿಮಲ್ ಟೆಕ್ಸ್ಟ್</string>
-    <string name="artist">ಕಲಾವಿದ</string>
-    <string name="artists">ಕಲಾವಿದರು</string>
-    <string name="audio_fade_duration">ಆಡಿಯೊ ಮರೆಯಾಗುವ ಅವಧಿ</string>
-    <string name="audio_focus_denied">ಧ್ವನಿ ಫೋಕಸ್ ತಿರಸ್ಕೃತಗೊಂಡಿದೆ.</string>
-    <string name="audio_settings_summary">ಧ್ವನಿ ಸಂಯೋಜನೆಗಳನ್ನು ಬದಲಾಯಿಸಿ ಮತ್ತು ಈಕ್ವಲೈಜರ್ ನಿಯಂತ್ರಣಗಳನ್ನು ಹೊಂದಿಸಿ</string>
-    <string name="auto">ಸ್ವಯಂ</string>
-    <string name="backup_restore_settings_summary">ನಿಮ್ಮ ಸಂಯೋಜನೆಗಳನ್ನು, ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಬ್ಯಾಕಪ್ ಮಾಡಿ ಮತ್ತು ಮರುಸ್ಥಾಪಿಸಿ</string>
-    <string name="backup_restore_title"><![CDATA[ಬ್ಯಾಕ್ಅಪ್ ಮತ್ತು ಮರುಸ್ಥಾಪನೆ]]></string>
-    <string name="backup_title">ಬ್ಯಾಕಪ್‍ಗಳು</string>
-    <string name="biography">ಜೀವನಚರಿತ್ರೆ</string>
-    <string name="black_theme_name">ಜಸ್ಟ್ ಬ್ಲಾಕ್</string>
-    <string name="blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="bluetooth_summary">ಬ್ಲೂಟೂತ್ ಸಾಧನಗಳನ್ನು ಪರಿಶೀಲಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಹತ್ತಿರದ ಸಾಧನಗಳ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿದೆ</string>
-    <string name="bluetooth_title">ಹತ್ತಿರದ ಸಾಧನಗಳು</string>
-    <string name="blur">ಬ್ಲರ್</string>
-    <string name="blur_card">ಬ್ಲರ್ ಕಾರ್ಡ್</string>
-    <string name="bug_report_failed">ವರದಿ ಕಳುಹಿಸಲು ಸಾಧ್ಯವಾಗುತ್ತಿಲ್ಲ</string>
-    <string name="bug_report_failed_invalid_token">ಅಮಾನ್ಯ ಪ್ರವೇಶ ಟೋಕನ್. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_issues_not_available">ಆಯ್ಕೆಮಾಡಿದ ರೆಪೊಸಿಟರಿಗಾಗಿ ಸಮಸ್ಯೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಲಾಗಿಲ್ಲ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_unknown">ಅನೀರೀಕ್ಷಿತ ದೋಷ ಉಂಟಾಗಿದೆ. ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಡೆವಲಪರ್ ಅನ್ನು ಸಂಪರ್ಕಿಸಿ.</string>
-    <string name="bug_report_failed_wrong_credentials">ತಪ್ಪಾದ ಬಳಕೆದಾರಹೆಸರು ಅಥವಾ ಪಾಸ್ವರ್ಡ್</string>
-    <string name="bug_report_issue">ಸಮಸ್ಯೆ</string>
-    <string name="bug_report_manual">ಹಸ್ತಚಾಲಿತವಾಗಿ ಕಳುಹಿಸಿ</string>
-    <string name="bug_report_no_description">ದಯವಿಟ್ಟು ಸಮಸ್ಯೆಯ ವಿವರಣೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_password">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮಾನ್ಯವಾದ GitHub ಪಾಸ್‌ವರ್ಡ್ ಅನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_title">ದಯವಿಟ್ಟು ಸಮಸ್ಯೆಯ ವಿವರಣೆಯನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_no_username">ದಯವಿಟ್ಟು ನಿಮ್ಮ ಮಾನ್ಯವಾದ GitHub ಬಳಕೆದಾರಹೆಸರನ್ನು ನಮೂದಿಸಿ</string>
-    <string name="bug_report_success">ಬಗ್ ವರದಿ ಯಶಸ್ವಿಯಾಗಿದೆ</string>
-    <string name="bug_report_summary">ಅನಿರೀಕ್ಷಿತ ದೋಷ ಸಂಭವಿಸಿದೆ. ಅಪ್ಲಿಕೇಶನ್ ಕ್ರ್ಯಾಶ್ ಆಗುತ್ತಿದ್ದರೆ \"ಅಪ್ಲಿಕೇಶನ್ ಡೇಟಾವನ್ನು ತೆರವುಗೊಳಿಸಿ\" ಅಥವಾ ಇಮೇಲ್ ಕಳುಹಿಸಿ. ನಿಮ್ಮ ಅನಾನುಕೂಲತೆಗಾಗಿ ಕ್ಷಮಿಸಿ </string>
-    <string name="bug_report_use_account">GitHub ಖಾತೆಯನ್ನು ಬಳಸಿ ಕಳುಹಿಸಿ</string>
-    <string name="buy_now">ಈಗ ಖರೀದಿಸಿ</string>
-    <string name="cancel_current_timer">ರದ್ದುಮಾಡಿ</string>
-    <string name="card">ಕಾರ್ಡ್</string>
-    <string name="card_color_style">ಕಲರ್ಡ್ ಕಾರ್ಡ್</string>
-    <string name="card_square">ಸ್ಕ್ವೇರ್ ಕಾರ್ಡ್</string>
-    <string name="card_style">ಕಾರ್ಡ್</string>
-    <string name="carousal_effect_on_now_playing_screen">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯ ಮೇಲೆ ಏರಿಳಿಕೆ ಪರಿಣಾಮ</string>
-    <string name="cascading">ಕ್ಯಾಸ್ಕೇಡಿಂಗ್</string>
-    <string name="changelog">ಚೇಂಜ್ ಲಾಗ್</string>
-    <string name="changelog_summary">ಹೊಸದೇನಿದೆ ಎಂಬುದನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="choose_image">ಚಿತ್ರವನ್ನು ಆರಿಸಿ</string>
-    <string name="choose_restore_title">ಏನನ್ನು ಮರುಸ್ಥಾಪಿಸಬೇಕು ಎಂಬುದನ್ನು ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="circle">ವೃತ್ತ</string>
-    <string name="circular">ವೃತ್ತಾಕಾರದ</string>
-    <string name="classic">ಕ್ಲಾಸಿಕ್‌</string>
-    <string name="clear_action">ತೆರವು ಮಾಡಿ</string>
-    <string name="clear_blacklist">ಕಪ್ಪು ಪಟ್ಟಿಯನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="clear_history">ಹಿಸ್ಟರಿಯನ್ನು ತೆರವುಗೊಳಿಸು</string>
-    <string name="clear_playing_queue">ಕ್ಯೂ ತೆರವುಗೊಳಿಸಿ</string>
-    <string name="color">ಬಣ್ಣ</string>
-    <string name="colors">ಬಣ್ಣಗಳು</string>
-    <string name="compact">ಕಾಂಪ್ಯಾಕ್ಟ್</string>
-    <string name="composer">ರಚನಕಾರ</string>
-    <string name="copied_device_info_to_clipboard">ಕ್ಲಿಪ್‌ಬೋರ್ಡ್‌ಗೆ ಸಾಧನದ ಮಾಹಿತಿಯನ್ನು ನಕಲಿಸಲಾಗಿದೆ.</string>
-    <string name="could_not_create_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="could_not_download_album_cover">"ಹೊಂದಾಣಿಕೆಯ ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ."</string>
-    <string name="could_not_restore_purchase">ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="could_not_scan_files">%d ಫೈಲ್ಗಳನ್ನು ಹುಡುಕಲಾಗಿಲ್ಲ.</string>
-    <string name="create_action">ರಚಿಸಿ</string>
-    <string name="create_new_backup">ರಚಿಸಿ</string>
-    <string name="created_playlist_x">%1$s ಪ್ಲೇಲಿಸ್ಟ್ ರಚಿಸಲಾಗಿದೆ.</string>
-    <string name="credit_title">ಸದಸ್ಯರು ಮತ್ತು ಕೊಡುಗೆದಾರರು </string>
-    <string name="currently_listening_to_x_by_x">ಪ್ರಸ್ತುತವಾಗಿ %2$s ಇವರಿಂದ %1$s ನ್ನು ಕೇಳುತ್ತಿದ್ದೀರ.</string>
-    <string name="custom_artist_images">ಕಸ್ಟಮ್ ಕಲಾವಿದರ ಚಿತ್ರಗಳು</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">ಕ್ರ್ಯಾಶ್ ವರದಿಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="dark_theme_name">ಸ್ವಲ್ಪ ಡಾರ್ಕ್</string>
-    <string name="delete_playlist_title">ಪ್ಲೇಲಿಸ್ಟ್ ಅನ್ನು ಅಳಿಸಿ</string>
-    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> ಪ್ಲೇಲಿಸ್ಟ್ ಅಳಿಸುವುದೇ?]]></string>
-    <string name="delete_playlists_title">ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಅಳಿಸಿ</string>
-    <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="depth">ಆಳ</string>
-    <string name="description">ವಿವರಣೆ</string>
-    <string name="device_info">ಸಾಧನದ ಮಾಹಿತಿ</string>
-    <string name="dialog_message_set_ringtone">ಆಡಿಯೊ ಸಂಯೋಜನೆಗಳನ್ನು ಮಾರ್ಪಡಿಸಲು Retro Music ಗೆ ಅನುಮತಿ ನೀಡಿ</string>
-    <string name="dialog_title_set_ringtone">ರಿಂಗ್‌ಟೋನ್ ಹೊಂದಿಸಿ</string>
-    <string name="disc_hint">ಡಿಸ್ಕ್ ಸಂಖ್ಯೆ</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="done">ಆಗಿದೆ</string>
-    <string name="drive_mode">ಡ್ರೈವ್ ಮೋಡ್</string>
-    <string name="edit_fab">ಎಡಿಟ್ ಬಟನ್</string>
-    <string name="edit_normal_lyrics">ಸಾಹಿತ್ಯ ಎಡಿಟ್‌ ಮಾಡಿ</string>
-    <string name="edit_synced_lyrics">ಸಿಂಕ್ ಮಾಡಿದ ಸಾಹಿತ್ಯವನ್ನು ಎಡಿಟ್ ಮಾಡಿ</string>
-    <string name="empty">ಖಾಲಿ</string>
-    <string name="equalizer">ಈಕ್ವಲೈಸರ್</string>
-    <string name="error_create_backup">ಬ್ಯಾಕಪ್ ರಚಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="error_delete_backup">ಬ್ಯಾಕಪ್ ಅನ್ನು ಅಳಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="error_empty_name">ನಿಮ್ಮ ಹೆಸರು ಖಾಲಿ ಇರುವಂತಿಲ್ಲ!</string>
-    <string name="error_load_failed">ಲೋಡ್ ವಿಫಲವಾಗಿದೆ</string>
-    <string name="error_share_file">ಫೈಲ್ ಅನ್ನು ಶೇರ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ</string>
-    <string name="expanded">ವಿಸ್ತರಿಸಿದೆ</string>
-    <string name="faq">ಪದೇ ಪದೇ ಕೇಳಲಾಗುವ ಪ್ರಶ್ನೆಗಳು</string>
-    <string name="favorites">ಮೆಚ್ಚಿನವು</string>
-    <string name="file_already_exists">ಫೈಲ್ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ</string>
-    <string name="finish_last_song">ಕೊನೆಯ ಹಾಡನ್ನು ಮುಗಿಸಿ</string>
-    <string name="fit">ಫಿಟ್‌</string>
-    <string name="flat">ಫ್ಲಾಟ್</string>
-    <string name="folders">ಫೋಲ್ಡರ್‌ಗಳು</string>
-    <string name="follow_system">ಸಿಸ್ಟಮ್ ಸಂಯೋಜನೆಗಳನ್ನು ಅನುಸರಿಸಿ</string>
-    <string name="for_you">ನಿಮಗಾಗಿ</string>
-    <string name="free">ಉಚಿತ</string>
-    <string name="full">ಪೂರ್ಣ</string>
-    <string name="full_card">ಫುಲ್ ಕಾರ್ಡ್</string>
-    <string name="general_settings_summary">ಅಪ್ಲಿಕೇಶನ್‌ನ ಥೀಮ್ ಮತ್ತು ಬಣ್ಣಗಳನ್ನು ಬದಲಾಯಿಸಿ</string>
-    <string name="general_settings_title">ನೋಟ ಮತ್ತು ಭಾವನೆ</string>
-    <string name="genre">ಪ್ರಕಾರ</string>
-    <string name="genres">ಪ್ರಕಾರಗಳು</string>
-    <string name="git_hub_summary">GitHub ನಲ್ಲಿ ಯೋಜನೆಯನ್ನು ಫೋರ್ಕ್ ಮಾಡಿ</string>
-    <string name="gradient">ಗ್ರೇಡಿಯಂಟ್</string>
-    <string name="grant_access">ಪ್ರವೇಶವನ್ನು ನೀಡಿ</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="grid_style_label">ಗ್ರಿಡ್ ಶೈಲಿ</string>
-    <string name="help_summary">ಹೆಚ್ಚಿನ ಸಹಾಯ ಬೇಕೇ?</string>
-    <string name="hinge">ಹಿಂಜ್</string>
-    <string name="history">ಹಿಸ್ಟರಿ</string>
-    <string name="history_cleared">ಹಿಸ್ಟರಿಯನ್ನು ತೆರವುಗೊಳಿಸಲಾಗಿದೆ</string>
-    <string name="history_undo_button">ರದ್ದುಮಾಡು</string>
-    <string name="home">ಮುಖಪುಟ</string>
-    <string name="horizontal_flip">ಸಮತಲ ಫ್ಲಿಪ್</string>
-    <string name="image">ಚಿತ್ರ</string>
-    <string name="image_gradient">ಗ್ರೇಡಿಯಂಟ್ ಚಿತ್ರ</string>
-    <string name="image_settings_summary">ಕಲಾವಿದರ ಚಿತ್ರ ಡೌನ್‌ಲೋಡ್ ಸಂಯೋಜನೆಗಳನ್ನು ಬದಲಾಯಿಸಿ</string>
-    <string name="import_label">ಆಮದು ಮಾಡಿ</string>
-    <string name="import_playlist">ಪ್ಲೇಲಿಸ್ಟ್ ಆಮದು ಮಾಡಿಕೊಳ್ಳಿ</string>
-    <string name="import_playlist_message">ಇದು ಹಾಡುಗಳೊಂದಿಗೆ ಆಂಡ್ರಾಯ್ಡ್ ಮೀಡಿಯಾ ಸ್ಟೋರ್‌ನಲ್ಲಿ ಪಟ್ಟಿ ಮಾಡಲಾದ ಎಲ್ಲಾ ಪ್ಲೇಲಿಸ್ಟ್ಗಳನ್ನು ಆಮದು ಮಾಡಿಕೊಳ್ಳುತ್ತದೆ, 
-ಪ್ಲೇಲಿಸ್ಟ್ಗಳು ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದ್ದರೆ, ಹಾಡುಗಳು ವಿಲೀನಗೊಳ್ಳುತ್ತವೆ.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s ಪ್ಲೇಲಿಸ್ಟ್ ಗೆ %1$d ಹಾಡುಗಳನ್ನು ಸೇರಿಸಲಾಗಿದೆ.</string>
-    <string name="instagram_page_summary">Instagram ನಲ್ಲಿ ಪ್ರದರ್ಶಿಸಲು ನಿಮ್ಮ Retro Music ಸೆಟಪ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="keyboard">ಕೀಬೋರ್ಡ್‌</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_last_modified">ಕೊನೆಯದಾಗಿ ಮಾರ್ಪಡಿಸಲಾದುದು</string>
-    <string name="label_more_from">%s ನಿಂದ ಇನ್ನಷ್ಟು</string>
-    <string name="label_sampling_rate">ಸ್ಯಾಂಪ್ಲಿಂಗ್ ರೇಟ್</string>
-    <string name="label_track_length">ಅವಧಿ</string>
-    <string name="labeled">ಲೇಬಲ್ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="last_added">ಇಗ ಸೇರಿಸಿರುವುದು</string>
-    <string name="last_song">ಕೊನೆಯ ಹಾಡು</string>
-    <string name="lets_go">ಹೋಗೋಣ</string>
-    <string name="library_categories">ಸಂಗ್ರಹ ವಿಭಾಗಗಳು</string>
-    <string name="licenses">ಪರವಾನಗಿಗಳು</string>
-    <string name="light_theme_name">ಸ್ಪಷ್ಟವಾಗಿ ಬಿಳಿ</string>
-    <string name="listeners_label">ಕೇಳುಗರು</string>
-    <string name="listing_files">ಕಡತಗಳ ಪಟ್ಟಿಮಾಡಲಾಗುತ್ತಿದೆ</string>
-    <string name="loading_products">ಉತ್ಪನ್ನಗಳನ್ನು ಲೋಡ್ ಮಾಡಲಾಗುತ್ತಿದೆ…</string>
-    <string name="login">ಲಾಗಿನ್</string>
-    <string name="lyrics">ಸಾಹಿತ್ಯ</string>
-    <string name="made_with_love">ಭಾರತದಲ್ಲಿ ❤️ ನೊಂದಿಗೆ ತಯಾರಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="material">ಮೆಟೀರಿಯಲ್</string>
-    <string name="md_error_label">ದೋಷ</string>
-    <string name="md_storage_perm_error">ಅನುಮತಿ ದೋಷ</string>
-    <string name="message_backup_create_success">ಬ್ಯಾಕಪ್ ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ರಚಿಸಲಾಗಿದೆ.</string>
-    <string name="message_limit_tabs">5 ಐಟಂಗಳಿಗಿಂತ ಹೆಚ್ಚಿಲ್ಲ</string>
-    <string name="message_pro_feature">%s ಪ್ರೊ ವೈಶಿಷ್ಟ್ಯವಾಗಿದೆ.</string>
-    <string name="message_restore_success">ಮರುಸ್ಥಾಪನೆ ಯಶಸ್ವಿಯಾಗಿ ಪೂರ್ಣಗೊಂಡಿದೆ.</string>
-    <string name="message_updated">ನವೀಕರಿಸಲಾಗಿದೆ</string>
-    <string name="message_welcome"><![CDATA[ನಮಸ್ಕಾರ! <br>%s ಗೆ ಸುಸ್ವಾಗತ]]></string>
-    <string name="my_name">ಹೆಸರು</string>
-    <string name="my_top_tracks">ಹೆಚ್ಚು ಕೇಳಿರುವುದು</string>
-    <string name="never">ಎಂದಿಗೂ ಬೇಡ</string>
-    <string name="new_music_mix">ಹೊಸ ಹಾಡುಗಳ ಮಿಶ್ರಣ</string>
-    <string name="new_playlist_title">ಹೊಸ ಪ್ಲೇಲೀಸ್ಟ್‌</string>
-    <string name="new_start_directory">%s ಹೊಸ ಪ್ರಾರಂಭದ ಡೈರೆಕ್ಟರಿಯಾಗಿದೆ.</string>
-    <string name="next_song">ಮುಂದಿನ ಹಾಡು</string>
-    <string name="no_albums">ನೀವು ಯಾವುದೇ ಆಲ್ಬಮ್‌ಗಳನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_artists">ನೀವು ಯಾವುದೇ ಕಲಾವಿದರನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_audio_ID">"ಮೊದಲು ಹಾಡನ್ನು ಪ್ಲೇ ಮಾಡಿ, ನಂತರ ಮತ್ತೆ ಪ್ರಯತ್ನಿಸಿ."</string>
-    <string name="no_backups_found">ಯಾವುದೇ ಬ್ಯಾಕ್‌ಅಪ್‌ಗಳು ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_equalizer">ಯಾವುದೇ ಈಕ್ವಲೈಜರ್ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_genres">ನೀವು ಯಾವುದೇ ಪ್ರಕಾರಗಳನ್ನು ಹೊಂದಿಲ್ಲ</string>
-    <string name="no_lyrics_found">ಯಾವುದೇ ಸಾಹಿತ್ಯ ಕಂಡುಬಂದಿಲ್ಲ</string>
-    <string name="no_playing_queue">ಯಾವುದೇ ಹಾಡು ಪ್ಲೇ ಆಗುತ್ತಿಲ್ಲ</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="normal_lyrics">ಸಾಮಾನ್ಯ ಸಾಹಿತ್ಯ</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ಯು ಮೀಡಿಯಾ ಸ್ಟೋರ್‌ನಲ್ಲಿ ಕಂಡುಬಂದಿಲ್ಲ.]]></string>
-    <string name="not_recently_played">ಇತ್ತೀಚೆಗೆ ಪ್ಲೇ ಮಾಡಲಾಗಿಲ್ಲ</string>
-    <string name="nothing_to_scan">ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಏನೂ ಇಲ್ಲ.</string>
-    <string name="nothing_to_see">ನೋಡಲು ಏನೂ ಇಲ್ಲ</string>
-    <string name="notification">ಅಧಿಸೂಚನೆ</string>
-    <string name="notification_settings_summary">ಅಧಿಸೂಚನೆ ಶೈಲಿಯನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="now_playing">ಇವಾಗ ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿರುವುದು</string>
-    <string name="now_playing_queue">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪಟ್ಟಿ</string>
-    <string name="now_playing_summary">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="now_playing_themes">9 ಕ್ಕೂ ಹೆಚ್ಚು ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್ಗಳು</string>
-    <string name="only_on_wifi">ವೈಫೈನಲ್ಲಿ ಮಾತ್ರ</string>
-    <string name="other_settings_summary">ಸುಧಾರಿತ ಪರೀಕ್ಷಾ ವೈಶಿಷ್ಟ್ಯಗಳು</string>
-    <string name="others">ಇತರೆ</string>
-    <string name="over_cover">ಕವರ್ ಮೇಲೆ</string>
-    <string name="password">ಗುಪ್ತಪದ</string>
-    <string name="past_three_months">ಕಳೆದ 3 ತಿಂಗಳುಗಳು</string>
-    <string name="paste_lyrics_here">ಸಾಹಿತ್ಯವನ್ನು ಇಲ್ಲಿ ಪೇಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="paste_timeframe_lyrics_here">ಸಮಯದ ಚೌಕಟ್ಟಿನ ಸಾಹಿತ್ಯವನ್ನು ಇಲ್ಲಿ ಪೇಸ್ಟ್ ಮಾಡಿ</string>
-    <string name="peek">ಇಣುಕಿ ನೋಡಿ</string>
-    <string name="permission_bluetooth_denied">ಸಮೀಪದ ಸಾಧನಗಳ ಅನುಮತಿಯನ್ನು ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="permission_external_storage_denied">ಬಾಹ್ಯ ಸಂಗ್ರಹಣೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="permission_summary">ಸಂಗೀತವನ್ನು ಪ್ಲೇ ಮಾಡಲು ನಿಮ್ಮ ಸಾಧನದ ಸಂಗ್ರಹಣೆಯನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
-    <string name="permission_title">ಸಂಗ್ರಹಣೆಯ ಪ್ರವೇಶ</string>
-    <string name="permissions_denied">ಅನುಮತಿ ನಿರಾಕರಿಸಲಾಗಿದೆ.</string>
-    <string name="personalize">ವೈಯಕ್ತಿಕಗೊಳಿಸಿ</string>
-    <string name="personalize_settings_summary">ನಿಮ್ಮ ನೌ ಪ್ಲೇಯಿಂಗ್ ಮತ್ತು UI ನಿಯಂತ್ರಣಗಳನ್ನು ಕಸ್ಟಮೈಸ್ ಮಾಡಿ</string>
-    <string name="pick_from_local_storage">ಲೋಕಲ್ ಸ್ಟೋರೇಜ್ ನಿಂದ ಆರಿಸಿ</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Retro Music ವಿನ್ಯಾಸ ಸ್ಫೂರ್ತಿಗಾಗಿ Pinterest ಪುಟವನ್ನು ಅನುಸರಿಸಿ</string>
-    <string name="plain">ಸಾದಾ</string>
-    <string name="playList_already_exits">ಪ್ಲೇಲೀಸ್ಟ್‌ ಈಗಾಗಲೇ ಅಸ್ತಿತ್ವದಲ್ಲಿದೆ</string>
-    <string name="playback_pitch">ಪಿಚ್</string>
-    <string name="playback_settings">ಪ್ಲೇಬ್ಯಾಕ್ ಸಂಯೋಜನೆಗಳು</string>
-    <string name="playback_speed">ಪ್ಲೇಬ್ಯಾಕ್‌ ವೇಗ</string>
-    <string name="playing_notification_description">ಪ್ಲೇಯಿಂಗ್ ಅಧಿಸೂಚನೆಯು ಪ್ಲೇ / ವಿರಾಮ ಇತ್ಯಾದಿಗಳಿಗೆ ಕ್ರಿಯೆಗಳನ್ನು ಒದಗಿಸುತ್ತದೆ.</string>
-    <string name="playing_notification_name">ಪ್ಲೇಯಿಂಗ್ ಅಧಿಸೂಚನೆ</string>
-    <string name="playlist_created_sucessfully">%s ಯಶಸ್ವಿಯಾಗಿ ರಚಿಸಲಾಗಿದೆ</string>
-    <string name="playlist_is_empty">ಪ್ಲೇಲಿಸ್ಟ್ ಖಾಲಿ ಇದೆ</string>
-    <string name="playlist_name_empty">ಪ್ಲೇಲಿಸ್ಟ್ ಹೆಸರು</string>
-    <string name="playlists">ಪ್ಲೇಲೀಸ್ಟ್‌ಗಳು</string>
-    <string name="pref_blur_amount_summary">ಮಸುಕು ಥೀಮ್‌ಗಳಿಗೆ ಮಸುಕು ಪ್ರಮಾಣವನ್ನು ಅನ್ವಯಿಸಲಾಗಿದೆ, ಕಡಿಮೆ ವೇಗವಾಗಿರುತ್ತದೆ</string>
-    <string name="pref_blur_amount_title">ಮಸುಕಿನ ಪ್ರಮಾಣ</string>
-    <string name="pref_filter_song_summary">ಹಾಡುಗಳನ್ನು ಉದ್ದದ ಮೂಲಕ ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
-    <string name="pref_filter_song_title">ಅವಧಿಯ ಪ್ರಕಾರ ಹಾಡನ್ನು ಫಿಲ್ಟರ್ ಮಾಡಿ</string>
-    <string name="pref_header_advanced">ಮುಂದುವರಿದ</string>
-    <string name="pref_header_album">ಆಲ್ಬಮ್ ಶೈಲಿ</string>
-    <string name="pref_header_audio">ಆಡಿಯೋ</string>
-    <string name="pref_header_blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="pref_header_controls">ನಿಯಂತ್ರಣಗಳು</string>
-    <string name="pref_header_general">ಥೀಮ್</string>
-    <string name="pref_header_images">ಚಿತ್ರಗಳು</string>
-    <string name="pref_header_library">ಸಂಗ್ರಹಣೆ</string>
-    <string name="pref_header_lockscreen">ಲಾಕ್ ಪರದೆ</string>
-    <string name="pref_header_playlists">ಪ್ಲೇಲೀಸ್ಟ್‌ಗಳು</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">ವಾಲ್ಯೂಮ್ ಸೊನ್ನೆಗೆ ಕಡಿಮೆಯಾದಾಗ ಹಾಡನ್ನು ವಿರಾಮಗೊಳಿಸುತ್ತದೆ ಮತ್ತು ವಾಲ್ಯೂಮ್ ಮಟ್ಟ ಹೆಚ್ಚಾದಾಗ ಮತ್ತೆ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸುತ್ತದೆ. ಅಪ್ಲಿಕೇಶನ್ ಹೊರಗೆ ಸಹ ಕಾರ್ಯನಿರ್ವಹಿಸುತ್ತದೆ</string>
-    <string name="pref_keep_pause_on_zero_volume_title">ಶೂನ್ಯದಲ್ಲಿ ವಿರಾಮಗೊಳಿಸುತ್ತದೆ</string>
-    <string name="pref_keep_screen_on_summary">ಈ ವೈಶಿಷ್ಟ್ಯವನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವುದರಿಂದ ಬ್ಯಾಟರಿ ಬಾಳಿಕೆ ಪರಿಣಾಮ ಬೀರಬಹುದು ಎಂಬುದನ್ನು ನೆನಪಿನಲ್ಲಿಡಿ</string>
-    <string name="pref_keep_screen_on_title">ಸ್ಕ್ರೀನ್ ಆನ್‌ನಲ್ಲಿರಿಸಿ</string>
-    <string name="pref_language_name">ಭಾಷೆಯನ್ನು ಆಯ್ಕೆ ಮಾಡಿ</string>
-    <string name="pref_snow_fall_title">ಹಿಮಪಾತದ ಪರಿಣಾಮ</string>
-    <string name="pref_summary_album_art_on_lockscreen">ಲಾಕ್‌ಸ್ಕ್ರೀನ್ ವಾಲ್‌ಪೇಪರ್ ಆಗಿ ಪ್ರಸ್ತುತ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಹಾಡಿನ ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಬಳಸಿ</string>
-    <string name="pref_summary_album_artists_only">ಕಲಾವಿದರ ವರ್ಗದಲ್ಲಿ ಆಲ್ಬಮ್ ಕಲಾವಿದರನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_audio_ducking">ಸಿಸ್ಟಮ್ ಧ್ವನಿಯನ್ನು ಪ್ಲೇ ಮಾಡಿದಾಗ ಅಥವಾ ಅಧಿಸೂಚನೆಯನ್ನು ಸ್ವೀಕರಿಸಿದಾಗ ವಾಲ್ಯೂಮ್ ಅನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
-    <string name="pref_summary_audio_fade">ಹಾಡನ್ನು ವಿರಾಮಗೊಳಿಸಿದಾಗ ಅಥವಾ ಪ್ಲೇ ಮಾಡಿದಾಗ ಆಡಿಯೊವನ್ನು ಫೇಡ್ ಮಾಡಿ</string>
-    <string name="pref_summary_blacklist">ಕಪ್ಪುಪಟ್ಟಿ ಮಾಡಲಾದ ಫೋಲ್ಡರ್‌ಗಳ ವಿಷಯವನ್ನು ನಿಮ್ಮ ಲೈಬ್ರರಿಯಿಂದ ಮರೆಮಾಡಲಾಗಿದೆ.</string>
-    <string name="pref_summary_bluetooth_playback">ಬ್ಲೂಟೂತ್ ಸಾಧನಕ್ಕೆ ಸಂಪರ್ಕಗೊಂಡ ತಕ್ಷಣ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ</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_notification">"ಆಲ್ಬಮ್ ಕವರ್‌ನ ರೋಮಾಂಚಕ ಬಣ್ಣದಲ್ಲಿ ಅಧಿಸೂಚನೆಯನ್ನು ಬಣ್ಣಿಸುತ್ತದೆ"</string>
-    <string name="pref_summary_cross_fade">ಹಾಡುಗಳ ನಡುವೆ ಕ್ರಾಸ್‌ಫೇಡ್ ಮಾಡುವ ಅವಧಿ</string>
-    <string name="pref_summary_desaturated_color">ಡಾರ್ಕ್ ಮೋಡ್‌ನಲ್ಲಿನ ಮೆಟೀರಿಯಲ್ ಡಿಸೈನ್ ಮಾರ್ಗಸೂಚಿಗಳ ಪ್ರಕಾರ ಡಿಸ್ಯಾಚುರೇಟೆಡ್ ಆಗಿರಬೇಕು</string>
-    <string name="pref_summary_expand_now_playing_panel">ಅಧಿಸೂಚನೆಯ ಮೇಲೆ ಕ್ಲಿಕ್ ಮಾಡುವುದರಿಂದ ಹೋಮ್ ಸ್ಕ್ರೀನ್ ಬದಲಿಗೆ ಪ್ಲೇಯಿಂಗ್ ಸ್ಕ್ರೀನ್ ಅನ್ನು ತೋರಿಸುತ್ತದೆ</string>
-    <string name="pref_summary_extra_controls">ಮಿನಿ ಪ್ಲೇಯರ್‌ಗೆ ಹೆಚ್ಚುವರಿ ನಿಯಂತ್ರಣಗಳನ್ನು ಸೇರಿಸಿ</string>
-    <string name="pref_summary_extra_song_info">ಫೈಲ್ ಫಾರ್ಮ್ಯಾಟ್, ಬಿಟ್ರೇಟ್ ಮತ್ತು ಆವರ್ತನದಂತಹ ಹೆಚ್ಚುವರಿ ಸಾಂಗ್ ಮಾಹಿತಿಯನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_gapless_playback">"ಕೆಲವು ಸಾಧನಗಳಲ್ಲಿ ಪ್ಲೇಬ್ಯಾಕ್ ಸಮಸ್ಯೆಗಳನ್ನು ಉಂಟುಮಾಡಬಹುದು."</string>
-    <string name="pref_summary_home_banner">ಹೋಮ್ ಬ್ಯಾನರ್ ಅನ್ನು ತೋರಿಸಿ ಅಥವಾ ಮರೆಮಾಡಿ</string>
-    <string name="pref_summary_ignore_media_store_artwork">ಆಲ್ಬಮ್ ಕವರ್ ಗುಣಮಟ್ಟವನ್ನು ಹೆಚ್ಚಿಸಬಹುದು, ಆದರೆ ಚಿತ್ರಗಳ ಲೋಡಿಂಗ್ ಸಮಯವನ್ನು ಹೆಚ್ಚು ಮಾಡುತ್ತದೆ. ಕಡಿಮೆ ರೆಸಲ್ಯೂಶನ್ ಕಲಾಕೃತಿಯಲ್ಲಿ ನಿಮಗೆ ಸಮಸ್ಯೆಗಳಿದ್ದರೆ ಮಾತ್ರ ಇದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸಿ</string>
-    <string name="pref_summary_library_categories">ಸಂಗ್ರಹಣೆಯ ವರ್ಗಗಳ ಗೋಚರತೆ ಮತ್ತು ಕ್ರಮವನ್ನು ಕಾನ್ಫಿಗರ್ ಮಾಡಿ.</string>
-    <string name="pref_summary_lock_screen">Retro Music ನ ಕಸ್ಟಮ್ ಲಾಕ್ ಸ್ಕ್ರೀನ್ ನಿಯಂತ್ರಣಗಳನ್ನು ಬಳಸಿ</string>
-    <string name="pref_summary_manage_audio_focus">ಬೇರೆ ಯಾವುದನ್ನಾದರೂ ಪ್ಲೇ ಮಾಡುವುದನ್ನು ಲೆಕ್ಕಿಸದೆ ಯಾವಾಗಲೂ ಆಡಿಯೊವನ್ನು ಹಿನ್ನೆಲೆಯಲ್ಲಿ ಪ್ಲೇ ಮಾಡಿ</string>
-    <string name="pref_summary_open_source_licences">ಮುಕ್ತ ಸಂಪನ್ಮೂಲ ಸಾಫ್ಟ್‌ವೇರ್‌ಗಾಗಿ ಪರವಾನಗಿ ವಿವರಗಳು</string>
-    <string name="pref_summary_pause_history">ಸಕ್ರಿಯಗೊಳಿಸಿದಾಗ, ಹೊಸದಾಗಿ ಪ್ಲೇ ಮಾಡಿದ ಹಾಡುಗಳು ಹಿಸ್ಟರಿಯಲ್ಲಿ ಕಾಣಿಸುವುದಿಲ್ಲ</string>
-    <string name="pref_summary_remember_tab">ಪ್ರಾರಂಭದಲ್ಲಿ ಕೊನೆಯದಾಗಿ ಬಳಸಿದ ಟ್ಯಾಬ್‌ಗೆ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-    <string name="pref_summary_show_lyrics">ಆಲ್ಬಮ್ ಕವರ್ ಮೇಲೆ ಸಿಂಕ್ ಮಾಡಿದ ಸಾಹಿತ್ಯವನ್ನು ಪ್ರದರ್ಶಿಸಿ</string>
-    <string name="pref_summary_suggestions">ಹೋಮ್ ಸ್ಕ್ರೀನ್‌ನಲ್ಲಿ ಹೊಸ ಸಂಗೀತದ ಮಿಶ್ರಣವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಲ್ಲಿ ಎಲ್ಲಿಯಾದರೂ ಸ್ವೈಪ್ ಮಾಡುವ ಮೂಲಕ ಹಾಡನ್ನು ಬದಲಾಯಿಸುವುದನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುತ್ತದೆ</string>
-    <string name="pref_summary_swipe_to_dismiss">ಮಿನಿ ಪ್ಲೇಯರ್ ಅನ್ನು ವಜಾಗೊಳಿಸಲು ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="pref_summary_toggle_full_screen">ಇಮ್ಮೆರ್ಸಿವ್‌ ಮೋಡ್</string>
-    <string name="pref_summary_toggle_headset">ಹೆಡ್‌ಫೋನ್‌ಗಳನ್ನು ಸಂಪರ್ಕಿಸಿದ ತಕ್ಷಣ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ</string>
-    <string name="pref_summary_toggle_shuffle">ಹಾಡುಗಳ ಹೊಸ ಪಟ್ಟಿಯನ್ನು ಪ್ಲೇ ಮಾಡುವಾಗ ಷಫಲ್ ಮೋಡ್ ಆಫ್ ಆಗುತ್ತದೆ</string>
-    <string name="pref_summary_toggle_volume">ಸಾಕಷ್ಟು ಸ್ಥಳಾವಕಾಶ ಲಭ್ಯವಿದ್ದರೆ, ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯಲ್ಲಿ ವಾಲ್ಯೂಮ್ ನಿಯಂತ್ರಣವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_summary_wallpaper_accent">ಹಿನ್ನೆಲೆಚಿತ್ರದಿಂದ ಪ್ರಧಾನ ಬಣ್ಣವನ್ನು ಆರಿಸಿ</string>
-    <string name="pref_summary_whitelist">/ಸಂಗೀತ ಫೋಲ್ಡರ್‌ನಿಂದ ಸಂಗೀತವನ್ನು ಮಾತ್ರ ತೋರಿಸಿ</string>
-    <string name="pref_title_album_art_on_lockscreen">ಆಲ್ಬಮ್ ಕವರ್ ತೋರಿಸಿ</string>
-    <string name="pref_title_album_artists_only">ಆಲ್ಬಮ್ ಕಲಾವಿದರಿಂದ ನ್ಯಾವಿಗೇಟ್ ಮಾಡಿ</string>
-    <string name="pref_title_album_cover_style">ಆಲ್ಬಮ್ ಕವರ್ ಥೀಮ್</string>
-    <string name="pref_title_album_cover_transform">ಆಲ್ಬಮ್ ಕವರ್ ಸ್ಕಿಪ್</string>
-    <string name="pref_title_app_shortcuts">ಬಣ್ಣದ ಅಪ್ಲಿಕೇಶನ್ ಶಾರ್ಟ್‌ಕಟ್‌ಗಳು</string>
-    <string name="pref_title_appbar_mode">ಹೆಡ್ಡರ್ ಶೈಲಿ</string>
-    <string name="pref_title_audio_ducking">ಫೋಕಸ್ ನಷ್ಟದ ಆಧಾರದ ಮೇಲೆ ಪರಿಮಾಣವನ್ನು ಕಡಿಮೆ ಮಾಡಿ</string>
-    <string name="pref_title_audio_fade">ಫೇಡ್ ಆಡಿಯೋ</string>
-    <string name="pref_title_auto_download_artist_images">ಕಲಾವಿದರ ಚಿತ್ರಗಳನ್ನು ಸ್ವಯಂ-ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ</string>
-    <string name="pref_title_blacklist">ಕಪ್ಪುಪಟ್ಟಿ</string>
-    <string name="pref_title_bluetooth_playback">ಬ್ಲೂಟೂತ್ ಪ್ಲೇಬ್ಯಾಕ್</string>
-    <string name="pref_title_blurred_album_art">ಆಲ್ಬಮ್ ಕವರ್ ಅನ್ನು ಮಸುಕುಗೊಳಿಸಿ</string>
-    <string name="pref_title_circle_button">ವೃತ್ತಾಕಾರದ ಪ್ಲೇ ಬಟನ್</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_cross_fade">ಕ್ರಾಸ್ಫೇಡ್ (ಬೀಟಾ)</string>
-    <string name="pref_title_custom_font">Manrope ಫಾಂಟ್ ಬಳಸಿ</string>
-    <string name="pref_title_desaturated_color">ಅಪರ್ಯಾಪ್ತ ಬಣ್ಣ</string>
-    <string name="pref_title_expand_now_playing_panel">ಈಗ ಪ್ಲೇ ಆಗುತ್ತಿರುವ ಪರದೆಯನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_extra_controls">ಹೆಚ್ಚುವರಿ ನಿಯಂತ್ರಣಗಳು</string>
-    <string name="pref_title_extra_song_info">ಹಾಡಿನ ಮಾಹಿತಿ</string>
-    <string name="pref_title_gapless_playback">ಅಂತರವಿಲ್ಲದ ಪ್ಲೇಬ್ಯಾಕ್</string>
-    <string name="pref_title_general_theme">ಆ್ಯಪ್‌ ಥೀಮ್</string>
-    <string name="pref_title_home_album_grid_style">ಆಲ್ಬಮ್ ಗ್ರಿಡ್</string>
-    <string name="pref_title_home_artist_grid_style">ಕಲಾವಿದ ಗ್ರಿಡ್</string>
-    <string name="pref_title_home_banner">ಬ್ಯಾನರ್</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_lyrics_screen_on">ಸಾಹಿತ್ಯವನ್ನು ತೋರಿಸುವಾಗ ಪರದೆಯನ್ನು ಆನ್ ಆಗಿರಿಸಿ</string>
-    <string name="pref_title_lyrics_type">ಸಾಹಿತ್ಯ ಪ್ರಕಾರ</string>
-    <string name="pref_title_manage_audio_focus">ಯಾವಾಗಲೂ ಪ್ಲೇಯಾಗಲಿ</string>
-    <string name="pref_title_now_playing_screen_appearance">ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್</string>
-    <string name="pref_title_open_source_licences">ಮುಕ್ತ ಮೂಲ ಪರವಾನಗಿಗಳು</string>
-    <string name="pref_title_pause_history">ವಿರಾಮದ ಹಿಸ್ಟರಿ</string>
-    <string name="pref_title_remember_tab">ಕೊನೆಯ ಟ್ಯಾಬ್ ಅನ್ನು ನೆನಪಿಡಿ</string>
-    <string name="pref_title_show_lyrics">ಸಾಹಿತ್ಯವನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_suggestions">ಸಲಹೆಗಳನ್ನು ತೋರಿಸಿ</string>
-    <string name="pref_title_swipe_anywhere_now_playing">ಹಾಡನ್ನು ಬದಲಾಯಿಸಲು ಎಲ್ಲಿಯಾದರೂ ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="pref_title_swipe_to_dismiss">ಕೆಳಗೆ ಸ್ವೈಪ್ ಮಾಡುವ ಮೂಲಕ ವಜಾಗೊಳಿಸಿ</string>
-    <string name="pref_title_tab_text_mode">ಟ್ಯಾಬ್ ಶೀರ್ಷಿಕೆಗಳ ಮೋಡ್</string>
-    <string name="pref_title_toggle_carousel_effect">ಏರಿಳಿಕೆ ಪರಿಣಾಮ</string>
-    <string name="pref_title_toggle_full_screen">ಪೂರ್ಣ-ಪರದೆಯ ಅಪ್ಲಿಕೇಶನ್</string>
-    <string name="pref_title_toggle_toggle_headset">ಸ್ವಚಾಲಿತ</string>
-    <string name="pref_title_toggle_toggle_shuffle">ಷಫಲ್ ಮೋಡ್</string>
-    <string name="pref_title_toggle_volume">ಧ್ವನಿ ನಿಯಂತ್ರಣ</string>
-    <string name="pref_title_wallpaper_accent">ವಾಲ್ಪೇಪರ್ನ ಪ್ರಧಾನ ಬಣ್ಣ</string>
-    <string name="pref_title_whitelist">ಶ್ವೇತಪಟ್ಟಿ ಸಂಗೀತ</string>
-    <string name="pro">ಪ್ರೊ</string>
-    <string name="pro_summary">ಕಪ್ಪು ಥೀಮ್, ನೌ ಪ್ಲೇಯಿಂಗ್ ಥೀಮ್‌ಗಳು, ಏರಿಳಿಕೆ ಪರಿಣಾಮ ಮತ್ತು ಇನ್ನಷ್ಟು..</string>
-    <string name="profile">ಪ್ರೊಫೈಲ್</string>
-    <string name="purchase">ಖರೀದಿ</string>
-    <string name="queue">ಪ್ಲೇ ಮಾಡಲಾಗುತ್ತಿರುವ ಪಟ್ಟಿ</string>
-    <string name="rate_app">ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ರೇಟ್ ಮಾಡಿ</string>
-    <string name="rate_on_google_play_summary">ಈ ಅಪ್ಲಿಕೇಶನ್ ಇಷ್ಟಪಡುತ್ತೀರಾ? ನಾವು ಅದನ್ನು ಇನ್ನಷ್ಟು ಉತ್ತಮಗೊಳಿಸುವುದು ಹೇಗೆ ಎಂಬುದನ್ನು Google Play Store ನಲ್ಲಿ ನಮಗೆ ತಿಳಿಸಿ</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_image">ಚಿತ್ರವನ್ನು ತೆಗೆದುಹಾಕಿ</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="replace_cover">ಕವರ್ ಬದಲಾಯಿಸಿ</string>
-    <string name="report_an_issue">ಸಮಸ್ಯೆಯನ್ನು ವರದಿಮಾಡಿ</string>
-    <string name="report_bug">ದೋಷವನ್ನು ವರದಿ ಮಾಡಿ</string>
-    <string name="reset_action">ಮರುಹೊಂದಿಸಿ</string>
-    <string name="reset_artist_image">ಕಲಾವಿದರ ಚಿತ್ರವನ್ನು ಮರುಹೊಂದಿಸಿ</string>
-    <string name="restore">ಪುನಸ್ಥಾಪಿಸಿ</string>
-    <string name="restore_message">ನೀವು ಬ್ಯಾಕಪ್ ಅನ್ನು ಮರುಸ್ಥಾಪಿಸಲು ಬಯಸುವಿರಾ?</string>
-    <string name="restored_previous_purchase_please_restart">ಹಿಂದಿನ ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ. ಎಲ್ಲಾ ವೈಶಿಷ್ಟ್ಯಗಳನ್ನು ಬಳಸಲು ದಯವಿಟ್ಟು ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಮರುಪ್ರಾರಂಭಿಸಿ.</string>
-    <string name="restored_previous_purchases">ಹಿಂದಿನ ಖರೀದಿಗಳನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗಿದೆ.</string>
-    <string name="restoring_purchase">ಖರೀದಿಯನ್ನು ಮರುಸ್ಥಾಪಿಸಲಾಗುತ್ತಿದೆ…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">ಸಂಗೀತವನ್ನು ರಿಂಗ್‌ಟೋನ್‌ನಂತೆ ಹೊಂದಿಸಲು ನಿಮ್ಮ ಸಾಧನದ ಸಂಯೋಜನೆಗಳನ್ನು ಪ್ರವೇಶಿಸಲು ಅಪ್ಲಿಕೇಶನ್‌ಗೆ ಅನುಮತಿಯ ಅಗತ್ಯವಿದೆ</string>
-    <string name="ringtone_title">ರಿಂಗ್‌ಟೋನ್‌ (ಐಚ್ಛಿಕ)</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_write_failed">ಕಡತ ಬರೆಯಲು ವಿಫಲವಾಗಿದೆ: %s</string>
-    <string name="save">ಉಳಿಸಿ</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">ಕಡತವಾಗಿ ಉಳಿಸಿ</string>
-    <string name="save_playlists_title">ಕಡತಗಳನ್ನಾಗಿ ಉಳಿಸಿ</string>
-    <string name="saved_playlist_to">%s ಪ್ಲೇಲಿಸ್ಟ್ ಗೆ ಉಳಿಸಲಾಗಿದೆ.</string>
-    <string name="saving_changes">ಬದಲಾವಣೆ ಉಳಿಸಲಾಗುತ್ತಿದೆ</string>
-    <string name="scan_media">ಮೀಡಿಯಾ ಸ್ಕ್ಯಾನ್ ಮಾಡಿ</string>
-    <string name="scanned_files">%2$d ಗಳಲ್ಲಿ %1$d ಗಳನ್ನು ಹುಡುಕಲಾಗಿದೆ.</string>
-    <string name="scrobbles_label">ಸ್ಕ್ರೋಬಲ್ಸ್</string>
-    <string name="select_all">ಎಲ್ಲವನ್ನೂ ಆಯ್ಕೆಮಾಡಿ</string>
-    <string name="selected">ಆಯ್ಕೆ ಮಾಡಲಾಗಿದೆ</string>
-    <string name="set">ಹೊಂದಿಸಿ</string>
-    <string name="set_artist_image">ಕಲಾವಿದರ ಚಿತ್ರವನ್ನು ಹೊಂದಿಸಿ</string>
-    <string name="share_app">ಅಪ್ಲಿಕೇಶನ್ ಹಂಚಿರಿ</string>
-    <string name="share_summary">ನಿಮ್ಮ ಸ್ನೇಹಿತರು ಮತ್ತು ಕುಟುಂಬದೊಂದಿಗೆ ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="share_to_stories">Stories ಗೆ ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="show_album_artists">ಆಲ್ಬಮ್ ಕಲಾವಿದರನ್ನು ತೋರಿಸಿ</string>
-    <string name="shuffle">ಷಫಲ್</string>
-    <string name="simple">ಸರಳ</string>
-    <string name="sleep_timer_canceled">ಸ್ಲೀಪ್ ಟೈಮರ್ ರದ್ದುಗೊಳಿಸಲಾಗಿದೆ.</string>
-    <string name="sleep_timer_set">ಈಗಿನಿಂದ %d ನಿಮಿಷಗಳವರೆಗೆ ಸ್ಲೀಪ್ ಟೈಮರ್ ಹೊಂದಿಸಲಾಗಿದೆ.</string>
-    <string name="social">ಸಾಮಾಜಿಕ ಜಾಲತಾಣಗಳು</string>
-    <string name="social_stories">Story ಯನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="song">ಹಾಡು</string>
-    <string name="song_duration">ಹಾಡಿನ ಅವಧಿ</string>
-    <string name="songs">ಹಾಡುಗಳು</string>
-    <string name="sort_order">ವಿಂಗಡಣಾ ಕ್ರಮ</string>
-    <string name="sort_order_a_z">ಆರೋಹಣ ಕ್ರಮದಲ್ಲಿ</string>
-    <string name="sort_order_album">ಆಲ್ಬಮ್</string>
-    <string name="sort_order_artist">ಕಲಾವಿದ</string>
-    <string name="sort_order_composer">ರಚನಕಾರ</string>
-    <string name="sort_order_date">ಸೇರಿಸಿದ‌ ದಿನಾಂಕ</string>
-    <string name="sort_order_date_modified">ಮಾರ್ಪಡಿಸಿದ‌ ದಿನಾಂಕ</string>
-    <string name="sort_order_default">ಪೂರ್ವನಿಯೋಜಿತ</string>
-    <string name="sort_order_num_songs">ಹಾಡಿನ ಎಣಿಕೆ</string>
-    <string name="sort_order_num_songs_desc">ಹಾಡುಗಳ ಎಣಿಕೆ ಅವರೋಹಣ ಕ್ರಮ</string>
-    <string name="sort_order_year">ವರ್ಷ</string>
-    <string name="sort_order_z_a">ಅವರೋಹಣ ಕ್ರಮ</string>
-    <string name="speech_not_supported">ಕ್ಷಮಿಸಿ! ನಿಮ್ಮ ಸಾಧನವು ಧ್ವನಿ ಇನ್‌ಪುಟ್ ಅನ್ನು ಬೆಂಬಲಿಸುವುದಿಲ್ಲ</string>
-    <string name="speech_prompt">ನಿಮ್ಮ ಸಂಗ್ರಹವನ್ನು ಹುಡುಕಿ</string>
-    <string name="stack">ಪೇರಿಸಿ</string>
-    <string name="start_play_music">ಸಂಗೀತ‌ ಪ್ಲೇ ಮಾಡಲು ಪ್ರಾರಂಭಿಸಿ.</string>
-    <string name="suggestion_songs">ಸಲಹೆಗಳು</string>
-    <string name="support_development">ಅಭಿವೃದ್ದಿಗೆ ಬೆಂಬಲಿಸಿ</string>
-    <string name="swipe_to_unlock">ಅನ್‍ಲಾಕ್ ಮಾಡಲು ಸ್ವೈಪ್ ಮಾಡಿ</string>
-    <string name="synced_lyrics">ಸಿಂಕ್ ಮಾಡಲಾಗಿರುವ ಸಾಹಿತ್ಯ</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">ದೋಷಗಳನ್ನು ಚರ್ಚಿಸಲು, ಸಲಹೆಗಳನ್ನು ನೀಡಲು, ಪ್ರದರ್ಶಿಸಲು ಮತ್ತು ಹೆಚ್ಚಿನದನ್ನು ಮಾಡಲು Telegram ಗುಂಪಿಗೆ ಸೇರಿಕೊಳ್ಳಿ</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="tiny_card_style">ಚಿಕ್ಕ ಕಾರ್ಡ್</string>
-    <string name="title">ಶೀರ್ಷಿಕೆ</string>
-    <string name="title_new_backup">ಹೊಸ ಬ್ಯಾಕಪ್</string>
-    <string name="today">ಇಂದು</string>
-    <string name="top_albums">ಉನ್ನತ ಆಲ್ಬಮ್‌ಗಳು</string>
-    <string name="top_artists">ಉನ್ನತ ಕಲಾವಿದರು</string>
-    <string name="track_hint">"ಸುರುಳಿ (ಸುರುಳಿ 2 ಕ್ಕೆ 2 ಅಥವಾ CD3 ಸುರುಳಿ 4 ಕ್ಕೆ 3004)"</string>
-    <string name="track_list">ಸುರುಳಿ ಸಂಖ್ಯೆ</string>
-    <string name="translate">ಅನುವಾದಿಸಿ</string>
-    <string name="translate_community">ಅಪ್ಲಿಕೇಶನ್ ಅನ್ನು ನಿಮ್ಮ ಭಾಷೆಗೆ ಭಾಷಾಂತರಿಸಲು ನಮಗೆ ಸಹಾಯ ಮಾಡಿ</string>
-    <string name="try_retro_music_premium">Retro Music ಪ್ರೀಮಿಯಂ ಅನ್ನು ಪ್ರಯತ್ನಿಸಿ</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Retro Music ನೊಂದಿಗೆ ನಿಮ್ಮ ವಿನ್ಯಾಸವನ್ನು ಹಂಚಿಕೊಳ್ಳಿ</string>
-    <string name="unlabeled">ಲೇಬಲ್ ಮಾಡಲಾಗಿಲ್ಲ</string>
-    <string name="unplayable_file">ಈ ಹಾಡನ್ನು ಪ್ಲೇ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ.</string>
-    <string name="up_next">ಮುಂದಿನದು</string>
-    <string name="update_image">ಚಿತ್ರವನ್ನು ನವೀಕರಿಸಿ</string>
-    <string name="updating">ನವೀಕರಿಸಲಾಗುತ್ತಿದೆ…</string>
-    <string name="user_images_description">ಬಳಕೆದಾರ ಚಿತ್ರಗಳು</string>
-    <string name="user_name">ಬಳಕೆದಾರರ ಹೆಸರು</string>
-    <string name="username">ಬಳಕೆದಾರರ ಹೆಸರು</string>
-    <string name="version">ಆವೃತ್ತಿ</string>
-    <string name="vertical_flip">ಲಂಬ ಫ್ಲಿಪ್</string>
-    <string name="view_on_telegram">Telegram ನಲ್ಲಿ ವೀಕ್ಷಿಸಿ</string>
-    <string name="volume">ಪರಿಮಾಣ</string>
-    <string name="web_search">ವೆಬ್ ಹುಡುಕಾಟ</string>
-    <string name="website">ಜಾಲತಾಣ</string>
-    <string name="website_summary">ನಮ್ಮ ಜಾಲತಾಣವನ್ನು ಪರಿಶೀಲಿಸಿ</string>
-    <string name="welcome">ಸುಸ್ವಾಗತ,</string>
-    <string name="what_do_you_want_to_share">ಏನನ್ನು ಹಂಚಿಕೊಳ್ಳಲು ಬಯಸುವಿರಿ?</string>
-    <string name="whats_new">ಹೊಸತೇನಿದೆ</string>
-    <string name="window">ಕ್ರಿಯೆಯ ಕಿಟಿಕಿ</string>
-    <string name="window_corner_edges">ದುಂಡಾದ ಮೂಲೆಗಳು</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="you_will_be_forwarded_to_the_issue_tracker_website">ನಿಮ್ಮನ್ನು ಸಮಸ್ಯೆ ಟ್ರ್ಯಾಕರ್ ಜಾಲತಾಣಕ್ಕೆ ರವಾನಿಸಲಾಗುತ್ತದೆ.</string>
-    <string name="your_account_data_is_only_used_for_authentication">ನಿಮ್ಮ ಖಾತೆಯ ಡೇಟಾವನ್ನು ದೃಢೀಕರಣಕ್ಕಾಗಿ ಮಾತ್ರ ಬಳಸಲಾಗುತ್ತದೆ.</string>
-</resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
deleted file mode 100644
index 428eec4b5..000000000
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">%s에 관하여</string>
-    <string name="about_settings_summary">Team, social links</string>
-    <string name="accent_color">강조 색상</string>
-    <string name="accent_color_desc">강조 색상을 지정합니다. 기본값은 녹색입니다.</string>
-    <string name="action_about">정보</string>
-    <string name="action_add_to_blacklist">블랙 리스트에 추가</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_cancel">현재 타이머 취소</string>
-    <string name="action_cast">Cast</string>
-    <string name="action_clear_playing_queue">재생 대기열 비우기</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">삭제</string>
-    <string name="action_delete_from_device">기기에서 삭제</string>
-    <string name="action_details">세부 정보</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">해당 앨범으로 이동</string>
-    <string name="action_go_to_artist">해당 아티스트로 이동</string>
-    <string name="action_go_to_genre">Go to genre</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</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">New playlist</string>
-    <string name="action_next">다음</string>
-    <string name="action_play">재생</string>
-    <string name="action_play_all">Play all</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_sort_order">Sort order</string>
-    <string name="action_tag_editor">태그 편집기</string>
-    <string name="action_toggle_favorite">Toggle favorite</string>
-    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
-    <string name="adaptive">Adaptive</string>
-    <string name="add_action">추가</string>
-    <string name="add_playlist_title">"재생목록에 추가"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"재생 대기열에 1곡이 추가되었습니다."</string>
-    <string name="added_x_titles_to_playing_queue">재생 대기열에 %1$d곡이 추가되었습니다.</string>
-    <string name="album">앨범</string>
-    <plurals name="albumSongs">
-        <item quantity="other">Songs</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">앨범</string>
-    <plurals name="albums">
-        <item quantity="other">Albums</item>
-    </plurals>
-    <string name="always">항상</string>
-    <string name="app_share">이 멋진 뮤직 플레이어를 한 번 써보세요!: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">무작위</string>
-    <string name="app_shortcut_top_tracks_short">자주 재생한 음악</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">카드</string>
-    <string name="app_widget_classic_name">클래식</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">소형</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">아티스트</string>
-    <string name="artists">아티스트</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">오디오 포커스가 거부되었습니다.</string>
-    <string name="audio_settings_summary">소리 설정 및 이퀄라이저 조정</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">바이오그래피</string>
-    <string name="black_theme_name">저스트 블랙</string>
-    <string name="blacklist">블랙리스트</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">흐림 효과</string>
-    <string name="blur_card">블러 카드</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Buy now</string>
-    <string name="cancel_current_timer">현재 타이머 취소</string>
-    <string name="card">카드</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">카드</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">변경 사항</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">클래식</string>
-    <string name="clear_action">비우기</string>
-    <string name="clear_blacklist">블랙리스트 비우기</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">색상</string>
-    <string name="colors">색상</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">\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>
-    <string name="could_not_restore_purchase">구매내역을 복구할 수 없습니다.</string>
-    <string name="could_not_scan_files">%d개의 파일을 스캔하지 못했습니다.</string>
-    <string name="create_action">만들기</string>
-    <string name="create_new_backup">만들기</string>
-    <string name="created_playlist_x">%1$s 재생목록을 만들었습니다.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">현재 %2$s의 %1$s를 듣는 중입니다.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">카인다 다크</string>
-    <string name="delete_playlist_title">재생목록 삭제</string>
-    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> 재생목록을 삭제하시겠습니까?]]></string>
-    <string name="delete_playlists_title">재생목록 삭제</string>
-    <string name="delete_song_title">Delete song</string>
-    <string name="delete_song_x"><![CDATA[<b>%1$s</b> 노래를 삭제하시겠습니까?]]></string>
-    <string name="delete_songs_title">Delete songs</string>
-    <string name="delete_x_playlists"><![CDATA[<b>%1$d</b>개의 재생목록을 삭제하시겠습니까?]]></string>
-    <string name="delete_x_songs"><![CDATA[<b>%1$d</b>개의 노래를 삭제하시겠습니까?]]></string>
-    <string name="deleted_x_songs">%1$d개의 노래를 삭제했습니다.</string>
-    <string name="deleting_songs">Deleting Songs</string>
-    <string name="depth">Depth</string>
-    <string name="description">Description</string>
-    <string name="device_info">Device info</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="disc_hint">Disc Number</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="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">비어 있음</string>
-    <string name="equalizer">이퀄라이저</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">즐겨찾기</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">플랫</string>
-    <string name="folders">폴더</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">추천</string>
-    <string name="free">Free</string>
-    <string name="full">전체</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">앱의 여러 가지 색상 변경</string>
-    <string name="general_settings_title">외관</string>
-    <string name="genre">장르</string>
-    <string name="genres">장르</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Grid style</string>
-    <string name="help_summary">Need more help?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">기록</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">홈</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s 재생목록에 %1$d개의 노래를 추가했습니다.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">비트레이트</string>
-    <string name="label_file_format">형식</string>
-    <string name="label_file_name">파일 이름</string>
-    <string name="label_file_path">파일 경로</string>
-    <string name="label_file_size">크기</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">샘플링 레이트</string>
-    <string name="label_track_length">길이</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">최근 추가된 목록</string>
-    <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">라이선스</string>
-    <string name="light_theme_name">클리어리 화이트</string>
-    <string name="listeners_label">Listeners</string>
-    <string name="listing_files">파일 목록 생성</string>
-    <string name="loading_products">제품을 불러오는 중...</string>
-    <string name="login">Login</string>
-    <string name="lyrics">가사</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">내 이름</string>
-    <string name="my_top_tracks">자주 재생한 음악</string>
-    <string name="never">아니오</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">새 재생목록</string>
-    <string name="new_start_directory">이제 %s 디렉터리가 새 초기 디렉터리입니다.</string>
-    <string name="next_song">Next Song</string>
-    <string name="no_albums">앨범 없음</string>
-    <string name="no_artists">아티스트 없음</string>
-    <string name="no_audio_ID">"먼저 노래를 재생하고 다시 시도해 보십시오."</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">이퀄라이저가 없습니다.</string>
-    <string name="no_genres">장르 없음</string>
-    <string name="no_lyrics_found">가사 없음</string>
-    <string name="no_playing_queue">No songs playing</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="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b>은(는) 미디어 저장소에 없는 항목입니다.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">스캔할 것이 없습니다.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">알림</string>
-    <string name="notification_settings_summary">알림 스타일 변경</string>
-    <string name="now_playing">지금 재생 중</string>
-    <string name="now_playing_queue">현재 재생 대기열</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Wi-Fi에서만</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">기타</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">이전 3개월</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">외부 저장소 접근 권한이 거부되었습니다.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">권한이 거부되었습니다.</string>
-    <string name="personalize">개인화</string>
-    <string name="personalize_settings_summary">지금 재생 중 화면과 UI 변경</string>
-    <string name="pick_from_local_storage">로컬 저장소에서 선택</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">단색</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">재생 알림은 재생/일시 정지 등에 대한 작업을 제공합니다.</string>
-    <string name="playing_notification_name">재생 중 알림</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">재생목록이 비어 있음</string>
-    <string name="playlist_name_empty">재생목록 이름</string>
-    <string name="playlists">재생목록</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">오디오</string>
-    <string name="pref_header_blacklist">블랙리스트</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">일반</string>
-    <string name="pref_header_images">이미지</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">잠금 화면</string>
-    <string name="pref_header_playlists">재생목록</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">현재 재생 중인 노래의 앨범 커버를 잠금 화면 배경화면으로 사용합니다.</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">알림, 탐색 등</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"몇몇 기기에서 재생 문제를 유발할 수 있습니다."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</string>
-    <string name="pref_summary_ignore_media_store_artwork">앨범 커버의 품질을 향상시킬 수 있지만 이미지를 불러오는 시간이 늘어납니다. 저해상도 이미지를 불러오는 데 문제가 있는 경우에만 사용하십시오.</string>
-    <string name="pref_summary_library_categories">Configure visibility and order of library categories.</string>
-    <string name="pref_summary_lock_screen">Retro music에서 제공하는 자체 잠금 화면 사용</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">오픈소스 소프트웨어의 상세 라이센스 정보</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">몰입 모드</string>
-    <string name="pref_summary_toggle_headset">이어폰이 연결되면 바로 음악을 재생합니다.</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_volume">음악 재생 화면에서 공간이 있을 시 볼륨 컨트롤을 보입니다</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">앨범 커버 표시</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">앱 바로가기 색상 틴트</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">알림이 올 때 볼륨 감소</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">아티스트 이미지 자동 다운로드</string>
-    <string name="pref_title_blacklist">블랙리스트</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">앨범 커버 블러</string>
-    <string name="pref_title_circle_button">Circular play button</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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">지연없이 재생하기</string>
-    <string name="pref_title_general_theme">기본 테마</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">미디어 저장소 커버 무시</string>
-    <string name="pref_title_last_added_interval">최근 추가된 음악 간격 지정</string>
-    <string name="pref_title_lock_screen">전체 화면 컨트롤</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pref_title_now_playing_screen_appearance">테마</string>
-    <string name="pref_title_open_source_licences">오픈소스 라이선스</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">회전 효과</string>
-    <string name="pref_title_toggle_full_screen">전체 화면</string>
-    <string name="pref_title_toggle_toggle_headset">자동 재생</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
-    <string name="pref_title_toggle_volume">볼륨 조절</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">구매</string>
-    <string name="queue">대기열</string>
-    <string name="rate_app">앱 평가</string>
-    <string name="rate_on_google_play_summary">앱이 마음에 드신다면 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_image">Remove Image</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="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">아티스트 이미지 초기화</string>
-    <string name="restore">복원</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">지난 구매를 복원했습니다. 모든 기능을 사용하기 위해선 앱을 재시작해 주세요.</string>
-    <string name="restored_previous_purchases">이전 구매 내역을 복원했습니다.</string>
-    <string name="restoring_purchase">구매 복원 중...</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">RetroMusic Pro 구매</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">파일로 저장</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">재생목록을 %s 위치에 파일로 저장했습니다.</string>
-    <string name="saving_changes">변경 사항 저장</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">%2$d개 파일 중 %1$d개 파일을 스캔했습니다.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">아티스트 이미지 설정</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">무작위 재생</string>
-    <string name="simple">심플</string>
-    <string name="sleep_timer_canceled">수면 타이머가 취소되었습니다.</string>
-    <string name="sleep_timer_set">수면 타이머가 지금으로부터 %d분 후로 설정되었습니다.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">노래</string>
-    <string name="song_duration">노래 길이</string>
-    <string name="songs">노래</string>
-    <string name="sort_order">정렬 순서</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">앨범</string>
-    <string name="sort_order_artist">아티스트</string>
-    <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">음성 입력을 지원하지 않는 기기입니다</string>
-    <string name="speech_prompt">라이브러리 검색</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">개발 지원</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">감사합니다!</string>
-    <string name="the_audio_file">오디오 파일</string>
-    <string name="this_month">이번 달</string>
-    <string name="this_week">이번 주</string>
-    <string name="this_year">올해</string>
-    <string name="tiny">작음</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">오늘</string>
-    <string name="top_albums">인기 앨범</string>
-    <string name="top_artists">인기 아티스트</string>
-    <string name="track_hint">"트랙 (트랙 2는 2, CD3의 트랙 4는 3004)"</string>
-    <string name="track_list">트랙 번호</string>
-    <string name="translate">번역</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">\uc774 \ub178\ub798\ub97c \uc7ac\uc0dd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4.</string>
-    <string name="up_next">다음 곡으로 재생</string>
-    <string name="update_image">이미지 갱신</string>
-    <string name="updating">갱신 중...</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">버전</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">웹 검색</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">무엇을 공유하시겠습니까?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">창</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">%1$s을(를) 벨소리로 설정했습니다.</string>
-    <string name="x_selected">%1$d개 항목 선택됨</string>
-    <string name="year">연도</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">계정 정보는 오로지 인증 목적으로만 사용됩니다.</string>
-</resources>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
new file mode 100644
index 000000000..d5af999ed
--- /dev/null
+++ b/app/src/main/res/values-ko/strings.xml
@@ -0,0 +1,494 @@
+<?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_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_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="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[<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="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>
+    <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">현재 %2$s의 %1$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">%2$s 재생목록에 %1$d개의 노래를 추가했습니다.</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">Wi-Fi에서만</string>
+
+    <string name="others">기타</string>
+
+    <string name="past_three_months">이전 3개월</string>
+
+    <string name="permission_external_storage_denied">외부 저장소 접근 권한이 거부되었습니다.</string>
+
+    <string name="permissions_denied">권한이 거부되었습니다.</string>
+
+    <string name="personalize">개인화</string>
+
+    <string name="personalize_settings_summary">지금 재생 중 화면과 UI 변경</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_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">"\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_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">Retro music에서 제공하는 자체 잠금 화면 사용</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">앱이 마음에 드신다면 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">지난 구매를 복원했습니다. 모든 기능을 사용하기 위해선 앱을 재시작해 주세요.</string>
+    <string name="restored_previous_purchases">이전 구매 내역을 복원했습니다.</string>
+
+    <string name="restoring_purchase">구매 복원 중...</string>
+
+    <string name="retro_equalizer">Retro 이퀄라이저</string>
+
+    <string name="retro_music_pro">RetroMusic Pro 구매</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, CD3의 트랙 4는 3004)"</string>
+
+    <string name="track_list">트랙 번호</string>
+
+    <string name="translate">번역</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_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>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-v31/integers.xml b/app/src/main/res/values-land/dimens.xml
similarity index 52%
rename from app/src/main/res/values-v31/integers.xml
rename to app/src/main/res/values-land/dimens.xml
index 308656262..bb871f65b 100644
--- a/app/src/main/res/values-v31/integers.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <integer name="overScrollMode">0</integer>
+    <dimen name="toolbar_margin_horizontal">8dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-land/integers.xml b/app/src/main/res/values-land/integers.xml
index e56b97117..a6b3daec9 100644
--- a/app/src/main/res/values-land/integers.xml
+++ b/app/src/main/res/values-land/integers.xml
@@ -1,5 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="permission_orientation">0</integer>
-    <integer name="permission_layout_weight">1</integer>
-</resources>
\ No newline at end of file
+<resources></resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
new file mode 100644
index 000000000..6990767ac
--- /dev/null
+++ b/app/src/main/res/values-large/dimens.xml
@@ -0,0 +1,5 @@
+<resources>
+    <dimen name="toolbar_margin_horizontal">42dp</dimen>
+    <dimen name="toolbar_height">52dp</dimen>
+    <dimen name="toolbar_margin_vertical">16dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-lv-rLV/strings.xml b/app/src/main/res/values-lv-rLV/strings.xml
deleted file mode 100644
index 341d7a886..000000000
--- a/app/src/main/res/values-lv-rLV/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Par %s</string>
-    <string name="about_settings_summary">Team, social links</string>
-    <string name="accent_color">Akcenta krāsa</string>
-    <string name="accent_color_desc">Motīva akcenta krāsa, pēc noklusējuma violets</string>
-    <string name="action_about">Par</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Pievienot izlasei</string>
-    <string name="action_add_to_playing_queue">Pievienot atskaņošanas rindai</string>
-    <string name="action_add_to_playlist">Pievienot atskaņošanas sarakstam</string>
-    <string name="action_cancel">Atcelt</string>
-    <string name="action_cast">Raidīt</string>
-    <string name="action_clear_playing_queue">Noņemt visu no atskaņošanas rindas</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">Dzēst</string>
-    <string name="action_delete_from_device">Dzēst no šīs ierīces</string>
-    <string name="action_details">Papildus informācija</string>
-    <string name="action_edit">Rediģēt</string>
-    <string name="action_go_to_album">Doties uz albumu</string>
-    <string name="action_go_to_artist">Doties uz izpildītāju</string>
-    <string name="action_go_to_genre">Doties uz žanru</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <string name="action_grant">Piešķirt</string>
-    <string name="action_grid_size">Grid size</string>
-    <string name="action_grid_size_land">Grid size (land)</string>
-    <string name="action_new_playlist">Jauns atskaņošanas saraksts</string>
-    <string name="action_next">Nākamais</string>
-    <string name="action_play">Atskaņot</string>
-    <string name="action_play_all">Atskaņot visu</string>
-    <string name="action_play_next">Atskaņot nākamo</string>
-    <string name="action_play_pause">Atskaņot/apturēt</string>
-    <string name="action_previous">Iepriekšējais</string>
-    <string name="action_remove_from_favorites">Izņemt no izlases</string>
-    <string name="action_remove_from_playing_queue">Noņemt no atskaņošanas rindas</string>
-    <string name="action_remove_from_playlist">Noņemt no atskaņošanas saraksta</string>
-    <string name="action_rename">Pārdēvēt</string>
-    <string name="action_save_playing_queue">Saglabāt atskaņošanas rindu</string>
-    <string name="action_scan">Skenēt</string>
-    <string name="action_search">Meklēt</string>
-    <string name="action_set">Sākt</string>
-    <string name="action_set_as_ringtone">Uzstādīt kā zvana signālu</string>
-    <string name="action_set_as_start_directory">Set as start directory</string>
-    <string name="action_settings">"Iestatījumi"</string>
-    <string name="action_share">Kopīgot</string>
-    <string name="action_shuffle_all">Jaukt visu</string>
-    <string name="action_shuffle_playlist">Jaukt atskaņošanas sarakstu</string>
-    <string name="action_sleep_timer">Sleep timer</string>
-    <string name="action_sort_order">Kārtošanas secība</string>
-    <string name="action_tag_editor">Atzīmju rediģēšana</string>
-    <string name="action_toggle_favorite">Toggle favorite</string>
-    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
-    <string name="adaptive">Adaptīvs</string>
-    <string name="add_action">Pievienot</string>
-    <string name="add_playlist_title">"Pievienot atskaņošanas sarakstam"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">%1$d dziesma(s) tika pievienota(s) %2$s</string>
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-    <string name="album">Albums</string>
-    <plurals name="albumSongs">
-        <item quantity="zero">Dziesmu</item>
-        <item quantity="one">Dziesma</item>
-        <item quantity="other">Dziesmas</item>
-    </plurals>
-    <string name="album_artist">Albuma izpildītājs</string>
-    <string name="albums">Albumi</string>
-    <plurals name="albums">
-        <item quantity="zero">Albumu</item>
-        <item quantity="one">Albums</item>
-        <item quantity="other">Albumi</item>
-    </plurals>
-    <string name="always">Vienmēr</string>
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Jaukt</string>
-    <string name="app_shortcut_top_tracks_short">Top dziesmas</string>
-    <string name="app_widget_big_name">Pilns attēls</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Klasisks</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Kompakts</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Izpildītājs</string>
-    <string name="artists">Izpildītāji</string>
-    <string name="audio_fade_duration">Audio fade duration</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="auto">Automātiski</string>
-    <string name="backup_restore_settings_summary">Dublējiet un atjaunojiet Jūsu iestatījumus un atskaņošanas sarakstus</string>
-    <string name="backup_restore_title"><![CDATA[Dublēt / atjaunot]]></string>
-    <string name="backup_title">Dublējumi</string>
-    <string name="biography">Biogrāfija</string>
-    <string name="black_theme_name">Vienkārši melns</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">Šai lietotnei nepieciešama pieeja tuvumā esošām ierīcēm, lai atrastu bluetooth ierīces</string>
-    <string name="bluetooth_title">Tuvumā esošās ierīces</string>
-    <string name="blur">Izpludināt</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Nepareizs lietotājvārds vai parole</string>
-    <string name="bug_report_issue">Kļūda</string>
-    <string name="bug_report_manual">Sūtīt manuāli</string>
-    <string name="bug_report_no_description">Lūdzu, ievadiet kļūdas raksturojumu</string>
-    <string name="bug_report_no_password">Lūdzu, ievadiet Jūsu GitHub konta paroli</string>
-    <string name="bug_report_no_title">Lūdzu, uzrakstiet kļūdas virsrakstu</string>
-    <string name="bug_report_no_username">Lūdzu, ievadiet Jūsu GitHub konta lietotājvārdu</string>
-    <string name="bug_report_success">Ziņošana par kļūdu vaikta veiksmīgi</string>
-    <string name="bug_report_summary">Notika neparadzēta kļūda. Žēl, ka Jūs saskārāties ar šo problēmu, ja lietotne turpina avarēt, notīriet lietotnes datus vai sūtiet e-pasta vēstuli </string>
-    <string name="bug_report_use_account">Sūtīt, izmantojot GitHub kontu</string>
-    <string name="buy_now">Pirkt tagad</string>
-    <string name="cancel_current_timer">Atcelt</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Klasisks</string>
-    <string name="clear_action">Notīrīt</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Izdzēst vēsturi</string>
-    <string name="clear_playing_queue">Notīrīt atskaņošanas rindu</string>
-    <string name="color">Krāsa</string>
-    <string name="colors">Krāsas</string>
-    <string name="compact">Kompakts</string>
-    <string name="composer">Komponists</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Neizdevās izveidot atskaņošanas sarakstu.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Nevarēja atjaunot pirkumu.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">Izveidot</string>
-    <string name="create_new_backup">Izveidot</string>
-    <string name="created_playlist_x">Izveidoja atskaņošanas sarakstu %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Jūs pašlaik klausāties %1$s, kuru izpilda %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Nedaudz tumšs</string>
-    <string name="delete_playlist_title">Dzēst atskaņošanas sarakstu</string>
-    <string name="delete_playlist_x"><![CDATA[Dzēst atskaņošanas sarakstu <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Dzēst atskaņošanas sarakstus</string>
-    <string name="delete_song_title">Dzēst dziesmu</string>
-    <string name="delete_song_x"><![CDATA[Dzēst dziesmu <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Dzēst dziesmas</string>
-    <string name="delete_x_playlists"><![CDATA[Dzēst <b>%1$d</b> atskaņošanas sarakstus?]]></string>
-    <string name="delete_x_songs"><![CDATA[Dzēst <b>%1$d</b> dziesmas?]]></string>
-    <string name="deleted_x_songs">Tika izdzēstas %1$d dziesmas.</string>
-    <string name="deleting_songs">Dziesmas tiek dzēstas</string>
-    <string name="depth">Depth</string>
-    <string name="description">Apraksts</string>
-    <string name="device_info">Informācija par ierīci</string>
-    <string name="dialog_message_set_ringtone">Ļaut Retro Music mainīt audio iestatījumus</string>
-    <string name="dialog_title_set_ringtone">Iestatīt zvana signālu</string>
-    <string name="disc_hint">Diska numurs</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Ziedot</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Nopirkt man:</string>
-    <string name="done">Gatavs</string>
-    <string name="drive_mode">Braukšanas režīms</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Rediģēt vārdus</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Tukšs</string>
-    <string name="equalizer">Ekvalaizers</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Neizdevās kopīgot failu</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">BUJ</string>
-    <string name="favorites">Izlase</string>
-    <string name="file_already_exists">Fails jau eksistē</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Mapes</string>
-    <string name="follow_system">Pielāgot sistēmai</string>
-    <string name="for_you">Tikai jums</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Izskats</string>
-    <string name="genre">Žanrs</string>
-    <string name="genres">Žanri</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Krāsu pāreja</string>
-    <string name="grant_access">Piešķirt piekļuvi</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="grid_style_label">Grid style</string>
-    <string name="help_summary">Nepieciešama papildu palīdzība?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">Vēsture</string>
-    <string name="history_cleared">Vēsture notīrīta</string>
-    <string name="history_undo_button">Atsaukt</string>
-    <string name="home">Sākums</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Attēls</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Importēt</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Tastatūra</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Formāts</string>
-    <string name="label_file_name">Faila nosaukums</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_file_size">Izmērs</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">Vairāk no %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Ilgums</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Pēdējie pievienotie</string>
-    <string name="last_song">Pēdējā dziesma</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licences</string>
-    <string name="light_theme_name">Acīmredzot balts</string>
-    <string name="listeners_label">Klausītāji</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Vārdi</string>
-    <string name="made_with_love">Radīts Indijā ar ❤️</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Kļūda</string>
-    <string name="md_storage_perm_error">Atļauju kļūda</string>
-    <string name="message_backup_create_success">Dublējums izveidots veiksmīgi.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s ir Pro funkcija.</string>
-    <string name="message_restore_success">Atjaunošana veikta veiksmīgi.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Vārds</string>
-    <string name="my_top_tracks">Visbiežāk atskaņotās</string>
-    <string name="never">Nekad</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Jauns atskaņošanas saraksts</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Nākamā dziesma</string>
-    <string name="no_albums">Jums nav mūzikas albumu</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Vispirms atskaņojiet kaut ko, tad mēģiniet vēlreiz."</string>
-    <string name="no_backups_found">Rezerves kopija nav atrasta</string>
-    <string name="no_equalizer">Ekvalaizeris nav atrasts</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">Dziesmas vārdi nav atrasti</string>
-    <string name="no_playing_queue">Šobrīd nekas netiek atskaņots</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">Nav rezultātu</string>
-    <string name="no_songs">Jums nav mūzikas</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Nav nesen atskaņots</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Paziņojums</string>
-    <string name="notification_settings_summary">Mainīt paziņojuma stilu</string>
-    <string name="now_playing">Pašlaik atskaņo</string>
-    <string name="now_playing_queue">Pašreizējā atskaņošanas rinda</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Tikai izmantojot Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Cits</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Parole</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Ielīmēt vārdus šeit</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Piekļuve krātuvei</string>
-    <string name="permissions_denied">Atļauja liegta.</string>
-    <string name="personalize">Personalizēt</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Atskaņošanas saraksts jau pastāv</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Atskaņošnas Iestatījumi</string>
-    <string name="playback_speed">Atskaņošanas ātrums</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s izveidots veiksmīgi</string>
-    <string name="playlist_is_empty">Atskaņošanas saraksts ir tukšs</string>
-    <string name="playlist_name_empty">Atskaņošanas saraksta nosaukums</string>
-    <string name="playlists">Atskaņošanas saraksti</string>
-    <string name="pref_blur_amount_summary">Izpludināšanas līmenis, kas tiek piemērots motīviem ar izpludinātiem elementiem. Jo zemāka vērtiba, jo ātrāk tiek izpludināts</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Šķirot mūziku pēc ilguma</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Pevienot melnajam sarakstam</string>
-    <string name="pref_header_controls">Vadība</string>
-    <string name="pref_header_general">Motīvs</string>
-    <string name="pref_header_images">Attēli</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Bloķēšanas ekrāns</string>
-    <string name="pref_header_playlists">Atskaņošanas saraksti</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Aptur dziesmu, kad skaļums ir 0, un atsāk atskaņošanu, kad skaļums tiek palielināts. Strādā arī ārpus lietotnes</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Apturēt atskaņošanu, ja skaļums ir 0</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Paturēt ekrānu ieslēgtu</string>
-    <string name="pref_language_name">Atlasīt valodu</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Samazināt skaļumu, kad tiek atskaņota sistēmas skaņa vai ir saņemts paziņojums</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Sākt atskaņošanu uzreiz pēc bluetooth ierīces pievienošanas</string>
-    <string name="pref_summary_blurred_album_art">Izpludināt albuma attēlu bloķēšanas ekrānā. Var rasties problēmas ar trešo pušu lietotnēm un logrīkiem</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_classic_notification">Izmontot standarta paziņojuma dizainu</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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">Kā norādīts Material design standartos, tumšajā režīmā krāsu piesātinājumam ir jābūt mazākam</string>
-    <string name="pref_summary_expand_now_playing_panel">Uzspiežot uz paziņojumatiks rādīts tas, kas pašreiz tiek atskaņots, nevis sākuma ekrāns</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Dažām ierīcēm var radīt atskaņošanas problēmas."</string>
-    <string name="pref_summary_home_banner">Rādīt vai slēpt sākuma baneri</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_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_manage_audio_focus">Vienmēr atskaņot audio, pat tad, ja tajā pašā brīdī tiek atskaņots kas cits</string>
-    <string name="pref_summary_open_source_licences">Licences skaidrojums atvērtā pirmkoda programmatūrām</string>
-    <string name="pref_summary_pause_history">Kad iespējots, nesen atskaņotas dziesmas netiks rādītas vēsturē</string>
-    <string name="pref_summary_remember_tab">Atverot doties uz pēdējā reizē atvērto cilni</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Rādīt jaunās mūzikas miksli sākuma ekrānā</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Sākt atskaņošanu uzreiz pēc austiņu pieslēgšanas</string>
-    <string name="pref_summary_toggle_shuffle">Jaukšana tiks izslēgta atskaņojot jaunu mūziku</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_wallpaper_accent">Iegūt akcenta krāsu no ekrāna tapetes</string>
-    <string name="pref_summary_whitelist">Rādīt mūziku tikai no /Music mapes</string>
-    <string name="pref_title_album_art_on_lockscreen">Rādīt albuma vāku</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Virsraksta izskats</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Automātiski lejupielādēt izpildītāju attēlus</string>
-    <string name="pref_title_blacklist">Pevienot melnajam sarakstam</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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">Iekrāsots paziņojums</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Izmantot Manrope fontu</string>
-    <string name="pref_title_desaturated_color">Nepiesātinātas krāsas</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Papildus vadība</string>
-    <string name="pref_title_extra_song_info">Dziesmas info</string>
-    <string name="pref_title_gapless_playback">Bezatstarpju atskaņošana</string>
-    <string name="pref_title_general_theme">Lietotnes motīvs</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Baneris</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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Vārdu veids</string>
-    <string name="pref_title_manage_audio_focus">Vienmēr atskaņot</string>
-    <string name="pref_title_now_playing_screen_appearance">Now playing theme</string>
-    <string name="pref_title_open_source_licences">Atvērtā pirmkoda licences</string>
-    <string name="pref_title_pause_history">Apturēt vēsturi</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Iegādāties</string>
-    <string name="queue">Atskaņošanas rinda</string>
-    <string name="rate_app">Novērtēt lietotni</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Nesenie albumi</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Noņemt</string>
-    <string name="remove_cover">Noņemt albuma vāku</string>
-    <string name="remove_from_blacklist">Izņemt no melnā saraksta</string>
-    <string name="remove_image">Noņemt attēlu</string>
-    <string name="remove_song_from_playlist_title">Izņemt dziesmu no atskaņošanas saraksta</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Izņemt dziesmu <b>%1$s</b> no atskaņošanas saraksta?]]></string>
-    <string name="remove_songs_from_playlist_title">Izņemt dziesmas no atskaņošanas saraksta</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Izņemt <b>%1$d</b> dziesams no atskaņošanas saraksta?]]></string>
-    <string name="rename_playlist_title">Mainīt atskaņošanas saraksta nosaukumu</string>
-    <string name="replace_cover">Mainīt albuma vāku</string>
-    <string name="report_an_issue">Ziņot par problēmu</string>
-    <string name="report_bug">Ziņot par kļūdu</string>
-    <string name="reset_action">Atiestatīt</string>
-    <string name="reset_artist_image">Atiestatīt izpildītāja attēlu</string>
-    <string name="restore">Atjaunot</string>
-    <string name="restore_message">Vai vēlaties atjaunot no rezerves kopijas?</string>
-    <string name="restored_previous_purchase_please_restart">Iepriekšējais pirkums atjaunots. Lūdzu, restartējiet lietotni, lai varētu lietot visas funkcijas.</string>
-    <string name="restored_previous_purchases">Iepriekšējais pirkums atjaunots veiksmīgi.</string>
-    <string name="restoring_purchase">Pirkums tiek atjaunots…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">Faila dzēšana neizdevās: %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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Saglabāt</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Saglabāt kā failu</string>
-    <string name="save_playlists_title">Saglabāt kā failus</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Jaukt</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">Kārtošanas secība</string>
-    <string name="sort_order_a_z">Augošā secībā</string>
-    <string name="sort_order_album">Albums</string>
-    <string name="sort_order_artist">Izpildītājs</string>
-    <string name="sort_order_composer">Komponists</string>
-    <string name="sort_order_date">Pievienošanas datums</string>
-    <string name="sort_order_date_modified">Labošanas datums</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Dziesmu skaits</string>
-    <string name="sort_order_num_songs_desc">Dziesmu skaits dilstošā secībā</string>
-    <string name="sort_order_year">Gads</string>
-    <string name="sort_order_z_a">Dilstošā secībā</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Sākt atskaņot mūziku.</string>
-    <string name="suggestion_songs">Ieteikumi</string>
-    <string name="support_development">Atbalstīt izstrādi</string>
-    <string name="swipe_to_unlock">Velciet ar pirkstu, lai atbloķētu</string>
-    <string name="synced_lyrics">Synced lyrics</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="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Dziesmas numurs</string>
-    <string name="translate">Tulkot</string>
-    <string name="translate_community">Palīdziet mums pārtulkot lietotni Jūsu valodā</string>
-    <string name="try_retro_music_premium">Izmēģināt Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Kopīgot Jūsu dizainu ar Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Šo dziesmu nevarēja atskaņot.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">Skatīt Telegram</string>
-    <string name="volume">Skaļums</string>
-    <string name="web_search">Meklēt tīmeklī</string>
-    <string name="website">Mājaslapa</string>
-    <string name="website_summary">Apskatiet mūsu mājaslapu</string>
-    <string name="welcome">Sveicināti,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">Kas jauns</string>
-    <string name="window">Logs</string>
-    <string name="window_corner_edges">Noapaļoti stūri</string>
-    <string name="x_has_been_set_as_ringtone">Iestatīt %1$s kā zvana signālu.</string>
-    <string name="x_selected">%1$d atlasīts</string>
-    <string name="year">Gads</string>
-    <string name="you_have_to_select_at_least_one_category">Ir jāizvēlas vismaz viena sadaļa.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-ml-rIN/strings.xml b/app/src/main/res/values-ml-rIN/strings.xml
deleted file mode 100644
index 6b8258ba1..000000000
--- a/app/src/main/res/values-ml-rIN/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">ഏകദേശം %s</string>
-    <string name="about_settings_summary">അണിയറ പ്രവർത്തകർ, സോഷ്യൽ മീഡിയ ലിങ്കുകൾ</string>
-    <string name="accent_color">ആക്സന്റ് നിറം</string>
-    <string name="accent_color_desc">The theme accent color, defaults to purple</string>
-    <string name="action_about">അപ്ലിക്കേഷനെക്കുറിച്ച് അറിയുവാൻ</string>
-    <string name="action_add_to_blacklist">ബ്ലാക്ക്‌ലിസ്റ്റിലേക്ക് ആഡ് ചെയ്യൂ</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_cancel">Cancel</string>
-    <string name="action_cast">കാസ്റ്റ്</string>
-    <string name="action_clear_playing_queue">നിലവിൽ ഉള്ള ക്യൂ ക്ലിയർ ചെയ്യൂ</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">ഡിലീറ്റ്</string>
-    <string name="action_delete_from_device">ഡിവൈസിൽ നിന്നും ഡിലീറ്റ് ചെയ്യൂ</string>
-    <string name="action_details">വിശദാംശങ്ങള്‍‌</string>
-    <string name="action_edit">എഡിറ്റ് ചെയ്യൂ</string>
-    <string name="action_go_to_album">ആൽബമിലേക്ക് പോകാൻ</string>
-    <string name="action_go_to_artist">ആർട്ടിസ്റ്റിലേക്ക് പോകാൻ</string>
-    <string name="action_go_to_genre">Go to genre</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Go to start directory</string>
-    <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">പുതിയ പ്ലേലിസ്റ്റ് സൃഷ്‌ടിക്കുക</string>
-    <string name="action_next">അടുത്തത്</string>
-    <string name="action_play">പ്ലേ</string>
-    <string name="action_play_all">Play all</string>
-    <string name="action_play_next">അടുത്തത് പ്ലേ ചെയ്യുക</string>
-    <string name="action_play_pause">Play/Pause</string>
-    <string name="action_previous">മുൻപുള്ളത് പ്ലേയ് ചെയ്യാൻ</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>
-    <string name="action_rename">Rename</string>
-    <string name="action_save_playing_queue">Save playing queue</string>
-    <string name="action_scan">Scan</string>
-    <string name="action_search">Search</string>
-    <string name="action_set">Start</string>
-    <string name="action_set_as_ringtone">Set as ringtone</string>
-    <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_shuffle_all">Shuffle all</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>
-    <string name="add_action">Add</string>
-    <string name="add_playlist_title">"പ്ലേലിസ്റ്റിലേക്ക് ആഡ് ചെയ്യുക"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
-    <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Songs</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
-    <string name="always">Always</string>
-    <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Shuffle</string>
-    <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">ആർട്ടിസ്റ്റ്</string>
-    <string name="artists">ആർട്ടിസ്റ്റുകൾ</string>
-    <string name="audio_fade_duration">Audio fade duration</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="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">Biography</string>
-    <string name="black_theme_name">Just Black</string>
-    <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Unable to send report</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Wrong username or password</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Buy now</string>
-    <string name="cancel_current_timer">Cancel</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Classic</string>
-    <string name="clear_action">Clear</string>
-    <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">Color</string>
-    <string name="colors">Colors</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
-    <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Could not scan %d files.</string>
-    <string name="create_action">Create</string>
-    <string name="create_new_backup">Create</string>
-    <string name="created_playlist_x">Created playlist %1$s.</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Kinda Dark</string>
-    <string name="delete_playlist_title">Delete playlist</string>
-    <string name="delete_playlist_x"><![CDATA[Delete the playlist <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Delete playlists</string>
-    <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="depth">Depth</string>
-    <string name="description">Description</string>
-    <string name="device_info">Device info</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
-    <string name="donate">Donate</string>
-    <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
-    <string name="donation_header">Buy me a:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Empty</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favorites</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">Folders</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">For you</string>
-    <string name="free">Free</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Change the theme and colors of the app</string>
-    <string name="general_settings_title">Look and feel</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genres</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Grid style</string>
-    <string name="help_summary">Need more help?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">History</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">Home</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Image</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">File name</string>
-    <string name="label_file_path">File path</string>
-    <string name="label_file_size">Size</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Length</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Last added</string>
-    <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licenses</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">Listeners</string>
-    <string name="listing_files">Listing files</string>
-    <string name="loading_products">Loading products…</string>
-    <string name="login">Login</string>
-    <string name="lyrics">Lyrics</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Name</string>
-    <string name="my_top_tracks">Most played</string>
-    <string name="never">Never</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">പുതിയ പ്ലേലിസ്റ്റ് സൃഷ്‌ടിക്കുക</string>
-    <string name="new_start_directory">%s is the new start directory.</string>
-    <string name="next_song">Next Song</string>
-    <string name="no_albums">You have no albums</string>
-    <string name="no_artists">You have no artists</string>
-    <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Permissions denied.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">Sort order</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">ആർട്ടിസ്റ്റ്</string>
-    <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Year</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
new file mode 100644
index 000000000..ccfd840b6
--- /dev/null
+++ b/app/src/main/res/values-ms/strings.xml
@@ -0,0 +1,444 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Warna aksen</string>
+    <string name="accent_color_desc">Warna tema aksen, tetapan asalnya adalah hijau</string>
+
+    <string name="action_about">Mengenai</string>
+
+    <string name="action_add_to_favorites">Tambahkan ke kegemaran</string>
+    <string name="action_add_to_playing_queue">Tambahkan ke baris gilir main</string>
+    <string name="action_add_to_playlist">Tambahkan ke senarai main...</string>
+
+    <string name="action_clear_playing_queue">Kosongkan baris gilir main</string>
+    <string name="action_clear_playlist">Kosongkan senarai main</string>
+
+    <string name="action_delete">Padam</string>
+    <string name="action_delete_from_device">Padamkan daripada peranti</string>
+
+    <string name="action_details">Butiran</string>
+
+    <string name="action_go_to_album">Pergi ke album</string>
+    <string name="action_go_to_artist">Pergi ke seniman</string>
+    <string name="action_go_to_start_directory">Pergi ke direktori mula</string>
+
+    <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_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_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>
+
+    <string name="action_rename">Namakan semula</string>
+
+    <string name="action_save_playing_queue">Simpan baris gilir main</string>
+
+    <string name="action_scan">Imbas</string>
+
+    <string name="action_search">Cari</string>
+
+    <string name="action_set">Tetapkan</string>
+    <string name="action_set_as_ringtone">Tetapkan sebagai nada dering</string>
+    <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_shuffle_all">Kocok semua</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>
+
+    <string name="add_action">Tambah</string>
+
+    <string name="add_photo">Tambah \ngambar</string>
+
+    <string name="add_playlist_title">"Tambahkan ke senarai main"</string>
+
+    <string name="added_title_to_playing_queue">"1 judul ditambah ke baris gilir."</string>
+
+    <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_or_artist_empty">Judul atau seniman adalah kosong.</string>
+
+    <string name="albums">Album</string>
+
+    <!-- Android Auto -->
+    <string name="always">Sentiasa</string>
+
+    <string name="app_share">Hai. Cuba lihat pemain muzik hebat ini di: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Kocok</string>
+    <string name="app_shortcut_top_tracks_short">Runut teratas</string>
+
+    <string name="app_widget_big_name">Retro Music - Besar</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="artists">Seniman</string>
+
+    <string name="audio_focus_denied">Fokus audio dinafikan.</string>
+
+    <string name="biography">Biografi</string>
+
+    <string name="black_theme_name">Cuma hitam</string>
+
+    <string name="blacklist">Senarai hitam</string>
+
+    <string name="cancel_current_timer">Batalkan pemasa semasa</string>
+
+    <string name="changelog">Log perubahan</string>
+
+    <string name="changelog_summary">Log perubahan dikelolakan daripada aplikasi Telegram</string>
+
+    <string name="clear_action">Kosongkan</string>
+
+    <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="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>
+    <string name="could_not_scan_files">Tidak dapat mengimbas %d fail.</string>
+
+    <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="dark_theme_name">Macam gelap</string>
+
+    <string name="default_hint">Tiada seni kata</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_x"><![CDATA[Padamkan lagu <b>%1$s</b>?]]></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="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="empty">Kosong</string>
+
+    <string name="equalizer">Penyama</string>
+
+    <string name="favorites">Kegemaran</string>
+
+    <string name="flat">Rata</string>
+
+    <string name="folders">Folder</string>
+
+    <string name="for_you">Untuk anda</string>
+
+    <string name="full">Penuh</string>
+
+    <string name="genre">Genre</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">Sejarah</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="label_bit_rate">Kadar bit</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="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_products">Memuatkan produk...</string>
+
+    <string name="lyrics">Seni kata</string>
+
+    <string name="my_name">Nama 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>
+
+    <string name="new_start_directory">%s ialah direktori mula yang baru</string>
+
+    <string name="no_albums">Tiada album</string>
+
+    <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_genres">Tiada genre</string>
+
+    <string name="no_lyrics_found">Tiada seni kata dijumpai</string>
+
+    <string name="no_playlists">Tiada senarai main</string>
+
+    <string name="no_results">Tiada hasil</string>
+
+    <string name="no_songs">Tiada lagu</string>
+
+    <string name="normal">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> tidak disenaraikan dalam gedung media.]]></string>
+
+    <string name="nothing_to_scan">Tiada apa-apa untuk diimbas</string>
+
+    <string name="notification">Pemberitahuan</string>
+
+    <string name="now_playing_queue">Kini memainkan baris gilir</string>
+
+    <string name="only_on_wifi">Hanya dengan Wi-Fi</string>
+
+    <string name="past_three_months">3 bulan lepas</string>
+
+    <string name="permission_external_storage_denied">Keizinan untuk mencapai storan luar dinafikan.</string>
+
+    <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="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>
+
+    <string name="playlist_is_empty">Senarai main kosong</string>
+
+    <string name="playlist_name_empty">Nama senarai main</string>
+
+    <string name="playlists">Senarai main</string>
+
+    <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_playlists">Senarai main</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>
+    <string name="pref_summary_classic_notification">Gunakan reka bentuk pemberitahuan klasik.</string>
+    <string name="pref_summary_colored_app">Warna latar belakang, butang kawalan berubah mengikut warna seni album</string>
+    <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_dominant_color">Kebanyakan warna dominan akan diambil daripada seni album atau seniman</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_lock_screen">Tunjukkan kawalan skrin kunci untuk Retro Music</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_full_screen">Dayakan ini untuk mod terendam</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>
+    <string name="pref_title_app_shortcuts">Pintasan aplikasi berwarna</string>
+    <string name="pref_title_audio_ducking">Kurangkan kelantangan jika kehilangan fokus</string>
+    <string name="pref_title_auto_download_artist_images">Muat turun imej seniman secara automatik</string>
+    <string name="pref_title_blurred_album_art">Kulit album kabur</string>
+    <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_gapless_playback">Main semula tanpa sela</string>
+    <string name="pref_title_general_theme">Tema umum</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_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_dominant_color">Warna dominan</string>
+    <string name="pref_title_toggle_full_screen">Aplikasi skrin penuh</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>
+    <string name="pref_title_user_info">Maklumat pengguna</string>
+
+    <string name="primary_color">Warna utama</string>
+    <string name="primary_color_desc">Warna tema utama, tetapan asalnya adalah putih</string>
+
+    <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="remove_action">Alih keluar</string>
+
+    <string name="remove_cover">Alih keluar kulit</string>
+
+    <string name="remove_from_blacklist">Keluarkan daripada senarai hitam</string>
+
+    <string name="remove_song_from_playlist_title">Keluarkan lagu daripada senarai main</string>
+    <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_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_equalizer">Penyama Retro</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <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="scanned_files">%1$d daripada %2$d fail diimbas.</string>
+
+    <string name="search_hint">Cari pustaka anda...</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="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_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="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_dashboard">Papan pemuka</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_user_info">Siapakah nama anda</string>
+
+    <string name="today">Hari ini</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="unplayable_file">Tidak dapat memainkan lagu ini.</string>
+
+    <string name="up_next">Seterusnya</string>
+
+    <string name="update_image">Kemas kini imej</string>
+
+    <string name="updating">Mengemas kini...</string>
+
+    <string name="version">Versi</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>
+
+    <string name="x_selected">%1$d dipilih</string>
+
+    <string name="year">Tahun</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-my-rMM/strings.xml b/app/src/main/res/values-my-rMM/strings.xml
deleted file mode 100644
index 30294269b..000000000
--- a/app/src/main/res/values-my-rMM/strings.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">About %s</string>
-    <string name="about_settings_summary">အဖွဲ့နှင့် လူမှုကွန်ယက်လင့်ခ်များ</string>
-    <string name="accent_color">Accent Color</string>
-    <string name="accent_color_desc">The theme accent color (ခရမ်းရောင်သည်မူလအရောင်)</string>
-    <string name="action_about">About</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">အကြိုက်ဆုံးသို့ထည့်မည်</string>
-    <string name="action_add_to_playing_queue">နားထောင်နေသည့်စာရင်းထဲသို့ထည့်မည်</string>
-    <string name="action_add_to_playlist">Playlist သို့ထည့်မည်</string>
-    <string name="action_cancel">ပယ်ဖျက်မည်</string>
-    <string name="action_cast">Cast</string>
-    <string name="action_clear_playing_queue">နားထောင်နေသည့်စာရင်းအားရှင်းမည်</string>
-    <string name="action_cycle_repeat">Cycle repeat mode</string>
-    <string name="action_delete">ဖျက်မည်</string>
-    <string name="action_delete_from_device">Device မှဖျက်မည်</string>
-    <string name="action_details">အသေးစိတ်</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">Album သို့သွားမည်</string>
-    <string name="action_go_to_artist">အဆိုတော်သို့သွားမည်</string>
-    <string name="action_go_to_genre">အမျိုးအစားသို့သွားမည်</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Directory အစသို့သွားမည်</string>
-    <string name="action_grant">ခွင့်ပြုမည်</string>
-    <string name="action_grid_size">အကွက်အရွယ်အစား</string>
-    <string name="action_grid_size_land">အကွက်အရွယ်အစား (land)</string>
-    <string name="action_new_playlist">Playlist အသစ်</string>
-    <string name="action_next">နောက်တစ်ပုဒ်</string>
-    <string name="action_play">Play မည်</string>
-    <string name="action_play_all">အားလုံး play မည်</string>
-    <string name="action_play_next">Play next</string>
-    <string name="action_play_pause">Play/ခေတ္တရပ်</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">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">Ringtone အဖြစ်ထားမည်</string>
-    <string name="action_set_as_start_directory">Directory အစအဖြစ်ထားမည်</string>
-    <string name="action_settings">"Settings"</string>
-    <string name="action_share">မျှဝေမည်</string>
-    <string name="action_shuffle_all">အားလုံး Shuffle play မည်</string>
-    <string name="action_shuffle_playlist">Playlist အား Shuffle play မည်</string>
-    <string name="action_sleep_timer">Sleep Timer</string>
-    <string name="action_sort_order">အထားအသိုပြင်မည်</string>
-    <string name="action_tag_editor">Tag တည်းဖြတ်ခြင်း</string>
-    <string name="action_toggle_favorite">Toggle favorite</string>
-    <string name="action_toggle_shuffle">Toggle shuffle mode</string>
-    <string name="adaptive">Adaptive</string>
-    <string name="add_action">ထည့်မည်</string>
-    <string name="add_playlist_title">"အောက်ပါ Playlist သို့ထည့်မည်"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"နားထောင်နေသည့်စာရင်းထဲသို့ ၁ ပုဒ်ပေါင်းထည့်ခဲ့သည်"</string>
-    <string name="added_x_titles_to_playing_queue">နားထောင်နေသည့်စာရင်းထဲသို့ %1$d ပုဒ်ပေါင်းထည့်ခဲ့သည်</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="other">သီချင်းများ</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="other">Albums</item>
-    </plurals>
-    <string name="always">Always</string>
-    <string name="app_share">ဟေ့ အရမ်းမိုက်တဲ့ဒီ Music Player ကိုတစ်ချက်ကြည့်ကြည့်! 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">ထိပ်ဆုံးသီချင်းများ</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">ကတ်</string>
-    <string name="app_widget_classic_name">ရိုးရိုး</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">အသေး</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">အဆိုတော်</string>
-    <string name="artists">အဆိုတော်များ</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">အသံအာရုံစိုက်ခြင်းအား ပယ်ဖျက်ခဲ့သည်</string>
-    <string name="audio_settings_summary">အသံ Settings များပြောင်းလဲရန်နှင့် Equalizer ချိန်ညှိရန်</string>
-    <string name="auto">အလိုအလျောက်</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">အတ္ထုပတ္တိ</string>
-    <string name="black_theme_name">အနက်ရောင်သာ</string>
-    <string name="blacklist">လစ်လျူရှုမည့်စာရင်း</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">ကတ်အဝါး</string>
-    <string name="bug_report_failed">သတင်းပို့၍မရနိုင်ပါ</string>
-    <string name="bug_report_failed_invalid_token">မမှန်ကန်သော Access token ဖြစ်သည်။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။</string>
-    <string name="bug_report_failed_issues_not_available">ရွေးချယ်ထားသော Repository အတွက် Issue ဖွင့်ခွင့်မပေးထားပါ။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။</string>
-    <string name="bug_report_failed_unknown">မသိထားသော Error တက်သွားခဲ့သည်။ ကျေးဇူးပြု၍ App ရေးသားသူအားဆက်သွယ်ပါ။</string>
-    <string name="bug_report_failed_wrong_credentials">Username (သို့မဟုတ်) Password မှားနေသည်</string>
-    <string name="bug_report_issue">အကြောင်းအရာ</string>
-    <string name="bug_report_manual">ကိုယ်တိုင်အသေးစိတ်သတင်းပို့မည်</string>
-    <string name="bug_report_no_description">ကျေးဇူးပြု၍ အကြောင်းအရာအသေးစိတ်ကိုဖြည့်သွင်းပါ</string>
-    <string name="bug_report_no_password">ကျေးဇူးပြု၍ မှန်ကန်သော Github password ကိုဖြည့်သွင်းပါ</string>
-    <string name="bug_report_no_title">ကျေးဇူးပြု၍အကြောင်းအရာခေါင်းစဉ်အားဖြည့်သွင်းပါ</string>
-    <string name="bug_report_no_username">ကျေးဇူးပြု၍ မှန်ကန်သော Github username ကိုဖြည့်သွင်းပါ</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">မသိထားတဲ့ Error တစ်ခုတက်ခဲ့တယ်ဆိုပါစို့။ ဆက်ပြီး Crash ဖြစ်နေတယ်ဆိုရင် \"Clear App Data\" လုပ်ပါ (ဒါမှမဟုတ်) အီးမေးလ်ပို့ပါ။</string>
-    <string name="bug_report_use_account">GitHub အကောင့်ဖြင့်ပို့မည်</string>
-    <string name="buy_now">ယခုဝယ်မည်</string>
-    <string name="cancel_current_timer">ပယ်ဖျက်မည်</string>
-    <string name="card">ကတ်</string>
-    <string name="card_color_style">အရောင်ပါသောကတ်</string>
-    <string name="card_square">လေးထောင့်ကတ်</string>
-    <string name="card_style">ကတ်</string>
-    <string name="carousal_effect_on_now_playing_screen">Now Playing Screen ပေါ်တွင် Carousel effect </string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">ပြောင်းလဲမှုမှတ်တမ်း</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">အဝိုင်း</string>
-    <string name="circular">အဝိုင်း</string>
-    <string name="classic">ရိုးရိုး</string>
-    <string name="clear_action">ရှင်းမည်</string>
-    <string name="clear_blacklist">Blacklist အားရှင်းမည်</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">နားထောင်နေသည့်စာရင်းအားရှင်းမည်</string>
-    <string name="color">အရောင်</string>
-    <string name="colors">အရောင်များ</string>
-    <string name="compact">Compact</string>
-    <string name="composer">တေးရေးဆရာ</string>
-    <string name="copied_device_info_to_clipboard">Device အချက်အလက်အား Clipboard သို့ ကော်ပီကူးခဲ့ပြီး</string>
-    <string name="could_not_create_playlist">Playlist ဖန်တီး၍မရပါ</string>
-    <string name="could_not_download_album_cover">"ကိုက်ညီသော Album Cover ကို Download မလုပ်နိုင်ပါ"</string>
-    <string name="could_not_restore_purchase">ဝယ်ယူမှုကိုပြန်မရယူနိုင်ပါ</string>
-    <string name="could_not_scan_files">ဖိုင် %d ခုကိုစကန်မဖတ်နိုင်ပါ</string>
-    <string name="create_action">ဖန်တီးမည်</string>
-    <string name="create_new_backup">ဖန်တီးမည်</string>
-    <string name="created_playlist_x">ဖန်တီးထားသော Playlist %1$s ခု</string>
-    <string name="credit_title">အဖွဲ့ဝင်များနှင့် ကူညီသူများ</string>
-    <string name="currently_listening_to_x_by_x">%2$s သီဆိုထားသော %1$s ကိုယခုနားထောင်နေသည်</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">အနက်ရောင်ဆန်ဆန်</string>
-    <string name="delete_playlist_title">Playlist ဖျက်ခြင်း</string>
-    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> Playlist ကိုဖျက်မှာလား]]></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[Playlist <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">Deleting Songs</string>
-    <string name="depth">Depth</string>
-    <string name="description">အကြောင်းအရာအသေးစိတ်</string>
-    <string name="device_info">Device အချက်အလက်</string>
-    <string name="dialog_message_set_ringtone">အသံ Settings ပြုပြင်ရန် Retro Music ကိုခွင့်ပြုချက်ပေးပါ</string>
-    <string name="dialog_title_set_ringtone">Ringtone ထားခြင်း</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Blacklist ကိုရှင်းလင်းလိုပါသလား</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Blacklist မှ <b>%1$s</b> ကိုဖယ်ရှားလိုပါသလား]]></string>
-    <string name="donate">လှူဒါန်းမည်</string>
-    <string name="donate_summary">ကျွန်တော့်ရဲ့လက်ရာအတွက် မုန့်ဖိုးရဖို့ထိုက်တန်တယ်လို့ထင်ရင် ဒီမှာပေးသွားလိုက်ပါ။</string>
-    <string name="donation_header">ဝယ်ပေးမယ်: </string>
-    <string name="done">ပြီးပြီ</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">ဘာမှမရှိပါ</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">မေးလေ့ရှိသောမေးခွန်းများ</string>
-    <string name="favorites">အကြိုက်ဆုံး</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">အနေတော်</string>
-    <string name="flat">အပြားပုံစံ</string>
-    <string name="folders">Folders</string>
-    <string name="follow_system">System အတိုင်း</string>
-    <string name="for_you">သင့်အတွက်</string>
-    <string name="free">အခမဲ့</string>
-    <string name="full">အပြည့်</string>
-    <string name="full_card">ကတ်အပြည့်ပုံစံ</string>
-    <string name="general_settings_summary">App Theme နှင့် အရောင်များကိုပြောင်းလဲရန်</string>
-    <string name="general_settings_title">Look and Feel</string>
-    <string name="genre">အမျိုးအစား</string>
-    <string name="genres">အမျိုးအစားများ</string>
-    <string name="git_hub_summary">Project ကို GitHub မှာ Fork လုပ်ပါ</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
-    <string name="grid_size_1">၁</string>
-    <string name="grid_size_2">၂</string>
-    <string name="grid_size_3">၃</string>
-    <string name="grid_size_4">၄</string>
-    <string name="grid_size_5">၅</string>
-    <string name="grid_size_6">၆</string>
-    <string name="grid_size_7">၇</string>
-    <string name="grid_size_8">၈</string>
-    <string name="grid_style_label">အကွက်စတိုင်</string>
-    <string name="help_summary">အကူအညီထပ်လိုပါသေးလား</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">မှတ်တမ်း</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">မူလ</string>
-    <string name="horizontal_flip">ရေပြင်ညီအတိုင်းဟိုဘက်ဒီဘက်လှန်ခြင်း</string>
-    <string name="image">ဓာတ်ပုံ</string>
-    <string name="image_gradient">Gradient ပုံ</string>
-    <string name="image_settings_summary">အဆိုတော်ပုံအား ဒေါင်းလုဒ်ဆွဲခြင်း Settings များ</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">Android မီဒီယာစတိုးမှ Playlist များကိုသီချင်းများနှင့်အတူ import လုပ်သွားမည်ဖြစ်ပြီး ရှိပြီးသား Playlist ဖြစ်ပါကသီချင်းများကိုထည့်ပေါင်းသွားပါမည်။</string>
-    <string name="inserted_x_songs_into_playlist_x">Playlist %2$s သို့သီချင်း %1$d ပုဒ်ထည့်ပြီးပါပြီ</string>
-    <string name="instagram_page_summary">သင့်ရဲ့ Retro Music setup ကို Instagram တွင်ပြသလိုက်ပါ</string>
-    <string name="keyboard">ကီးဘုတ်</string>
-    <string name="label_bit_rate">Bitrate</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_last_modified">Last Modified</string>
-    <string name="label_more_from">%s ၏နောက်ထပ် Album များ</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">ကြာချိန်</string>
-    <string name="labeled">Label ထိုးထားမည်</string>
-    <string name="last_added">နောက်ဆုံးသွင်းထားသော</string>
-    <string name="last_song">နောက်ဆုံးအပုဒ်</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Tab အမျိုးအစားများ</string>
-    <string name="licenses">လိုင်စင်များ</string>
-    <string name="light_theme_name">အဖြူရောင်သက်သက်</string>
-    <string name="listeners_label">နားဆင်သူများ</string>
-    <string name="listing_files">ဖိုင်ပြန်စီနေသည်...</string>
-    <string name="loading_products">ခဏစောင့်ပါ...</string>
-    <string name="login">Login</string>
-    <string name="lyrics">သီချင်းစာသား</string>
-    <string name="made_with_love">အိန္ဒိယနိုင်ငံတွင် ❤️ များဖြင့် ဖန်တီးသည်</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Error</string>
-    <string name="md_storage_perm_error">Storage ခွင့်ပြုချက် error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">နာမည်</string>
-    <string name="my_top_tracks">အများဆုံးနားထောင်ခဲ့သော</string>
-    <string name="never">ဘယ်တော့မှ</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Playlist အသစ်</string>
-    <string name="new_start_directory">%s ဟာ Directory အစဖြစ်သွားပါပြီ</string>
-    <string name="next_song">နောက်တစ်ပုဒ်</string>
-    <string name="no_albums">Album တစ်ခုမှမရှိပါ</string>
-    <string name="no_artists">အဆိုတော်တစ်ယောက်မှမရှိပါ</string>
-    <string name="no_audio_ID">"သီချင်းတစ်ပုဒ်အရင် play ကြည့်ပြီးမှ ပြန်ကြိုးစားပါ"</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">Equalizer တစ်ခုမှရှာမတွေ့ပါ</string>
-    <string name="no_genres">အမျိုးအစားခွဲစရာတစ်ခုမှမရှိပါ</string>
-    <string name="no_lyrics_found">သီချင်းစာသားရှာမတွေ့ပါ</string>
-    <string name="no_playing_queue">သီချင်းတစ်ပုဒ်မှ play မထားပါ</string>
-    <string name="no_playlists">Playlist တစ်ခုမှမရှိပါ</string>
-    <string name="no_purchase_found">ဝယ်ယူထားမှုမရှိပါ</string>
-    <string name="no_results">ရှာမတွေ့ပါ</string>
-    <string name="no_songs">သီချင်းတစ်ပုဒ်မှမရှိပါ</string>
-    <string name="normal">ပုံမှန်</string>
-    <string name="normal_lyrics">ပုံမှန်သီချင်းစာသား</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> သည် Android မီဒီယာစတိုးတွင် မရှိပါ]]></string>
-    <string name="not_recently_played">မကြာသေးခင်က play မထားပါ</string>
-    <string name="nothing_to_scan">စကန်ဖတ်စရာမရှိပါ</string>
-    <string name="nothing_to_see">ကြည့်စရာတစ်ခုမှမရှိပါ</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Notification ပုံစံကို စိတ်ကြိုက်ပြင်ဆင်မည်</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Now playing screen ကိုစိတ်ကြိုက်ပြင်ခြင်း</string>
-    <string name="now_playing_themes">Now playing theme (၉) ခုအထက် ရရှိခြင်း</string>
-    <string name="only_on_wifi">Wi-Fi ဖြင့်သာ</string>
-    <string name="other_settings_summary">အဆင့်မြင့် Settings များ</string>
-    <string name="others">အခြား</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">လွန်ခဲ့သော (၃)လ</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">External Storage ကြည့်ရှုခွင့်အားငြင်းပယ်ခဲ့သည်။</string>
-    <string name="permission_summary">သီချင်းဖွင့်ရန်အတွက် ယခု App အား Storage ကြည့်ရှုခွင့်ပေးရန်လိုသည်။</string>
-    <string name="permission_title">Storage ကြည့်ရှုခွင့်</string>
-    <string name="permissions_denied">ခွင့်ပြုချက်ငြင်းပယ်ခံရသည်</string>
-    <string name="personalize">မိမိစိတ်ကြိုက်</string>
-    <string name="personalize_settings_summary">Now Playing နှင့် UI controls များကိုစိတ်ကြိုက်ပြင်ဆင်မည်</string>
-    <string name="pick_from_local_storage">Local Storage မှ ရွေးမည်</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Retro Music ဒီဇိုင်းအကြံဉာဏ်ကောင်းများအတွက် Pinterest page ကို follow ပါ</string>
-    <string name="plain">ရှင်းရှင်းလင်းလင်းပုံစံ</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">Playing notification သည် play/pause ခလုတ် စသည့်တို့ကိုဖော်ပြပေးသည်</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist တွင်ဘာမှမရှိပါ</string>
-    <string name="playlist_name_empty">Playlist နာမည်</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Blur Themes များအတွက်သက်ရောက်သော အဝါးပမာဏဖြစ်ပြီး ပမာဏနည်းလေ ပိုမြန်လေဖြစ်သည်</string>
-    <string name="pref_blur_amount_title">အဝါးပမာဏ</string>
-    <string name="pref_filter_song_summary">ကြာချိန်ဖြင့်သီချင်းစစ်ထုတ်မည်</string>
-    <string name="pref_filter_song_title">သီချင်းကြာချိန်စစ်ထုတ်ခြင်း</string>
-    <string name="pref_header_advanced">ပိုမိုဆန်းသစ်သော</string>
-    <string name="pref_header_album">Album စတိုင်</string>
-    <string name="pref_header_audio">အသံပိုင်းဆိုင်ရာ</string>
-    <string name="pref_header_blacklist">လစ်လျူရှုမည့်စာရင်း</string>
-    <string name="pref_header_controls">ထိန်းချုပ်မှုဆိုင်ရာ</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Volume သုညရောက်သွားပါက သီချင်းရပ်ပြီး Volume ပြန်ကျယ်လာသည့်အခါ ပြန် play မည်ဖြစ်သည်။ App ထဲဝင်မထားသော်လည်းအလုပ်လုပ်သည်။</string>
-    <string name="pref_keep_pause_on_zero_volume_title">သုည၌ရပ်ခြင်း</string>
-    <string name="pref_keep_screen_on_summary">ဤ feature ဖွင့်ထားပါက ဘက်ထရီသက်တမ်းထိခိုက်နိုင်ပါသည်</string>
-    <string name="pref_keep_screen_on_title">Screen တစ်ချိန်လုံးဖွင့်ထားမည်</string>
-    <string name="pref_language_name">ဘာသာစကားရွေးချယ်မည်</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">ယခု play နေသောသီချင်း Album cover ပုံအား Lockscreen wallpaper အဖြစ်ထားမည်</string>
-    <string name="pref_summary_album_artists_only">Album သီဆိုသူများကိုလည်း အဆိုတော် Category တွင်ထားမည်</string>
-    <string name="pref_summary_audio_ducking">System Sound (သို့) Notification တစ်ခုရောက်လာသည့်အခါ သီချင်းအသံကိုတိုးမည်</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">Blacklist folder သိို့သွင်းထားသည်များကို Library တွင်မြင်ရမည်မဟုတ်ပါ</string>
-    <string name="pref_summary_bluetooth_playback">Bluetooth device နှင့်ချိတ်ဆက်လိုက်သည်နှင့် သီချင်းစဖွင့်မည်</string>
-    <string name="pref_summary_blurred_album_art">Lockscreen တွင် Album cover ပုံကိုဝါးထားမည်။ Third-party app နှင့် Widget များတွင် ပြဿနာတက်နိုင်သည်။</string>
-    <string name="pref_summary_carousel_effect">Now Playing screen မှ Album cover အတွက် Carousel effect ဖြစ်သည်။ ဤ effect ကြောင့် ကတ်နှင့် ကတ်အဝါး Theme များအလုပ်လုပ်မည်မဟုတ်ပါ။</string>
-    <string name="pref_summary_classic_notification">Android ၏ Notification ဒီဇိုင်းအဟောင်းကိုသုံးမည်</string>
-    <string name="pref_summary_colored_app">နောက်ခံအရောင်နှင့်ထိန်းချုပ်ခလုတ်အရောင်များသည် Now Playing screen မှ Album cover အရောင်အတိုင်း ပြောင်းလဲပါမည်</string>
-    <string name="pref_summary_colored_app_shortcuts">Accent color မှ App shortcuts များကိုအရောင်ပြောင်းလဲသည်။ Accent color ပြောင်းသည့်အခါတိုင်း App ကိုသက်ရောက်မှုရှိစေရန် ဤခလုတ်ကိုအဖွင့်၊အပိတ်လုပ်ပေးပါ။</string>
-    <string name="pref_summary_colored_notification">"Notification အရောင်ကို Album cover မှထင်ရှားသည့်အရောင်အတိုင်း ပြောင်းမည်"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">Material ဒီဇိုင်းညွှန်ကြားချက်များအရ Dark Mode ဖွင့်ထားချိန်တွင်အရောင်များမှိန်နေသင့်သည်</string>
-    <string name="pref_summary_expand_now_playing_panel">Notification ကိုနှိပ်သည့်အခါ Home screen သို့ရောက်မည့်အစား Now Playing screen သို့တိုက်ရိုက်ရောက်သွားမည်</string>
-    <string name="pref_summary_extra_controls">Mini player တွင် ထိန်းချုပ်ခလုတ်အပိုများထပ်ပေါင်းမည်</string>
-    <string name="pref_summary_extra_song_info">သီချင်းဖိုင်၏အသေးစိတ်အချက်အလက်များ ပြသမည်၊ ဥပမာ - ဖိုင်အမျိုးအစား၊ bitrate နှင့် ကြိမ်နှုန်း</string>
-    <string name="pref_summary_gapless_playback">"အချို့ device များတွင် playback ပြဿနာများဖြစ်ပေါ်နိုင်သည်"</string>
-    <string name="pref_summary_home_banner">Home banner အား ပြသခြင်း၊ ဖျောက်ထားခြင်း</string>
-    <string name="pref_summary_ignore_media_store_artwork">Album cover အရည်အသွေးပိုမိုကောင်းမွန်လာနိုင်သော်လည်း Loading time ပိုကြာနိုင်သည်။ အရည်အသွေးနိမ့်သောပုံများနှင့်အဆင်မပြေမှသာလျှင် ဤခလုတ်ကိုဖွင့်ပါ။</string>
-    <string name="pref_summary_library_categories">Library category များ ဖော်ခြင်း၊ ဖျောက်ခြင်းနှင့် အထားအသိုများ ချိန်ညှိမည်</string>
-    <string name="pref_summary_lock_screen">Retro Music ၏ ပြင်ဆင်ထားသော Lockscreen controls များကိုသုံးမည်</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">Open Source software အတွက် လိုင်စင်အချက်အလက်များ</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">နားကြပ်နှင့်ချိတ်ဆက်ပြီးသည့်နှင့် စတင် play မည်</string>
-    <string name="pref_summary_toggle_shuffle">သီချင်းဖွင့်မည့်စာရင်း\'အသစ်\'ကို play သည့်အခါ Shuffle Mode ပိတ်သွားပါမည်</string>
-    <string name="pref_summary_toggle_volume">နေရာလုံလုံလောက်လောက်ရှိပါက Now Playing screen တွင် အသံအတိုးအကျယ်ခလုတ်များပြသမည်</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Album cover ပြသခြင်း</string>
-    <string name="pref_title_album_artists_only">Album သီဆိုသူဖြင့် ရှာဖွေခြင်း</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored App shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">အဆိုတော်ဓာတ်ပုံများကို အလိုအလျောက်ဒေါင်းလုဒ်ဆွဲခြင်း</string>
-    <string name="pref_title_blacklist">လစ်လျူရှုမည့်စာရင်း</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Album cover အဝါး</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Notification ဒီဇိုင်းအဟောင်း</string>
-    <string name="pref_title_colored_app">Adaptive color</string>
-    <string name="pref_title_colored_notification">အရောင်ပါသော notification</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Now Playing screen ပြသခြင်း</string>
-    <string name="pref_title_extra_controls">အပိုထိန်းချုပ်မှုများ</string>
-    <string name="pref_title_extra_song_info">သီချင်းဖိုင်အချက်အလက် </string>
-    <string name="pref_title_gapless_playback">လစ်ဟာမှုမရှိ play ခြင်း</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album အကွက်ပုံစံ</string>
-    <string name="pref_title_home_artist_grid_style">အဆိုတော်အကွက်ပုံစံ</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Media Store covers များကိုလျစ်လျူရှုခြင်း</string>
-    <string name="pref_title_last_added_interval">နောက်ဆုံးသွင်းထားသော playlist ရှိသီချင်းများ</string>
-    <string name="pref_title_lock_screen">Lockscreen အပြည့် controls</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab ခေါင်းစဉ်ပြသခြင်း</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">App ကို screen အပြည့်ထားမည်</string>
-    <string name="pref_title_toggle_toggle_headset">အလိုအလျောက် play ခြင်း</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
-    <string name="pref_title_toggle_volume">အသံထိန်းချုပ်မှု</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">ဝယ်ယူမည်</string>
-    <string name="queue">နားထောင်နေသည့်စာရင်း</string>
-    <string name="rate_app">ဤ app ကို star ပေးမည်</string>
-    <string name="rate_on_google_play_summary">App ကိုကြိုက်ပါသလား။ ယခုထက်ပိုကောင်းမွန်အောင်ဘယ်လိုလုပ်ရမလဲဆိုတာ ကျွန်တော်တို့ကို Google Play Store မှာပြောပြပေးပါ။</string>
-    <string name="recent_albums">မကြာသေးခင်ကနားထောင်ထားသော Album များ</string>
-    <string name="recent_artists">မကြာသေးခင်ကနားထောင်ထားသော အဆိုတော်များ</string>
-    <string name="remove_action">ပယ်ဖျက်မည်</string>
-    <string name="remove_cover">Cover ကိုဖျက်မည်</string>
-    <string name="remove_from_blacklist">Blacklist မှဖျက်မည်</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Playlist မှဖျက်မည်</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_playlist_title">Playlist နာမည်ပြင်မည်</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">ပြဿနာတစ်ခုသတင်းပို့မည်</string>
-    <string name="report_bug">Bug report တင်မည်</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">ပြန်လည်ရယူမည်</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">ယခင်ဝယ်ယူမှုကို ပြန်လည်ရယူပြီးပါပြီ။ Feature အားလုံးအလုပ်လုပ်ရန် app မှထွက်ပြီးပြန်ဝင်ပါ။</string>
-    <string name="restored_previous_purchases">ယခင်ဝယ်ယူမှုအား ပြန်လည်ရယူပြီးပါပြီ</string>
-    <string name="restoring_purchase">ယခင်ဝယ်ယူမှုအား ပြန်လည်ရယူနေသည်...</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">သီချင်းများကို Ringtone ထားရန် app အား System Settings များကိုပြင်ဆင်ခွင့်ပေးရန်လိုသည်။</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">ဖိုင်ဖျက်ခြင်းမအောင်မြင်ပါ: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">SAF URI ကိုမရယူနိုင်ပါ</string>
-    <string name="saf_guide_slide1_description">Navigation drawer ကိုဖွင့်ပါ</string>
-    <string name="saf_guide_slide1_description_before_o">Overflow Menu မှ \'Show SD card\' ကိုနှိပ်ပါ</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s သည် SD card ကြည့်ရှုခွင့်လိုအပ်သည်</string>
-    <string name="saf_guide_slide2_description">SD card ၏ ထိပ်ဆုံး Directory ကိုရွေးပေးရန်လိုအပ်သည်</string>
-    <string name="saf_guide_slide2_title">Navigation drawer တွင် SD card ကိုရွေးချယ်ပါ</string>
-    <string name="saf_guide_slide3_description">Folder အခွဲများကို မဖွင့်ပါနှင့်</string>
-    <string name="saf_guide_slide3_title">Screen ၏အောက်ဆုံးတွင်ရှိသော \'select\' ခလုတ်ကိုနှိပ်ပါ</string>
-    <string name="saf_write_failed">ဖိုင်ပြုပြင်ခြင်းမအောင်မြင်ပါ: %s</string>
-    <string name="save">မှတ်ထားမည်</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">ဖိုင်အဖြစ်သိမ်းမည်</string>
-    <string name="save_playlists_title">ဖိုင်များအဖြစ်သိမ်းမည်</string>
-    <string name="saved_playlist_to">%s တွင် playlist ကိုသိမ်းခဲ့သည်</string>
-    <string name="saving_changes">ပြောင်းလဲမှုများကိုမှတ်သားနေသည်</string>
-    <string name="scan_media">မီဒီယာစကန်ဖတ်မည်</string>
-    <string name="scanned_files">ဖိုင် %2$d ခုအနက် %1$d ခုကို စကန်ဖတ်ပြီးပါပြီ</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">အားလုံးရွေးမည်</string>
-    <string name="selected">ရွေးချယ်ထားသော</string>
-    <string name="set">ထားမည်</string>
-    <string name="set_artist_image">အဆိုတော်ပုံအဖြစ်ထားမည်</string>
-    <string name="share_app">App ကိုမျှဝေမည်</string>
-    <string name="share_summary">သင့်မိသားစုနှင့် သူငယ်ချင်းများကိုပြန်လည်မျှဝေလိုက်ပါ</string>
-    <string name="share_to_stories">Stories သို့မျှဝေမည်</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">ရိုးရိုးရှင်းရှင်း</string>
-    <string name="sleep_timer_canceled">Sleep timer ကိုဖျက်ပြီးပါပြီ</string>
-    <string name="sleep_timer_set">ယခုမှစတင်၍ Sleep timer ကို %d မိနစ်အချိန်မှတ်ပြီးပါပြီ</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Story မျှဝေမည်</string>
-    <string name="song">သီချင်း</string>
-    <string name="song_duration">သီချင်းကြာချိန်</string>
-    <string name="songs">သီချင်းများ</string>
-    <string name="sort_order">အထားအသိုပြင်မည်</string>
-    <string name="sort_order_a_z">ငယ်ရာမှကြီးရာ</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">အဆိုတော်</string>
-    <string name="sort_order_composer">တေးရေးဆရာ</string>
-    <string name="sort_order_date">ထည့်သွင်းသည့်ရက်</string>
-    <string name="sort_order_date_modified">ပြင်ဆင်သည့်ရက်</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">အပုဒ်အရေအတွက်</string>
-    <string name="sort_order_num_songs_desc">အပုဒ်အရေအတွက်ပြောင်းပြန်</string>
-    <string name="sort_order_year">ထွက်ရှိသည့်နှစ်</string>
-    <string name="sort_order_z_a">ကြီးရာမှငယ်ရာ</string>
-    <string name="speech_not_supported">ဆောရီး! သင့် device သည် အသံဖြင့်ပြောဆိုခြင်းအား အထောက်အပံ့မပေးထားပါ</string>
-    <string name="speech_prompt">သင့် Library တွင်ရှာဖွေခြင်း</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">သီချင်းစတင် play ပါပြီ</string>
-    <string name="suggestion_songs">အကြံပြုထားသောသီချင်းများ</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">ချိန်ကိုက်ထားသောသီချင်းစာသား</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Bugs များကို ဆွေးနွေးရန်၊ အကြံပြုချက်များပေးရန်၊ ကြွားရန်နှင့် စသည်များ...</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">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">နာမည်</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">ယနေ့</string>
-    <string name="top_albums">ထိပ်ဆုံး Album များ</string>
-    <string name="top_artists">ထိပ်ဆုံးအဆိုတော်များ</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">အပုဒ်နံပါတ်</string>
-    <string name="translate">ဘာသာပြန်ခြင်း</string>
-    <string name="translate_community">App ကိုသင့်ဘာသာစကားသို့ ကူပြန်ပေးပါ</string>
-    <string name="try_retro_music_premium">Retro Music Premium ကိုစမ်းကြည့်ပါ</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">သင့် Retro Music ဒီဇိုင်းများကိုမျှဝေပါ</string>
-    <string name="unlabeled">Label မထိုးပါ</string>
-    <string name="unplayable_file">ဤသီချင်းကို မ play နိုင်ပါ</string>
-    <string name="up_next">လာမည့်အပုဒ်</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">အပ်ဒိတ်လုပ်နေသည်…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">သုံးစွဲသူ</string>
-    <string name="username">သုံးစွဲသူအမည်</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">ဒေါင်လိုက်ဟိုဘက်ဒီဘက်လှန်ခြင်း</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">အသံအတိုးအကျယ်</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">မင်္ဂလာပါ</string>
-    <string name="what_do_you_want_to_share">ဘာများမျှဝေချင်ပါသလဲ</string>
-    <string name="whats_new">ဘာအသစ်တွေရှိလဲ</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">အနားအကွေးပုံစံ</string>
-    <string name="x_has_been_set_as_ringtone">%1$s ကို Ringtone အဖြစ်ထားပြီးပါပြီ</string>
-    <string name="x_selected">%1$d ခုကိုရွေးထားသည်</string>
-    <string name="year">ထွက်ရှိသည့်နှစ်</string>
-    <string name="you_have_to_select_at_least_one_category">အနည်းဆုံး category တစ်ခုရွေးချယ်ရန်လိုအပ်သည်</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Issue tracker website သို့ခေါ်ဆောင်သွားပါမည်</string>
-    <string name="your_account_data_is_only_used_for_authentication">သင့်အကောင့်အချက်အလက်ကို အတည်ပြုရန်အတွက်သာအသုံးပြုပါသည်။</string>
-</resources>
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index 33a2b2f6b..69f875c28 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -1,4 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?><!--
+<?xml version="1.0" encoding="utf-8"?>
+<!--
   ~ Copyright (c) 2019 Hemanth Savarala.
   ~
   ~ Licensed under the GNU General Public License v3
@@ -14,17 +15,26 @@
 
 <resources>
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_background_color">?attr/colorSurface</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="android:windowLightNavigationBar">false</item>
+        <!--Manual setting colors-->
+        <item name="colorPrimary">@color/darkColorPrimary</item>
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="materialCardViewStyle">@style/Widget.MaterialComponents.CardView</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night-v31/styles.xml b/app/src/main/res/values-night-v31/styles.xml
deleted file mode 100644
index ed9ee3788..000000000
--- a/app/src/main/res/values-night-v31/styles.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<resources>
-    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3">
-        <item name="colorSurface">@color/blackColorSurface</item>
-    </style>
-
-    <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="colorSurface">@android:color/system_accent2_800</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
deleted file mode 100644
index e25b5f1f4..000000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <color name="window_color">@android:color/black</color>
-
-    <color name="bottomSheetColor">#202020</color>
-    <color name="widget_md3_bg_color">@color/darkerColorSurface</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/colors_md3.xml b/app/src/main/res/values-night/colors_md3.xml
deleted file mode 100644
index 4450fd615..000000000
--- a/app/src/main/res/values-night/colors_md3.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="elevationOverlay">@color/elevationOverlayDark</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index cd45bb5ce..e53f21ee5 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -14,17 +14,25 @@
 
 <resources>
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_background_color">?attr/colorSurface</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <!--Manual setting colors-->
         <item name="colorPrimary">@color/darkColorPrimary</item>
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
deleted file mode 100644
index 070ec270a..000000000
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Over %s</string>
-    <string name="about_settings_summary">Team, sociale linkjes</string>
-    <string name="accent_color">Accent kleur</string>
-    <string name="accent_color_desc">De accent kleur, standaard naar groen</string>
-    <string name="action_about">Over</string>
-    <string name="action_add_to_blacklist">Voeg toe aan zwarte lijst</string>
-    <string name="action_add_to_favorites">Toevoegen aan favorieten</string>
-    <string name="action_add_to_playing_queue">Voeg toe aan afspeel wachtrij</string>
-    <string name="action_add_to_playlist">Voeg toe aan afspeellijst...</string>
-    <string name="action_cancel">Annuleer huidige timer</string>
-    <string name="action_cast">Casten</string>
-    <string name="action_clear_playing_queue">Afspeel wachtrij legen</string>
-    <string name="action_cycle_repeat">Wissel herhalingmodus</string>
-    <string name="action_delete">Verwijder</string>
-    <string name="action_delete_from_device">Verwijder van apparaat</string>
-    <string name="action_details">Details</string>
-    <string name="action_edit">Bewerk</string>
-    <string name="action_go_to_album">Ga naar album </string>
-    <string name="action_go_to_artist">Ga naar artiest</string>
-    <string name="action_go_to_genre">Ga naar genre</string>
-    <string name="action_go_to_lyrics">Ga naar Songtekst</string>
-    <string name="action_go_to_start_directory">Ga naar begin directory</string>
-    <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_all">Speel alles</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_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>
-    <string name="action_rename">Hernoem</string>
-    <string name="action_save_playing_queue">Afspeel wachtrij opslaan</string>
-    <string name="action_scan">Scannen</string>
-    <string name="action_search">Zoek</string>
-    <string name="action_set">Instellen</string>
-    <string name="action_set_as_ringtone">Stel in als ringtone</string>
-    <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_shuffle_all">Shuffle alles</string>
-    <string name="action_shuffle_playlist">Shuffle afspeellijst</string>
-    <string name="action_sleep_timer">Slaap timer</string>
-    <string name="action_sort_order">Sorteer volgorde</string>
-    <string name="action_tag_editor">Tags aanpassen</string>
-    <string name="action_toggle_favorite">Favorieten in-/uitschakelen</string>
-    <string name="action_toggle_shuffle">Shuffle mode in-/uitschakelen</string>
-    <string name="adaptive">Adaptief</string>
-    <string name="add_action">Toevoegen</string>
-    <string name="add_playlist_title">"Toevogen aan afspeellijst"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">%1$d nummer(s) toegevoegd aan %2$s</string>
-    <string name="added_title_to_playing_queue">"1 titel aan afspeel wachtrij toegevoegd."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d titels toegevoegd aan afspeel wachtrij</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Nummers</item>
-    </plurals>
-    <string name="album_artist">Albumartiest</string>
-    <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
-    <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_widget_big_name">Volledige Afbeelding</string>
-    <string name="app_widget_card_name">Kaart</string>
-    <string name="app_widget_classic_name">Klassiek</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Klein</string>
-    <string name="app_widget_text_name">Minimale tekst</string>
-    <string name="artist">Artiest</string>
-    <string name="artists">Artiesten</string>
-    <string name="audio_fade_duration">Audio fade duur</string>
-    <string name="audio_focus_denied">Geluid focus geweigerd </string>
-    <string name="audio_settings_summary">Wijzig de geluidsinstellingen en pas de equalizer aan</string>
-    <string name="auto">Automatisch</string>
-    <string name="backup_restore_settings_summary">Back-up en herstel je instellingen, afspeellijsten</string>
-    <string name="backup_restore_title"><![CDATA[Back-up & Herstel]]></string>
-    <string name="backup_title">Back-ups</string>
-    <string name="biography">Biografie</string>
-    <string name="black_theme_name">Gewoon zwart</string>
-    <string name="blacklist">Zwarte lijst</string>
-    <string name="bluetooth_summary">De app heeft nabije toestel toestemming nodig om te checken voor bluetooth toestellen</string>
-    <string name="bluetooth_title">Apparaten in de buurt</string>
-    <string name="blur">Vervagen</string>
-    <string name="blur_card">Vervaag Kaart</string>
-    <string name="bug_report_failed">Mislukt om het rapport te verzenden</string>
-    <string name="bug_report_failed_invalid_token">Ongeldige toegangstoken. Neem alsjeblieft contact op met de app-ontwikkelaar.</string>
-    <string name="bug_report_failed_issues_not_available">Problemen zijn niet ingeschakeld voor de geselecteerde opslagplaats. Gelieve de app ontwikkelaar te contacteren.</string>
-    <string name="bug_report_failed_unknown">Er is een onverwachte fout opgetreden. Neem alsjeblieft contact op met de app-ontwikkelaar.</string>
-    <string name="bug_report_failed_wrong_credentials">Verkeerde gebruikersnaam of wachtwoord</string>
-    <string name="bug_report_issue">Probleem</string>
-    <string name="bug_report_manual">Verstuur handmatig</string>
-    <string name="bug_report_no_description">Vul alsjeblieft een beschrijving voor het probleem in</string>
-    <string name="bug_report_no_password">Vul alsjeblieft je geldig GitHub-wachtwoord in</string>
-    <string name="bug_report_no_title">Vul alsjeblieft een titel voor het probleem in</string>
-    <string name="bug_report_no_username">Vul alsjeblieft je geldig GitHub-gebruikersnaam in</string>
-    <string name="bug_report_success">Fout rapporteren succesvol</string>
-    <string name="bug_report_summary">Een onverwachte fout is opgetreden. Het spijt me dat je deze bug tegengekomen bent. Als het blijft crashen, kies dan \"Clear app data\" of verstuur een email </string>
-    <string name="bug_report_use_account">Verstuur door middel van je GitHub-account</string>
-    <string name="buy_now">Kopen</string>
-    <string name="cancel_current_timer">Annuleer huidige timer</string>
-    <string name="card">Kaart</string>
-    <string name="card_color_style">Gekleurde Kaart</string>
-    <string name="card_square">Vierkante Kaart</string>
-    <string name="card_style">Kaart</string>
-    <string name="carousal_effect_on_now_playing_screen">Carrousel effect op het nu aan het spelen scherm</string>
-    <string name="cascading">Trapsgewijs</string>
-    <string name="changelog">Logboek</string>
-    <string name="changelog_summary">Bekijk wat er nieuw is</string>
-    <string name="choose_image">Kies Afbeelding</string>
-    <string name="choose_restore_title">Kies wat u wil herstellen</string>
-    <string name="circle">Cirkel</string>
-    <string name="circular">Rond</string>
-    <string name="classic">Klassiek</string>
-    <string name="clear_action">Legen</string>
-    <string name="clear_blacklist">Leeg zwarte lijst</string>
-    <string name="clear_history">Geschiedenis Wissen</string>
-    <string name="clear_playing_queue">Maak wachtrij leeg</string>
-    <string name="color">Kleur</string>
-    <string name="colors">Kleuren</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Componist</string>
-    <string name="copied_device_info_to_clipboard">Apparaatinfo is naar klembord gekopiëerd.</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>
-    <string name="could_not_restore_purchase">Kon aankoop niet herstellen.</string>
-    <string name="could_not_scan_files">Kon %d files niet scannen.</string>
-    <string name="create_action">Aanmaken</string>
-    <string name="create_new_backup">Aanmaken</string>
-    <string name="created_playlist_x">Afspeellijst %1$s aangemaakt.</string>
-    <string name="credit_title">Leden en bijdragers </string>
-    <string name="currently_listening_to_x_by_x">Nu luisterend naar %1$s van %2$s.</string>
-    <string name="custom_artist_images">Aangepaste artiestenafbeeldingen</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Deel Crash Rapport</string>
-    <string name="dark_theme_name">Soort van donker</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">Verwijder nummer</string>
-    <string name="delete_song_x"><![CDATA[Verwijder liedje <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Verwijder nummers</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>
-    <string name="deleting_songs">Nummers aan het verwijderen</string>
-    <string name="depth">Diepte</string>
-    <string name="description">Beschrijving</string>
-    <string name="device_info">Apparaatinfo</string>
-    <string name="dialog_message_set_ringtone">Sta Retro Music toe om audioinstellingen te wijzigen</string>
-    <string name="dialog_title_set_ringtone">Stel in als beltoon</string>
-    <string name="disc_hint">Schijfnummer</string>
-    <string name="do_you_want_to_clear_the_blacklist">Wil je de zwarte lijst leegmaken?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Wil je <b>%1$s</b> verwijderen van de zwarte lijst?]]></string>
-    <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="donation_header">Koop mij een</string>
-    <string name="done">Klaar</string>
-    <string name="drive_mode">Rijmodus</string>
-    <string name="edit_fab">Bewerk knop</string>
-    <string name="edit_normal_lyrics">Muziek tekst bewerken</string>
-    <string name="edit_synced_lyrics">Gesynchroniseerde muziek tekst bewerken</string>
-    <string name="empty">Leeg</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Kon geen back-up maken</string>
-    <string name="error_delete_backup">Kon back-up niet verwijderen</string>
-    <string name="error_empty_name">Uw naam kan niet leeg zijn!</string>
-    <string name="error_load_failed">Laden mislukt</string>
-    <string name="error_share_file">Kon bestand niet delen</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">Veelgestelde vragen</string>
-    <string name="favorites">Favorieten</string>
-    <string name="file_already_exists">Bestand bestaat al</string>
-    <string name="finish_last_song">Eindig laatste nummer</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Plat</string>
-    <string name="folders">Mappen</string>
-    <string name="follow_system">Volg systeem</string>
-    <string name="for_you">Voor jou</string>
-    <string name="free">Gratis</string>
-    <string name="full">Vol</string>
-    <string name="full_card">Volledige kaart</string>
-    <string name="general_settings_summary">Pas het thema en de kleuren van de app aan</string>
-    <string name="general_settings_title">Look en feel</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genres</string>
-    <string name="git_hub_summary">Fork het project op GitHub</string>
-    <string name="gradient">Gradiënt</string>
-    <string name="grant_access">Verleen toegang</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="grid_style_label">Rasterstijl</string>
-    <string name="help_summary">Meer hulp nodig?</string>
-    <string name="hinge">Scharnier</string>
-    <string name="history">Geschiedenis</string>
-    <string name="history_cleared">Geschiedenis gewist</string>
-    <string name="history_undo_button">Ongedaan maken</string>
-    <string name="home">Start</string>
-    <string name="horizontal_flip">Flip horizontaal</string>
-    <string name="image">Afbeelding</string>
-    <string name="image_gradient">Gradiënt afbeelding</string>
-    <string name="image_settings_summary">Wijzig downloadinstellingen voor artiesten afbeeldingen</string>
-    <string name="import_label">Importeren</string>
-    <string name="import_playlist">Importeer afspeellijst</string>
-    <string name="import_playlist_message">Het importeert alle afspeellijsten binnenin de Android Media Store met nummers. Als de afspeellijst al bestaat, worden de nummers samengevoegd.</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$d liedjes toegevoegd aan afspeellijst %2$s.</string>
-    <string name="instagram_page_summary">Deel jouw Retro Music setup om anderen te emotioneren op Instagram</string>
-    <string name="keyboard">Keyboard</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Formaat</string>
-    <string name="label_file_name">Bestandsnaam</string>
-    <string name="label_file_path">Bestandslocatie</string>
-    <string name="label_file_size">Grootte</string>
-    <string name="label_last_modified">Laatst gewijzigd</string>
-    <string name="label_more_from">Meer van %s</string>
-    <string name="label_sampling_rate">Samplingfrequentie</string>
-    <string name="label_track_length">Duur</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Laatst toegevoegd</string>
-    <string name="last_song">Vorige nummer</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Bibliotheek categorieën</string>
-    <string name="licenses">Licenties</string>
-    <string name="light_theme_name">Clearly wit</string>
-    <string name="listeners_label">Luisteraars</string>
-    <string name="listing_files">Luister bestanden</string>
-    <string name="loading_products">Podcasts laden...</string>
-    <string name="login">Inloggen</string>
-    <string name="lyrics">Tekst/Lyrics</string>
-    <string name="made_with_love">Gemaakt met ❤️ in India</string>
-    <string name="material">Materiaal</string>
-    <string name="md_error_label">Fout</string>
-    <string name="md_storage_perm_error">Toegangsfout</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Niet meer dan 5 items</string>
-    <string name="message_pro_feature">%s is een Pro-functie.</string>
-    <string name="message_restore_success">Herstellen succesvol voltooid.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hallo! <br>Welkom bij %s]]></string>
-    <string name="my_name">Mijn naam</string>
-    <string name="my_top_tracks">Mijn top tracks</string>
-    <string name="never">Nooit</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Nieuwe afspeellijst</string>
-    <string name="new_start_directory">%s is de nieuwe start folder</string>
-    <string name="next_song">Volgend Nummer</string>
-    <string name="no_albums">Geen albums</string>
-    <string name="no_artists">Geen artiesten</string>
-    <string name="no_audio_ID">"Laat eerst een liedje afspelen, probeer dan opniew."</string>
-    <string name="no_backups_found">Geen Back-ups Gevonden</string>
-    <string name="no_equalizer">Geen equalizer gevonden.</string>
-    <string name="no_genres">Je hebt geen genres</string>
-    <string name="no_lyrics_found">Geen lyrics gevonden</string>
-    <string name="no_playing_queue">Geen nummer draaiend</string>
-    <string name="no_playlists">Geen afspeellijsten</string>
-    <string name="no_purchase_found">Geen aankoop gevonden.</string>
-    <string name="no_results">Geen resultaten</string>
-    <string name="no_songs">Geen liedjes</string>
-    <string name="normal">Normaal</string>
-    <string name="normal_lyrics">Normale tekst/lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> staat niet in de media store]]></string>
-    <string name="not_recently_played">Al een tijdje niet beluisterd</string>
-    <string name="nothing_to_scan">Niets om te scannen</string>
-    <string name="nothing_to_see">Niks te zien hier, enkel leegte</string>
-    <string name="notification">Notificatie</string>
-    <string name="notification_settings_summary">Pas de notificatiestijl aan</string>
-    <string name="now_playing">Speelt nu</string>
-    <string name="now_playing_queue">Nu afspeel wachtrij</string>
-    <string name="now_playing_summary">Pas het \"speelt nu\"-scherm aan</string>
-    <string name="now_playing_themes">9+ \"speelt nu\" thema\'s</string>
-    <string name="only_on_wifi">Alleen Wi-Fi</string>
-    <string name="other_settings_summary">Geavanceerde beveiligingsfuncties</string>
-    <string name="others">Anders</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Wachtwoord</string>
-    <string name="past_three_months">Laatste 3 maanden</string>
-    <string name="paste_lyrics_here">Plak tekst/lyrics hier</string>
-    <string name="paste_timeframe_lyrics_here">Plak timeframe tekst/lyrics hier</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permissie voor toegang tot extern opslag is afgewezen</string>
-    <string name="permission_summary">De app heeft toestemming nodig tot je apparaat\'s opslag om muziek af te kunnen spelen</string>
-    <string name="permission_title">Toegang tot opslag</string>
-    <string name="permissions_denied">Permissies afgewezen</string>
-    <string name="personalize">Personaliseer</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Kies van local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Vlak</string>
-    <string name="playList_already_exits">Afspeellijst bestaat al</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Afspeel instellingen</string>
-    <string name="playback_speed">Afspeelsnelheid</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_created_sucessfully">%s succesvol aangemaakt</string>
-    <string name="playlist_is_empty">Afspeellijst is leeg</string>
-    <string name="playlist_name_empty">Naam afspeellijst</string>
-    <string name="playlists">Afspeellijsten</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter nummers op lengte</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Geavanceerd</string>
-    <string name="pref_header_album">Album stijl</string>
-    <string name="pref_header_audio">Geluid</string>
-    <string name="pref_header_blacklist">Zwarte lijst</string>
-    <string name="pref_header_controls">Bedieningselementen</string>
-    <string name="pref_header_general">Thema</string>
-    <string name="pref_header_images">Afbeeldingen</string>
-    <string name="pref_header_library">Bibliotheek</string>
-    <string name="pref_header_lockscreen">Vergrendelscherm</string>
-    <string name="pref_header_playlists">Afspeellijsten</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pauzeer op nul</string>
-    <string name="pref_keep_screen_on_summary">Houd er rekening mee dat het inschakelen van deze functie de levensduur van de batterij kan beïnvloeden</string>
-    <string name="pref_keep_screen_on_title">Houd het scherm aan</string>
-    <string name="pref_language_name">Taal selecteren</string>
-    <string name="pref_snow_fall_title">Sneeuwval effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Gebruik de huidige cover als vergrendelscherm achtergrond.</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Notificaties, bediening etc.</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <string name="pref_summary_blurred_album_art">Vervaagt de album cover op het vergrendelscherm. Kan problemen veroorzaken met apps van derde en 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_classic_notification">Gebruik het klassieke notificatie design.</string>
-    <string name="pref_summary_colored_app">Achtergrond, de kleur van de besturingstoetsen verandert overeenstemmend met de album opmaak van het afspeelscherm</string>
-    <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_notification">"Kleurt de notificatie in de kleur van de album cover"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Extra besturingselementen voor mini speler toevoegen</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Kan afspeelproblemen veroorzaken op sommige toestellen"</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_library_categories">Configure visibility and order of library categories.</string>
-    <string name="pref_summary_lock_screen">Zet besturing knoppen aan op vergrendelscherm</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">Licentie details voor open source software</string>
-    <string name="pref_summary_pause_history">Wanneer ingeschakeld, zullen nieuw afgespeelde nummers niet zichtbaar zijn in de geschiedenis</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Toon Nieuwe Muziek Mix op het startscherm</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Zet dit aan voor immersive mode</string>
-    <string name="pref_summary_toggle_headset">Wanneer headphones ingeplugd zijn, afspelen start automatisch</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_volume">Als er ruimte is in het nu afspelen scherm, zet volume knoppen aan</string>
-    <string name="pref_summary_wallpaper_accent">Haal accentkleur uit achtergrond</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Laat album cover zien</string>
-    <string name="pref_title_album_artists_only">Navigeer via Album Artiest</string>
-    <string name="pref_title_album_cover_style">Album cover thema</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Gekleurde app snelkoppelingen</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Beperk volume bij verliezen focus</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Automatisch downloaden artisten afbeeldingen</string>
-    <string name="pref_title_blacklist">Zwarte lijst</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Vervaag album cover</string>
-    <string name="pref_title_circle_button">Ronde afspeelknop</string>
-    <string name="pref_title_classic_notification">Klassiek notificatie design</string>
-    <string name="pref_title_colored_app">Aangepaste kleur</string>
-    <string name="pref_title_colored_notification">Gekleurde notificatie</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Gebruik Manrope lettertype</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Afspelen zonder pauzes</string>
-    <string name="pref_title_general_theme">Basis thema</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Altijd afspelen</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_pause_history">Pauzeer geschiedenis</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carrousel-effect</string>
-    <string name="pref_title_toggle_full_screen">Volledig scherm app</string>
-    <string name="pref_title_toggle_toggle_headset">Automatisch afspelen</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shufflemodus</string>
-    <string name="pref_title_toggle_volume">Volume knoppen</string>
-    <string name="pref_title_wallpaper_accent">Achtergrond accentkleur</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profiel</string>
-    <string name="purchase">Kopen</string>
-    <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_albums">Recente albums</string>
-    <string name="recent_artists">Recente artiesten</string>
-    <string name="remove_action">Verwijderen</string>
-    <string name="remove_cover">Verwijder cover</string>
-    <string name="remove_from_blacklist">Verwijder van zwarte lijst</string>
-    <string name="remove_image">Verwijder afbeelding</string>
-    <string name="remove_song_from_playlist_title">Verwijder liedje van afspeellijst</string>
-    <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_playlist_title">Hernoem afspeellijst</string>
-    <string name="replace_cover">Vervang Cover</string>
-    <string name="report_an_issue">Een probleem melden</string>
-    <string name="report_bug">Een bug rapporteren</string>
-    <string name="reset_action">Resetten</string>
-    <string name="reset_artist_image">Reset artiest afbeelding</string>
-    <string name="restore">Herstellen</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Teruggezette aankopen</string>
-    <string name="restoring_purchase">Aankoop herstellen…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Beltoon (Optioneel)</string>
-    <string name="saf_delete_failed">Bestand verwijderen gefaald: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Kan SAF URI niet ophalen</string>
-    <string name="saf_guide_slide1_description">Navigatielade openen</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 heeft toegang tot de SD-kaart nodig</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Opslaan</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Opslaan als bestand</string>
-    <string name="save_playlists_title">Opslaan als bestanden</string>
-    <string name="saved_playlist_to">Afspeellijst opgeslagen in %s.</string>
-    <string name="saving_changes">Aanpassingen opslaan</string>
-    <string name="scan_media">Media scannen</string>
-    <string name="scanned_files">%1$d van de %2$d bestanden gescant</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Alles selecteren</string>
-    <string name="selected">Geselecteerd</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Stel artiest afbeelding in</string>
-    <string name="share_app">App delen</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">Simpel</string>
-    <string name="sleep_timer_canceled">Slaap timer geannuleerd</string>
-    <string name="sleep_timer_set">Slaap timer ingesteld in %d minuten vanaf nu</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Verhaal delen</string>
-    <string name="song">Liedje</string>
-    <string name="song_duration">Duur liedje</string>
-    <string name="songs">Nummers</string>
-    <string name="sort_order">Volgorde </string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artiest</string>
-    <string name="sort_order_composer">Componist</string>
-    <string name="sort_order_date">Datum toegevoegd</string>
-    <string name="sort_order_date_modified">Datum aangepast</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Aantal nummers</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Jaar</string>
-    <string name="sort_order_z_a">Descending</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="stack">Stack</string>
-    <string name="start_play_music">Begin muziek afspelen.</string>
-    <string name="suggestion_songs">Suggesties</string>
-    <string name="support_development">Ondersteun ontwikkelaars</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</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="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="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Titel</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Vandaag</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top Artiesten</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_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Probeer Retro Muziek Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Deel jouw ontwerp met Retro Muziek</string>
-    <string name="unlabeled">Niet gelabeld</string>
-    <string name="unplayable_file">Kon dit nummer niet afspelen </string>
-    <string name="up_next">Volgende</string>
-    <string name="update_image">Update afbeelding</string>
-    <string name="updating">Bijwerken...</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Gebruikersnaam</string>
-    <string name="version">Versie</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">Bekijk op Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web zoekopdracht</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welkom,</string>
-    <string name="what_do_you_want_to_share">Wat wil je delen?</string>
-    <string name="whats_new">Wat is er nieuw</string>
-    <string name="window">Venster</string>
-    <string name="window_corner_edges">Afgeronde hoeken</string>
-    <string name="x_has_been_set_as_ringtone">Stel %1$s in als ringtone</string>
-    <string name="x_selected">%1$d geselecteerd</string>
-    <string name="year">Jaar</string>
-    <string name="you_have_to_select_at_least_one_category">Je moet ten minste één categorie selecteren.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
new file mode 100644
index 000000000..7335bc78b
--- /dev/null
+++ b/app/src/main/res/values-nl/strings.xml
@@ -0,0 +1,420 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Accent kleur</string>
+    <string name="accent_color_desc">De accent kleur, standaard naar groen</string>
+
+    <string name="action_about">Over</string>
+
+    <string name="action_add_to_favorites">Toevoegen aan favorieten</string>
+    <string name="action_add_to_playing_queue">Voeg toe aan afspeel wachtrij</string>
+    <string name="action_add_to_playlist">Voeg toe aan afspeellijst...</string>
+
+    <string name="action_clear_playing_queue">Afspeel wachtrij legen</string>
+    <string name="action_clear_playlist">Leeg afspeellijst</string>
+
+    <string name="action_delete">Verwijder</string>
+    <string name="action_delete_from_device">Verwijder van apparaat</string>
+
+    <string name="action_details">Details</string>
+
+    <string name="action_go_to_album">"Ga naar album "</string>
+    <string name="action_go_to_artist">Ga naar artiest</string>
+    <string name="action_go_to_start_directory">Ga naar begin directory</string>
+
+    <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_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_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>
+
+    <string name="action_rename">Hernoem</string>
+
+    <string name="action_save_playing_queue">Afspeel wachtrij opslaan</string>
+
+    <string name="action_scan">Scan</string>
+
+    <string name="action_search">Zoek</string>
+
+    <string name="action_set">Instellen</string>
+    <string name="action_set_as_ringtone">Stel in als ringtone</string>
+    <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_shuffle_all">Shuffle alles</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>
+
+    <string name="add_action">Toevoegen</string>
+
+    <string name="add_photo">Foto toevoegen</string>
+
+    <string name="add_playlist_title">"Toevogen aan afspeellijst"</string>
+
+    <string name="added_title_to_playing_queue">"1 titel aan afspeel wachtrij toegevoegd."</string>
+
+    <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_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_widget_big_name">Retro music - Groot</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="artists">Artiesten</string>
+
+    <string name="audio_focus_denied">"Geluid focus geweigerd "</string>
+
+    <string name="biography">Biografie</string>
+
+    <string name="black_theme_name">Gewoon zwart</string>
+
+    <string name="blacklist">Zwarte lijst</string>
+
+    <string name="cancel_current_timer">Annuleer huidige timer</string>
+
+    <string name="changelog">Changelog</string>
+
+    <string name="changelog_summary">Changelog onderhouden in Telegram</string>
+
+    <string name="clear_action">Legen</string>
+
+    <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="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>
+    <string name="could_not_scan_files">Kon %d files niet scannen.</string>
+
+    <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="dark_theme_name">Soort van donker</string>
+
+    <string name="default_hint">Geen lyrics</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_x"><![CDATA[Verwijder liedje <b>%1$s</b>?]]></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>
+
+    <string name="do_you_want_to_clear_the_blacklist">Wil je de zwarte lijst leegmaken?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Wil je <b>%1$s</b> verwijderen van de zwarte lijst?]]></string>
+
+    <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="donation_header">Koop mij een</string>
+
+    <string name="download_from_last_fm">Downloaden van Last.fm</string>
+
+    <string name="empty">Leeg</string>
+
+    <string name="equalizer">Equalizer</string>
+
+    <string name="favorites">Favorieten</string>
+
+    <string name="flat">Plat</string>
+
+    <string name="folders">Mappen</string>
+
+    <string name="full">Vol</string>
+
+    <string name="genre">Genre</string>
+
+    <string name="history">Geschiedenis</string>
+
+    <string name="home">Start</string>
+
+    <string name="inserted_x_songs_into_playlist_x">%1$d liedjes toegevoegd aan afspeellijst %2$s.</string>
+
+    <string name="label_bit_rate">Bitrate</string>
+
+    <string name="label_file_format">Formaat</string>
+    <string name="label_file_name">Bestandsnaam</string>
+    <string name="label_file_path">Bestandslocatie</string>
+    <string name="label_file_size">Grootte</string>
+
+    <string name="label_sampling_rate">Sampling rate</string>
+
+    <string name="label_track_length">Duur</string>
+
+    <string name="last_added">Laatst toegevoegd</string>
+
+    <string name="lets_play_something">Laten we iets afspelen</string>
+
+    <string name="library">Bibliotheek</string>
+
+    <string name="licenses">Licenties</string>
+
+    <string name="light_theme_name">Clearly wit</string>
+
+    <string name="listing_files">Luister bestanden</string>
+
+    <string name="loading_products">Podcasts laden...</string>
+
+    <string name="lyrics">Lyrics</string>
+
+    <string name="my_name">Mijn naam</string>
+
+    <string name="my_top_tracks">Mijn top tracks</string>
+
+    <string name="never">Nooit</string>
+
+    <string name="new_playlist_title">Nieuwe afspeellijst</string>
+
+    <string name="new_start_directory">%s is de nieuwe start folder</string>
+
+    <string name="no_albums">Geen albums</string>
+
+    <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_lyrics_found">Geen lyrics gevonden</string>
+
+    <string name="no_playlists">Geen afspeellijsten</string>
+
+    <string name="no_results">Geen resultaten</string>
+
+    <string name="no_songs">Geen liedjes</string>
+
+    <string name="normal">Normaal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> staat niet in de media store]]></string>
+
+    <string name="nothing_to_scan">Niets om te scannen</string>
+
+    <string name="notification">Notificatie</string>
+
+    <string name="now_playing_queue">Nu afspeel wachtrij</string>
+
+    <string name="only_on_wifi">Alleen Wi-Fi</string>
+
+    <string name="past_three_months">Laatste 3 maanden</string>
+
+    <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="plain">Vlak</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>
+
+    <string name="playlist_is_empty">Afspeellijst is leeg</string>
+
+    <string name="playlist_name_empty">Naam afspeellijst</string>
+
+    <string name="playlists">Afspeellijsten</string>
+
+    <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_playlists">Afspeellijsten</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>
+    <string name="pref_summary_classic_notification">Gebruik het klassieke notificatie design.</string>
+    <string name="pref_summary_colored_app">Achtergrond, de kleur van de besturingstoetsen verandert overeenstemmend met de album opmaak van het afspeelscherm</string>
+    <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_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">Zet besturing knoppen aan 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_tab_titles">Aan/uitzetten tabblad titels</string>
+    <string name="pref_summary_toggle_full_screen">Zet dit aan voor immersive mode</string>
+    <string name="pref_summary_toggle_headset">Wanneer headphones ingeplugd zijn, afspelen start automatisch</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>
+    <string name="pref_title_app_shortcuts">Gekleurde app snelkoppelingen</string>
+    <string name="pref_title_audio_ducking">Beperk volume bij verliezen focus</string>
+    <string name="pref_title_auto_download_artist_images">Automatisch downloaden artisten afbeeldingen</string>
+    <string name="pref_title_blurred_album_art">Vervaag album cover</string>
+    <string name="pref_title_classic_notification">Klassiek notificatie design</string>
+    <string name="pref_title_colored_app">Aangepaste kleur</string>
+    <string name="pref_title_colored_notification">Gekleurde notificatie</string>
+    <string name="pref_title_gapless_playback">Afspelen zonder pauzes</string>
+    <string name="pref_title_general_theme">Basis thema</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_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_full_screen">Volledig scherm app</string>
+    <string name="pref_title_toggle_tab_titles">Tabblad titels</string>
+    <string name="pref_title_toggle_toggle_headset">Automatisch afspelen</string>
+    <string name="pref_title_toggle_volume">Volume knoppen</string>
+    <string name="pref_title_user_info">Gebruikers info</string>
+
+    <string name="primary_color">Primaire kleur</string>
+
+    <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="remove_action">Verwijderen</string>
+
+    <string name="remove_cover">Verwijder cover</string>
+
+    <string name="remove_from_blacklist">Verwijder van zwarte lijst</string>
+
+    <string name="remove_song_from_playlist_title">Verwijder liedje van afspeellijst</string>
+    <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_playlist_title">Hernoem afspeellijst</string>
+
+    <string name="reset_artist_image">Reset artiest afbeelding</string>
+
+    <string name="restored_previous_purchases">Teruggezette aankopen</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="scanned_files">%1$d van de %2$d bestanden gescant</string>
+
+    <string name="search_hint">Zoek in je biebliotheek</string>
+
+    <string name="set_artist_image">Stel artiest afbeelding in</string>
+
+    <string name="shuffle">Shuffle</string>
+
+    <string name="simple">Simpel</string>
+
+    <string name="sleep_timer_canceled">Slaap timer geannuleerd</string>
+    <string name="sleep_timer_set">Slaap timer ingesteld in %d minuten vanaf nu</string>
+
+    <string name="song">Liedje</string>
+
+    <string name="song_duration">Duur liedje</string>
+
+    <string name="songs">Nummers</string>
+
+    <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_user_info">Laat gewoon je naam zien op het startscherm</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_dashboard">Dashbord</string>
+
+    <string name="title_good_afternoon">Goedemiddag</string>
+    <string name="title_good_day">Goededag</string>
+    <string name="title_good_evening">Goede avond</string>
+    <string name="title_good_morning">Goedemorgen</string>
+    <string name="title_good_night">Goede nacht</string>
+
+    <string name="title_user_info">Wat is je naam</string>
+
+    <string name="today">Vandaag</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="unplayable_file">"Kon dit nummer niet afspelen "</string>
+
+    <string name="up_next">Volgende</string>
+
+    <string name="update_image">Update afbeelding</string>
+
+    <string name="updating">Bijwerken...</string>
+
+    <string name="version">Versie</string>
+
+    <string name="web_search">Web zoekopdracht</string>
+
+    <string name="what_do_you_want_to_share">Wat wil je delen?</string>
+
+    <string name="x_has_been_set_as_ringtone">Stel %1$s in als ringtone</string>
+
+    <string name="x_selected">%1$d geselecteerd</string>
+
+    <string name="year">Jaar</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
deleted file mode 100644
index bed25c0c5..000000000
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">O %s</string>
-    <string name="about_settings_summary">Zespół, media społecznościowe</string>
-    <string name="accent_color">Kolor wiodący</string>
-    <string name="accent_color_desc">Kolor wiodący motywu, domyślnie morski</string>
-    <string name="action_about">O aplikacji</string>
-    <string name="action_add_to_blacklist">Dodaj do ignorowanych</string>
-    <string name="action_add_to_favorites">Dodaj do ulubionych</string>
-    <string name="action_add_to_playing_queue">Dodaj do kolejki</string>
-    <string name="action_add_to_playlist">Dodaj do playlisty</string>
-    <string name="action_cancel">Anuluj</string>
-    <string name="action_cast">Przesyłaj</string>
-    <string name="action_clear_playing_queue">Wyczyść kolejkę</string>
-    <string name="action_cycle_repeat">Przełącz 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>
-    <string name="action_edit">Edytuj</string>
-    <string name="action_go_to_album">Przejdź do albumu</string>
-    <string name="action_go_to_artist">Przejdź do wykonawcy</string>
-    <string name="action_go_to_genre">Idź do gatunku</string>
-    <string name="action_go_to_lyrics">Przejdź do tekstu utworu</string>
-    <string name="action_go_to_start_directory">Przejdź do folderu startowego</string>
-    <string name="action_grant">Przyznaj</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_all">Odtwarzaj wszystkie</string>
-    <string name="action_play_next">Odtwarzaj następne</string>
-    <string name="action_play_pause">Odtwórz/Zatrzymaj</string>
-    <string name="action_previous">Poprzedni</string>
-    <string name="action_remove_from_favorites">Usuń z ulubionych</string>
-    <string name="action_remove_from_playing_queue">Usuń z kolejki</string>
-    <string name="action_remove_from_playlist">Usuń z playlisty</string>
-    <string name="action_rename">Zmień nazwę</string>
-    <string name="action_save_playing_queue">Zapisz kolejkę</string>
-    <string name="action_scan">Skanuj</string>
-    <string name="action_search">Szukaj</string>
-    <string name="action_set">Rozpocznij</string>
-    <string name="action_set_as_ringtone">Ustaw jako dzwonek</string>
-    <string name="action_set_as_start_directory">Ustaw jako folder startowy</string>
-    <string name="action_settings">"Ustawienia"</string>
-    <string name="action_share">Udostępnij</string>
-    <string name="action_shuffle_all">Losowo wszystko</string>
-    <string name="action_shuffle_playlist">Playlista losowo</string>
-    <string name="action_sleep_timer">Wyłącznik czasowy</string>
-    <string name="action_sort_order">Sortowanie</string>
-    <string name="action_tag_editor">Edytor tagów</string>
-    <string name="action_toggle_favorite">Przełącz na ulubione</string>
-    <string name="action_toggle_shuffle">Przełącz tryb losowy</string>
-    <string name="adaptive">Adaptacyjny</string>
-    <string name="add_action">Dodaj</string>
-    <string name="add_playlist_title">"Dodaj do playlisty"</string>
-    <string name="add_time_framed_lryics">Dodaj tekst z ramką czasową</string>
-    <string name="added_song_count_to_playlist">Dodano %1$d utworów do %2$s</string>
-    <string name="added_title_to_playing_queue">"Dodano tytuł do kolejki odtwarzania"</string>
-    <string name="added_x_titles_to_playing_queue">Dodano %1$d tytułów do kolejki</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Utwór</item>
-        <item quantity="few">Utwory</item>
-        <item quantity="many">Utworów</item>
-        <item quantity="other">Utworów</item>
-    </plurals>
-    <string name="album_artist">Wykonawca albumu</string>
-    <string name="albums">Albumy</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="few">Albumy</item>
-        <item quantity="many">Albumów</item>
-        <item quantity="other">Albumów</item>
-    </plurals>
-    <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>
-    <string name="app_shortcut_shuffle_all_short">Losowo</string>
-    <string name="app_shortcut_top_tracks_short">Najczęściej odtwarzane utwory</string>
-    <string name="app_widget_big_name">Duży</string>
-    <string name="app_widget_card_name">Karta</string>
-    <string name="app_widget_classic_name">Klasyczny</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Mały</string>
-    <string name="app_widget_text_name">Minimalna treść</string>
-    <string name="artist">Wykonawca</string>
-    <string name="artists">Wykonawcy</string>
-    <string name="audio_fade_duration">Czas zanikania dźwięku</string>
-    <string name="audio_focus_denied">Odrzucono fokus dźwiękowy.</string>
-    <string name="audio_settings_summary">Dostosuj ustawienia dźwięku i equalizera</string>
-    <string name="auto">Automatyczny</string>
-    <string name="backup_restore_settings_summary">Twórz kopie zapasowe i przywracaj swoje ustawienia oraz playlisty</string>
-    <string name="backup_restore_title"><![CDATA[Kopia zapasowa i przywracanie]]></string>
-    <string name="backup_title">Kopie zapasowe</string>
-    <string name="biography">Biografia</string>
-    <string name="black_theme_name">Czarny motyw</string>
-    <string name="blacklist">Lista ignorowanych</string>
-    <string name="bluetooth_summary">Aplikacja potrzebuje uprawnień urządzeń w pobliżu do sprawdzania urządzeń Bluetooth</string>
-    <string name="bluetooth_title">Urządzenia w pobliżu</string>
-    <string name="blur">Rozmycie</string>
-    <string name="blur_card">Rozmyta Karta</string>
-    <string name="bug_report_failed">Nie udało się wysłać raportu</string>
-    <string name="bug_report_failed_invalid_token">Niepoprawny token dostępu. Skontaktuj się z twórcą aplikacji.</string>
-    <string name="bug_report_failed_issues_not_available">Problemy nie zostały włączone dla wybranego repozytorium. Skontaktuj się z twórcą aplikacji.</string>
-    <string name="bug_report_failed_unknown">Wystąpił nieoczekiwany błąd. Skontaktuj się z twórcą aplikacji.</string>
-    <string name="bug_report_failed_wrong_credentials">Zła nazwa użytkownika lub hasło</string>
-    <string name="bug_report_issue">Problem</string>
-    <string name="bug_report_manual">Wyślij ręcznie</string>
-    <string name="bug_report_no_description">Opisz problem</string>
-    <string name="bug_report_no_password">Wpisz poprawne hasło serwisu GitHub</string>
-    <string name="bug_report_no_title">Wpisz tytuł problemu</string>
-    <string name="bug_report_no_username">Wpisz poprawną nazwę użytkownika serwisu GitHub</string>
-    <string name="bug_report_success">Zgłoszenie błędu zakończone powodzeniem</string>
-    <string name="bug_report_summary">Wystąpił nieoczekiwany błąd. Przepraszamy za wystąpienie tego problemu. Jeśli nie możesz korzystać z aplikacji – wyczyść dane aplikacji lub wyślij nam e-maila </string>
-    <string name="bug_report_use_account">Wyślij używając konta serwisu GitHub</string>
-    <string name="buy_now">Kup teraz</string>
-    <string name="cancel_current_timer">Anuluj</string>
-    <string name="card">Karta</string>
-    <string name="card_color_style">Kolorowa Karta</string>
-    <string name="card_square">Kwadratowa karta</string>
-    <string name="card_style">Karta</string>
-    <string name="carousal_effect_on_now_playing_screen">Efekt karuzeli na ekranie Teraz odtwarzane</string>
-    <string name="cascading">Kaskadowy</string>
-    <string name="changelog">Lista zmian</string>
-    <string name="changelog_summary">Sprawdź, co nowego</string>
-    <string name="choose_image">Wybierz obraz</string>
-    <string name="choose_restore_title">Wybierz, co przywrócić</string>
-    <string name="circle">Okrąg</string>
-    <string name="circular">Okrągły</string>
-    <string name="classic">Klasyczny</string>
-    <string name="clear_action">Wyczyść</string>
-    <string name="clear_blacklist">Wyczyść czarną listę</string>
-    <string name="clear_history">Wyczyść historię</string>
-    <string name="clear_playing_queue">Wyczyść kolejkę</string>
-    <string name="color">Kolor</string>
-    <string name="colors">Kolory</string>
-    <string name="compact">Kompaktowy</string>
-    <string name="composer">Kompozytor</string>
-    <string name="copied_device_info_to_clipboard">Skopiowano informacje o urządzeniu do schowka</string>
-    <string name="could_not_create_playlist">Nie udało się utworzyć playlisty.</string>
-    <string name="could_not_download_album_cover">"Nie udało się pobrać pasującej okładki albumu"</string>
-    <string name="could_not_restore_purchase">Nie udało się przywrócić zakupu.</string>
-    <string name="could_not_scan_files">Nie udało się przeskanować %d plików.</string>
-    <string name="create_action">Utwórz</string>
-    <string name="create_new_backup">Utwórz</string>
-    <string name="created_playlist_x">Stworzono playlistę %1$s.</string>
-    <string name="credit_title">Twórcy</string>
-    <string name="currently_listening_to_x_by_x">Aktualnie odtwarzane %1$s wykonawcy %2$s.</string>
-    <string name="custom_artist_images">Własne obrazy wykonawcy</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Udostępnij raport o awarii</string>
-    <string name="dark_theme_name">Ciemny</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[Usunąć <b>%1$d</b> playlisty?]]></string>
-    <string name="delete_x_songs"><![CDATA[Usunąć <b>%1$d</b> utwory?]]></string>
-    <string name="deleted_x_songs">Usunięto %1$d utworów.</string>
-    <string name="deleting_songs">Usuwanie utworów</string>
-    <string name="depth">Głębia</string>
-    <string name="description">Opis</string>
-    <string name="device_info">Informacje o urządzeniu</string>
-    <string name="dialog_message_set_ringtone">Pozwól Retro Music na modyfikację ustawień dźwięku</string>
-    <string name="dialog_title_set_ringtone">Ustaw jako dzwonek</string>
-    <string name="disc_hint">Numer płyty</string>
-    <string name="do_you_want_to_clear_the_blacklist">Czy chcesz wyczyścić listę ignorowanych?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Czy chcesz usunąć <b>%1$s</b> z listy ignorowanych?]]></string>
-    <string name="donate">Wesprzyj nas</string>
-    <string name="donate_summary">Jeżeli uważasz, że zasługuje na zapłatę za moją pracę możesz zostawić tu drobną sumę</string>
-    <string name="donation_header">Kup mi:</string>
-    <string name="done">Gotowe</string>
-    <string name="drive_mode">Tryb samochodowy</string>
-    <string name="edit_fab">Przycisk Edytuj</string>
-    <string name="edit_normal_lyrics">Edytuj tekst</string>
-    <string name="edit_synced_lyrics">Edytuj zsynchronizowany tekst</string>
-    <string name="empty">Pusto</string>
-    <string name="equalizer">Korektor dźwięku</string>
-    <string name="error_create_backup">Nie udało się utworzyć kopii zapasowej</string>
-    <string name="error_delete_backup">Nie udało się usunąć kopii zapasowej</string>
-    <string name="error_empty_name">Imię nie może być puste!</string>
-    <string name="error_load_failed">Nie udało się załadować</string>
-    <string name="error_share_file">Nie udało się udostępnić pliku</string>
-    <string name="expanded">Rozszerzony</string>
-    <string name="faq">Najczęściej zadawane pytania</string>
-    <string name="favorites">Ulubione</string>
-    <string name="file_already_exists">Plik już istnieje</string>
-    <string name="finish_last_song">Dokończ ostatni utwór</string>
-    <string name="fit">Dopasuj</string>
-    <string name="flat">Płaski</string>
-    <string name="folders">Foldery</string>
-    <string name="follow_system">Zgodnie z motywem systemu</string>
-    <string name="for_you">Dla Ciebie</string>
-    <string name="free">Darmowe</string>
-    <string name="full">Pełne</string>
-    <string name="full_card">Pełna karta</string>
-    <string name="general_settings_summary">Zmień motyw i kolory aplikacji</string>
-    <string name="general_settings_title">Wygląd i zachowanie interfejsu</string>
-    <string name="genre">Gatunek</string>
-    <string name="genres">Gatunki</string>
-    <string name="git_hub_summary">Zobacz kod na GitHubie</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Przyznaj dostęp</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="grid_style_label">Styl siatki</string>
-    <string name="help_summary">Potrzebujesz dodatkowej pomocy?</string>
-    <string name="hinge">Zawias</string>
-    <string name="history">Historia</string>
-    <string name="history_cleared">Historia została wyczyszczona</string>
-    <string name="history_undo_button">Cofnij</string>
-    <string name="home">Strona główna</string>
-    <string name="horizontal_flip">Obrót poziomy</string>
-    <string name="image">Grafika</string>
-    <string name="image_gradient">Grafika gradientowy</string>
-    <string name="image_settings_summary">Zmień ustawienia pobierania grafiki wykonawcy</string>
-    <string name="import_label">Importuj</string>
-    <string name="import_playlist">Importuj playlistę</string>
-    <string name="import_playlist_message">Importuje wszystkie playlisty wymienione w Android Media Store z utworami; jeśli playlisty już istnieją, utwory zostaną scalone.</string>
-    <string name="inserted_x_songs_into_playlist_x">Dodano %1$d utworów do playlisty %2$s.</string>
-    <string name="instagram_page_summary">Udostępnij swój desigm aplikacji Retro Music na Instagramie</string>
-    <string name="keyboard">Klawiatura</string>
-    <string name="label_bit_rate">Jakość</string>
-    <string name="label_file_format">Typ</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_last_modified">Ostatnio zmodyfikowano</string>
-    <string name="label_more_from">Więcej z %s</string>
-    <string name="label_sampling_rate">Częstotliwość próbkowania</string>
-    <string name="label_track_length">Długość</string>
-    <string name="labeled">Podpisano</string>
-    <string name="last_added">Ostatnio dodane</string>
-    <string name="last_song">Ostatni utwór</string>
-    <string name="lets_go">Zaczynajmy</string>
-    <string name="library_categories">Kategorie biblioteki</string>
-    <string name="licenses">Licencje</string>
-    <string name="light_theme_name">Jasny</string>
-    <string name="listeners_label">Słuchacze</string>
-    <string name="listing_files">Wyświetlanie plików</string>
-    <string name="loading_products">Ładowanie...</string>
-    <string name="login">Zaloguj się</string>
-    <string name="lyrics">Tekst utworu</string>
-    <string name="made_with_love">Stworzone z ❤️ w Indiach</string>
-    <string name="material">Materialistyczny</string>
-    <string name="md_error_label">Błąd</string>
-    <string name="md_storage_perm_error">Błąd uprawnień</string>
-    <string name="message_backup_create_success">Kopia zapasowa utworzona pomyślnie.</string>
-    <string name="message_limit_tabs">Nie więcej niż 5 elementów</string>
-    <string name="message_pro_feature">%s jest funkcją wersji Pro.</string>
-    <string name="message_restore_success">Przywracanie zakończone pomyślnie.</string>
-    <string name="message_updated">Zaktualizowano</string>
-    <string name="message_welcome"><![CDATA[Witaj! <br>Zapraszamy do %s]]></string>
-    <string name="my_name">Imię</string>
-    <string name="my_top_tracks">Najczęściej odtw.</string>
-    <string name="never">Nigdy</string>
-    <string name="new_music_mix">Nowy miks muzyki</string>
-    <string name="new_playlist_title">Nowa playlista</string>
-    <string name="new_start_directory">%s jest nowym folderem startowym.</string>
-    <string name="next_song">Następny utwór</string>
-    <string name="no_albums">Brak albumów</string>
-    <string name="no_artists">Brak wykonawców</string>
-    <string name="no_audio_ID">"Odtwórz jakiś utwór i spróbuj ponownie."</string>
-    <string name="no_backups_found">Nie znaleziono kopii zapasowych</string>
-    <string name="no_equalizer">Nie znaleziono korektora dźwięku</string>
-    <string name="no_genres">Brak gatunków</string>
-    <string name="no_lyrics_found">Nie znaleziono tekstu utworu</string>
-    <string name="no_playing_queue">Brak odtwarzanych utworów</string>
-    <string name="no_playlists">Brak playlist</string>
-    <string name="no_purchase_found">Nie znaleziono zakupu.</string>
-    <string name="no_results">Brak wyników.</string>
-    <string name="no_songs">Brak utworów</string>
-    <string name="normal">Normalne</string>
-    <string name="normal_lyrics">Tekst utworu</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nie znajduje się w magazynie multimediów.]]></string>
-    <string name="not_recently_played">Ostatnio nieodtwarzane</string>
-    <string name="nothing_to_scan">Brak elementów do przeskanowania.</string>
-    <string name="nothing_to_see">Pusto</string>
-    <string name="notification">Powiadomienie</string>
-    <string name="notification_settings_summary">Dostosuj wygląd powiadomień</string>
-    <string name="now_playing">Teraz odtwarzane</string>
-    <string name="now_playing_queue">Teraz odtwarzane</string>
-    <string name="now_playing_summary">Dostosuj odtwarzacz</string>
-    <string name="now_playing_themes">9+ motywów odtwarzacza</string>
-    <string name="only_on_wifi">Tylko przez Wi-Fi</string>
-    <string name="other_settings_summary">Zaawansowane funkcje eksperymentalne</string>
-    <string name="others">Inne ustawienia</string>
-    <string name="over_cover">Nad okładką</string>
-    <string name="password">Hasło</string>
-    <string name="past_three_months">Ostatnie 3 miesiące</string>
-    <string name="paste_lyrics_here">Wklej tekst tutaj</string>
-    <string name="paste_timeframe_lyrics_here">Wklej tutaj tekst utworu z ramami czasowymi</string>
-    <string name="peek">Podgląd</string>
-    <string name="permission_bluetooth_denied">Odmowa dostępu do urządzeń w pobliżu.</string>
-    <string name="permission_external_storage_denied">Odmowa dostępu do pamięci zewnętrznej.</string>
-    <string name="permission_summary">Potrzebujemy uprawnień do pamięci urządzenia, aby odtwarzać muzykę</string>
-    <string name="permission_title">Dostęp do pamięci</string>
-    <string name="permissions_denied">Odmowa dostępu.</string>
-    <string name="personalize">Personalizuj</string>
-    <string name="personalize_settings_summary">Dostosuj interfejs i odtwarzacz</string>
-    <string name="pick_from_local_storage">Wybierz z pamięci lokalnej</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Śledź stronę Retro Music na Pintrescie po więcej inspiracji</string>
-    <string name="plain">Wyraźny</string>
-    <string name="playList_already_exits">Playlista już istnieje</string>
-    <string name="playback_pitch">Tonacja</string>
-    <string name="playback_settings">Ustawienia odtwarzania</string>
-    <string name="playback_speed">Szybkość odtwarzania</string>
-    <string name="playing_notification_description">Powiadomienie odtwarzania pokazuje przyciski odtwórz/zatrzymaj itp.</string>
-    <string name="playing_notification_name">Powiadomienie odtwarzania</string>
-    <string name="playlist_created_sucessfully">%s utworzona pomyślnie</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="pref_blur_amount_summary">Poziom rozmycia dla motywów; mniej znaczy szybciej</string>
-    <string name="pref_blur_amount_title">Poziom rozmycia</string>
-    <string name="pref_filter_song_summary">Filtruj utwory według długości</string>
-    <string name="pref_filter_song_title">Filtruj długość utworów</string>
-    <string name="pref_header_advanced">Zaawansowane</string>
-    <string name="pref_header_album">Styl okładki</string>
-    <string name="pref_header_audio">Dźwięk</string>
-    <string name="pref_header_blacklist">Lista ignorowanych</string>
-    <string name="pref_header_controls">Przyciski kontrolne</string>
-    <string name="pref_header_general">Motyw</string>
-    <string name="pref_header_images">Grafiki</string>
-    <string name="pref_header_library">Biblioteka</string>
-    <string name="pref_header_lockscreen">Ekran blokady</string>
-    <string name="pref_header_playlists">Playlisty</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Zatrzymuje odtwarzanie po wyciszeniu urządzenia i wznawia je po jego odciszeniu. Kiedy zwiększysz głośność, odtwarzanie rozpocznie się nawet gdy jesteś poza aplikacją</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Zatrzymaj przy wyłączonym dźwięku</string>
-    <string name="pref_keep_screen_on_summary">Ta opcja może mieć wpływ na zużycie baterii</string>
-    <string name="pref_keep_screen_on_title">Pozostaw ekran włączony</string>
-    <string name="pref_language_name">Wybierz język</string>
-    <string name="pref_snow_fall_title">Efekt „padającego śniegu”</string>
-    <string name="pref_summary_album_art_on_lockscreen">Używaj okładki aktualnie odtwarzanego albumu jako tła ekranu blokady</string>
-    <string name="pref_summary_album_artists_only">Pokaż wykonawców albumu w kategorii wykonawcy</string>
-    <string name="pref_summary_audio_ducking">Zmniejsz głośność kiedy dostajesz powiadomienia</string>
-    <string name="pref_summary_audio_fade">Płynnie ścisz dźwięk przy rozpoczynaniu lub wstrzymywaniu odtwarzania</string>
-    <string name="pref_summary_blacklist">Zawartość ignorowanych folderów jest ukrywana w Twojej bibliotece.</string>
-    <string name="pref_summary_bluetooth_playback">Rozpocznij odtwarzanie po podłączeniu urządzenia Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Rozmyj okładkę albumu na ekranie blokady. Może powodować problemy z aplikacjami i widżetami innych firm</string>
-    <string name="pref_summary_carousel_effect">Efekt karuzeli na okładce obecnie odtwarzanego albumu. Motywy karty i rozmycie nie będą dostępne</string>
-    <string name="pref_summary_classic_notification">Użyj klasycznego wyglądu powiadomień</string>
-    <string name="pref_summary_colored_app">Tło oraz kolory przycisków sterujących będą zmieniać się zgodnie z okładką albumu na ekranie odtwarzacza</string>
-    <string name="pref_summary_colored_app_shortcuts">Koloruje skróty aplikacji w kolorze wiodącym. Za każdym razem, gdy zmieniasz kolor, włącz tę opcję, aby zmiany odniosły skutek.</string>
-    <string name="pref_summary_colored_notification">"Koloruje powiadomienie dominującym kolorem okładki albumu."</string>
-    <string name="pref_summary_cross_fade">Czas płynnego przejścia między utworami</string>
-    <string name="pref_summary_desaturated_color">Podążaj za zaleceniami Material Design; w trybie ciemnym kolory powinny być mniej nasycone</string>
-    <string name="pref_summary_expand_now_playing_panel">Kliknięcie powiadomienia pokaże odtwarzacz zamiast ekranu głównego</string>
-    <string name="pref_summary_extra_controls">Dodaj dodatkowe przyciski do miniodtwarzacza</string>
-    <string name="pref_summary_extra_song_info">Pokaż dodatkowe informacje o utworze, takie jak format pliku, próbkowanie i jakość</string>
-    <string name="pref_summary_gapless_playback">"Może powodować problemy z odtwarzaniem na niektórych urządzeniach."</string>
-    <string name="pref_summary_home_banner">Pokaż lub ukryj baner ekranu głównego</string>
-    <string name="pref_summary_ignore_media_store_artwork">Może zwiększyć jakość okładki albumu, ale powoduje spowolnienie ładowania obrazu. Włącz tę opcję tylko jeśli masz problemy z okładkami o niskiej rozdzielczości.</string>
-    <string name="pref_summary_library_categories">Dostosuj widoczność i kolejność kategorii bibliotek.</string>
-    <string name="pref_summary_lock_screen">Użyj niestandardowych przycisków kontroli na ekranie blokady</string>
-    <string name="pref_summary_manage_audio_focus">Zawsze odtwarzaj dźwięk w tle niezależnie od tego, co jest odtwarzane</string>
-    <string name="pref_summary_open_source_licences">Szczegóły licencji oprogramowania typu open source</string>
-    <string name="pref_summary_pause_history">Gdy włączone, nowo odtworzone utwory nie będą wyświetlane w historii</string>
-    <string name="pref_summary_remember_tab">Przejdź do ostatnio używanej zakładki przy starcie</string>
-    <string name="pref_summary_show_lyrics">Wyświetla zsynchronizowane teksty piosenek nad okładką albumu</string>
-    <string name="pref_summary_suggestions">Pokaż Nowy miks muzyki na ekranie głównym</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Włącza możliwość zmiany utworu przesuwając w dowolnym miejscu na ekranie odtwarzania</string>
-    <string name="pref_summary_swipe_to_dismiss">Przesuń w dół, aby zamknąć mini odtwarzacz</string>
-    <string name="pref_summary_toggle_full_screen">Tryb imersji</string>
-    <string name="pref_summary_toggle_headset">Rozpocznij odtwarzanie po podłączeniu zestawu słuchawkowego</string>
-    <string name="pref_summary_toggle_shuffle">Odtwarzanie losowe zostanie wyłączone podczas odtwarzania nowej listy utworów</string>
-    <string name="pref_summary_toggle_volume">Pokaż sterowanie głośnością w odtwarzaczu, gdy jest wystarczająco wolnego miejsca</string>
-    <string name="pref_summary_wallpaper_accent">Wyodrębnij kolor akcentu z tapety</string>
-    <string name="pref_summary_whitelist">Pokazuj muzykę tylko z folderu /Music</string>
-    <string name="pref_title_album_art_on_lockscreen">Pokaż okładkę albumu</string>
-    <string name="pref_title_album_artists_only">Nawiguj przez wykonawcę albumu</string>
-    <string name="pref_title_album_cover_style">Wygląd okładki albumu</string>
-    <string name="pref_title_album_cover_transform">Przesuwanie okładki albumu</string>
-    <string name="pref_title_app_shortcuts">Kolorowe skróty aplikacji</string>
-    <string name="pref_title_appbar_mode">Styl nagłówka</string>
-    <string name="pref_title_audio_ducking">Zmniejsz głośność przy braku skupienia</string>
-    <string name="pref_title_audio_fade">Zanikanie dźwięku</string>
-    <string name="pref_title_auto_download_artist_images">Automatycznie pobierz grafiki wykonawców</string>
-    <string name="pref_title_blacklist">Lista ignorowanych</string>
-    <string name="pref_title_bluetooth_playback">Odtwarzanie przez Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Rozmyj okładkę albumu</string>
-    <string name="pref_title_circle_button">Okrągły przycisk Odtwórz</string>
-    <string name="pref_title_classic_notification">Klasyczny wygląd powiadomień</string>
-    <string name="pref_title_colored_app">Kolor adaptacyjny</string>
-    <string name="pref_title_colored_notification">Kolorowe powiadomienia</string>
-    <string name="pref_title_cross_fade">Płynne przejście (Beta)</string>
-    <string name="pref_title_custom_font">Użyj czcionki Manrope</string>
-    <string name="pref_title_desaturated_color">Mniej nasycony kolor</string>
-    <string name="pref_title_expand_now_playing_panel">Wyświetl teraz odtwarzane</string>
-    <string name="pref_title_extra_controls">Dodatkowe przyciski kontroli</string>
-    <string name="pref_title_extra_song_info">Informacje o utworze</string>
-    <string name="pref_title_gapless_playback">Odtwarzanie bez przerw</string>
-    <string name="pref_title_general_theme">Motyw aplikacji</string>
-    <string name="pref_title_home_album_grid_style">Siatka albumu</string>
-    <string name="pref_title_home_artist_grid_style">Siatka wykonawców</string>
-    <string name="pref_title_home_banner">Baner strony głównej</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 dodanych playlist</string>
-    <string name="pref_title_lock_screen">Sterowanie pełnoekranowe</string>
-    <string name="pref_title_lyrics_screen_on">Pozostaw włączony ekran podczas wyświetlania tekstu utworu</string>
-    <string name="pref_title_lyrics_type">Typ tekstu utworu</string>
-    <string name="pref_title_manage_audio_focus">Zawsze odtwarzaj</string>
-    <string name="pref_title_now_playing_screen_appearance">Wyglądodtwarzacza</string>
-    <string name="pref_title_open_source_licences">Licencje typu Open Source</string>
-    <string name="pref_title_pause_history">Wstrzymaj historię</string>
-    <string name="pref_title_remember_tab">Zapamiętaj ostatnią zakładkę</string>
-    <string name="pref_title_show_lyrics">Pokaż teksty utworów</string>
-    <string name="pref_title_suggestions">Pokaż sugestie</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Przesuń gdziekolwiek, aby zmienić utwór</string>
-    <string name="pref_title_swipe_to_dismiss">Odrzuć przesunięciem w dół</string>
-    <string name="pref_title_tab_text_mode">Wygląd tytułów kart</string>
-    <string name="pref_title_toggle_carousel_effect">Efekt karuzeli</string>
-    <string name="pref_title_toggle_full_screen">Aplikacja pełnoekranowa</string>
-    <string name="pref_title_toggle_toggle_headset">Autoodtwarzanie</string>
-    <string name="pref_title_toggle_toggle_shuffle">Tryb losowy</string>
-    <string name="pref_title_toggle_volume">Sterowanie głośnością</string>
-    <string name="pref_title_wallpaper_accent">Kolor akcentu z tapety</string>
-    <string name="pref_title_whitelist">Muzyka z listy dozwolonych</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Czarny motyw, motywy teraz odtwarzanych, efekt karuzeli i wiele więcej..</string>
-    <string name="profile">Profil</string>
-    <string name="purchase">Kup</string>
-    <string name="queue">Kolejka odtwarzania</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 co o niej sądzisz i co powinniśmy poprawić.</string>
-    <string name="recent_albums">Ostatnie albumy</string>
-    <string name="recent_artists">Ostatni wykonawcy</string>
-    <string name="remove_action">Usuń</string>
-    <string name="remove_cover">Usuń okładkę</string>
-    <string name="remove_from_blacklist">Usuń z listy ignorowanych</string>
-    <string name="remove_image">Usuń obraz</string>
-    <string name="remove_song_from_playlist_title">Usuń utwór z playlisty</string>
-    <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">Usuń utwory z playlisty</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Usunąć te utwory <b>%1$d</b> z playlisty?]]></string>
-    <string name="rename_playlist_title">Zmień nazwę playlisty</string>
-    <string name="replace_cover">Zamień okładkę</string>
-    <string name="report_an_issue">Zgłoś problem</string>
-    <string name="report_bug">Zgłoś błąd</string>
-    <string name="reset_action">Zresetuj</string>
-    <string name="reset_artist_image">Zresetuj grafikę wykonawcy</string>
-    <string name="restore">Przywróć</string>
-    <string name="restore_message">Czy chcesz przywrócić kopię zapasową?</string>
-    <string name="restored_previous_purchase_please_restart">Przywrócono poprzedni zakup. Zrestartuj aplikacje aby korzystać z wszystkich funkcji.</string>
-    <string name="restored_previous_purchases">Przywrócono poprzednie zakupy.</string>
-    <string name="restoring_purchase">Przywracanie zakupu...</string>
-    <string name="retro_music_player">Odtwarzacz Retro Music</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Potrzebujemy uprawnień do ustawień Twojego urządzenia, aby ustawić utwór jako dzwonek</string>
-    <string name="ringtone_title">Dzwonek (opcjonalny)</string>
-    <string name="saf_delete_failed">Nie udało się usunąć pliku: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Nie można uzyskać URI SAF</string>
-    <string name="saf_guide_slide1_description">Otwórz szufladę nawigacji</string>
-    <string name="saf_guide_slide1_description_before_o">Włącz \'Pokaż kartę SD\' w menu przeciążenia</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s wymaga dostępu do karty SD</string>
-    <string name="saf_guide_slide2_description">Wybierz folder główny karty SD</string>
-    <string name="saf_guide_slide2_title">Wybierz kartę SD w panelu nawigacji</string>
-    <string name="saf_guide_slide3_description">Nie otwieraj żadnych podfolderów</string>
-    <string name="saf_guide_slide3_title">Dotknij przycisku \'Wybierz\' u dołu ekranu</string>
-    <string name="saf_write_failed">Nie udało się zapisać do pliku: %s</string>
-    <string name="save">Zapisz</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Zapisz jako plik</string>
-    <string name="save_playlists_title">Zapisz jako</string>
-    <string name="saved_playlist_to">Zapisz playlistę do %s.</string>
-    <string name="saving_changes">Zapisywanie zmian</string>
-    <string name="scan_media">Skanuj media</string>
-    <string name="scanned_files">Przeskanowano %1$d z plików %2$d.</string>
-    <string name="scrobbles_label">Scrobble</string>
-    <string name="select_all">Zaznacz wszystko</string>
-    <string name="selected">Zaznaczone</string>
-    <string name="set">Ustaw</string>
-    <string name="set_artist_image">Ustaw grafikę wykonawcy</string>
-    <string name="share_app">Udostępnij aplikację</string>
-    <string name="share_summary">Daj znać o tej aplikacji znajomymi i rodzine</string>
-    <string name="share_to_stories">Udostępnik jako Stories</string>
-    <string name="show_album_artists">Pokaż wykonawców albumu</string>
-    <string name="shuffle">Losowo</string>
-    <string name="simple">Prosty</string>
-    <string name="sleep_timer_canceled">Wyłącznik czasowy wyłączony.</string>
-    <string name="sleep_timer_set">Wyłącznik czasowy ustawiony na %d minut.</string>
-    <string name="social">Społeczność</string>
-    <string name="social_stories">Udostępnij historię</string>
-    <string name="song">Utwór</string>
-    <string name="song_duration">Długość utworu</string>
-    <string name="songs">Utwory</string>
-    <string name="sort_order">Sortowanie</string>
-    <string name="sort_order_a_z">Rosnąco</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Wykonawca</string>
-    <string name="sort_order_composer">Kompozytor</string>
-    <string name="sort_order_date">Data dodania</string>
-    <string name="sort_order_date_modified">Data modyfikacji</string>
-    <string name="sort_order_default">Domyślnie</string>
-    <string name="sort_order_num_songs">Liczba utworów</string>
-    <string name="sort_order_num_songs_desc">Liczba utworów malejąco</string>
-    <string name="sort_order_year">Rok</string>
-    <string name="sort_order_z_a">Malejąco</string>
-    <string name="speech_not_supported">Twoje urządzenie nie obsługuje wprowadzania głosowego</string>
-    <string name="speech_prompt">Przeszukaj swoją bibliotekę</string>
-    <string name="stack">Stos</string>
-    <string name="start_play_music">Rozpocznij odtwarzanie</string>
-    <string name="suggestion_songs">Sugestie</string>
-    <string name="support_development">Wspieraj rozwój</string>
-    <string name="swipe_to_unlock">Przesuń, aby odblokować</string>
-    <string name="synced_lyrics">Zsynchronizowany tekst utworu</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Dołącz do grupy Telegram, aby zgłosić błędy lub zasugerować zmiany</string>
-    <string name="thank_you">Dziękuję!</string>
-    <string name="the_audio_file">Plik dźwiękowy</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="tiny_card_style">Mała karta</string>
-    <string name="title">Tytuł</string>
-    <string name="title_new_backup">Nowa kopia zapasowa</string>
-    <string name="today">Dzisiaj</string>
-    <string name="top_albums">Najczęściej odtwarzane albumy</string>
-    <string name="top_artists">Najczęściej odtwarzani wykonawcy</string>
-    <string name="track_hint">"Ścieżka (2 dla ścieżki 2 lub 3004 dla ścieżki CD3 4)"</string>
-    <string name="track_list">Numer utworu</string>
-    <string name="translate">Przetłumacz</string>
-    <string name="translate_community">Pomóż nam przetłumaczyć aplikację na swój język</string>
-    <string name="try_retro_music_premium">Wypróbuj Retro Music Premium</string>
-    <string name="twitter_page">Strona na Twitterze</string>
-    <string name="twitter_page_summary">Podziel się swoim designem z Retro Music</string>
-    <string name="unlabeled">Niepodpisane</string>
-    <string name="unplayable_file">Nie można odtworzyć utworu.</string>
-    <string name="up_next">Następne</string>
-    <string name="update_image">Zaktualizuj grafikę</string>
-    <string name="updating">Aktualizowanie…</string>
-    <string name="user_images_description">Zdjęcia użytkownika</string>
-    <string name="user_name">Nazwa użytkownika</string>
-    <string name="username">Nazwa użytkownika</string>
-    <string name="version">Wersja</string>
-    <string name="vertical_flip">Obrót pionowy</string>
-    <string name="view_on_telegram">Zobacz na Telegramie</string>
-    <string name="volume">Głośność</string>
-    <string name="web_search">Przeszukaj sieć</string>
-    <string name="website">Strona internetowa</string>
-    <string name="website_summary">Odwiedź naszą stronę internetową</string>
-    <string name="welcome">Witaj,</string>
-    <string name="what_do_you_want_to_share">Co chciałbyś udostępnić?</string>
-    <string name="whats_new">Co nowego</string>
-    <string name="window">Okno</string>
-    <string name="window_corner_edges">Zaokrąglone rogi</string>
-    <string name="x_has_been_set_as_ringtone">Ustaw %1$s jako dzwonek.</string>
-    <string name="x_selected">Wybrano %1$d</string>
-    <string name="year">Rok</string>
-    <string name="you_have_to_select_at_least_one_category">Zaznacz przynajmniej jedną kategorię</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Zostaniesz przekierowany do strony ze zgłoszeniami.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Informacje o twoim koncie są używane tylko do autoryzacji.</string>
-</resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
new file mode 100644
index 000000000..aa51c8c10
--- /dev/null
+++ b/app/src/main/res/values-pl/strings.xml
@@ -0,0 +1,778 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="about_settings_summary">Zespół, media społecznościowe</string>
+
+    <string name="accent_color">Kolor akcentu</string>
+    <string name="accent_color_desc">Kolor akcentu motywu, domyślnie morski</string>
+
+    <string name="action_about">O aplikacji</string>
+
+    <string name="action_add_to_favorites">Dodaj do ulubionych</string>
+    <string name="action_add_to_playing_queue">Dodaj do kolejki</string>
+    <string name="action_add_to_playlist">Dodaj do playlisty</string>
+
+    <string name="action_clear_playing_queue">Wyczyść kolejkę</string>
+    <string name="action_clear_playlist">Wyczyść playlistę</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>
+
+    <string name="action_go_to_album">Przejdź do albumu</string>
+    <string name="action_go_to_artist">Przejdź do artysty</string>
+    <string name="action_go_to_genre">Idź do gatunku</string>
+    <string name="action_go_to_start_directory">Przejdź do katalogu startowego</string>
+
+    <string name="action_grant">Przyznaj</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_all">Odtwórz wszystko</string>
+    <string name="action_play_next">Odtwarzaj następne</string>
+    <string name="action_play_pause">Odtwarzanie/Pauza</string>
+
+    <string name="action_previous">Poprzedni</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>
+
+    <string name="action_rename">Zmień nazwę</string>
+
+    <string name="action_save_playing_queue">Zapisz kolejkę</string>
+
+    <string name="action_scan">Skanuj</string>
+
+    <string name="action_search">Szukaj</string>
+
+    <string name="action_set">Rozpocznij</string>
+    <string name="action_set_as_ringtone">Ustaw jako dzwonek</string>
+    <string name="action_set_as_start_directory">Ustaw jako katalog startowy</string>
+
+    <string name="action_settings">"Ustawienia"</string>
+
+    <string name="action_share">Udostępnij</string>
+
+    <string name="action_shuffle_all">Losowo wszystko</string>
+    <string name="action_shuffle_playlist">Playlista losowo</string>
+
+    <string name="action_sleep_timer">Wyłącznik czasowy</string>
+
+    <string name="action_sort_order">Sortowanie</string>
+
+    <string name="action_tag_editor">Edytor tagów</string>
+
+    <string name="adaptive">Adaptacyjny</string>
+
+    <string name="add_action">Dodaj</string>
+
+    <string name="add_lyrics">Dodaj tekst utworu</string>
+
+    <string name="add_photo">Dodaj\nzdjęcie</string>
+
+    <string name="add_playlist_title">"Dodaj do playlisty"</string>
+
+    <string name="add_time_framed_lryics">Dodaj znaczniki czasowe do tekstu</string>
+
+    <string name="added_title_to_playing_queue">"Dodano 1 tytuł do kolejki odtwarzania"</string>
+
+    <string name="added_x_titles_to_playing_queue">Dodano %1$d tytułów do kolejki</string>
+
+    <string name="album">Album</string>
+
+    <string name="album_artist">Artysta albumu</string>
+
+    <string name="album_or_artist_empty">Pole tytuł lub artysta jest puste.</string>
+
+    <string name="albums">Albumy</string>
+
+    <!-- Android Auto -->
+    <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 -->
+    <string name="app_shortcut_shuffle_all_short">Losowo</string>
+    <string name="app_shortcut_top_tracks_short">Najczęściej odtwarzane utwory</string>
+
+    <string name="app_widget_big_name">Retro music - Duży</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="app_widget_text_name">Retro music - Tekst</string>
+
+    <string name="artist">Artysta</string>
+
+    <string name="artists">Artyści</string>
+
+    <string name="audio_focus_denied">Odrzucono fokus dźwiękowy.</string>
+
+    <string name="audio_settings_summary">Dostosuj ustawienia dźwięku i equalizera</string>
+
+    <string name="auto">Automatyczny</string>
+
+    <string name="base_color_theme">Bazowy kolor motywu</string>
+
+    <string name="bass_boost">Wzmocnienie Bassu</string>
+
+    <string name="bio">Biografia</string>
+
+    <string name="biography">Biografia</string>
+
+    <string name="black_theme_name">Po prostu czarny</string>
+
+    <string name="blacklist">Czarna lista</string>
+
+    <string name="blur">Rozmycie</string>
+
+    <string name="blur_card">Rozmyta Karta</string>
+
+    <string name="bug_report_failed">Nie udało się wysłać raportu</string>
+    <string name="bug_report_failed_invalid_token">Niepoprawny token dostępu. Proszę się skontaktować z twórcą aplikacji.</string>
+    <string name="bug_report_failed_issues_not_available">Problemy nie zostały włączone dla wybranego repozytorium. Proszę się skontaktować z twórcą aplikacji.</string>
+    <string name="bug_report_failed_unknown">Wystąpił nieoczekiwany błąd. Proszę skontaktować się z twórcą aplikacji.</string>
+    <string name="bug_report_failed_wrong_credentials">Zła nazwa użytkownika lub hasło</string>
+    <string name="bug_report_issue">Problem</string>
+    <string name="bug_report_manual">Wyślij ręcznie</string>
+    <string name="bug_report_no_description">Proszę opisać problemu</string>
+    <string name="bug_report_no_password">Proszę wpisać poprawne hasło GitHub</string>
+    <string name="bug_report_no_title">Proszę wpisać tytuł problemu</string>
+    <string name="bug_report_no_username">Proszę wpisać poprawną nazwę użytkownika GitHub</string>
+    <string name="bug_report_summary">Wystąpił nieoczekiwany błąd. Wyczyść dane podręczne lub - jeśli błąd pojawi się ponownie - wyślij nam maila.</string>
+    <string name="bug_report_uploading">Wrzucanie raportu na GitHub...</string>
+    <string name="bug_report_use_account">Wyślij przez konto GitHub</string>
+
+    <string name="cancel_current_timer">Anuluj</string>
+
+    <string name="card">Karta</string>
+
+    <string name="card_circular_style">Okrągły</string>
+
+    <string name="card_color_style">Kolorowa Karta</string>
+
+    <string name="card_style">Karta</string>
+
+    <string name="carousal">Karuzela</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Efekt karuzeli na ekranie Teraz odtwarzane</string>
+
+    <string name="cascading">Kaskadowy</string>
+
+    <string name="cast">Strumieniowanie</string>
+
+    <string name="changelog">Lista zmian</string>
+
+    <string name="changelog_summary">Lista zmian zarządzana z aplikacji Telegram</string>
+
+    <string name="circular">Okrągły</string>
+
+    <string name="classic">Klasyczny</string>
+
+    <string name="clear_action">Wyczyść</string>
+
+    <string name="clear_app_data">Wyczyść dane aplikacji</string>
+
+    <string name="clear_blacklist">Wyczyść czarną listę</string>
+
+    <string name="clear_playing_queue">Wyczyść kolejkę</string>
+
+    <string name="clear_playlist_title">Wyczyść playlistę</string>
+    <string name="clear_playlist_x"><![CDATA[Wyczy\u015bci\u0107 playlist\u0119 <b>%1$s</b>? Ta czynno\u015b\u0107 nie mo\u017ce zosta\u0107 cofni\u0119ta!]]></string>
+
+    <string name="close_notification">Zamknij</string>
+
+    <string name="color">Kolor</string>
+
+    <string name="color_theme_name">Kolor</string>
+
+    <string name="colors">Kolory</string>
+
+    <string name="composer">Kompozytor</string>
+
+    <string name="copied_device_info_to_clipboard">Skopiowano informacje o urządzeniu do schowka</string>
+
+    <string name="could_not_create_playlist">Nie mo\u017cna utworzy\u0107 playlisty.</string>
+    <string name="could_not_download_album_cover">"Nie mo\u017cna pobra\u0107 dopasowanej ok\u0142adki albumu"</string>
+    <string name="could_not_restore_purchase">Nie można przywrócić zakupów.</string>
+    <string name="could_not_scan_files">Nie można przeskanować %d plików.</string>
+
+    <string name="create_action">Utwórz</string>
+
+    <string name="created_playlist_x">Stworzono playlistę %1$s.</string>
+
+    <string name="credit_title">Członkowie i współpracownicy</string>
+
+    <string name="currently_listening_to_x_by_x">Aktualnie odtwarzane %1$s wykonawcy %2$s.</string>
+
+    <string name="dark_theme_name">Dość ciemny</string>
+
+    <string name="default_hint">Brak tekstu</string>
+
+    <string name="delete_playlist_title">Usuń playlistę</string>
+    <string name="delete_playlist_x"><![CDATA[Usunąć listę odtwarzania <b>%1$s</b>?]]></string>
+
+    <string name="delete_playlists_title">Usuń listy odtwarzania</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[Usunąć listy odtwarzania <b>%1$d</b> ?]]></string>
+    <string name="delete_x_songs"><![CDATA[Usunąć utwory <b>%1$d</b> ?]]></string>
+    <string name="deleted_x_songs">Usunięto %1$d utworów.</string>
+
+    <string name="depth">Głębia</string>
+
+    <string name="description">Opis</string>
+
+    <string name="device_info">Informacje o urządzeniu</string>
+
+    <string name="dialog_message_set_ringtone">Pozwól Retro Music na modyfikację ustawień dźwięku</string>
+
+    <string name="dialog_title_set_ringtone">Ustaw jako dzwonek</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">Wesprzyj nas</string>
+
+    <string name="donate_summary">Jeżeli uważasz, że zasługuje na zapłatę za moją pracę możesz zostawić tu drobną sumę</string>
+
+    <string name="donation_header">Kup mi:</string>
+
+    <string name="download_from_last_fm">Pobierz z Last.fm</string>
+
+    <string name="edit">Edytuj</string>
+
+    <string name="edit_cover">Edytuj okładkę</string>
+
+    <string name="empty">Pusto</string>
+
+    <string name="equalizer">Korektor dźwięku</string>
+
+    <string name="error">Błąd</string>
+
+    <string name="faq">FAQ</string>
+
+    <string name="favorites">Ulubione</string>
+
+    <string name="finish_last_song">Dokończ ostatnią piosenkę</string>
+
+    <string name="fit">Dopasuj</string>
+
+    <string name="flat">Płaski</string>
+
+    <string name="folders">Foldery</string>
+
+    <string name="for_you">Dla Ciebie</string>
+
+    <string name="full">Pełne</string>
+
+    <string name="full_card">Pełna karta</string>
+
+    <string name="general_settings_summary">Zmień motyw i kolory aplikacji</string>
+    <string name="general_settings_title">Wygląd i zachowanie interfejsu</string>
+
+    <string name="genre">Gatunek</string>
+
+    <string name="genres">Gatunki</string>
+
+    <string name="git_hub_summary">Zobacz kod na GitHubie</string>
+
+    <string name="google_plus_community">Dołącz do społeczności Google Plus by uzyskać informacje o aktualizacjach i pomoc</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="hinge">Zawias</string>
+
+    <string name="history">Historia</string>
+
+    <string name="home">Strona główna</string>
+
+    <string name="horizontal_flip">Obrót poziomy</string>
+
+    <string name="image">Obraz</string>
+
+    <string name="image_gradient">Obraz gradientowy</string>
+
+    <string name="image_settings_summary">Zmień ustawienia pobierania obrazka wykonawcy</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Dodano %1$d utworów do listy odtwarzania %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Udostępnij swój setup aplikacji Retro Music na Instagramie</string>
+
+    <string name="keyboard">Klawiatura</string>
+
+    <string name="label_bit_rate">Bitrate</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="labeled">Wszystkie podpisy</string>
+
+    <string name="last_added">Ostatnio dodane</string>
+
+    <string name="last_song">Ostatni utwór</string>
+
+    <string name="lets_play_something">Odtwórzmy jakąś muzykę</string>
+
+    <string name="library">Biblioteka</string>
+
+    <string name="library_categories">Kategorie biblioteki</string>
+
+    <string name="licenses">Licencje</string>
+
+    <string name="light_theme_name">Śnieżno biały</string>
+
+    <string name="listing_files">Listowanie plików</string>
+
+    <string name="loading_products">Ładowanie...</string>
+
+    <string name="login">Zaloguj się</string>
+
+    <string name="lyrics">Tekst utworu</string>
+
+    <string name="made_with_love">Stworzone z ❤️ w Indiach</string>
+
+    <string name="material">Materialistyczny</string>
+
+    <string name="md_error_label">Błąd</string>
+
+    <string name="md_storage_perm_error">Błąd uprawnień</string>
+
+    <string name="my_name">Moje imię</string>
+
+    <string name="my_top_tracks">Najczęściej odtwarzane</string>
+
+    <string name="never">Nigdy</string>
+
+    <string name="new_banner_photo">Nowe zdjęcie banera</string>
+
+    <string name="new_playlist_title">Nowa lista odtwarzania</string>
+
+    <string name="new_profile_photo">Nowe zdjęcie profilowe</string>
+
+    <string name="new_start_directory">%s jest nowym katalogiem startowym.</string>
+
+    <string name="next_song">Następny utwór</string>
+
+    <string name="no_albums">Brak albumów</string>
+
+    <string name="no_artists">Brak artystów</string>
+
+    <string name="no_audio_ID">"Odtwórz jakiś utwór i spróbuj ponownie."</string>
+
+    <string name="no_equalizer">Nie znaleziono korektora dźwięku.</string>
+
+    <string name="no_genres">Brak gatunków</string>
+
+    <string name="no_lyrics_found">Nie znaleziono tekstu utworu</string>
+
+    <string name="no_playlists">Brak list odtwarzania</string>
+
+    <string name="no_purchase_found">Nie znaleziono zakupów.</string>
+
+    <string name="no_results">Brak wyników.</string>
+
+    <string name="no_songs">Brak utworów</string>
+
+    <string name="normal">Normalne</string>
+
+    <string name="normal_lyrics">Normalny tekst utworu</string>
+
+    <string name="normal_style">Normalny</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nie znajduje się w magazynie multimediów.]]></string>
+
+    <string name="nothing_to_scan">Nic do skanowania.</string>
+
+    <string name="notification">Powiadomienie</string>
+
+    <string name="notification_settings_summary">Zmień wygląd powiadomień</string>
+
+    <string name="now_playing">Teraz odtwarzane</string>
+    <string name="now_playing_queue">Kolejka teraz odtwarzanych</string>
+    <string name="now_playing_summary">Dostosuj panel aktualnie odtwarzanych</string>
+    <string name="now_playing_themes">9+ motywów Teraz odtwarzane</string>
+
+    <string name="only_on_wifi">Tylko przez Wi-Fi</string>
+
+    <string name="other_settings_summary">Zaawansowane funkcje eksperymentalne</string>
+
+    <string name="others">Inne ustawienia</string>
+
+    <string name="password">Hasło</string>
+
+    <string name="past_three_months">Przez 3 miesiące</string>
+
+    <string name="paste_lyrics_here">Wklej tekst utworu tutaj</string>
+
+    <string name="permission_external_storage_denied">Odmowa dostępu do pamięci zewnętrznej.</string>
+
+    <string name="permissions_denied">Odmowa dostępu.</string>
+
+    <string name="personalize">Personalizuj</string>
+
+    <string name="personalize_settings_summary">Dostosuj interfejs \"Teraz odtwarzane\"</string>
+
+    <string name="pick_from_local_storage">Wybierz z pamięci lokalnej</string>
+
+    <string name="pick_image_intent_text">Wybierz obraz</string>
+
+    <string name="pinterest_page">Pinterest</string>
+    <string name="pinterest_page_summary">Śledź stronę Retro Music na Pintrest po więcej inspiracji</string>
+
+    <string name="plain">Wyraźny</string>
+
+    <string name="playing_notification_description">Powiadomienie odtwarzania pokazuje przyciski play/pauza itp.</string>
+    <string name="playing_notification_name">Powiadomienie odtwarzania</string>
+
+    <string name="playlist_empty_text">Pusta lista odtwarzania</string>
+
+    <string name="playlist_is_empty">Lista odtwarzania jest pusta</string>
+
+    <string name="playlist_name_empty">Nazwa listy odtwarzania</string>
+
+    <string name="playlists">Listy odtwarzania</string>
+
+    <string name="pref_album_detail_style">Styl detali albumu</string>
+
+    <string name="pref_blur_amount_summary">Ilość rozmycia dla motywów, mniejsza ilość jest szybsza</string>
+    <string name="pref_blur_amount_title">Wartość rozmycia</string>
+
+    <string name="pref_filter_song_title">Filtruj długość utworów</string>
+
+    <string name="pref_header_album">Styl okładki</string>
+    <string name="pref_header_audio">Dźwięk</string>
+    <string name="pref_header_controls">Przyciski kontrolne</string>
+    <string name="pref_header_general">Motyw</string>
+    <string name="pref_header_images">Obrazki</string>
+    <string name="pref_header_library">Biblioteka</string>
+    <string name="pref_header_lockscreen">Ekran blokady</string>
+    <string name="pref_header_playlists">Listy odtwarzania</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Zatrzymuje odtwarzanie przy zerowym poziomie głośności i wznawia po jego zwiększeniu. Kiedy zwiększysz głośność, odtwarzanie rozpocznie się nawet gdy jesteś poza aplikacją</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Zatrzymaj przy wyłączonym dźwięku</string>
+    <string name="pref_keep_screen_on_summary">Ta opcja może mieć wpływ na zużycie baterii</string>
+    <string name="pref_keep_screen_on_title">Pozostaw ekran włączony</string>
+
+    <string name="pref_now_playing_screen_summary">Kliknij aby otworzyć z lub przesunąć do przezroczystej nawigacji ekranu teraz odtwarzane</string>
+    <string name="pref_now_playing_screen_title">Kliknij albo przesuń</string>
+
+
+    <string name="pref_snow_fall_title">Efekt spadającego śniegu</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Używaj okładki aktualnie odtwarzanego albumu jako tapety ekranu blokady</string>
+    <string name="pref_summary_audio_ducking">Zmniejsz głośność kiedy dostajesz powiadomienia</string>
+    <string name="pref_summary_blacklist">Zawartość czarnej listy jest ukryta w twojej bibliotece.</string>
+    <string name="pref_summary_blurred_album_art">Rozmazuj okładkę albumu na ekranie blokady. Może powodować problemy z aplikacjami i widżetami innych firm</string>
+    <string name="pref_summary_carousel_effect">Efekt karuzeli na okładce obecnie odtwarzanego albumu. Zwróć uwagę, że motyw karty i rozmycia nie zadziała</string>
+    <string name="pref_summary_classic_notification">Użyj klasycznego wyglądu powiadomień.</string>
+    <string name="pref_summary_colored_app">Tło oraz kolor przycisku sterującego zmieniają się zgodnie z okładką albumu na ekranie odtwarzacza</string>
+    <string name="pref_summary_colored_app_shortcuts">Koloruje skróty aplikacji w kolorze akcentującym. Za każdym razem, gdy zmieniasz kolor, włącz tę opcję, aby zmiany odniosły skutek.</string>
+    <string name="pref_summary_colored_navigation_bar">Koloruje pasek nawigacji kolorem wiodącym.</string>
+    <string name="pref_summary_colored_notification">"Koloruje powiadomienie dominuj\u0105cym kolorem ok\u0142adki albumu."</string>
+    <string name="pref_summary_dominant_color">Najbardziej dominujący kolor zostanie wybrany z okładki albumu lub wykonawcy.</string>
+    <string name="pref_summary_extra_controls">Dodaj ekstra przyciski do małego odtwarzacza</string>
+    <string name="pref_summary_gapless_playback">"Może powodować problemy z odtwarzaniem na niektórych urządzeniach."</string>
+    <string name="pref_summary_genre_toggle">Przełącz kartę gatunku</string>
+    <string name="pref_summary_home_banner">Przełącz styl banera strony głównej</string>
+    <string name="pref_summary_ignore_media_store_artwork">Może zwiększyć jakość okładki albumu, ale powoduje spowolnienie ładowania obrazu. Włącz tę opcję tylko jeśli masz problemy z okładkami o niskiej rozdzielczości.</string>
+    <string name="pref_summary_library_categories">Skonfiguruj widoczność i kolejność kategorii w bibliotece.</string>
+    <string name="pref_summary_lock_screen">Sterowanie Retro na zablokowanym ekranie.</string>
+    <string name="pref_summary_open_source_licences">Szczegóły licencji oprogramowania open source</string>
+    <string name="pref_summary_round_corners">Zaokrąglone krawędzie okna, okładek albumów itp.</string>
+    <string name="pref_summary_tab_titles">Włącz/wyłącz tytuły kart u dołu.</string>
+    <string name="pref_summary_toggle_full_screen">Tryb imersji</string>
+    <string name="pref_summary_toggle_headset">Zacznij odtwarzanie po podłączanie zestawu słuchawkowego</string>
+    <string name="pref_summary_toggle_shuffle">Odtwarzanie losowe zostanie wyłączone podczas odtwarzania nowej listy utworów</string>
+    <string name="pref_summary_toggle_volume">Włącz sterowanie głośnością na ekranie \"teraz odtwarzane\"</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Pokaż okładkę albumu</string>
+    <string name="pref_title_album_cover_style">Wygląd okładki albumu</string>
+    <string name="pref_title_album_cover_transform">Przesuwanie okładki albumu</string>
+    <string name="pref_title_album_grid_style">Siatka albumów</string>
+    <string name="pref_title_app_shortcuts">Kolorowe skróty aplikacji</string>
+    <string name="pref_title_artist_grid_style">Siatka wykonawców</string>
+    <string name="pref_title_audio_ducking">Zmniejsz głośność przy braku skupienia</string>
+    <string name="pref_title_auto_download_artist_images">Automatycznie pobierz obrazki wykonawców</string>
+    <string name="pref_title_blacklist">Czarna lista</string>
+    <string name="pref_title_blurred_album_art">Rozmaż okładkę albumu</string>
+    <string name="pref_title_choose_equalizer">Wybierz korektor dźwięku</string>
+    <string name="pref_title_classic_notification">Klasyczny wygląd powiadomień</string>
+    <string name="pref_title_colored_app">Kolor adaptacyjny</string>
+    <string name="pref_title_colored_notification">Kolorowe powiadomienia</string>
+    <string name="pref_title_extra_controls">Dodatkowe sterowanie</string>
+    <string name="pref_title_gapless_playback">Odtwarzanie bez przerw</string>
+    <string name="pref_title_general_theme">Motyw główny</string>
+    <string name="pref_title_genre_toggle">Pokaż kartę gatunku</string>
+    <string name="pref_title_home_artist_grid_style">Siatka wykonawców strony głównej</string>
+    <string name="pref_title_home_banner">Baner strony głównej</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignoruj okładki z Media Store</string>
+    <string name="pref_title_last_added_interval">Ostatnio dodany interwał listy odtwarzania</string>
+    <string name="pref_title_lock_screen">Sterowanie pełno ekranowe</string>
+    <string name="pref_title_navigation_bar">Kolorowy pasek nawigacji</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">Narożne krawędzie</string>
+    <string name="pref_title_tab_text_mode">Wygląd tytułów kart</string>
+    <string name="pref_title_toggle_carousel_effect">Efekt karuzeli</string>
+    <string name="pref_title_toggle_dominant_color">Kolor dominujący</string>
+    <string name="pref_title_toggle_full_screen">Aplikacja pełnoekranowa</string>
+    <string name="pref_title_toggle_tab_titles">Tytuły kart</string>
+    <string name="pref_title_toggle_toggle_headset">Autoodtwarzanie</string>
+    <string name="pref_title_toggle_toggle_shuffle">Tryb losowy</string>
+    <string name="pref_title_toggle_volume">Sterowanie głośnością</string>
+    <string name="pref_title_user_info">Informacje użytkownika</string>
+
+    <string name="primary_color">Kolor podstawowy</string>
+    <string name="primary_color_desc">Główny kolor motywu, domyślnie niebieski, działa teraz z ciemnymi kolorami</string>
+
+    <string name="pro_summary">Efekt karuzeli, kolorowe motywy i wiele więcej...</string>
+
+    <string name="profile">Profil</string>
+
+    <string name="purchase">Kup</string>
+
+    <string name="purchase_summary">*Zastanów się przed zakupem, nie proś o zwrot.</string>
+
+    <string name="queue">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 co o niej sądzisz i co powinniśmy poprawić.</string>
+
+    <string name="recent_albums">Ostatnie albumy</string>
+
+    <string name="recent_artists">Ostatni artyści</string>
+
+    <string name="remove_action">Usuń</string>
+
+    <string name="remove_banner_photo">Usuń zdjęcie banera</string>
+
+    <string name="remove_cover">Usuń okładkę</string>
+
+    <string name="remove_from_blacklist">Usuń z czarnej listy</string>
+
+    <string name="remove_profile_photo">Usuń zdjęcie profilowe</string>
+
+    <string name="remove_song_from_playlist_title">Usuń utwór z listy odtwarzania</string>
+    <string name="remove_song_x_from_playlist"><![CDATA[Usunąć utwór <b>%1$s</b> z listy odtwarzania?]]></string>
+
+    <string name="remove_songs_from_playlist_title">Usuń te utwory z listy odtwarzania</string>
+
+    <string name="remove_x_songs_from_playlist"><![CDATA[Usunąć te utwory <b>%1$d</b> z listy odtwarzania?]]></string>
+
+    <string name="rename_playlist_title">Zmień nazwę listy odtwarzania</string>
+
+    <string name="report_an_issue">Zgłoś problem</string>
+
+    <string name="report_bug">Zgłoś błąd</string>
+
+    <string name="reset_action">Zresetuj</string>
+
+    <string name="reset_artist_image">Zresetuj obrazek wykonawcy</string>
+
+    <string name="restore">Przywróć</string>
+
+    <string name="restored_previous_purchase_please_restart">Przywrócono poprzedni zakup. Zrestartuj aplikacje aby korzystać z wszystkich funkcji.</string>
+    <string name="restored_previous_purchases">Przywrócono poprzednie zakupy.</string>
+
+    <string name="restoring_purchase">Przywracanie zakupu...</string>
+
+    <string name="retro_equalizer">Korektor dźwięku Retro</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <string name="save">Zapisz</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Zapisz jako plik</string>
+
+    <string name="save_playlists_title">Zapisz jako</string>
+
+    <string name="saved_playlist_to">Zapisz listę odtwarzania do %s.</string>
+
+    <string name="saving_changes">Zapisywanie zmian</string>
+
+    <string name="scan_media">Skanuj media</string>
+
+    <string name="scanned_files">Zeskanowano %1$d z plików %2$d.</string>
+
+    <string name="search_hint">Przeszukaj bibliotekę...</string>
+
+    <string name="select_all">Zaznacz wszystko</string>
+
+    <string name="select_banner_photo">Wybierz zdjęcie banera</string>
+
+    <string name="selected">Zaznaczone</string>
+
+    <string name="send_crash_log">Zgłoś awarię</string>
+
+    <string name="set">Ustaw</string>
+
+    <string name="set_artist_image">Ustaw obrazek wykonawcy</string>
+
+    <string name="set_photo">Ustaw zdjęcie profilowe</string>
+
+    <string name="share_app">Udostępnij aplikację</string>
+
+    <string name="shuffle">Losowo</string>
+
+    <string name="simple">Prosty</string>
+
+    <string name="sleep_timer_canceled">Wyłącznik czasowy wyłączony.</string>
+    <string name="sleep_timer_set">Wyłącznik czasowy ustawiony na %d minut.</string>
+
+    <string name="slide">Slajd</string>
+
+    <string name="small">Mały album</string>
+
+    <string name="social">Społeczność</string>
+
+    <string name="song">Utwór</string>
+
+    <string name="song_duration">Długość utworu</string>
+
+    <string name="songs">Utwory</string>
+
+    <string name="sort_order">Porządek sortowania</string>
+    <string name="sort_order_a_z">Rosnąco</string>
+    <string name="sort_order_album">Album</string>
+    <string name="sort_order_artist">Artysta</string>
+    <string name="sort_order_composer">Kompozytor</string>
+    <string name="sort_order_date">Dane</string>
+    <string name="sort_order_year">Rok</string>
+    <string name="sort_order_z_a">Malejąco</string>
+
+    <string name="speech_not_supported">Przepraszamy! Twoje urządzenie nie obsługuje wprowadzania głosowego</string>
+
+    <string name="speech_prompt">Przeszukaj swoją bibliotekę</string>
+
+    <string name="stack">Stos</string>
+
+    <string name="start_play_music">Rozpocznij odtwarzanie</string>
+
+    <string name="suggestion_songs">Sugestie</string>
+
+    <string name="summary_user_info">Po prostu pokaż tylko swoje imię na ekranie głównym</string>
+
+    <string name="support_development">Wspieraj rozwój</string>
+
+    <string name="swipe_to_unlock">Przesuń, aby odblokować</string>
+
+    <string name="synced_lyrics">Synchronizowany tekst utworu</string>
+
+    <string name="system_equalizer">Systemowy korektor dźwięku</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Dołącz do grupy Telegram, aby zgłosić błędy, zasugerować zmiany i inne</string>
+
+    <string name="thank_you">Dziękuję!</string>
+
+    <string name="the_audio_file">Pliki dźwiękowy</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_good_afternoon">Miłego popołudnia</string>
+    <string name="title_good_day">Dzień dobry</string>
+    <string name="title_good_evening">Dobry wieczór</string>
+    <string name="title_good_morning">Dzień dobry</string>
+    <string name="title_good_night">Dobry wieczór</string>
+
+    <string name="title_user_info">Jak masz na imię?</string>
+
+    <string name="today">Dzisiaj</string>
+
+    <string name="top_albums">Najczęściej odtwarzane albumy</string>
+
+    <string name="top_artists">Najczęściej odtwarzani artyści</string>
+
+    <string name="track_hint">"Ścieżka (2 dla ścieżki 2 lub 3004 dla ścieżki CD3 4)"</string>
+
+    <string name="track_list">Numer utworu</string>
+
+    <string name="translate">Przetłumacz</string>
+
+    <string name="translate_community">Pomóż nam tłumaczyć aplikację na swój język</string>
+
+    <string name="twitter_page">Strona na Twitterze</string>
+    <string name="twitter_page_summary">Podziel się swoim designem z Retro Music</string>
+
+    <string name="unlabeled">Niepodpisane</string>
+
+    <string name="unplayable_file">Nie mo\u017cna odtworzy\u0107 utworu.</string>
+
+    <string name="up_next">Następne</string>
+
+    <string name="update_image">Zaktualizuj obrazek</string>
+
+    <string name="updating">Aktualizowanie...</string>
+
+    <string name="username">Nazwa użytkownika</string>
+
+    <string name="version">Wersja</string>
+
+    <string name="vertical_flip">Obrót pionowy</string>
+
+    <string name="virtualizer">Wirtualizacja</string>
+
+    <string name="web_search">Przeszukaj sieć</string>
+
+    <string name="welcome">Witaj,</string>
+
+    <string name="what_do_you_want_to_share">Co chciałbyś udostępnić?</string>
+
+    <string name="whats_new">Co nowego</string>
+
+    <string name="window">Okno</string>
+
+    <string name="window_corner_edges">Zaokrąglone rogi</string>
+
+    <string name="x_has_been_set_as_ringtone">Ustaw %1$s jako dzwonek.</string>
+
+    <string name="x_selected">Wybrano %1$d</string>
+
+    <string name="year">Rok</string>
+
+    <string name="you_have_to_select_at_least_one_category">Musisz zaznaczyć przynajmniej jedną kategorię</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Będziesz przekierowany do strony ze zgłoszeniami.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Informacje o twoim koncie są używane tylko do autoryzacji.</string>
+    <string name="label_more_from">More from %s</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 95a14162e..709533f3d 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -1,203 +1,294 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Sobre %s</string>
-    <string name="about_settings_summary">Equipe, links sociais</string>
+    <string name="about_settings_summary">Time, links sociais</string>
+
     <string name="accent_color">Cor de destaque</string>
-    <string name="accent_color_desc">A cor de destaque do tema, o padrão é roxo</string>
+    <string name="accent_color_desc">A cor de destaque do tema, o padrão é verde</string>
+
     <string name="action_about">Sobre</string>
-    <string name="action_add_to_blacklist">Adicionar à Lista Negra</string>
+
     <string name="action_add_to_favorites">Adicionar aos favoritos</string>
-    <string name="action_add_to_playing_queue">Adicionar à fila</string>
-    <string name="action_add_to_playlist">Adicionar à playlist</string>
-    <string name="action_cancel">Cancelar</string>
-    <string name="action_cast">Transmitir</string>
-    <string name="action_clear_playing_queue">Limpar a fila</string>
-    <string name="action_cycle_repeat">Alternar entre modos de repetição</string>
+    <string name="action_add_to_playing_queue">Adicionar à lista de reprodução</string>
+    <string name="action_add_to_playlist">Adicionar à lista</string>
+
+    <string name="action_clear_playing_queue">Limpar a atual fila de reprodução</string>
+    <string name="action_clear_playlist">Remover todos os itens da playlist</string>
+
     <string name="action_delete">Excluir</string>
     <string name="action_delete_from_device">Excluir do dispositivo</string>
+
     <string name="action_details">Detalhes</string>
-    <string name="action_edit">Editar</string>
+
     <string name="action_go_to_album">Ir para o álbum</string>
     <string name="action_go_to_artist">Ir para o artista</string>
     <string name="action_go_to_genre">Ir para o gênero</string>
-    <string name="action_go_to_lyrics">Ir para Letras</string>
     <string name="action_go_to_start_directory">Ir para o diretório inicial</string>
-    <string name="action_grant">Conceder</string>
+
+    <string name="action_grant">Permitir</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 playlist</string>
+
+    <string name="action_new_playlist">Nova lista de reprodução</string>
+
     <string name="action_next">Próxima</string>
+
     <string name="action_play">Reproduzir</string>
-    <string name="action_play_all">Reproduzir todas</string>
-    <string name="action_play_next">Tocar em seguida</string>
+    <string name="action_play_all">Reproduzir tudo</string>
+    <string name="action_play_next">Reproduzir a próxima</string>
     <string name="action_play_pause">Reproduzir/Pausar</string>
+
     <string name="action_previous">Anterior</string>
+
     <string name="action_remove_from_favorites">Remover dos favoritos</string>
-    <string name="action_remove_from_playing_queue">Remover da fila</string>
+    <string name="action_remove_from_playing_queue">Remover da fila de reprodução</string>
     <string name="action_remove_from_playlist">Remover da playlist</string>
+
     <string name="action_rename">Renomear</string>
-    <string name="action_save_playing_queue">Salvar fila</string>
+
+    <string name="action_save_playing_queue">Salvar fila de reprodução</string>
+
     <string name="action_scan">Escanear</string>
+
     <string name="action_search">Pesquisar</string>
+
     <string name="action_set">Iniciar</string>
     <string name="action_set_as_ringtone">Definir como toque</string>
     <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_shuffle_all">Embaralhar todas</string>
+
+    <string name="action_shuffle_all">Misturar todas</string>
     <string name="action_shuffle_playlist">Embaralhar playlist</string>
+
     <string name="action_sleep_timer">Temporizador</string>
+
     <string name="action_sort_order">Ordem de classificação</string>
-    <string name="action_tag_editor">Editor de tags</string>
-    <string name="action_toggle_favorite">Ativar/desativar favorito</string>
-    <string name="action_toggle_shuffle">Ativar/desativar modo aleatório</string>
+
+    <string name="action_tag_editor">Editor de TAG</string>
+
     <string name="adaptive">Adaptável</string>
+
     <string name="add_action">Adicionar</string>
-    <string name="add_playlist_title">"Adicionar à playlist"</string>
-    <string name="add_time_framed_lryics">Adicionar Letras Sincronizadas</string>
-    <string name="added_song_count_to_playlist">%1$d Música(s) adicionada(s) a %2$s</string>
-    <string name="added_title_to_playing_queue">"1 música foi adicionada à fila."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d músicas foram adicionadas à fila.</string>
+
+    <string name="add_lyrics">Adicionar letras</string>
+
+    <string name="add_photo">Adicionar foto</string>
+
+    <string name="add_playlist_title">"Adicionar à lista"</string>
+
+    <string name="add_time_framed_lryics">Adicione tempo de enquadramento das letras</string>
+
+    <string name="added_title_to_playing_queue">"Uma música foi adicionada à fila de reprodução"</string>
+
+    <string name="added_x_titles_to_playing_queue">Foram adicionadas %1$d músicas na fila de reprodução</string>
+
     <string name="album">Álbum</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Música</item>
-        <item quantity="other">Músicas</item>
-    </plurals>
-    <string name="album_artist">Artista do Álbum</string>
+
+    <string name="album_artist">Álbum do artista</string>
+
+    <string name="album_or_artist_empty">O título ou artista está vazio</string>
+
     <string name="albums">Álbuns</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbuns</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">Sempre</string>
-    <string name="app_share">Ei, confira este reprodutor de música em: 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_short">Melhores Músicas</string>
-    <string name="app_widget_big_name">Imagem Inteira</string>
-    <string name="app_widget_card_name">Cartão</string>
-    <string name="app_widget_classic_name">Clássico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeno</string>
-    <string name="app_widget_text_name">Texto Minimalista</string>
+
+    <string name="app_share">Ei, confira este reprodutor de música legal em: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
+    <string name="app_shortcut_shuffle_all_short">Aleatório</string>
+    <string name="app_shortcut_top_tracks_short">Músicas favoritas</string>
+
+    <string name="app_widget_big_name">Música Retrô-Grande</string>
+    <string name="app_widget_card_name">Música Retrô-Cartão</string>
+    <string name="app_widget_classic_name">Música Retrô-Clássico</string>
+    <string name="app_widget_small_name">Música Retrô-Pequeno</string>
+    <string name="app_widget_text_name">Música Retrô-Texto</string>
+
     <string name="artist">Artista</string>
+
     <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duração do áudio gradual</string>
-    <string name="audio_focus_denied">Foco de áudio negado.</string>
+
+    <string name="audio_focus_denied">Foco de áudio negado</string>
+
     <string name="audio_settings_summary">Altere as configurações de som e ajuste os controles do equalizador</string>
+
     <string name="auto">Automático</string>
-    <string name="backup_restore_settings_summary">Fazer backup e restauração das suas configurações, playlists, etc.</string>
-    <string name="backup_restore_title"><![CDATA[Backup e Restauração]]></string>
-    <string name="backup_title">Backups</string>
+
+    <string name="base_color_theme">Baseado na cor do tema</string>
+
+    <string name="bass_boost">Aumento de graves</string>
+
+    <string name="bio">Biografia</string>
+
     <string name="biography">Biografia</string>
-    <string name="black_theme_name">Totalmente preto</string>
+
+    <string name="black_theme_name">Apenas preto</string>
+
     <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">O aplicativo precisa de permissão de dispositivos próximos para verificar por dispositivo “bluetooth”</string>
-    <string name="bluetooth_title">Dispositivos próximos</string>
-    <string name="blur">Desfoque</string>
-    <string name="blur_card">Cartão Desfocado</string>
+
+    <string name="blur">Desfocado</string>
+
+    <string name="blur_card">Cartão desfocado</string>
+
     <string name="bug_report_failed">Não é possível enviar o relatório</string>
-    <string name="bug_report_failed_invalid_token">Token de acesso inválido. Por favor, entre em contato com o desenvolvedor do aplicativo.</string>
-    <string name="bug_report_failed_issues_not_available">Os problemas não estão ativados para o repositório selecionado. Por favor, entre em contato com o desenvolvedor do aplicativo.</string>
+    <string name="bug_report_failed_invalid_token">Token de acesso inválido. Entre em contato com o desenvolvedor do aplicativo</string>
+    <string name="bug_report_failed_issues_not_available">Os problemas não estão ativados para o repositório selecionado. Entre em contato com o desenvolvedor do aplicativo.</string>
     <string name="bug_report_failed_unknown">Um erro inesperado ocorreu. Entre em contato com o desenvolvedor do aplicativo.</string>
     <string name="bug_report_failed_wrong_credentials">Nome do usuário ou senha incorreta</string>
-    <string name="bug_report_issue">Erro</string>
+    <string name="bug_report_issue">Questão</string>
     <string name="bug_report_manual">Enviar manualmente</string>
     <string name="bug_report_no_description">Por favor, insira uma descrição do problema</string>
     <string name="bug_report_no_password">Por favor, digite sua senha válida do GitHub</string>
     <string name="bug_report_no_title">Por favor, insira um título do problema</string>
     <string name="bug_report_no_username">Por favor, digite seu nome de usuário válido do GitHub</string>
-    <string name="bug_report_success">Erro reportado com sucesso</string>
     <string name="bug_report_summary">Um erro inesperado ocorreu. Se você tentar novamente e o erro persistir, use a opção \"Limpar dados do aplicativo\" ou envie-nos um e-mail</string>
+    <string name="bug_report_uploading">Enviando relatório para o GitHub...</string>
     <string name="bug_report_use_account">Enviar usando uma conta do GitHub</string>
-    <string name="buy_now">Comprar agora</string>
+
     <string name="cancel_current_timer">Cancelar</string>
+
     <string name="card">Cartão</string>
-    <string name="card_color_style">Cartão Colorido</string>
-    <string name="card_square">Cartão Quadrado</string>
+
+    <string name="card_circular_style">Circular</string>
+
+    <string name="card_color_style">Cartão colorido</string>
+
     <string name="card_style">Cartão</string>
+
+    <string name="carousal">Carrossel</string>
+
     <string name="carousal_effect_on_now_playing_screen">Efeito carrossel na tela de reprodução</string>
+
     <string name="cascading">Cascata</string>
+
+    <string name="cast">Transmitir</string>
+
     <string name="changelog">Lista de mudanças</string>
-    <string name="changelog_summary">Veja o que há de novo</string>
-    <string name="choose_image">Chotos Imagem</string>
-    <string name="choose_restore_title">Selecione o que será restaurado</string>
-    <string name="circle">Círculo</string>
+
+    <string name="changelog_summary">Lista de mudanças mantida no Canal no Telegram</string>
+
     <string name="circular">Circular</string>
+
     <string name="classic">Clássico</string>
+
     <string name="clear_action">Limpar</string>
+
+    <string name="clear_app_data">Limpar dados do aplicativo</string>
+
     <string name="clear_blacklist">Limpar lista negra</string>
-    <string name="clear_history">Limpar Histórico</string>
+
     <string name="clear_playing_queue">Limpar fila</string>
+
+    <string name="clear_playlist_title">Limpar playlist</string>
+    <string name="clear_playlist_x"><![CDATA[Limpar a playlist <b>%1$s</b>? Isso n\u00e3o pode ser desfeito!]]></string>
+
+    <string name="close_notification">Fechar</string>
+
     <string name="color">Cor</string>
+
+    <string name="color_theme_name">Cor</string>
+
     <string name="colors">Cores</string>
-    <string name="compact">Compacto</string>
+
     <string name="composer">Compositor</string>
-    <string name="copied_device_info_to_clipboard">Informações do dispositivo copiadas para a área de transferência.</string>
-    <string name="could_not_create_playlist">Não foi possível criar a playlist.</string>
-    <string name="could_not_download_album_cover">"Não foi possível baixar a capa do álbum correspondente."</string>
-    <string name="could_not_restore_purchase">Não foi possível restaurar a compra.</string>
-    <string name="could_not_scan_files">Não foi possível escanear %d arquivos.</string>
+
+    <string name="copied_device_info_to_clipboard">Informações do dispositivo copiado para a área de transferência.</string>
+
+    <string name="could_not_create_playlist">N\u00e3o foi poss\u00edvel criar a playlist</string>
+    <string name="could_not_download_album_cover">"N\u00e3o foi poss\u00edvel baixar uma capa do \u00e1lbum correspondente"</string>
+    <string name="could_not_restore_purchase">Não foi possível restaurar a compra</string>
+    <string name="could_not_scan_files">Não foi possível escanear %d arquivos</string>
+
     <string name="create_action">Criar</string>
-    <string name="create_new_backup">Criar</string>
-    <string name="created_playlist_x">A playlist %1$s foi criada.</string>
+
+    <string name="created_playlist_x">A playlist %1$s foi criada</string>
+
     <string name="credit_title">Membros e contribuidores</string>
+
     <string name="currently_listening_to_x_by_x">Atualmente ouvindo %1$s por %2$s.</string>
-    <string name="custom_artist_images">Imagens de Artista Personalizadas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Enviar Relatório de Erros</string>
+
     <string name="dark_theme_name">Meio escuro</string>
+
+    <string name="default_hint">Sem letras</string>
+
     <string name="delete_playlist_title">Excluir playlist</string>
     <string name="delete_playlist_x"><![CDATA[Excluir a playlist <b>%1$s</b>?]]></string>
+
     <string name="delete_playlists_title">Excluir playlists</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> playlists?]]></string>
     <string name="delete_x_songs"><![CDATA[Excluir <b>%1$d</b> músicas?]]></string>
     <string name="deleted_x_songs">%1$d músicas foram excluídas.</string>
-    <string name="deleting_songs">Apagando músicas</string>
+
     <string name="depth">Profundidade</string>
+
     <string name="description">Descrição</string>
-    <string name="device_info">Informações do dispositivo</string>
+
+    <string name="device_info">Informação do dispositivo</string>
+
     <string name="dialog_message_set_ringtone">Permite que o Retro Music modifique as configurações de áudio</string>
-    <string name="dialog_title_set_ringtone">Definir como toque</string>
-    <string name="disc_hint">Número do Disco</string>
+
+    <string name="dialog_title_set_ringtone">Definir toque</string>
+
     <string name="do_you_want_to_clear_the_blacklist">Você quer limpar a lista negra?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Você quer remover <b>%1$s</b> da 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 recompensado pelo meu trabalho, você pode me deixar algum dinheiro aqui</string>
-    <string name="donation_header">Me pague um:</string>
-    <string name="done">Concluído</string>
-    <string name="drive_mode">Modo Carro</string>
-    <string name="edit_fab">Botão Editar</string>
-    <string name="edit_normal_lyrics">Editar Letra</string>
-    <string name="edit_synced_lyrics">Editar Letras Sincronizadas</string>
+
+    <string name="donation_header">Compre-me um:</string>
+
+    <string name="download_from_last_fm">Baixar do Last.fm</string>
+
+    <string name="edit">Editar</string>
+
+    <string name="edit_cover">Editar capa</string>
+
     <string name="empty">Vazio</string>
+
     <string name="equalizer">Equalizador</string>
-    <string name="error_create_backup">Não foi possível criar um backup</string>
-    <string name="error_delete_backup">Não foi possível excluir o backup</string>
-    <string name="error_empty_name">Seu nome não pode estar em branco!</string>
-    <string name="error_load_failed">Falha ao carregar</string>
-    <string name="error_share_file">Não foi possível salvar o arquivo</string>
-    <string name="expanded">Expandido</string>
+
+    <string name="error">Erro</string>
+
     <string name="faq">Perguntas frequentes</string>
+
     <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">O arquivo já existe</string>
-    <string name="finish_last_song">Finalizar a última música</string>
-    <string name="fit">Ajustar</string>
+
+    <string name="finish_last_song">Terminar a última música</string>
+
+    <string name="fit">Em forma</string>
+
     <string name="flat">Plano</string>
+
     <string name="folders">Pastas</string>
-    <string name="follow_system">Padrão do sistema</string>
+
     <string name="for_you">Para você</string>
-    <string name="free">Grátis</string>
-    <string name="full">Completo</string>
-    <string name="full_card">Cartão completo</string>
+
+    <string name="full">Tela cheia</string>
+
+    <string name="full_card">Cartão cheio</string>
+
     <string name="general_settings_summary">Alterar o tema e as cores do aplicativo</string>
     <string name="general_settings_title">Aparência</string>
+
     <string name="genre">Gênero</string>
+
     <string name="genres">Gêneros</string>
-    <string name="git_hub_summary">Bifurcação do projeto no GitHub</string>
-    <string name="gradient">Degradê</string>
-    <string name="grant_access">Conceder acesso</string>
+
+    <string name="git_hub_summary">Fork o projeto no GitHub</string>
+
+    <string name="google_plus_community">Participe da comunidade do Google+, onde você pode pedir ajuda ou seguir as atualizações do Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -206,356 +297,484 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Estilo da grade</string>
-    <string name="help_summary">Precisa de mais ajuda?</string>
+
+    <string name="grid_style_label"><![CDATA[Grades & Estilos]]></string>
+
     <string name="hinge">Dobradiça</string>
+
     <string name="history">Histórico</string>
-    <string name="history_cleared">Histórico apagado</string>
-    <string name="history_undo_button">Desfazer</string>
-    <string name="home">Tela Inicial</string>
+
+    <string name="home">Início</string>
+
     <string name="horizontal_flip">Giro horizontal</string>
+
     <string name="image">Imagem</string>
+
     <string name="image_gradient">Imagem degradê</string>
+
     <string name="image_settings_summary">Alterar as configurações de download das imagens dos artistas</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar playlist</string>
-    <string name="import_playlist_message">Importar todas as playlists listadas no Armazenamento de Mídia do Android com suas músicas, se as listas de reprodução já existirem, as músicas serão mescladas.</string>
+
     <string name="inserted_x_songs_into_playlist_x">%1$d músicas adicionadas na playlist %2$s.</string>
-    <string name="instagram_page_summary">Compartilhe sua personalização do Retro Music no Instagram</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Compartilhe seu perfil do Retro Music para mostrá-lo no Instagram</string>
+
     <string name="keyboard">Teclado</string>
+
     <string name="label_bit_rate">Taxa de bits</string>
+
     <string name="label_file_format">Formato</string>
     <string name="label_file_name">Nome do arquivo</string>
-    <string name="label_file_path">Localização do arquivo</string>
+    <string name="label_file_path">Caminho do arquivo</string>
     <string name="label_file_size">Tamanho</string>
-    <string name="label_last_modified">Última Modificação</string>
-    <string name="label_more_from">Mais de %s</string>
+
     <string name="label_sampling_rate">Taxa de amostragem</string>
+
     <string name="label_track_length">Comprimento</string>
+
     <string name="labeled">Rotulado</string>
-    <string name="last_added">Adições recentes</string>
+
+    <string name="last_added">Mais recentes</string>
+
     <string name="last_song">Última música</string>
-    <string name="lets_go">Vamos lá</string>
+
+    <string name="lets_play_something">Vamos reproduzir alguma música</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">Claramente Branco</string>
-    <string name="listeners_label">Ouvintes</string>
-    <string name="listing_files">Listando arquivos</string>
-    <string name="loading_products">Carregando produtos…</string>
+
+    <string name="licenses">"Licenças "</string>
+
+    <string name="light_theme_name">Claramente branco</string>
+
+    <string name="listing_files">Listando arquivos...</string>
+
+    <string name="loading_products">Carregando produtos...</string>
+
     <string name="login">Entrar</string>
+
     <string name="lyrics">Letras</string>
+
     <string name="made_with_love">Feito com ❤️ na Índia</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Erro</string>
+
     <string name="md_storage_perm_error">Erro de permissão</string>
-    <string name="message_backup_create_success">Backup criado com sucesso.</string>
-    <string name="message_limit_tabs">Não mais do que 5 itens</string>
-    <string name="message_pro_feature">%s é um recurso Pro.</string>
-    <string name="message_restore_success">Restauração concluída com sucesso.</string>
-    <string name="message_updated">Atualizado</string>
-    <string name="message_welcome"><![CDATA[Olá! <br>Bem-vindo ao %s]]></string>
+
     <string name="my_name">Nome</string>
+
     <string name="my_top_tracks">Mais tocadas</string>
+
     <string name="never">Nunca</string>
-    <string name="new_music_mix">Novo Mix de Músicas</string>
+
+    <string name="new_banner_photo">Nova foto do mural</string>
+
     <string name="new_playlist_title">Nova playlist</string>
-    <string name="new_start_directory">%s é o novo diretório inicial.</string>
+
+    <string name="new_profile_photo">"Nova foto de perfil "</string>
+
+    <string name="new_start_directory">%s é o novo diretório inicial</string>
+
     <string name="next_song">Próxima música</string>
-    <string name="no_albums">Você não tem álbuns</string>
-    <string name="no_artists">Você não tem artistas</string>
-    <string name="no_audio_ID">"Reproduza uma música e tente novamente."</string>
-    <string name="no_backups_found">Nenhum Backup Encontrado</string>
+
+    <string name="no_albums">Sem álbuns</string>
+
+    <string name="no_artists">Sem artistas</string>
+
+    <string name="no_audio_ID">"Reproduza uma música primeiro e tente novamente"</string>
+
     <string name="no_equalizer">Nenhum equalizador encontrado</string>
-    <string name="no_genres">Você não tem gêneros</string>
+
+    <string name="no_genres">Sem gêneros</string>
+
     <string name="no_lyrics_found">Nenhuma letra encontrada</string>
-    <string name="no_playing_queue">Nenhuma música tocando</string>
-    <string name="no_playlists">Você não tem playlists</string>
+
+    <string name="no_playlists">Sem playlists</string>
+
     <string name="no_purchase_found">Nenhuma compra encontrada.</string>
+
     <string name="no_results">Sem resultados</string>
-    <string name="no_songs">Você não tem músicas</string>
+
+    <string name="no_songs">Sem músicas</string>
+
     <string name="normal">Normal</string>
+
     <string name="normal_lyrics">Letras normais</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> não está listado no armazenamento de mídia.]]></string>
-    <string name="not_recently_played">Não reproduzido recentemente</string>
+
+    <string name="normal_style">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> não está listado no armazenamento de mídia]]></string>
+
     <string name="nothing_to_scan">Nada para escanear.</string>
-    <string name="nothing_to_see">Nada para ver</string>
+
     <string name="notification">Notificação</string>
+
     <string name="notification_settings_summary">Personalizar o estilo de notificação</string>
-    <string name="now_playing">Tela de Reprodução</string>
-    <string name="now_playing_queue">Fila de reprodução atual</string>
-    <string name="now_playing_summary">Personalizar a tela de reprodução</string>
-    <string name="now_playing_themes">9 temas incríveis para a interface do reprodutor</string>
-    <string name="only_on_wifi">Apenas em Wi-Fi</string>
+
+    <string name="now_playing">Reproduzindo agora</string>
+    <string name="now_playing_queue">Reproduzindo agora na fila</string>
+    <string name="now_playing_summary">Personalizar tela de reprodução</string>
+    <string name="now_playing_themes">Incríveis 9 temas para a interface do reprodutor</string>
+
+    <string name="only_on_wifi">Apenas com Wi-Fi</string>
+
     <string name="other_settings_summary">Recursos avançados em teste</string>
+
     <string name="others">Outro</string>
-    <string name="over_cover">Sobre a Capa</string>
+
     <string name="password">Senha</string>
+
     <string name="past_three_months">Últimos 3 meses</string>
-    <string name="paste_lyrics_here">Colar Letras Aqui</string>
-    <string name="paste_timeframe_lyrics_here">Colar letras sincronizadas aqui</string>
-    <string name="peek">Espiada</string>
-    <string name="permission_bluetooth_denied">Permissão de dispositivos próximos negada.</string>
-    <string name="permission_external_storage_denied">Permissão para acessar o armazenamento externo negada.</string>
-    <string name="permission_summary">O aplicativo precisa de permissão para acessar o armazenamento do seu dispositivo para reproduzir músicas</string>
-    <string name="permission_title">Acesso ao Armazenamento</string>
+
+    <string name="paste_lyrics_here">Cole as letras aqui</string>
+
+    <string name="permission_external_storage_denied">Permissão para acessar o armazenamento externo negada</string>
+
     <string name="permissions_denied">Permissões negadas.</string>
+
     <string name="personalize">Personalizar</string>
-    <string name="personalize_settings_summary">Personalizar os controles na tela de reprodução e interface do usuário</string>
+
+    <string name="personalize_settings_summary">Personalizar os controles em Reproduzindo agora e Interface do Usuário</string>
+
     <string name="pick_from_local_storage">Escolha do armazenamento local</string>
+
+    <string name="pick_image_intent_text">Escolha a imagem</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Siga a página no Pinterest para se inspirar no design do Retro Music</string>
-    <string name="plain">Plano</string>
-    <string name="playList_already_exits">A playlist já existe</string>
-    <string name="playback_pitch">Tom</string>
-    <string name="playback_settings">Configurações de Reprodução</string>
-    <string name="playback_speed">Velocidade de Reprodução</string>
-    <string name="playing_notification_description">A notificação de reprodução fornece ações para reproduzir/pausar, etc.</string>
+    <string name="pinterest_page_summary">Siga a página do Pinterest para inspiração de design do Retro Music</string>
+
+    <string name="plain">Liso</string>
+
+    <string name="playing_notification_description">A notificação de reprodução fornece ações para reprodução/pausa, etc</string>
     <string name="playing_notification_name">Notificação de reprodução</string>
-    <string name="playlist_created_sucessfully">%s criada com sucesso</string>
+
+    <string name="playlist_empty_text">Playlist vazia</string>
+
     <string name="playlist_is_empty">A playlist está vazia</string>
+
     <string name="playlist_name_empty">Nome da playlist</string>
+
     <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Quantidade de desfoque aplicada a temas de desfoque, quanto menor mais rápido</string>
+
+    <string name="pref_album_detail_style">Estilo de detalhe do álbum</string>
+
+    <string name="pref_blur_amount_summary">Quantidade de desfoque aplicada a temas de desfoque, menor é mais rápido</string>
     <string name="pref_blur_amount_title">Quantidade de desfoque</string>
-    <string name="pref_filter_song_summary">Filtrar músicas por duração</string>
-    <string name="pref_filter_song_title">Filtrar músicas por duração</string>
-    <string name="pref_header_advanced">Avançado</string>
+
+    <string name="pref_filter_song_title">Filtrar duração da música</string>
+
     <string name="pref_header_album">Estilo do álbum</string>
     <string name="pref_header_audio">Áudio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
     <string name="pref_header_controls">Controles</string>
     <string name="pref_header_general">Tema</string>
     <string name="pref_header_images">Imagens</string>
     <string name="pref_header_library">Biblioteca</string>
     <string name="pref_header_lockscreen">Tela de bloqueio</string>
     <string name="pref_header_playlists">Playlists</string>
+
     <string name="pref_keep_pause_on_zero_volume_summary">Pausa a reprodução quando o volume é zerado e reproduz novamente quando o volume aumentar. Também funciona fora do aplicativo</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pausar em zero</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Pausar quando o volume for zerado</string>
     <string name="pref_keep_screen_on_summary">Tenha em mente que ativar este recurso pode afetar a duração da bateria</string>
     <string name="pref_keep_screen_on_title">Manter a tela ligada</string>
-    <string name="pref_language_name">Selecione o idioma</string>
-    <string name="pref_snow_fall_title">Efeito de queda de neve</string>
+
+    <string name="pref_now_playing_screen_summary">Clique para abrir ou deslizar sem a navegação transparente da tela que está sendo reproduzida agora</string>
+    <string name="pref_now_playing_screen_title">Clique ou deslize</string>
+
+    <string name="pref_snow_fall_title">Efeito de neve caindo</string>
+
     <string name="pref_summary_album_art_on_lockscreen">Usar a capa do álbum da música em reprodução como papel de parede na tela de bloqueio</string>
-    <string name="pref_summary_album_artists_only">Mostrar Artistas do Álbum na categoria de Artistas</string>
-    <string name="pref_summary_audio_ducking">Diminuir o volume quando um som do sistema for reproduzido ou uma notificação for recebida</string>
-    <string name="pref_summary_audio_fade">Desvanecer o áudio quando a música é pausada ou reproduzida</string>
-    <string name="pref_summary_blacklist">O conteúdo de pastas na lista negra é escondido da sua biblioteca.</string>
-    <string name="pref_summary_bluetooth_playback">Começar a tocar assim que se conectar a um dispositivo Bluetooth</string>
+    <string name="pref_summary_audio_ducking">Diminua o volume quando um som do sistema for reproduzido ou uma notificação for recebida</string>
+    <string name="pref_summary_blacklist">O conteúdo das pastas na lista negra está oculto da sua biblioteca.</string>
     <string name="pref_summary_blurred_album_art">Desfoque a capa do álbum na tela de bloqueio. Pode causar problemas com aplicativos e widgets de terceiros</string>
-    <string name="pref_summary_carousel_effect">Efeito carrossel para a imagem do álbum na tela de reprodução. Note que os temas \"Cartão\" e \"Cartão Desfocado\" não irão funcionar</string>
-    <string name="pref_summary_classic_notification">Usar o design de notificação clássico</string>
-    <string name="pref_summary_colored_app">As cores de fundo e do botão de controle mudam de acordo com a capa do álbum na tela de reprodução</string>
+    <string name="pref_summary_carousel_effect">Efeito carrossel para a imagem do álbum na tela de reprodução. Note que nos temas \"Cartão\" e \"Cartão desfocado\" não irá funcionar</string>
+    <string name="pref_summary_classic_notification">Use o design de notificação clássico</string>
+    <string name="pref_summary_colored_app">As cores de fundo e do botão de controle mudam de acordo com a capa do álbum a partir da tela que está sendo reproduzida</string>
     <string name="pref_summary_colored_app_shortcuts">Colore os atalhos do aplicativo na cor de destaque. Toda vez que você mudar a cor alterne essa opção para ter efeito</string>
-    <string name="pref_summary_colored_notification">"Colore a notificação com a cor da capa do álbum"</string>
-    <string name="pref_summary_cross_fade">Duração de transição entre músicas</string>
-    <string name="pref_summary_desaturated_color">Conforme o guia do Material Design, as cores devem ser dessaturadas no modo escuro</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicar na notificação irá mostrar a tela de reprodução ao invés da tela inicial</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">"Colore a notifica\u00e7\u00e3o na cor vibrante da capa do \u00e1lbum"</string>
+    <string name="pref_summary_dominant_color">A cor mais dominante será escolhida da capa do álbum/artista</string>
     <string name="pref_summary_extra_controls">Adicionar botões extras para o mini reprodutor</string>
-    <string name="pref_summary_extra_song_info">Mostrar informações extras da música, como formato de arquivo, taxa de bits e frequência</string>
-    <string name="pref_summary_gapless_playback">"Pode causar problemas de reprodução em alguns dispositivos."</string>
-    <string name="pref_summary_home_banner">Mostrar ou esconder o mural inicial</string>
-    <string name="pref_summary_ignore_media_store_artwork">Pode aumentar a qualidade da capa do álbum, mas diminui a velocidade de carregamento. Ative isso apenas se você tiver problemas com capas de baixa resolução</string>
-    <string name="pref_summary_library_categories">Configurar visibilidade e ordem das categorias da biblioteca.</string>
+    <string name="pref_summary_gapless_playback">"Pode causar problemas de reprodução em alguns dispositivos"</string>
+    <string name="pref_summary_genre_toggle">Alternar aba de gêneros</string>
+    <string name="pref_summary_home_banner">Alternar o estilo do mural inicial</string>
+    <string name="pref_summary_ignore_media_store_artwork">Pode aumentar a qualidade da capa do álbum, mas diminui a velocidade de carregamento da capa do álbum. Ative isso apenas se você tiver problemas com capas de baixa resolução</string>
+    <string name="pref_summary_library_categories">Configurar visibilidade e ordem de categorias da biblioteca.</string>
     <string name="pref_summary_lock_screen">Usar controles personalizados do Retro Music na tela de bloqueio</string>
-    <string name="pref_summary_manage_audio_focus">Sempre reproduzir o áudio em segundo plano independentemente de qualquer coisa que esteja sendo reproduzida</string>
     <string name="pref_summary_open_source_licences">Detalhes da licença para software de código aberto</string>
-    <string name="pref_summary_pause_history">Quando ativado, as músicas tocadas recentemente não serão exibidas no histórico</string>
-    <string name="pref_summary_remember_tab">Navegar para a última guia usada ao iniciar</string>
-    <string name="pref_summary_show_lyrics">Exibir letras sincronizadas sobre a capa do álbum</string>
-    <string name="pref_summary_suggestions">Mostrar \"Mix de Novas Músicas\" na tela inicial</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Permite mudar a música deslizando em qualquer lugar na tela em reprodução</string>
-    <string name="pref_summary_swipe_to_dismiss">Deslize para baixo para dispensar o mini player</string>
+    <string name="pref_summary_round_corners">Arredondar as bordas do aplicativo</string>
+    <string name="pref_summary_tab_titles">Ativar títulos para as guias da barra de navegação inferior</string>
     <string name="pref_summary_toggle_full_screen">Modo imersivo</string>
-    <string name="pref_summary_toggle_headset">Começar a reproduzir imediatamente após os fones de ouvido forem conectados</string>
+    <string name="pref_summary_toggle_headset">Comecar a reproduzir imediatamente quando os fones de ouvido forem conectados</string>
     <string name="pref_summary_toggle_shuffle">O modo aleatório será desativado ao reproduzir uma nova lista de músicas</string>
-    <string name="pref_summary_toggle_volume">Se houver espaço suficiente, mostrar os controles de volume na tela de reprodução</string>
-    <string name="pref_summary_wallpaper_accent">Extraia a cor de destaque do papel de parede</string>
-    <string name="pref_summary_whitelist">Somente mostrar músicas da pasta /Music</string>
+    <string name="pref_summary_toggle_volume">Se houver espaço suficiente, mostre os controles de volume na tela que está sendo reproduzida</string>
+
     <string name="pref_title_album_art_on_lockscreen">Exibir a capa do álbum</string>
-    <string name="pref_title_album_artists_only">Navegar pelo Artista do Álbum</string>
     <string name="pref_title_album_cover_style">Tema da capa do álbum</string>
     <string name="pref_title_album_cover_transform">Pular a capa do álbum</string>
+    <string name="pref_title_album_grid_style">Grade do álbum</string>
     <string name="pref_title_app_shortcuts">Colorir os atalhos do aplicativo</string>
-    <string name="pref_title_appbar_mode">Estilo do cabeçalho</string>
-    <string name="pref_title_audio_ducking">Reduzir o volume durante perda de foco</string>
-    <string name="pref_title_audio_fade">Desvanecer áudio</string>
+    <string name="pref_title_artist_grid_style">Grade do artista</string>
+    <string name="pref_title_audio_ducking">Reduza o volume na perda de foco</string>
     <string name="pref_title_auto_download_artist_images">Baixar automaticamente as imagens dos artistas</string>
     <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Reprodução bluetooth</string>
     <string name="pref_title_blurred_album_art">Desfocar a capa do álbum</string>
-    <string name="pref_title_circle_button">Botão de reprodução circular</string>
+    <string name="pref_title_choose_equalizer">Escolha o equalizador</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ções coloridas</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Usar a fonte Manrope</string>
-    <string name="pref_title_desaturated_color">Cor dessaturada</string>
-    <string name="pref_title_expand_now_playing_panel">Mostrar tela de reprodução</string>
     <string name="pref_title_extra_controls">Controles extras</string>
-    <string name="pref_title_extra_song_info">Informações da música</string>
-    <string name="pref_title_gapless_playback">Reprodução sem pausas</string>
+    <string name="pref_title_gapless_playback">Reprodução contínua</string>
     <string name="pref_title_general_theme">Tema do aplicativo</string>
-    <string name="pref_title_home_album_grid_style">Álbum em grade</string>
-    <string name="pref_title_home_artist_grid_style">Artistas em grade</string>
-    <string name="pref_title_home_banner">Mural</string>
+    <string name="pref_title_genre_toggle">Exibir a aba de gêneros</string>
+    <string name="pref_title_home_artist_grid_style">Grade de artistas na tela inicial</string>
+    <string name="pref_title_home_banner">Mural na tela inicial</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 \"Mais recentes\"</string>
     <string name="pref_title_lock_screen">Controles em tela cheia</string>
-    <string name="pref_title_lyrics_screen_on">Manter a tela ligada ao mostrar as letras</string>
-    <string name="pref_title_lyrics_type">Tipo de letra</string>
-    <string name="pref_title_manage_audio_focus">Sempre reproduzir</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema da tela de reprodução</string>
+    <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
+    <string name="pref_title_now_playing_screen_appearance">Tema da tela \"Reproduzindo agora\"</string>
     <string name="pref_title_open_source_licences">Licenças de código aberto</string>
-    <string name="pref_title_pause_history">Pausar histórico</string>
-    <string name="pref_title_remember_tab">Lembrar a última guia</string>
-    <string name="pref_title_show_lyrics">Mostrar letras</string>
-    <string name="pref_title_suggestions">Mostrar sugestões</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Deslize em qualquer lugar para mudar a música</string>
-    <string name="pref_title_swipe_to_dismiss">Dispensar com deslize para baixo</string>
-    <string name="pref_title_tab_text_mode">Modo de títulos nas guias</string>
+    <string name="pref_title_round_corners">Bordas arredondadas</string>
+    <string name="pref_title_tab_text_mode">Modo de títulos nas abas</string>
     <string name="pref_title_toggle_carousel_effect">Efeito carrossel</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_toggle_headset">Reprodução automática</string>
+    <string name="pref_title_toggle_tab_titles">Títulos das guias</string>
+    <string name="pref_title_toggle_toggle_headset">Execuções automática</string>
     <string name="pref_title_toggle_toggle_shuffle">Modo aleatório</string>
     <string name="pref_title_toggle_volume">Controles do volume</string>
-    <string name="pref_title_wallpaper_accent">Cor de destaque do papel de parede</string>
-    <string name="pref_title_whitelist">Lista branca</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema escuro, Temas na tela de reprodução, Efeito carrossel e mais..</string>
+    <string name="pref_title_user_info">Informação do usuário</string>
+
+    <string name="primary_color">Cor primária</string>
+    <string name="primary_color_desc">A cor principal do tema por padrão é cinza azulado, por enquanto funciona com cores escuras</string>
+
+    <string name="pro_summary">Temas do reproduzindo agora, Efeito carrossel, Tema de cor e mais...</string>
+
     <string name="profile">Perfil</string>
+
     <string name="purchase">Comprar</string>
+
+    <string name="purchase_summary">*Pense antes de comprar, não pergunte por reembolso!</string>
+
     <string name="queue">Fila</string>
+
     <string name="rate_app">Avalie o aplicativo</string>
-    <string name="rate_on_google_play_summary">Adorou este aplicativo? Informe-nos na Google Play Store como podemos melhorá-lo</string>
+
+    <string name="rate_on_google_play_summary">Adorou este aplicativo? Informe-nos na Google Play Store como podemos melhorar o aplicativo</string>
+
     <string name="recent_albums">Álbuns recentes</string>
+
     <string name="recent_artists">Artistas recentes</string>
+
     <string name="remove_action">Remover</string>
+
+    <string name="remove_banner_photo">Remover foto do mural</string>
+
     <string name="remove_cover">Remover capa</string>
+
     <string name="remove_from_blacklist">Remover da lista negra</string>
-    <string name="remove_image">Remover Imagem</string>
+
+    <string name="remove_profile_photo">Remover foto do perfil</string>
+
     <string name="remove_song_from_playlist_title">Remover música da playlist</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Remover a música <b>%1$s</b> da playlist?]]></string>
+
     <string name="remove_songs_from_playlist_title">Remover músicas da playlist</string>
+
     <string name="remove_x_songs_from_playlist"><![CDATA[Remover <b>%1$d</b> músicas da playlist?]]></string>
+
     <string name="rename_playlist_title">Renomear playlist</string>
-    <string name="replace_cover">Substituir a Capa</string>
+
     <string name="report_an_issue">Reportar um problema</string>
+
     <string name="report_bug">Reportar erro</string>
+
     <string name="reset_action">Resetar</string>
+
     <string name="reset_artist_image">Restaurar imagem do artista</string>
+
     <string name="restore">Restaurar</string>
-    <string name="restore_message">Confirma a restauração do backup?</string>
+
     <string name="restored_previous_purchase_please_restart">Compra anterior restaurada. Por favor, reinicie o aplicativo para fazer uso de todos os recursos.</string>
-    <string name="restored_previous_purchases">Compras anteriores restauradas.</string>
+    <string name="restored_previous_purchases">Compras anteriores foram restauradas.</string>
+
     <string name="restoring_purchase">Restaurando compra...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Equalizador do Retro Music</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">O aplicativo precisa de permissão para acessar as configurações do seu dispositivo para definir músicas como toque</string>
-    <string name="ringtone_title">Toque (opcional)</string>
-    <string name="saf_delete_failed">Falha ao excluir arquivo: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Não foi possível obter URI SAF</string>
-    <string name="saf_guide_slide1_description">Abrir painel de navegação</string>
-    <string name="saf_guide_slide1_description_before_o">Ativar \'Mostrar cartão SD\' no menu flutuante</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s precisa de acesso ao cartão SD</string>
-    <string name="saf_guide_slide2_description">Você precisa selecionar o diretório raiz do seu cartão SD</string>
-    <string name="saf_guide_slide2_title">Selecione seu cartão SD no menu de navegação</string>
-    <string name="saf_guide_slide3_description">Não abra nenhuma subpasta</string>
-    <string name="saf_guide_slide3_title">Toque no botão \'selecionar\' na parte inferior da tela</string>
-    <string name="saf_write_failed">Falha na escrita do arquivo: %s</string>
+
     <string name="save">Salvar</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Salvar como arquivo</string>
+
     <string name="save_playlists_title">Salvar como arquivos</string>
-    <string name="saved_playlist_to">Playlist salva como %s.</string>
-    <string name="saving_changes">Salvando alterações</string>
+
+    <string name="saved_playlist_to">Playlist salva para %s</string>
+
+    <string name="saving_changes">Salvando alterações...</string>
+
     <string name="scan_media">Escanear mídia</string>
-    <string name="scanned_files">Escaneados %1$d de %2$d arquivos.</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="scanned_files">Escaneados %1$d dos %2$d arquivos</string>
+
+    <string name="search_hint">Pesquisar na sua biblioteca ...</string>
+
     <string name="select_all">Selecionar tudo</string>
+
+    <string name="select_banner_photo">Selecione a foto do mural</string>
+
     <string name="selected">Selecionado</string>
+
+    <string name="send_crash_log">Enviar log de falha</string>
+
     <string name="set">Definir</string>
+
     <string name="set_artist_image">Definir imagem do artista</string>
+
+    <string name="set_photo">Definir uma foto de perfil</string>
+
     <string name="share_app">Compartilhar o aplicativo</string>
-    <string name="share_summary">Compartilhe o aplicativo com amigos e familiares</string>
-    <string name="share_to_stories">Compartilhar no Stories</string>
-    <string name="show_album_artists">Mostrar Artistas do Álbum</string>
+
     <string name="shuffle">Aleatório</string>
+
     <string name="simple">Simples</string>
-    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
-    <string name="sleep_timer_set">Temporizador definido para %d minutos a partir de agora.</string>
+
+    <string name="sleep_timer_canceled">Temporizador cancelado</string>
+    <string name="sleep_timer_set">Temporizador definido para %d minutos a partir de agora</string>
+
+    <string name="slide">Deslizar</string>
+
+    <string name="small">"Português 
+"</string>
+
     <string name="social">Social</string>
-    <string name="social_stories">Compartilhar story</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">Ordem de classificação</string>
-    <string name="sort_order_a_z">Nome (crescente)</string>
+    <string name="sort_order_a_z">Ascendente</string>
     <string name="sort_order_album">Álbum</string>
     <string name="sort_order_artist">Artista</string>
     <string name="sort_order_composer">Compositor</string>
-    <string name="sort_order_date">Data adicionada</string>
-    <string name="sort_order_date_modified">Data de alteração</string>
-    <string name="sort_order_default">Padrão</string>
-    <string name="sort_order_num_songs">Quantidade de músicas (crescente)</string>
-    <string name="sort_order_num_songs_desc">Quantidade de músicas (decrescente)</string>
+    <string name="sort_order_date">Data</string>
     <string name="sort_order_year">Ano</string>
-    <string name="sort_order_z_a">Nome (decrescente)</string>
+    <string name="sort_order_z_a">Decrescente</string>
+
     <string name="speech_not_supported">Desculpe! O seu dispositivo não suporta entrada de voz</string>
-    <string name="speech_prompt">Pesquisar sua biblioteca</string>
+
+    <string name="speech_prompt">Pesquisar...</string>
+
     <string name="stack">Pilha</string>
-    <string name="start_play_music">Começar a reproduzir a música.</string>
+
+    <string name="start_play_music">Começar a reprodução de música.</string>
+
     <string name="suggestion_songs">Sugestões</string>
+
+    <string name="summary_user_info">Mostrar apenas o seu nome na tela inicial</string>
+
     <string name="support_development">Apoiar o desenvolvimento</string>
+
     <string name="swipe_to_unlock">Deslize para desbloquear</string>
+
     <string name="synced_lyrics">Letras sincronizadas</string>
+
+    <string name="system_equalizer">Equalizador do sistema</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Junte-se ao grupo no Telegram para discutir bugs, fazer sugestões e muito mais</string>
+
     <string name="thank_you">Obrigado!</string>
+
     <string name="the_audio_file">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">Pequeno</string>
-    <string name="tiny_card_style">Cartão pequeno</string>
+
+    <string name="tiny">Minúsculo</string>
+
     <string name="title">Título</string>
-    <string name="title_new_backup">Novo Backup</string>
+
+    <string name="title_dashboard">Painel de controle</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_user_info">Qual o seu nome?</string>
+
     <string name="today">Hoje</string>
-    <string name="top_albums">Melhores álbuns</string>
-    <string name="top_artists">Melhores artistas</string>
+
+    <string name="top_albums">Melhores albuns</string>
+
+    <string name="top_artists">Artistas principais</string>
+
     <string name="track_hint">"Música (2 para a música 2 ou 3004 para a música 4 do CD3)"</string>
+
     <string name="track_list">Número da música</string>
+
     <string name="translate">Traduzir</string>
-    <string name="translate_community">Ajude-nos a traduzir o aplicativo para o seu idioma</string>
-    <string name="try_retro_music_premium">Experimente o Retro Music Premium</string>
-    <string name="twitter_page">Twitter </string>
+
+    <string name="translate_community">Ajude-nos a traduzir o aplicativo para seu idioma</string>
+
+    <string name="twitter_page">"Twitter "</string>
     <string name="twitter_page_summary">Compartilhe seu design com o Retro Music</string>
+
     <string name="unlabeled">Não rotulado</string>
-    <string name="unplayable_file">Não foi possível reproduzir esta música.</string>
+
+    <string name="unplayable_file">N\u00e3o foi poss\u00edvel reproduzir est\u00e1 m\u00fasica.</string>
+
     <string name="up_next">A seguir</string>
+
     <string name="update_image">Atualizar imagem</string>
+
     <string name="updating">Atualizando...</string>
-    <string name="user_images_description">Imagens do Usuário</string>
-    <string name="user_name">Nome do Usuário</string>
-    <string name="username">Nome de Usuário</string>
+
+    <string name="username">Nome de usuário</string>
+
     <string name="version">Versão</string>
+
     <string name="vertical_flip">Giro vertical</string>
-    <string name="view_on_telegram">Ver no Telegram</string>
-    <string name="volume">Volume</string>
+
+    <string name="virtualizer">Virtualizador</string>
+
     <string name="web_search">Pesquisar na internet</string>
-    <string name="website">Site</string>
-    <string name="website_summary">Confira nosso site</string>
+
     <string name="welcome">Bem-vindo(a),</string>
+
     <string name="what_do_you_want_to_share">O que você quer compartilhar?</string>
+
     <string name="whats_new">Novidades</string>
+
     <string name="window">Janela</string>
+
     <string name="window_corner_edges">Cantos arredondados</string>
+
     <string name="x_has_been_set_as_ringtone">Definir %1$s como toque.</string>
-    <string name="x_selected">%1$d selecionado</string>
+
+    <string name="x_selected">%1$sd selecionado</string>
+
     <string name="year">Ano</string>
+
     <string name="you_have_to_select_at_least_one_category">Você precisa selecionar ao menos uma categoria.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Você será encaminhado para o website de rastreio de problemas.</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Você será encaminhado para o website do rastreador de problemas.</string>
+
     <string name="your_account_data_is_only_used_for_authentication">Os dados da sua conta são usados ​​apenas para autenticação.</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
deleted file mode 100644
index bdd5108e6..000000000
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Acerca de %s</string>
-    <string name="about_settings_summary">Equipa, links sociais</string>
-    <string name="accent_color">Cor de destaque</string>
-    <string name="accent_color_desc">Cor de destaque do tema. Roxo é o predefinido</string>
-    <string name="action_about">Acerca de</string>
-    <string name="action_add_to_blacklist">Adicionar à lista negra</string>
-    <string name="action_add_to_favorites">Adicionar aos favoritos</string>
-    <string name="action_add_to_playing_queue">Adicionar à fila de reprodução</string>
-    <string name="action_add_to_playlist">Adicionar à lista</string>
-    <string name="action_cancel">Cancelar</string>
-    <string name="action_cast">Transmitir</string>
-    <string name="action_clear_playing_queue">Limpar fila de reprodução</string>
-    <string name="action_cycle_repeat">Modo de repetição</string>
-    <string name="action_delete">Eliminar</string>
-    <string name="action_delete_from_device">Eliminar do dispositivo</string>
-    <string name="action_details">Detalhes</string>
-    <string name="action_edit">Editar</string>
-    <string name="action_go_to_album">Ir para o álbum</string>
-    <string name="action_go_to_artist">Ir para o artista</string>
-    <string name="action_go_to_genre">Ir para género</string>
-    <string name="action_go_to_lyrics">Ir para Letras</string>
-    <string name="action_go_to_start_directory">Ir para diretoria inicial</string>
-    <string name="action_grant">Conceder</string>
-    <string name="action_grid_size">Tamanho da grelha</string>
-    <string name="action_grid_size_land">Tamanho da grelha (horizontal)</string>
-    <string name="action_new_playlist">Nova lista de reprodução</string>
-    <string name="action_next">Seguinte</string>
-    <string name="action_play">Reproduzir</string>
-    <string name="action_play_all">Reproduzir tudo</string>
-    <string name="action_play_next">Reproduzir seguinte</string>
-    <string name="action_play_pause">Reproduzir/Pausar</string>
-    <string name="action_previous">Anterior</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>
-    <string name="action_rename">Renomear</string>
-    <string name="action_save_playing_queue">Guardar fila de reprodução</string>
-    <string name="action_scan">Analisar</string>
-    <string name="action_search">Procurar</string>
-    <string name="action_set">Iniciar</string>
-    <string name="action_set_as_ringtone">Definir como toque</string>
-    <string name="action_set_as_start_directory">Definir como diretoria inicial</string>
-    <string name="action_settings">"Definições"</string>
-    <string name="action_share">Partilhar</string>
-    <string name="action_shuffle_all">Misturar tudo</string>
-    <string name="action_shuffle_playlist">Misturar lista</string>
-    <string name="action_sleep_timer">Temporizador</string>
-    <string name="action_sort_order">Ordenação</string>
-    <string name="action_tag_editor">Editor de etiquetas</string>
-    <string name="action_toggle_favorite">Ligar/desligar favoritos</string>
-    <string name="action_toggle_shuffle">Ligar/desligar aleatório</string>
-    <string name="adaptive">Adaptável</string>
-    <string name="add_action">Adicionar</string>
-    <string name="add_playlist_title">"Adicionar à lista"</string>
-    <string name="add_time_framed_lryics">Adicionar letras do cronograma</string>
-    <string name="added_song_count_to_playlist">%1$d música(s) adicionada(s) a %2$s</string>
-    <string name="added_title_to_playing_queue">"Adicionada 1 música à fila."</string>
-    <string name="added_x_titles_to_playing_queue">Adicionadas %1$d músicas à fila.</string>
-    <string name="album">Álbum</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Música</item>
-        <item quantity="other">Músicas</item>
-    </plurals>
-    <string name="album_artist">Artista do álbum</string>
-    <string name="albums">Álbuns</string>
-    <plurals name="albums">
-        <item quantity="one">Álbum</item>
-        <item quantity="other">Álbuns</item>
-    </plurals>
-    <string name="always">Sempre</string>
-    <string name="app_share">Veja este novo leitor de música em: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Aleatório</string>
-    <string name="app_shortcut_top_tracks_short">Top músicas</string>
-    <string name="app_widget_big_name">Imagem inteira</string>
-    <string name="app_widget_card_name">Cartão</string>
-    <string name="app_widget_classic_name">Clássico</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Pequeno</string>
-    <string name="app_widget_text_name">Texto mínimo</string>
-    <string name="artist">Artista</string>
-    <string name="artists">Artistas</string>
-    <string name="audio_fade_duration">Duração da transição</string>
-    <string name="audio_focus_denied">Foco de áudio negado.</string>
-    <string name="audio_settings_summary">Alterar as definições de som e ajustar o equalizador</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Copiar e restaurar as suas definições, listas</string>
-    <string name="backup_restore_title"><![CDATA[Cópia e restauro]]></string>
-    <string name="backup_title">Cópias</string>
-    <string name="biography">Biografia</string>
-    <string name="black_theme_name">Apenas preto</string>
-    <string name="blacklist">Lista negra</string>
-    <string name="bluetooth_summary">Esta aplicação necessita de permissão de dispositivos próximos para encontrar dispositivos Bluetooth</string>
-    <string name="bluetooth_title">Dispositivos próximos</string>
-    <string name="blur">Desfocar</string>
-    <string name="blur_card">Desfocar cartão</string>
-    <string name="bug_report_failed">Não foi possível enviar o relatório</string>
-    <string name="bug_report_failed_invalid_token">Token de acesso inválido. Contacte o programador da aplicação.</string>
-    <string name="bug_report_failed_issues_not_available">Os problemas não estão activos para este repositório. Contacte o programador.</string>
-    <string name="bug_report_failed_unknown">Ocorreu um erro inesperado. Contacte o programador da aplicação.</string>
-    <string name="bug_report_failed_wrong_credentials">Utilizador ou palavra-passe inválidos</string>
-    <string name="bug_report_issue">Problema</string>
-    <string name="bug_report_manual">Enviar manualmente</string>
-    <string name="bug_report_no_description">Introduzir uma descrição do problema</string>
-    <string name="bug_report_no_password">Introduzir a sua palavra-passe do GitHub</string>
-    <string name="bug_report_no_title">Introduzir título do problema</string>
-    <string name="bug_report_no_username">Introduzir o seu utilizador do GitHub</string>
-    <string name="bug_report_success">Erro enviado com sucesso</string>
-    <string name="bug_report_summary">Ocorreu um erro inesperado. Se continuar a acontecer limpe os dados da aplicação ou envie um email </string>
-    <string name="bug_report_use_account">Enviar utilizando a conta GitHub</string>
-    <string name="buy_now">Comprar agora</string>
-    <string name="cancel_current_timer">Cancelar</string>
-    <string name="card">Cartão</string>
-    <string name="card_color_style">Cartão colorido</string>
-    <string name="card_square">Cartão quadrado</string>
-    <string name="card_style">Cartão</string>
-    <string name="carousal_effect_on_now_playing_screen">Efeito carrossel no ecrã de A reproduzir</string>
-    <string name="cascading">Cascata</string>
-    <string name="changelog">Alterações</string>
-    <string name="changelog_summary">Veja o que há de novo</string>
-    <string name="choose_image">Escolher imagem</string>
-    <string name="choose_restore_title">Escolher o que restaurar</string>
-    <string name="circle">Círculo</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Clássico</string>
-    <string name="clear_action">Limpar</string>
-    <string name="clear_blacklist">Limpar lista negra</string>
-    <string name="clear_history">Limpar histórico</string>
-    <string name="clear_playing_queue">Limpar fila</string>
-    <string name="color">Cor</string>
-    <string name="colors">Cores</string>
-    <string name="compact">Compacto</string>
-    <string name="composer">Compositor</string>
-    <string name="copied_device_info_to_clipboard">Informações copiadas para área de transferências.</string>
-    <string name="could_not_create_playlist">Não foi possível criar a lista.</string>
-    <string name="could_not_download_album_cover">"Não foi possível transferir a capa de álbum correspondente."</string>
-    <string name="could_not_restore_purchase">Não foi possível restaurar a compra.</string>
-    <string name="could_not_scan_files">Não é possível verificar %d ficheiros.</string>
-    <string name="create_action">Criar</string>
-    <string name="create_new_backup">Criar</string>
-    <string name="created_playlist_x">Lista %1$s criada.</string>
-    <string name="credit_title">Membros e contribuidores </string>
-    <string name="currently_listening_to_x_by_x">A ouvir %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imagens personalizadas de artistas</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Partilhar relatório de erro</string>
-    <string name="dark_theme_name">Meio escuro</string>
-    <string name="delete_playlist_title">Eliminar lista</string>
-    <string name="delete_playlist_x"><![CDATA[Eliminar a lista <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Eliminar listas</string>
-    <string name="delete_song_title">Eliminar música</string>
-    <string name="delete_song_x"><![CDATA[Eliminar a música <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Eliminar músicas</string>
-    <string name="delete_x_playlists"><![CDATA[Eliminar <b>%1$d</b> listas?]]></string>
-    <string name="delete_x_songs"><![CDATA[Eliminar <b>%1$d</b> músicas?]]></string>
-    <string name="deleted_x_songs">%1$d músicas eliminadas.</string>
-    <string name="deleting_songs">A eliminar músicas</string>
-    <string name="depth">Profundidade</string>
-    <string name="description">Descrição</string>
-    <string name="device_info">Info. do dispositivo</string>
-    <string name="dialog_message_set_ringtone">Permitir que Música Retro modifique as definições de áudio</string>
-    <string name="dialog_title_set_ringtone">Definir toque</string>
-    <string name="disc_hint">Número do disco</string>
-    <string name="do_you_want_to_clear_the_blacklist">Quer limpar a lista negra?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Quer remover <b>%1$s</b> da lista negra?]]></string>
-    <string name="donate">Doar</string>
-    <string name="donate_summary">Se achar que eu mereço ser pago pelo meu trabalho, pode fazê-lo aqui</string>
-    <string name="donation_header">Compre-me:</string>
-    <string name="done">Concluído</string>
-    <string name="drive_mode">Modo Condução</string>
-    <string name="edit_fab">Botão editar</string>
-    <string name="edit_normal_lyrics">Editar letras</string>
-    <string name="edit_synced_lyrics">Editar letras sincronizadas</string>
-    <string name="empty">Vazio</string>
-    <string name="equalizer">Equalizador</string>
-    <string name="error_create_backup">Não foi possível criar cópia</string>
-    <string name="error_delete_backup">Não foi possível eliminar cópia</string>
-    <string name="error_empty_name">O nome não pode estar vazio!</string>
-    <string name="error_load_failed">O carregamento falhou</string>
-    <string name="error_share_file">Não foi possível partilhar o ficheiro</string>
-    <string name="expanded">Expandido</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favoritos</string>
-    <string name="file_already_exists">O ficheiro já existe</string>
-    <string name="finish_last_song">Terminar a última música</string>
-    <string name="fit">Ajustar</string>
-    <string name="flat">Plano</string>
-    <string name="folders">Pastas</string>
-    <string name="follow_system">Seguir o sistema</string>
-    <string name="for_you">Para si</string>
-    <string name="free">Gratuito</string>
-    <string name="full">Inteiro</string>
-    <string name="full_card">Cartão inteiro</string>
-    <string name="general_settings_summary">Alterar o tema e cores da aplicação</string>
-    <string name="general_settings_title">Aspeto e aparência</string>
-    <string name="genre">Género</string>
-    <string name="genres">Géneros</string>
-    <string name="git_hub_summary">Fork o projeto no Github</string>
-    <string name="gradient">Gradiente</string>
-    <string name="grant_access">Conceder acesso</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="grid_style_label">Estilo da grelha</string>
-    <string name="help_summary">Necessita de ajuda?</string>
-    <string name="hinge">Dobradiça</string>
-    <string name="history">Histórico</string>
-    <string name="history_cleared">Histórico limpo</string>
-    <string name="history_undo_button">Anular</string>
-    <string name="home">Início</string>
-    <string name="horizontal_flip">Flip horizontal</string>
-    <string name="image">Imagem</string>
-    <string name="image_gradient">Imagem gradiente</string>
-    <string name="image_settings_summary">Alterar definições de transferência de imagens</string>
-    <string name="import_label">Importar</string>
-    <string name="import_playlist">Importar lista</string>
-    <string name="import_playlist_message">Importar todas as lista em Android Media Store com músicas. Se as listas já existirem, as músicas vão ser unidas.</string>
-    <string name="inserted_x_songs_into_playlist_x">Inseridas %1$d músicas na lista %2$s.</string>
-    <string name="instagram_page_summary">Partilhar a sua configuração de Música Retro para mostrar no Instagram</string>
-    <string name="keyboard">Teclado</string>
-    <string name="label_bit_rate">Taxa de bits</string>
-    <string name="label_file_format">Formato</string>
-    <string name="label_file_name">Nome</string>
-    <string name="label_file_path">Caminho</string>
-    <string name="label_file_size">Tamanho</string>
-    <string name="label_last_modified">Última modificação</string>
-    <string name="label_more_from">Mais de %s</string>
-    <string name="label_sampling_rate">Taxa de amostragem</string>
-    <string name="label_track_length">Tamanho</string>
-    <string name="labeled">Etiquetada</string>
-    <string name="last_added">Última adicionada</string>
-    <string name="last_song">Última música</string>
-    <string name="lets_go">Vamos lá</string>
-    <string name="library_categories">Categorias</string>
-    <string name="licenses">Licenças</string>
-    <string name="light_theme_name">Claramente branco</string>
-    <string name="listeners_label">Ouvintes</string>
-    <string name="listing_files">A listar ficheiros</string>
-    <string name="loading_products">A carregar produtos…</string>
-    <string name="login">Iniciar sessão</string>
-    <string name="lyrics">Letras</string>
-    <string name="made_with_love">Feito com ❤️ na Índia</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Erro</string>
-    <string name="md_storage_perm_error">Erro de permissões</string>
-    <string name="message_backup_create_success">Cópia criada com sucesso</string>
-    <string name="message_limit_tabs">Não mais do que 5 itens</string>
-    <string name="message_pro_feature">%s é uma funcionalidade Pro</string>
-    <string name="message_restore_success">Restauro concluído com sucesso</string>
-    <string name="message_updated">Actualizado</string>
-    <string name="message_welcome"><![CDATA[Olá! <br>Bem-vindo a %s]]></string>
-    <string name="my_name">Nome</string>
-    <string name="my_top_tracks">Mais tocadas</string>
-    <string name="never">Nunca</string>
-    <string name="new_music_mix">Novo mix de música</string>
-    <string name="new_playlist_title">Nova lista de reprodução</string>
-    <string name="new_start_directory">%s é a nova directoria inicial.</string>
-    <string name="next_song">Música seguinte</string>
-    <string name="no_albums">Sem álbuns</string>
-    <string name="no_artists">Sem artistas</string>
-    <string name="no_audio_ID">"Toca uma música primeiro e tente novamente."</string>
-    <string name="no_backups_found">Sem cópias</string>
-    <string name="no_equalizer">Sem equalizadores</string>
-    <string name="no_genres">Sem géneros</string>
-    <string name="no_lyrics_found">Sem letras</string>
-    <string name="no_playing_queue">Sem músicas a tocar</string>
-    <string name="no_playlists">Sem listas de reprodução</string>
-    <string name="no_purchase_found">Sem compras.</string>
-    <string name="no_results">Sem resultados</string>
-    <string name="no_songs">Sem músicas</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Letras normais</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> não está listada no armazenamento.]]></string>
-    <string name="not_recently_played">Não tocado recentemente</string>
-    <string name="nothing_to_scan">Nada para verificar.</string>
-    <string name="nothing_to_see">Nada para ver</string>
-    <string name="notification">Notificações</string>
-    <string name="notification_settings_summary">Personalizar o estilo das notificações</string>
-    <string name="now_playing">A reproduzir</string>
-    <string name="now_playing_queue">Fila de A reproduzir</string>
-    <string name="now_playing_summary">Personalizar o ecrã A reproduzir</string>
-    <string name="now_playing_themes">9+ temas de A reproduzir</string>
-    <string name="only_on_wifi">Apenas em Wi-Fi</string>
-    <string name="other_settings_summary">Funcionalidades avançadas</string>
-    <string name="others">Outros</string>
-    <string name="over_cover">Sobre a capa</string>
-    <string name="password">Palavra-passe</string>
-    <string name="past_three_months">Últimos 3 meses</string>
-    <string name="paste_lyrics_here">Colar letras aqui</string>
-    <string name="paste_timeframe_lyrics_here">Colar letras do cronograma aqui</string>
-    <string name="peek">Espreitar</string>
-    <string name="permission_bluetooth_denied">Permissão de dispositivos próximos negada</string>
-    <string name="permission_external_storage_denied">Permissão para aceder ao armazenamento externo negada.</string>
-    <string name="permission_summary">Esta aplicação necessita de permissão para aceder ao armazenamento para tocar músicas</string>
-    <string name="permission_title">Acesso ao armazenamento</string>
-    <string name="permissions_denied">Permissões negadas.</string>
-    <string name="personalize">Personalizar</string>
-    <string name="personalize_settings_summary">Personalizar os controlos de A reproduzir e interface</string>
-    <string name="pick_from_local_storage">Escolher do dispositivo</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Seguir a página do Pinterest para inspiração de design Música Retro</string>
-    <string name="plain">Plano</string>
-    <string name="playList_already_exits">A lista já existe</string>
-    <string name="playback_pitch">Tonalidade</string>
-    <string name="playback_settings">Definições de reprodução</string>
-    <string name="playback_speed">Velocidade de reprodução</string>
-    <string name="playing_notification_description">A notificação de reprodução fornece acções para reprodução/pausa, etc.</string>
-    <string name="playing_notification_name">Notificação de reprodução</string>
-    <string name="playlist_created_sucessfully">%s criado com sucesso</string>
-    <string name="playlist_is_empty">A lista está vazia</string>
-    <string name="playlist_name_empty">Nome da lista</string>
-    <string name="playlists">Listas</string>
-    <string name="pref_blur_amount_summary">Quantidade de desfocagem aplicada para temas. Menos é mais rápido</string>
-    <string name="pref_blur_amount_title">Valor de desfocagem</string>
-    <string name="pref_filter_song_summary">Filtrar por tamanho</string>
-    <string name="pref_filter_song_title">Filtrar por duração</string>
-    <string name="pref_header_advanced">Avançadas</string>
-    <string name="pref_header_album">Estilo do álbum</string>
-    <string name="pref_header_audio">Áudio</string>
-    <string name="pref_header_blacklist">Lista negra</string>
-    <string name="pref_header_controls">Controlos</string>
-    <string name="pref_header_general">Temas</string>
-    <string name="pref_header_images">Imagens</string>
-    <string name="pref_header_library">Biblioteca</string>
-    <string name="pref_header_lockscreen">Ecrã de bloqueio</string>
-    <string name="pref_header_playlists">Listas</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausa a música quando o volume diminui para zero e começa a tocar quando o volume aumentar. Também funciona fora da aplicação</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pausar no zero</string>
-    <string name="pref_keep_screen_on_summary">Esta funcionalidade pode afectar a vida da bateria</string>
-    <string name="pref_keep_screen_on_title">Manter o ecrã ligado</string>
-    <string name="pref_language_name">Selecionar idioma</string>
-    <string name="pref_snow_fall_title">Efeito de neve caída</string>
-    <string name="pref_summary_album_art_on_lockscreen">Utilizar a capa do álbum da música actual como papel de parede do ecrã de bloqueio</string>
-    <string name="pref_summary_album_artists_only">Mostrar artistas do álbum na categoria do artista</string>
-    <string name="pref_summary_audio_ducking">Diminuir o volume quando são reproduzidos sons de sistema ou notificações</string>
-    <string name="pref_summary_audio_fade">Transição quando a música é pausada ou reproduzida</string>
-    <string name="pref_summary_blacklist">O conteúdo das pastas na lista negra está escondido da sua biblioteca.</string>
-    <string name="pref_summary_bluetooth_playback">Começar a tocar assim que ligado ao dispositivo Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">Desfocar a capa do álbum no ecrã de bloqueio. Pode causar problemas com aplicações e widgets</string>
-    <string name="pref_summary_carousel_effect">Efeito carrossel no ecrã A reproduzir. Os temas de cartões e cartões desfocados não vão funcionar</string>
-    <string name="pref_summary_classic_notification">Utilizar o design clássico de notificações</string>
-    <string name="pref_summary_colored_app">As cores do fundo e dos botões mudam consoante a capa do álbum no ecrã A reproduzir</string>
-    <string name="pref_summary_colored_app_shortcuts">Dá cor aos atalhos na cor de destaque. Sempre que alterar a cor, ligue/desligue para fazer efeito</string>
-    <string name="pref_summary_colored_notification">"Colorir as notificações na capa do álbum"</string>
-    <string name="pref_summary_cross_fade">Duração da transição entre músicas</string>
-    <string name="pref_summary_desaturated_color">Segundo o guia do Material Design as cores do modo escuro não devem ser saturadas</string>
-    <string name="pref_summary_expand_now_playing_panel">Tocar na notificação vai mostrar o ecrã A reproduzir em vez do ecrã inicial</string>
-    <string name="pref_summary_extra_controls">Adicionar controlos extras para o mini leitor</string>
-    <string name="pref_summary_extra_song_info">Mostrar info. extras da música, como o formato, taxa de bits e frequência</string>
-    <string name="pref_summary_gapless_playback">"Pode causar problemas na reprodução nalguns dispositivos."</string>
-    <string name="pref_summary_home_banner">Mostrar ou ocultar o banner inicial</string>
-    <string name="pref_summary_ignore_media_store_artwork">Pode aumentar a qualidade da capa do álbum, mas aumenta o tempo de carregamento. Ligue apenas se tiver problemas com capas de baixa resolução</string>
-    <string name="pref_summary_library_categories">Configurar visibilidade e ordem das categorias.</string>
-    <string name="pref_summary_lock_screen">Utilizar os controlos personalizados do Música Retro</string>
-    <string name="pref_summary_manage_audio_focus">Reproduzir sempre áudio em segundo plano independentemente do que estiver a ser reproduzido</string>
-    <string name="pref_summary_open_source_licences">Detalhes da licença do software open source</string>
-    <string name="pref_summary_pause_history">Quando activado, as músicas novas reproduzidas não vão aparecer no histórico</string>
-    <string name="pref_summary_remember_tab">Ir para o último separador ao iniciar</string>
-    <string name="pref_summary_show_lyrics">Mostrar letras por cima da capa do álbum</string>
-    <string name="pref_summary_suggestions">Mostrar o novo música mix no ecrã inicial</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Activar a mudança de música ao deslizar em qualquer lado no ecrã de A reproduzir agora</string>
-    <string name="pref_summary_swipe_to_dismiss">Deslizar para baixo para dispensar o mini leitor</string>
-    <string name="pref_summary_toggle_full_screen">Modo imersivo</string>
-    <string name="pref_summary_toggle_headset">Tocar imediatamente após ligar os auriculares</string>
-    <string name="pref_summary_toggle_shuffle">O modo aleatório vai ser desligado ao reproduzir uma nova lista</string>
-    <string name="pref_summary_toggle_volume">Se tiver espaço suficiente, mostrar os controlos de volume no ecrã A reproduzir</string>
-    <string name="pref_summary_wallpaper_accent">Extrair a cor através do papel de parede</string>
-    <string name="pref_summary_whitelist">Mostrar apenas músicas de /Music</string>
-    <string name="pref_title_album_art_on_lockscreen">Mostrar capa do álbum</string>
-    <string name="pref_title_album_artists_only">Navegar pelos artistas</string>
-    <string name="pref_title_album_cover_style">Tema da capa do álbum</string>
-    <string name="pref_title_album_cover_transform">Ignorar capa do álbum</string>
-    <string name="pref_title_app_shortcuts">Atalhos coloridos</string>
-    <string name="pref_title_appbar_mode">Estilo de cabeçalho</string>
-    <string name="pref_title_audio_ducking">Reduzir volume na perda de foco</string>
-    <string name="pref_title_audio_fade">Desvanecer áudio</string>
-    <string name="pref_title_auto_download_artist_images">Transferir imagens automaticamente</string>
-    <string name="pref_title_blacklist">Lista negra</string>
-    <string name="pref_title_bluetooth_playback">Reprodução Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Desfocar capa do álbum</string>
-    <string name="pref_title_circle_button">Botão circular de reprodução</string>
-    <string name="pref_title_classic_notification">Design de notificações clássico</string>
-    <string name="pref_title_colored_app">Cor adaptável</string>
-    <string name="pref_title_colored_notification">Notificações coloridas</string>
-    <string name="pref_title_cross_fade">Crossfade (beta)</string>
-    <string name="pref_title_custom_font">Utilizar tipo de letra Manrope</string>
-    <string name="pref_title_desaturated_color">Cores não saturadas</string>
-    <string name="pref_title_expand_now_playing_panel">Mostrar ecrã A reproduzir</string>
-    <string name="pref_title_extra_controls">Controlos adicionais</string>
-    <string name="pref_title_extra_song_info">Info. da música</string>
-    <string name="pref_title_gapless_playback">Reprodução contínua</string>
-    <string name="pref_title_general_theme">Tema da aplicação</string>
-    <string name="pref_title_home_album_grid_style">Álbuns em grelha</string>
-    <string name="pref_title_home_artist_grid_style">Artistas em grelha</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorar capas da Media Store</string>
-    <string name="pref_title_last_added_interval">Intervalo da última lista adicionada</string>
-    <string name="pref_title_lock_screen">Controlos de ecrã inteiro</string>
-    <string name="pref_title_lyrics_screen_on">Manter o ecrã ligada ao mostrar letras</string>
-    <string name="pref_title_lyrics_type">Tipo de letras</string>
-    <string name="pref_title_manage_audio_focus">Reproduzir sempre</string>
-    <string name="pref_title_now_playing_screen_appearance">Tema A reproduzir</string>
-    <string name="pref_title_open_source_licences">Licenças open source</string>
-    <string name="pref_title_pause_history">Pausar histórico</string>
-    <string name="pref_title_remember_tab">Memorizar separador</string>
-    <string name="pref_title_show_lyrics">Mostrar letras</string>
-    <string name="pref_title_suggestions">Mostrar sugestões</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Deslizar em qualquer lado para alterar a música</string>
-    <string name="pref_title_swipe_to_dismiss">Dispensar ao deslizar para baixo</string>
-    <string name="pref_title_tab_text_mode">Títulos nos separadores</string>
-    <string name="pref_title_toggle_carousel_effect">Efeito carrossel</string>
-    <string name="pref_title_toggle_full_screen">Aplicação em ecrã inteiro</string>
-    <string name="pref_title_toggle_toggle_headset">Reprod. automática</string>
-    <string name="pref_title_toggle_toggle_shuffle">Modo aleatório</string>
-    <string name="pref_title_toggle_volume">Controlos de volume</string>
-    <string name="pref_title_wallpaper_accent">Cor do papel de parede</string>
-    <string name="pref_title_whitelist">Lista segura de música</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Tema escuro, temas A reproduzir, efeito carrossel e muito mais..</string>
-    <string name="profile">Perfil</string>
-    <string name="purchase">Comprar</string>
-    <string name="queue">Fila de reprodução</string>
-    <string name="rate_app">Classificar a aplicação</string>
-    <string name="rate_on_google_play_summary">Gosta desta aplicação? Deixe-nos saber na Google Play Store como torná-la ainda melhor</string>
-    <string name="recent_albums">Álbuns recentes</string>
-    <string name="recent_artists">Artistas recentes</string>
-    <string name="remove_action">Remover</string>
-    <string name="remove_cover">Remover capa</string>
-    <string name="remove_from_blacklist">Remover da lista negra</string>
-    <string name="remove_image">Remover imagem</string>
-    <string name="remove_song_from_playlist_title">Remover música da lista de reprodução</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> músicas da lista de reprodução?]]></string>
-    <string name="rename_playlist_title">Renomear lista</string>
-    <string name="replace_cover">Substituir capa</string>
-    <string name="report_an_issue">Reportar um erro</string>
-    <string name="report_bug">Reportar erro</string>
-    <string name="reset_action">Repor</string>
-    <string name="reset_artist_image">Repor imagem do artista</string>
-    <string name="restore">Restaurar</string>
-    <string name="restore_message">Deseja restaurar a cópia?</string>
-    <string name="restored_previous_purchase_please_restart">Compra anterior restaurada. Reinicie a aplicação para utilizar todas as funcionalidades.</string>
-    <string name="restored_previous_purchases">Compras anteriores restauradas.</string>
-    <string name="restoring_purchase">A restaurar compras…</string>
-    <string name="retro_music_player">Música Retro</string>
-    <string name="retro_music_pro">Música Retro Pro</string>
-    <string name="ringtone_summary">Esta aplicação necessita de permissão para aceder às definições para definir músicas como toques</string>
-    <string name="ringtone_title">Toque (opcional)</string>
-    <string name="saf_delete_failed">Erro ao eliminar ficheiro: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Não é possível obter URI SAF</string>
-    <string name="saf_guide_slide1_description">Abrir painel de navegação</string>
-    <string name="saf_guide_slide1_description_before_o">Activar \'Mostrar cartão SD\' no menu</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s necessita de acesso ao cartão SD</string>
-    <string name="saf_guide_slide2_description">É necessário seleccionar a pasta raiz do cartão SD</string>
-    <string name="saf_guide_slide2_title">Seleccionar o 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 \'Seleccionar\' na parte inferior do ecrã</string>
-    <string name="saf_write_failed">Erro ao escrever ficheiro: %s</string>
-    <string name="save">Guardar</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Guardar como ficheiro</string>
-    <string name="save_playlists_title">Guardar como ficheiros</string>
-    <string name="saved_playlist_to">Lista guardada em %s.</string>
-    <string name="saving_changes">A guardar alterações</string>
-    <string name="scan_media">Verificar multimédia</string>
-    <string name="scanned_files">%1$d de %2$d ficheiros verificados.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Seleccionar tudo</string>
-    <string name="selected">Seleccionados</string>
-    <string name="set">Definir</string>
-    <string name="set_artist_image">Definir imagem do artista</string>
-    <string name="share_app">Partilhar aplicação</string>
-    <string name="share_summary">Partilhar a aplicação com os seus amigos e família</string>
-    <string name="share_to_stories">Partilhar em Stories</string>
-    <string name="show_album_artists">Mostrar artistas</string>
-    <string name="shuffle">Aleatório</string>
-    <string name="simple">Simples</string>
-    <string name="sleep_timer_canceled">Temporizador cancelado.</string>
-    <string name="sleep_timer_set">Temporizador definido para %d minutos a partir de agora.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Partilhar história</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">Ordenação</string>
-    <string name="sort_order_a_z">Ascendente</string>
-    <string name="sort_order_album">Álbum</string>
-    <string name="sort_order_artist">Artista</string>
-    <string name="sort_order_composer">Compositor</string>
-    <string name="sort_order_date">Data adicionado</string>
-    <string name="sort_order_date_modified">Data modificado</string>
-    <string name="sort_order_default">Predefinido</string>
-    <string name="sort_order_num_songs">Contagem de músicas</string>
-    <string name="sort_order_num_songs_desc">Contagem decrescente</string>
-    <string name="sort_order_year">Ano</string>
-    <string name="sort_order_z_a">Descendente</string>
-    <string name="speech_not_supported">O seu dispositivo não suporta entrada de fala</string>
-    <string name="speech_prompt">Procurar na sua biblioteca</string>
-    <string name="stack">Pilha</string>
-    <string name="start_play_music">Comece a tocar música.</string>
-    <string name="suggestion_songs">Sugestões</string>
-    <string name="support_development">Apoie o desenvolvimento</string>
-    <string name="swipe_to_unlock">Deslizar para desbloquear</string>
-    <string name="synced_lyrics">Letras sincronizadas</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Junte-se ao grupo do Telegram para discutir problemas, fazer sugestões e muito mais</string>
-    <string name="thank_you">Obrigado!</string>
-    <string name="the_audio_file">O ficheiro 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">Pequeno</string>
-    <string name="tiny_card_style">Cartão pequeno</string>
-    <string name="title">Título</string>
-    <string name="title_new_backup">Nova cópia</string>
-    <string name="today">Hoje</string>
-    <string name="top_albums">Top álbuns</string>
-    <string name="top_artists">Top artistas</string>
-    <string name="track_hint">"Faixa (2 para faixa 2 ou 3004 para CD3 faixa 4)"</string>
-    <string name="track_list">Número da faixa</string>
-    <string name="translate">Traduzir</string>
-    <string name="translate_community">Ajude-nos a traduzir a aplicação para o seu idioma</string>
-    <string name="try_retro_music_premium">Experimente Música Retro Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Partilhe o seu design com Música Retro</string>
-    <string name="unlabeled">Sem etiqueta</string>
-    <string name="unplayable_file">Não foi possível tocar esta música.</string>
-    <string name="up_next">A seguir</string>
-    <string name="update_image">Actualizar imagem</string>
-    <string name="updating">A actualizar…</string>
-    <string name="user_images_description">Imagens do utilizador</string>
-    <string name="user_name">Utilizador</string>
-    <string name="username">Utilizador</string>
-    <string name="version">Versão</string>
-    <string name="vertical_flip">Flip vertical</string>
-    <string name="view_on_telegram">Ver no Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Pesquisar na web</string>
-    <string name="website">Site</string>
-    <string name="website_summary">Veja o nosso site</string>
-    <string name="welcome">Bem-vindo,</string>
-    <string name="what_do_you_want_to_share">O que deseja partilhar?</string>
-    <string name="whats_new">O que há de novo</string>
-    <string name="window">Janelas</string>
-    <string name="window_corner_edges">Cantos arredondados</string>
-    <string name="x_has_been_set_as_ringtone">Definir %1$s como toque.</string>
-    <string name="x_selected">%1$d selecionado(s)</string>
-    <string name="year">Ano</string>
-    <string name="you_have_to_select_at_least_one_category">Tem que seleccionar pelo menos uma categoria.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">Vai ser reencaminhado para o site de rastreio de problemas.</string>
-    <string name="your_account_data_is_only_used_for_authentication">As informações da sua conta são utilizadas apenas autenticação.</string>
-</resources>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
deleted file mode 100644
index e04b164dd..000000000
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Despre %s</string>
-    <string name="about_settings_summary">Echipă și legături sociale</string>
-    <string name="accent_color">Culoare ton</string>
-    <string name="accent_color_desc">Culoarea de accent, implicit, se face verde.</string>
-    <string name="action_about">Despre</string>
-    <string name="action_add_to_blacklist">Adăugare la lista neagră</string>
-    <string name="action_add_to_favorites">Adaugă la favorite</string>
-    <string name="action_add_to_playing_queue">Adaugă la coada de redare</string>
-    <string name="action_add_to_playlist">Adaugă la un playlist</string>
-    <string name="action_cancel">Anulează cronometrul curent</string>
-    <string name="action_cast">Transmite</string>
-    <string name="action_clear_playing_queue">Curăță coada de redare</string>
-    <string name="action_cycle_repeat">Mod repetare ciclu</string>
-    <string name="action_delete">Șterge</string>
-    <string name="action_delete_from_device">Șterge de pe dispozitiv</string>
-    <string name="action_details">Detalii</string>
-    <string name="action_edit">Editare</string>
-    <string name="action_go_to_album">Pagină album</string>
-    <string name="action_go_to_artist">Pagină artist</string>
-    <string name="action_go_to_genre">Mergi la gen</string>
-    <string name="action_go_to_lyrics">Mergi la versuri</string>
-    <string name="action_go_to_start_directory">Registrul principal</string>
-    <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">Playlist nou</string>
-    <string name="action_next">Următorul</string>
-    <string name="action_play">Redați</string>
-    <string name="action_play_all">Redă-le pe toate</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_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>
-    <string name="action_rename">Redenumiți</string>
-    <string name="action_save_playing_queue">Salvează coada de redare</string>
-    <string name="action_scan">Scanează</string>
-    <string name="action_search">Căutare</string>
-    <string name="action_set">Pornește</string>
-    <string name="action_set_as_ringtone">Setează ca ton de apel</string>
-    <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_shuffle_all">Amestecă tot</string>
-    <string name="action_shuffle_playlist">Amestecă playlist</string>
-    <string name="action_sleep_timer">Cronometru de somn</string>
-    <string name="action_sort_order">Ordine de sortare</string>
-    <string name="action_tag_editor">Detalii piesă</string>
-    <string name="action_toggle_favorite">Comutare favorite</string>
-    <string name="action_toggle_shuffle">Comutare amestecare</string>
-    <string name="adaptive">Adaptiv</string>
-    <string name="add_action">Adaugă</string>
-    <string name="add_playlist_title">"Adaugă la playlist"</string>
-    <string name="add_time_framed_lryics">Adaugă versuri încadrate în timp</string>
-    <string name="added_song_count_to_playlist">S-au adăugat %1$d melodii la %2$s</string>
-    <string name="added_title_to_playing_queue">"Adăugat 1 titlu la coada de redare."</string>
-    <string name="added_x_titles_to_playing_queue">Adăugate %1$d titluri la coada de redare</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Melodie</item>
-        <item quantity="few">Melodii</item>
-        <item quantity="other">Melodii</item>
-    </plurals>
-    <string name="album_artist">Artist album</string>
-    <string name="albums">Albume</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="few">Albume</item>
-        <item quantity="other">Albume</item>
-    </plurals>
-    <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>
-    <string name="app_shortcut_shuffle_all_short">Amestecă</string>
-    <string name="app_shortcut_top_tracks_short">Top cântece</string>
-    <string name="app_widget_big_name">Imagine completă</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Clasic</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Mic</string>
-    <string name="app_widget_text_name">Text minimal</string>
-    <string name="artist">Artist</string>
-    <string name="artists">Artiști</string>
-    <string name="audio_fade_duration">Durată de estompare audio</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="auto">Automat</string>
-    <string name="backup_restore_settings_summary">Salvează și restaurează setările, listele de redare</string>
-    <string name="backup_restore_title"><![CDATA[Copie de rezervă și restaurare]]></string>
-    <string name="backup_title">Copii de rezervă</string>
-    <string name="biography">Biografie</string>
-    <string name="black_theme_name">Negru</string>
-    <string name="blacklist">Lista neagră</string>
-    <string name="bluetooth_summary">Aplicația are nevoie de permisiunea dispozitive din apropiere pentru a verifica dacă există dispozitive bluetooth</string>
-    <string name="bluetooth_title">Dispozitive în apropiere</string>
-    <string name="blur">Estompare</string>
-    <string name="blur_card">Estompare card</string>
-    <string name="bug_report_failed">Imposibil de trimis raportul</string>
-    <string name="bug_report_failed_invalid_token">Jeton de acces nevalid. Vă rugăm să contactați dezvoltatorul aplicației.</string>
-    <string name="bug_report_failed_issues_not_available">Trimiterea problemelor nu este disponibilă pentru repertoriul selectat. Te rugăm să contactezi dezvoltatorul aplicației.</string>
-    <string name="bug_report_failed_unknown">A apărut o eroare neașteptată. Te rugăm să contactezi dezvoltatorul aplicației.</string>
-    <string name="bug_report_failed_wrong_credentials">Nume de utilizator sau parolă greșită</string>
-    <string name="bug_report_issue">Problemă</string>
-    <string name="bug_report_manual">Trimite manual</string>
-    <string name="bug_report_no_description">Introduceți o descriere a problemei</string>
-    <string name="bug_report_no_password">Te rugăm să introduci parola ta validă de GitHub</string>
-    <string name="bug_report_no_title">Te rugăm să introduci un titlu pentru problemă</string>
-    <string name="bug_report_no_username">Te rugăm să introduci numele tău de utilizator valid</string>
-    <string name="bug_report_success">Raportul de erori s-a încheiat cu succes</string>
-    <string name="bug_report_summary">A apărut o eroare neașteptată. Ne pare rău că ai întâmpinat această problemă. Dacă aplicația continuă să se închidă, șterge datele acesteia din setări sau trimite-ne un email </string>
-    <string name="bug_report_use_account">Trimiteți utilizând contul GitHub</string>
-    <string name="buy_now">Cumpărați acum</string>
-    <string name="cancel_current_timer">Anulează cronometrul curent</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">Card colorat</string>
-    <string name="card_square">Card pătrat</string>
-    <string name="card_style">Card</string>
-    <string name="carousal_effect_on_now_playing_screen">Efect de carusel pe ecranul de redare acum</string>
-    <string name="cascading">În cascadă</string>
-    <string name="changelog">Modificări</string>
-    <string name="changelog_summary">Vezi ce este nou</string>
-    <string name="choose_image">Alege imaginea</string>
-    <string name="choose_restore_title">Alege ce să restaurezi</string>
-    <string name="circle">Cerc</string>
-    <string name="circular">Circular</string>
-    <string name="classic">Clasic</string>
-    <string name="clear_action">Șterge</string>
-    <string name="clear_blacklist">Șterge \"Lista neagră\"</string>
-    <string name="clear_history">Goliți istoricul</string>
-    <string name="clear_playing_queue">Curăță coada</string>
-    <string name="color">Culoare</string>
-    <string name="colors">Culori</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Compozitor</string>
-    <string name="copied_device_info_to_clipboard">Informațiile dispozitivului au fost copiate în clipboard.</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>
-    <string name="could_not_restore_purchase">Nu a putut fi restabilită achiziția.</string>
-    <string name="could_not_scan_files">Nu s-au putut scana %d fișiere</string>
-    <string name="create_action">Crează</string>
-    <string name="create_new_backup">Crează</string>
-    <string name="created_playlist_x">S-a creat playlist-ul %1$s.</string>
-    <string name="credit_title">Membri și contribuitori </string>
-    <string name="currently_listening_to_x_by_x">Acum ascultați %1$s de %2$s.</string>
-    <string name="custom_artist_images">Imagini personalizate pentru Artist</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Distribuie raportul de defecțiuni</string>
-    <string name="dark_theme_name">Suriu</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 melodia</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 melodiile</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">Se șterg melodiile</string>
-    <string name="depth">Profunzime</string>
-    <string name="description">Descriere</string>
-    <string name="device_info">Informații dispozitiv</string>
-    <string name="dialog_message_set_ringtone">Permite aplicației Retro Music să modifice setările audio</string>
-    <string name="dialog_title_set_ringtone">Setare ton apel</string>
-    <string name="disc_hint">Număr disc</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="done">Finalizat</string>
-    <string name="drive_mode">Mod condus</string>
-    <string name="edit_fab">Buton editare</string>
-    <string name="edit_normal_lyrics">Editare versuri</string>
-    <string name="edit_synced_lyrics">Editare versuri sincronizate</string>
-    <string name="empty">Gol</string>
-    <string name="equalizer">Egalizator</string>
-    <string name="error_create_backup">Nu s-a putut crea copia de rezervă</string>
-    <string name="error_delete_backup">Nu s-a putut șterge copia de rezervă</string>
-    <string name="error_empty_name">Numele dvs. nu poate fi gol!</string>
-    <string name="error_load_failed">Încărcare eșuată</string>
-    <string name="error_share_file">Nu s-a putut partaja fișierul</string>
-    <string name="expanded">Extins</string>
-    <string name="faq">Întrebări frecvente</string>
-    <string name="favorites">Favorite</string>
-    <string name="file_already_exists">Fișierul există deja</string>
-    <string name="finish_last_song">Finalizează ultima melodie</string>
-    <string name="fit">Potrivire</string>
-    <string name="flat">Uniform</string>
-    <string name="folders">Mape</string>
-    <string name="follow_system">Urmărește sistemul</string>
-    <string name="for_you">Pentru dvs.</string>
-    <string name="free">Gratuit</string>
-    <string name="full">Plin</string>
-    <string name="full_card">Card complet</string>
-    <string name="general_settings_summary">Schimbați culorile generale ale aplicației</string>
-    <string name="general_settings_title">Aspect</string>
-    <string name="genre">Gen muzical</string>
-    <string name="genres">Genuri</string>
-    <string name="git_hub_summary">Creează o copie a repertoriului pe GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Acordare acces</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="grid_style_label">Stil grilă</string>
-    <string name="help_summary">Aveți nevoie de mai mult ajutor?</string>
-    <string name="hinge">Balama</string>
-    <string name="history">Istoric</string>
-    <string name="history_cleared">Istoric șters</string>
-    <string name="history_undo_button">Anulare</string>
-    <string name="home">Acasă</string>
-    <string name="horizontal_flip">Întoarcere pe orizontală</string>
-    <string name="image">Imagine</string>
-    <string name="image_gradient">Imagine gradient</string>
-    <string name="image_settings_summary">Schimbă setările de descărcare a imaginii artistului</string>
-    <string name="import_label">Importare</string>
-    <string name="import_playlist">Importare listă de redare</string>
-    <string name="import_playlist_message">Importă toate listele de redare listate în Android Media Store cu melodii, dacă listele de redare există deja, melodiile vor fi îmbinate.</string>
-    <string name="inserted_x_songs_into_playlist_x">Au fost insertate %1$d cântece în playlist-ul %2$s.</string>
-    <string name="instagram_page_summary">Partajați configurația Retro Music pentru a o publica pe Instagram</string>
-    <string name="keyboard">Tastatură</string>
-    <string name="label_bit_rate">Rată de biți</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_last_modified">Ultima modificare</string>
-    <string name="label_more_from">Mai multe de la %s</string>
-    <string name="label_sampling_rate">Rata de eșantionare</string>
-    <string name="label_track_length">Lungime</string>
-    <string name="labeled">Etichetat</string>
-    <string name="last_added">Adăugate recent</string>
-    <string name="last_song">Ultima melodie</string>
-    <string name="lets_go">Să începem</string>
-    <string name="library_categories">Categorii bibliotecă</string>
-    <string name="licenses">Licențe</string>
-    <string name="light_theme_name">Alb</string>
-    <string name="listeners_label">Ascultători</string>
-    <string name="listing_files">Listarea fișierelor</string>
-    <string name="loading_products">Se încarcă produsele...</string>
-    <string name="login">Autentificare</string>
-    <string name="lyrics">Versuri</string>
-    <string name="made_with_love">Creat cu ❤️ în India</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Eroare</string>
-    <string name="md_storage_perm_error">Eroare de permisiune</string>
-    <string name="message_backup_create_success">Copie de rezervă creată cu succes.</string>
-    <string name="message_limit_tabs">Cel mult 5 elemente</string>
-    <string name="message_pro_feature">%s este o caracteristică Pro.</string>
-    <string name="message_restore_success">Restaurare finalizată cu succes.</string>
-    <string name="message_updated">Actualizat</string>
-    <string name="message_welcome"><![CDATA[Salut! <br>Bun venit la %s]]></string>
-    <string name="my_name">Numele Meu</string>
-    <string name="my_top_tracks">Top cântece redate</string>
-    <string name="never">Niciodată</string>
-    <string name="new_music_mix">Mixare muzică nouă</string>
-    <string name="new_playlist_title">Playlist nou</string>
-    <string name="new_start_directory">%s a fost setat ca noul registru principal.</string>
-    <string name="next_song">Următoarea melodie</string>
-    <string name="no_albums">Niciun album</string>
-    <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_backups_found">Nicio copie de rezervă găsită</string>
-    <string name="no_equalizer">Nu a fost găsit nici un equalizer.</string>
-    <string name="no_genres">Niciun gen</string>
-    <string name="no_lyrics_found">Nu a fost găsite versuri.</string>
-    <string name="no_playing_queue">Nicio melodie redată</string>
-    <string name="no_playlists">Niciun playlist</string>
-    <string name="no_purchase_found">Nu s-a găsit nicio achiziție.</string>
-    <string name="no_results">Niciun rezultat</string>
-    <string name="no_songs">Niciun cântec</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Versuri normale</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nu este litsat în magazinul media.]]></string>
-    <string name="not_recently_played">Nu s-a redat recent</string>
-    <string name="nothing_to_scan">Nimic de scanat.</string>
-    <string name="nothing_to_see">Nimic de văzut</string>
-    <string name="notification">Notificare</string>
-    <string name="notification_settings_summary">Personalizează stil de notificare</string>
-    <string name="now_playing">Se redă</string>
-    <string name="now_playing_queue">Coada de redare</string>
-    <string name="now_playing_summary">Personalizează ecranul de redare acum</string>
-    <string name="now_playing_themes">9+ teme</string>
-    <string name="only_on_wifi">Doar pe Wi-Fi</string>
-    <string name="other_settings_summary">Funcții avansate de testare</string>
-    <string name="others">Altele</string>
-    <string name="over_cover">Peste copertă</string>
-    <string name="password">Parolă</string>
-    <string name="past_three_months">Ultimele 3 luni</string>
-    <string name="paste_lyrics_here">Lipește versuri aici</string>
-    <string name="paste_timeframe_lyrics_here">Lipiți versurile temporale aici</string>
-    <string name="peek">Vizualizare</string>
-    <string name="permission_bluetooth_denied">Permisiunea pentru dispozitivele din apropiere a fost refuzată.</string>
-    <string name="permission_external_storage_denied">Accesul la stocarea externă este respinsă.</string>
-    <string name="permission_summary">Aplicația are nevoie de permisiunea de a accesa spațiul de stocare al dispozitivului pentru a reda muzica</string>
-    <string name="permission_title">Acces la stocare</string>
-    <string name="permissions_denied">Permisiunile au fost respinse.</string>
-    <string name="personalize">Personalizare</string>
-    <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="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Urmărește pagina Pinterest pentru inspirație de design Retro Music</string>
-    <string name="plain">Simplu</string>
-    <string name="playList_already_exits">Lista de redare există deja</string>
-    <string name="playback_pitch">Pas</string>
-    <string name="playback_settings">Setări de redare</string>
-    <string name="playback_speed">Viteză de redare</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_created_sucessfully">%s creată cu succes</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="pref_blur_amount_summary">Cantitatea de blur aplicată temelor din această categorie, o valoare mai mică redă performanțe mai bune</string>
-    <string name="pref_blur_amount_title">Cantitatea de blur</string>
-    <string name="pref_filter_song_summary">Filtrează melodiile după lungime</string>
-    <string name="pref_filter_song_title">Filtrează durata melodiei</string>
-    <string name="pref_header_advanced">Avansat</string>
-    <string name="pref_header_album">Stil album</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Lista neagră</string>
-    <string name="pref_header_controls">Comenzi</string>
-    <string name="pref_header_general">General</string>
-    <string name="pref_header_images">Imagini</string>
-    <string name="pref_header_library">Bibliotecă</string>
-    <string name="pref_header_lockscreen">Ecran de blocare</string>
-    <string name="pref_header_playlists">Playlist-uri</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pune pe pauză melodia când volumul scade la zero și reia redarea când volumul crește. De asemenea această funcție funcționează și în afara aplicației</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pauză la zero</string>
-    <string name="pref_keep_screen_on_summary">Rețineți că activarea acestei funcții poate afecta durata bateriei</string>
-    <string name="pref_keep_screen_on_title">Păstrează ecranul pornit</string>
-    <string name="pref_language_name">Selectați limba</string>
-    <string name="pref_snow_fall_title">Efectul de cădere a zăpezii</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_album_artists_only">Arată și albumul artiștilor în categoria Artist</string>
-    <string name="pref_summary_audio_ducking">Notificațiile, navigarea etc.</string>
-    <string name="pref_summary_audio_fade">Estompare audio atunci când melodia este oprită sau redată</string>
-    <string name="pref_summary_blacklist">Conținutul dosarelor din lista neagră este ascuns în bibliotecă.</string>
-    <string name="pref_summary_bluetooth_playback">Începe redarea imediat ce este conectat un dispozitiv Bluetooth</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_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_notification">"Coloreaz\u0103 notificarea dup\u0103 culoarea copertei de album."</string>
-    <string name="pref_summary_cross_fade">Durata de intersectare între melodii</string>
-    <string name="pref_summary_desaturated_color">Conform schemei folosite, Material Design, în modul întunecat, culorile ar trebui să fie mai desaturate</string>
-    <string name="pref_summary_expand_now_playing_panel">Apăsând pe notificare se va afișa ecranul cu actuala melodia redată, în locul ecranului principal</string>
-    <string name="pref_summary_extra_controls">Adaugă controale suplementare pentru mini player</string>
-    <string name="pref_summary_extra_song_info">Afișează informații suplimentare despre piesă, cum ar fi formatul fișierului, rata de biți și frecvența</string>
-    <string name="pref_summary_gapless_playback">"Poate cauza probleme de redare pe unele dispozitive."</string>
-    <string name="pref_summary_home_banner">Arată sau ascunde banner-ul acasă</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_library_categories">Configurează vizibilitatea și ordinea categoriilor de librării.</string>
-    <string name="pref_summary_lock_screen">Comenzi pe ecranul de blocare pentru Retro music.</string>
-    <string name="pref_summary_manage_audio_focus">Redă mereu audio în fundal, indiferent dacă altceva este redat</string>
-    <string name="pref_summary_open_source_licences">Detalii privind licența pentru software open source</string>
-    <string name="pref_summary_pause_history">Când este activată, melodiile noi recent redate, nu vor apărea în istoric</string>
-    <string name="pref_summary_remember_tab">Navigați la ultima filă folosită la pornire</string>
-    <string name="pref_summary_show_lyrics">Afișează versurile sincronizate peste coperta de album</string>
-    <string name="pref_summary_suggestions">Arată Noul Mix de Muzică pe ecranul principal</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Activează schimbarea melodiei prin glisare oriunde pe ecranul cu melodia redată actuală</string>
-    <string name="pref_summary_swipe_to_dismiss">Glisează în jos pentru a închide mini player-ul</string>
-    <string name="pref_summary_toggle_full_screen">Mod imersiv</string>
-    <string name="pref_summary_toggle_headset">Începe redarea imediat ce sunt conectate căștile.</string>
-    <string name="pref_summary_toggle_shuffle">Modul de amestecare se va dezactiva atunci când vei asculta o nouă listă de melodii</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_summary_wallpaper_accent">Extrage accentul de culoare din fundal</string>
-    <string name="pref_summary_whitelist">Arată doar melodiile din folderul de muzică</string>
-    <string name="pref_title_album_art_on_lockscreen">Afișați coperta albumului</string>
-    <string name="pref_title_album_artists_only">Navighează după Artistul de album</string>
-    <string name="pref_title_album_cover_style">Temă pentru coperta albumului</string>
-    <string name="pref_title_album_cover_transform">Ignoră coperta de album</string>
-    <string name="pref_title_app_shortcuts">Comenzi rapide colorate</string>
-    <string name="pref_title_appbar_mode">Stil antet</string>
-    <string name="pref_title_audio_ducking">Reduce volumul la pierderea focalizării</string>
-    <string name="pref_title_audio_fade">Estompare audio</string>
-    <string name="pref_title_auto_download_artist_images">Descărcați automat imagini ale artistului</string>
-    <string name="pref_title_blacklist">Lista neagră</string>
-    <string name="pref_title_bluetooth_playback">Redare prin Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Spălăcește coperta albumului</string>
-    <string name="pref_title_circle_button">Butonul de redare circulară</string>
-    <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_cross_fade">Suprapunere între piese (Beta)</string>
-    <string name="pref_title_custom_font">Utilizează fontul Manrope</string>
-    <string name="pref_title_desaturated_color">Culoare desaturată</string>
-    <string name="pref_title_expand_now_playing_panel">Arată ecranul de redare actuală</string>
-    <string name="pref_title_extra_controls">Comenzi suplimentare</string>
-    <string name="pref_title_extra_song_info">Informații melodie</string>
-    <string name="pref_title_gapless_playback">Redare \"Gapless\"</string>
-    <string name="pref_title_general_theme">Temă</string>
-    <string name="pref_title_home_album_grid_style">Grilă album</string>
-    <string name="pref_title_home_artist_grid_style">Grila Artist</string>
-    <string name="pref_title_home_banner">Banner</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_lyrics_screen_on">Menține ecranul aprins când se afișează versurile</string>
-    <string name="pref_title_lyrics_type">Tipul versurilor</string>
-    <string name="pref_title_manage_audio_focus">Redare întotdeauna</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_pause_history">Istoric de pauze</string>
-    <string name="pref_title_remember_tab">Reține ultima filă</string>
-    <string name="pref_title_show_lyrics">Arată versurile</string>
-    <string name="pref_title_suggestions">Arată sugestiile</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Glisează oriunde pentru a schimba melodia</string>
-    <string name="pref_title_swipe_to_dismiss">Respinge prin glisare în jos</string>
-    <string name="pref_title_tab_text_mode">Mod titlu filă</string>
-    <string name="pref_title_toggle_carousel_effect">Efect de carusel</string>
-    <string name="pref_title_toggle_full_screen">Ecran complet</string>
-    <string name="pref_title_toggle_toggle_headset">Redare automată</string>
-    <string name="pref_title_toggle_toggle_shuffle">Mod redare aleatorie</string>
-    <string name="pref_title_toggle_volume">Controale volum</string>
-    <string name="pref_title_wallpaper_accent">Culoare de accent fundal</string>
-    <string name="pref_title_whitelist">Lista albă de muzică</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Temă neagră, teme pentru ecranul de redare, efectul Carusel și multe altele..</string>
-    <string name="profile">Profil</string>
-    <string name="purchase">Procurare</string>
-    <string name="queue">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_albums">Albume recente</string>
-    <string name="recent_artists">Artişti recenţi</string>
-    <string name="remove_action">Eliminare</string>
-    <string name="remove_cover">Eliminare copertă</string>
-    <string name="remove_from_blacklist">Eliminare din lista neagră</string>
-    <string name="remove_image">Ștergeți imaginea</string>
-    <string name="remove_song_from_playlist_title">Eliminați melodia din lista de redare</string>
-    <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_playlist_title">Redenumiţi lista de redare</string>
-    <string name="replace_cover">Înlocuiește coperta</string>
-    <string name="report_an_issue">Raportați o problemă</string>
-    <string name="report_bug">Raportare bug</string>
-    <string name="reset_action">Resetare</string>
-    <string name="reset_artist_image">Reseteţi imaginea artistului</string>
-    <string name="restore">Restabilire</string>
-    <string name="restore_message">Doriți să restaurați copia de rezervă?</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_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Cumpărați RetroMusic Pro</string>
-    <string name="ringtone_summary">Aplicația are nevoie de permisiunea de a accesa setările dispozitivului pentru a seta muzica ca ton de apel</string>
-    <string name="ringtone_title">Ton sonerie (opțional)</string>
-    <string name="saf_delete_failed">Ștergerea fișierului a eșuat: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Nu se poate obține SAF URI</string>
-    <string name="saf_guide_slide1_description">Deschide sertarul de navigare</string>
-    <string name="saf_guide_slide1_description_before_o">Activează opțiunea \"Arată cardul de memorie\" în meniu</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s are nevoie de acces la cardul SD</string>
-    <string name="saf_guide_slide2_description">Trebuie să selectezi directorul root al cardului SD</string>
-    <string name="saf_guide_slide2_title">Selectează cardul SD în meniul de navigare</string>
-    <string name="saf_guide_slide3_description">Nu deschide niciun subdirector</string>
-    <string name="saf_guide_slide3_title">Apasă butonul \'selectează\' din partea de jos a ecranului</string>
-    <string name="saf_write_failed">Scrierea fișierului a eșuat: %s</string>
-    <string name="save">Salvare</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Salvare ca fişier</string>
-    <string name="save_playlists_title">Salvează ca fișiere</string>
-    <string name="saved_playlist_to">Salvaţi lista de redare în %s.</string>
-    <string name="saving_changes">Salvare modificări</string>
-    <string name="scan_media">Scanare media</string>
-    <string name="scanned_files">Au fost scanate %1$d din %2$d fişiere.</string>
-    <string name="scrobbles_label">Monitorizare timp muzică</string>
-    <string name="select_all">Selectează tot</string>
-    <string name="selected">Selectat</string>
-    <string name="set">Setare</string>
-    <string name="set_artist_image">Setaţi imaginea artistului</string>
-    <string name="share_app">Distribuie aplicația</string>
-    <string name="share_summary">Distribuie aplicația prietenilor și familiei</string>
-    <string name="share_to_stories">Distribuie în Poveste</string>
-    <string name="show_album_artists">Arată artiștii albumului</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="social">Social</string>
-    <string name="social_stories">Partajează povestea</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="sort_order_a_z">Ascendent</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_composer">Compozitor</string>
-    <string name="sort_order_date">Data adăugării</string>
-    <string name="sort_order_date_modified">Data modificării</string>
-    <string name="sort_order_default">Implicit</string>
-    <string name="sort_order_num_songs">Numărul pieselor</string>
-    <string name="sort_order_num_songs_desc">Numărul descrierilor de melodii</string>
-    <string name="sort_order_year">An</string>
-    <string name="sort_order_z_a">Descrescător</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="stack">Stivă</string>
-    <string name="start_play_music">Începe să redai muzică.</string>
-    <string name="suggestion_songs">Sugestii</string>
-    <string name="support_development">Susţineţi dezvoltarea</string>
-    <string name="swipe_to_unlock">Glisează pentru a debloca</string>
-    <string name="synced_lyrics">Versuri sincronizate</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Alătură-te grupului de Telegram pentru a discuta despre erori, a face sugestii și mai multe</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="tiny_card_style">Card mic</string>
-    <string name="title">Titlu</string>
-    <string name="title_new_backup">Copie de rezervă nouă</string>
-    <string name="today">Astăzi</string>
-    <string name="top_albums">Albume de top</string>
-    <string name="top_artists">Artişti 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_community">Ajută-ne să traducem aplicația</string>
-    <string name="try_retro_music_premium">Încearcă Retro Muzică Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Împărtășește design-ul tău cu Retro Music</string>
-    <string name="unlabeled">Neetichetat</string>
-    <string name="unplayable_file">Nu s-a putut reda aceast\u0103 melodie.</string>
-    <string name="up_next">Urmează</string>
-    <string name="update_image">Actualizare imagine</string>
-    <string name="updating">Se actualizează...</string>
-    <string name="user_images_description">Imaginile utilizatorului</string>
-    <string name="user_name">Nume utilizator</string>
-    <string name="username">Nume utilizator</string>
-    <string name="version">Versiune</string>
-    <string name="vertical_flip">Rotire răsturnată</string>
-    <string name="view_on_telegram">Vezi pe Telegram</string>
-    <string name="volume">Volum</string>
-    <string name="web_search">Căutare pe internet</string>
-    <string name="website">Pagină web</string>
-    <string name="website_summary">Vizitați site-ul nostru</string>
-    <string name="welcome">Bun venit,</string>
-    <string name="what_do_you_want_to_share">Ce doriți să expediați?</string>
-    <string name="whats_new">Ce e nou</string>
-    <string name="window">Fereastră</string>
-    <string name="window_corner_edges">Colțuri rotunjite</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ă selectezi cel puțin o categorie.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">O să fii redirecționat spre un site pentru monitorizarea erorilor.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Datele contului tău sunt folosite doar pentru autentificare.</string>
-</resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
new file mode 100644
index 000000000..4f85a50d0
--- /dev/null
+++ b/app/src/main/res/values-ro/strings.xml
@@ -0,0 +1,494 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Culoare ton</string>
+    <string name="accent_color_desc">Culoarea de accent, implicit, se face verde.</string>
+
+    <string name="action_about">Despre</string>
+
+    <string name="action_add_to_favorites">Adaugă la favorite</string>
+    <string name="action_add_to_playing_queue">Adaugă la coada de redare</string>
+    <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_delete">Șterge</string>
+    <string name="action_delete_from_device">Șterge de pe dispozitiv</string>
+
+    <string name="action_details">Detalii</string>
+
+    <string name="action_go_to_album">Pagină album</string>
+    <string name="action_go_to_artist">Pagină artist</string>
+    <string name="action_go_to_start_directory">Registrul principal</string>
+
+    <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_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_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>
+
+    <string name="action_rename">redenumiți</string>
+
+    <string name="action_save_playing_queue">Salvează coada de redare</string>
+
+    <string name="action_scan">Scanează</string>
+
+    <string name="action_search">Căutare</string>
+
+    <string name="action_set">Setare</string>
+    <string name="action_set_as_ringtone">Setează ca ton de apel</string>
+    <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_shuffle_all">Amestecă tot</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="add_action">Adaugă</string>
+
+    <string name="add_photo">Adaugă fotografie</string>
+
+    <string name="add_playlist_title">"Adaugă la playlist"</string>
+
+    <string name="added_title_to_playing_queue">"Adăugat 1 titlu la coada de redare."</string>
+
+    <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_or_artist_empty">Titlul ori numele artistului nu e completat</string>
+
+    <string name="albums">Albume</string>
+
+    <!-- Android Auto -->
+    <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 -->
+    <string name="app_shortcut_shuffle_all_short">Amestecă</string>
+    <string name="app_shortcut_top_tracks_short">Top cântece</string>
+
+    <string name="app_widget_big_name">Retro music - Mare</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="artists">Artiști</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="biography">Biografie</string>
+
+    <string name="black_theme_name">Negru</string>
+
+    <string name="blacklist">Lista neagră</string>
+
+    <string name="blur">Blur</string>
+
+    <string name="blur_card">Blur Card</string>
+
+    <string name="cancel_current_timer">Anulează cronometrul curent</string>
+
+    <string name="card">Card</string>
+
+    <string name="changelog">Modificări</string>
+
+    <string name="changelog_summary">Lista de modificări păstrată din aplicația \"Telegram\"</string>
+
+    <string name="clear_action">Șterge</string>
+
+    <string name="clear_blacklist">Șterge \"Lista neagră\"</string>
+
+    <string name="clear_playlist_title">Șterge playlist</string>
+    <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="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>
+    <string name="could_not_restore_purchase">Nu a putut fi restabilită achiziția.</string>
+    <string name="could_not_scan_files">Nu s-au putut scana %d fișiere</string>
+
+    <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="dark_theme_name">Suriu</string>
+
+    <string name="default_hint">Nu există versuri</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_x"><![CDATA[Doriți să ștergeți cântecul <b>%1$s</b>?]]></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="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="empty">Gol</string>
+
+    <string name="equalizer">Egalizator</string>
+
+    <string name="favorites">Favorite</string>
+
+    <string name="flat">Uniform</string>
+
+    <string name="folders">Mape</string>
+
+    <string name="for_you">Pentru dvs.</string>
+
+    <string name="full">Plin</string>
+
+    <string name="general_settings_summary">Schimbați culorile generale ale aplicației</string>
+    <string name="general_settings_title">Aspect</string>
+
+    <string name="genre">Gen muzical</string>
+
+    <string name="genres">Genuri</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">Istoric</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="label_bit_rate">Bitrate</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="last_added">Adăugate recent</string>
+
+    <string name="lets_play_something">Hai să ascultăm ceva</string>
+
+    <string name="library">Biblioteca</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_products">Se încarcă produsele...</string>
+
+    <string name="lyrics">Versuri</string>
+
+    <string name="my_name">Numele 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>
+
+    <string name="new_start_directory">%s a fost setat ca noul registru principal.</string>
+
+    <string name="no_albums">Niciun album</string>
+
+    <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_genres">Niciun gen</string>
+
+    <string name="no_lyrics_found">Nu a fost găsite versuri.</string>
+
+    <string name="no_playlists">Niciun playlist</string>
+
+    <string name="no_purchase_found">Nu s-a găsit nicio achiziție.</string>
+
+    <string name="no_results">Niciun rezultat</string>
+
+    <string name="no_songs">Niciun cântec</string>
+
+    <string name="normal">Normal</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nu este litsat în magazinul media.]]></string>
+
+    <string name="nothing_to_scan">Nimic de scanat.</string>
+
+    <string name="notification">Notificare</string>
+
+    <string name="notification_settings_summary">Personalizează stil de notificare</string>
+
+    <string name="now_playing">Se redă</string>
+    <string name="now_playing_queue">Coada de redare</string>
+
+    <string name="only_on_wifi">Doar pe Wi-Fi</string>
+
+    <string name="others">Altele</string>
+
+    <string name="past_three_months">Ultimele 3 luni</string>
+
+    <string name="permission_external_storage_denied">Accesul la stocarea externă este respinsă.</string>
+
+    <string name="permissions_denied">Permisiunile au fost respinse.</string>
+
+    <string name="personalize">Personalizare</string>
+
+    <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="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="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_playlists">Playlist-uri</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_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_dominant_color">Cea mai dominantă culoare va fi selectată din coperta albumului sau a artistului.</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_lock_screen">Comenzi pe ecranul de blocare pentru Retro music.</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_full_screen">Mod imersiv</string>
+    <string name="pref_summary_toggle_headset">Începe redarea imediat ce sunt conectate căștile.</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>
+    <string name="pref_title_audio_ducking">Reduce volumul la pierderea focalizării</string>
+    <string name="pref_title_auto_download_artist_images">Descărcați automat imagini ale artistului</string>
+    <string name="pref_title_blurred_album_art">Spălăcește coperta albumului</string>
+    <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_gapless_playback">Redare \"Gapless\"</string>
+    <string name="pref_title_general_theme">Temă</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_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_carousel_effect">Efect de carusel</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_tab_titles">Titlurile categoriior</string>
+    <string name="pref_title_toggle_toggle_headset">Redare automată</string>
+    <string name="pref_title_toggle_volume">Controale volum</string>
+    <string name="pref_title_user_info">Info utilizator</string>
+
+    <string name="primary_color">Culoarea de bază</string>
+    <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="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_albums">Albume recente</string>
+
+    <string name="recent_artists">Artişti recenţi</string>
+
+    <string name="remove_action">Eliminare</string>
+
+    <string name="remove_cover">Eliminare copertă</string>
+
+    <string name="remove_from_blacklist">Eliminare din lista neagră</string>
+
+    <string name="remove_song_from_playlist_title">Eliminați melodia din lista de redare</string>
+    <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_playlist_title">Redenumiţi lista de redare</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_equalizer">Retro Egalizator</string>
+
+    <string name="retro_music_pro">Cumpărați RetroMusic Pro</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <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="scanned_files">Au fost scanate %1$d din %2$d fişiere.</string>
+
+    <string name="search_hint">Căutare în bibliotecă...</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="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="summary_user_info">Numele tău va fi afișat pe ecranul de pornire</string>
+
+    <string name="support_development">Susţineţi dezvoltarea</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <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_dashboard">Tablou de bord</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_user_info">Numele dvs.</string>
+
+    <string name="today">Astăzi</string>
+
+    <string name="top_albums">Albume de top</string>
+
+    <string name="top_artists">Artişti 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="unplayable_file">Nu s-a putut reda aceast\u0103 melodie.</string>
+
+    <string name="up_next">Urmează</string>
+
+    <string name="update_image">Actualizare imagine</string>
+
+    <string name="updating">Se actualizează...</string>
+
+    <string name="version">Versiune</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="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
deleted file mode 100644
index 40177b115..000000000
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Об альбоме %s</string>
-    <string name="about_settings_summary">Команда, ссылки на социальные сети</string>
-    <string name="accent_color">Цвет акцента</string>
-    <string name="accent_color_desc">Акцентный цвет, по умолчанию фиолетовый</string>
-    <string name="action_about">О программe</string>
-    <string name="action_add_to_blacklist">Добавить в чёрный список</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_cancel">Отменить</string>
-    <string name="action_cast">Трансляция</string>
-    <string name="action_clear_playing_queue">Очистить очередь воспроизведения</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_edit">Изменить</string>
-    <string name="action_go_to_album">Перейти к альбому</string>
-    <string name="action_go_to_artist">Перейти к исполнителю</string>
-    <string name="action_go_to_genre">Перейти к жанру</string>
-    <string name="action_go_to_lyrics">Перейти к тексту песни</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_all">Играть все</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_sort_order">Порядок сортировки</string>
-    <string name="action_tag_editor">Редактор тегов</string>
-    <string name="action_toggle_favorite">Показать избранное</string>
-    <string name="action_toggle_shuffle">Включить перемешивающий режим</string>
-    <string name="adaptive">Адаптированная</string>
-    <string name="add_action">Добавить</string>
-    <string name="add_playlist_title">"Добавить в плейлист"</string>
-    <string name="add_time_framed_lryics">Добавить синхронизированный текст</string>
-    <string name="added_song_count_to_playlist">Добавлено(-а) %1$d песня (-и, -ен) в %2$s</string>
-    <string name="added_title_to_playing_queue">"В очередь добавлен 1 трек"</string>
-    <string name="added_x_titles_to_playing_queue">В очередь добавлен(-о) %1$d трек(-а, -ов).</string>
-    <string name="album">Альбом</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Песня</item>
-        <item quantity="few">Песни</item>
-        <item quantity="many">Песен</item>
-        <item quantity="other">Треков</item>
-    </plurals>
-    <string name="album_artist">Исполнитель альбома</string>
-    <string name="albums">Альбомы</string>
-    <plurals name="albums">
-        <item quantity="one">Альбом</item>
-        <item quantity="few">Альбома</item>
-        <item quantity="many">Альбомов</item>
-        <item quantity="other">Альбомов</item>
-    </plurals>
-    <string name="always">Всегда</string>
-    <string name="app_share">Привет, попробуй этот классный музыкальный плеер для Android: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Перемешать</string>
-    <string name="app_shortcut_top_tracks_short">Лучшие треки</string>
-    <string name="app_widget_big_name">Заполнение</string>
-    <string name="app_widget_card_name">Компактный</string>
-    <string name="app_widget_classic_name">Классический</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Небольшой</string>
-    <string name="app_widget_text_name">Текстовый</string>
-    <string name="artist">Исполнитель</string>
-    <string name="artists">Исполнители</string>
-    <string name="audio_fade_duration">Длительность затухания аудио</string>
-    <string name="audio_focus_denied">Фокус на аудио отключен.</string>
-    <string name="audio_settings_summary">Измените настройки звука и отрегулируйте настройки эквалайзера</string>
-    <string name="auto">Автоматически</string>
-    <string name="backup_restore_settings_summary">Резервирование и восстановление настроек, плейлисты</string>
-    <string name="backup_restore_title"><![CDATA[Резервирование и восстановление]]></string>
-    <string name="backup_title">Резервные копии</string>
-    <string name="biography">Биография</string>
-    <string name="black_theme_name">Чёрное оформление</string>
-    <string name="blacklist">Черный список</string>
-    <string name="bluetooth_summary">Приложению требуется разрешение на поиск ближайших устройств Bluetooth</string>
-    <string name="bluetooth_title">Ближайшие устройства</string>
-    <string name="blur">Размытие</string>
-    <string name="blur_card">Карточка с размытием</string>
-    <string name="bug_report_failed">Невозможно отправить отчет</string>
-    <string name="bug_report_failed_invalid_token">Недопустимый ключ доступа. Пожалуйста, свяжитесь с разработчиком приложения.</string>
-    <string name="bug_report_failed_issues_not_available">Проблемы не активны в выбранном хранилище. Пожалуйста, свяжитесь с разработчиком приложения.</string>
-    <string name="bug_report_failed_unknown">Произошла непредвиденная ошибка. Пожалуйста, свяжитесь с разработчиком приложения.</string>
-    <string name="bug_report_failed_wrong_credentials">Неверное имя пользователя или пароль</string>
-    <string name="bug_report_issue">Вопрос</string>
-    <string name="bug_report_manual">Отправить вручную</string>
-    <string name="bug_report_no_description">Пожалуйста, введите описание проблемы</string>
-    <string name="bug_report_no_password">Пожалуйста, введите ваш корректный пароль GitHub</string>
-    <string name="bug_report_no_title">Пожалуйста, введите название отчета о проблеме</string>
-    <string name="bug_report_no_username">Пожалуйста, введите корректно ваше имя пользователя GitHub</string>
-    <string name="bug_report_success">Отчёт об ошибке создан</string>
-    <string name="bug_report_summary">Произошла непредвиденная ошибка. Приносим извинения за предоставленные неудобства. Если проблемы не исчезают, очистите данные приложения или свяжитесь с нами по электронной почте </string>
-    <string name="bug_report_use_account">Отправить с помощью учетной записи GitHub</string>
-    <string name="buy_now">Купить сейчас</string>
-    <string name="cancel_current_timer">Отменить</string>
-    <string name="card">Карточка</string>
-    <string name="card_color_style">Цветная карточка</string>
-    <string name="card_square">Квадратная Карточка</string>
-    <string name="card_style">Карточка</string>
-    <string name="carousal_effect_on_now_playing_screen">Эффект карусели на экране воспроизведения</string>
-    <string name="cascading">Каскадный</string>
-    <string name="changelog">Список изменений</string>
-    <string name="changelog_summary">Узнайте, что нового</string>
-    <string name="choose_image">Выберите изображение</string>
-    <string name="choose_restore_title">Выберете резервную копию для восстановления</string>
-    <string name="circle">Круг</string>
-    <string name="circular">Круговая</string>
-    <string name="classic">Классическая</string>
-    <string name="clear_action">Очистить</string>
-    <string name="clear_blacklist">Очистить черный список</string>
-    <string name="clear_history">Очистить историю</string>
-    <string name="clear_playing_queue">Очистить очередь</string>
-    <string name="color">Цветная</string>
-    <string name="colors">Цвета</string>
-    <string name="compact">Компактный</string>
-    <string name="composer">Композитор</string>
-    <string name="copied_device_info_to_clipboard">Скопировать информацию об устройстве в буфер обмена.</string>
-    <string name="could_not_create_playlist">Не удалось создать плейлист.</string>
-    <string name="could_not_download_album_cover">"Не удалось загрузить подходящую обложку для альбома."</string>
-    <string name="could_not_restore_purchase">Не удалось восстановить покупку.</string>
-    <string name="could_not_scan_files">Не удалось просканировать %d файлов.</string>
-    <string name="create_action">Создать</string>
-    <string name="create_new_backup">Создать</string>
-    <string name="created_playlist_x">Создан плейлист %1$s.</string>
-    <string name="credit_title">Участники и помощники</string>
-    <string name="currently_listening_to_x_by_x">Сейчас играет %1$s от %2$s.</string>
-    <string name="custom_artist_images">Пользовательские изображения исполнителей</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Отправить отчет о крахе</string>
-    <string name="dark_theme_name">Тёмное оформление</string>
-    <string name="delete_playlist_title">Удалить плейлист</string>
-    <string name="delete_playlist_x"><![CDATA[Удалить плейлист <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Удалить плейлисты</string>
-    <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="depth">Масштабирование</string>
-    <string name="description">Описание</string>
-    <string name="device_info">Информация об устройстве</string>
-    <string name="dialog_message_set_ringtone">Разрешить Retro Music изменять настройки звука</string>
-    <string name="dialog_title_set_ringtone">Выбрать мелодию звонка</string>
-    <string name="disc_hint">Номер диска</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="done">Готово</string>
-    <string name="drive_mode">Режим вождения</string>
-    <string name="edit_fab">Кнопка редактирования</string>
-    <string name="edit_normal_lyrics">Редактировать текст</string>
-    <string name="edit_synced_lyrics">Редактировать синхронизированный текст</string>
-    <string name="empty">Пусто</string>
-    <string name="equalizer">Эквалайзер</string>
-    <string name="error_create_backup">Не удалось создать резервную копию</string>
-    <string name="error_delete_backup">Не удалось удалить резервную копию</string>
-    <string name="error_empty_name">Ваше имя не может быть пустым!</string>
-    <string name="error_load_failed">Ошибка загрузки</string>
-    <string name="error_share_file">Не удалось просканировать файл</string>
-    <string name="expanded">Увеличенная</string>
-    <string name="faq">ЧаВО</string>
-    <string name="favorites">Любимые</string>
-    <string name="file_already_exists">Файл уже существует</string>
-    <string name="finish_last_song">Закончить вопсроизведение последнего трека</string>
-    <string name="fit">По размеру</string>
-    <string name="flat">Плоское</string>
-    <string name="folders">Папки</string>
-    <string name="follow_system">Системное</string>
-    <string name="for_you">Для вас</string>
-    <string name="free">Доступно</string>
-    <string name="full">Заполнение</string>
-    <string name="full_card">Заполненная карточка</string>
-    <string name="general_settings_summary">Изменение оформления и цвета приложения</string>
-    <string name="general_settings_title">Внешний вид</string>
-    <string name="genre">Жанр</string>
-    <string name="genres">Жанры</string>
-    <string name="git_hub_summary">Развивайте проект на GitHub</string>
-    <string name="gradient">Градиент</string>
-    <string name="grant_access">Предоставить доступ</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="grid_style_label">Стиль сетки</string>
-    <string name="help_summary">Нужна ещё помощь?</string>
-    <string name="hinge">Петля</string>
-    <string name="history">История</string>
-    <string name="history_cleared">История очищена</string>
-    <string name="history_undo_button">Отменить</string>
-    <string name="home">Главная</string>
-    <string name="horizontal_flip">Горизонтальный поворот</string>
-    <string name="image">Изображение</string>
-    <string name="image_gradient">Градиентное изображение</string>
-    <string name="image_settings_summary">Изменение настроек загрузки изображений исполнителей</string>
-    <string name="import_label">Импорт</string>
-    <string name="import_playlist">Импорт плейлиста</string>
-    <string name="import_playlist_message">Импортирует все плейлисты с песнями, находящиеся в Android Media Store. Если плейлисты уже существуют, песни будут объединены.</string>
-    <string name="inserted_x_songs_into_playlist_x">В плейлист %2$s внесено %1$d  песен.</string>
-    <string name="instagram_page_summary">Поделитесь своим обзором на приложение Retro Music в Instagram</string>
-    <string name="keyboard">Клавиатура</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_last_modified">Последнее изменение</string>
-    <string name="label_more_from">Больше от %s</string>
-    <string name="label_sampling_rate">Частота дискретизации</string>
-    <string name="label_track_length">Длительность</string>
-    <string name="labeled">Показывать всегда</string>
-    <string name="last_added">Последние добавленные</string>
-    <string name="last_song">Последний трек</string>
-    <string name="lets_go">Вперед</string>
-    <string name="library_categories">Разделы библиотеки</string>
-    <string name="licenses">Лицензии</string>
-    <string name="light_theme_name">Белое</string>
-    <string name="listeners_label">Слушатели</string>
-    <string name="listing_files">Список файлов</string>
-    <string name="loading_products">Загрузка товаров…</string>
-    <string name="login">Войти</string>
-    <string name="lyrics">Текст песни</string>
-    <string name="made_with_love">Сделано с ❤️ в Индии</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Ошибка</string>
-    <string name="md_storage_perm_error">Ошибка разрешения</string>
-    <string name="message_backup_create_success">Резервная копия успешно создана.</string>
-    <string name="message_limit_tabs">Должно быть не более 5 элементов</string>
-    <string name="message_pro_feature">%s является Pro функцией.</string>
-    <string name="message_restore_success">Восстановление успешно завершено.</string>
-    <string name="message_updated">Обновлено</string>
-    <string name="message_welcome"><![CDATA[Здравствуйте! <br>Добро пожаловать в %s]]></string>
-    <string name="my_name">Имя</string>
-    <string name="my_top_tracks">Часто воспроизводимые</string>
-    <string name="never">Никогда</string>
-    <string name="new_music_mix">Новый Микс</string>
-    <string name="new_playlist_title">Новый плейлист</string>
-    <string name="new_start_directory">%s - новая стартовая директория.</string>
-    <string name="next_song">Следующий трек</string>
-    <string name="no_albums">У вас нет альбомов</string>
-    <string name="no_artists">У вас нет исполнителей</string>
-    <string name="no_audio_ID">"Сначала проиграйте песню, затем попробуйте ещё раз."</string>
-    <string name="no_backups_found">Резервные копии не найдены</string>
-    <string name="no_equalizer">Эквалайзер не найден</string>
-    <string name="no_genres">У вас нет жанров</string>
-    <string name="no_lyrics_found">Текст не найден</string>
-    <string name="no_playing_queue">Нет проигрываемых песен</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="normal_lyrics">Обычный текст</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> не найден в хранилище медиа.]]></string>
-    <string name="not_recently_played">Нет недавно воспроизведенных треков</string>
-    <string name="nothing_to_scan">Нет файлов для сканирования.</string>
-    <string name="nothing_to_see">Нет файлов для сканирования</string>
-    <string name="notification">Уведомление</string>
-    <string name="notification_settings_summary">Настроить стиль уведомления</string>
-    <string name="now_playing">Экран воспроизведения</string>
-    <string name="now_playing_queue">Очередь в экране воспроизведения</string>
-    <string name="now_playing_summary">Настройка экрана воспроизведения</string>
-    <string name="now_playing_themes">9 новых оформлений экрана воспроизведения</string>
-    <string name="only_on_wifi">Только по Wi-Fi</string>
-    <string name="other_settings_summary">Экспериментальные возможности</string>
-    <string name="others">Другие</string>
-    <string name="over_cover">Поверх обложки</string>
-    <string name="password">Пароль</string>
-    <string name="past_three_months">Последние 3 месяца</string>
-    <string name="paste_lyrics_here">Вставьте текст песни</string>
-    <string name="paste_timeframe_lyrics_here">Вставьте синхронизированный текст песни</string>
-    <string name="peek">Просмотр</string>
-    <string name="permission_bluetooth_denied">Отказано в доступе к поиску устройств поблизости.</string>
-    <string name="permission_external_storage_denied">Разрешение для доступа к внешнему хранилищу не получено.</string>
-    <string name="permission_summary">Приложению требуется разрешение на доступ к внутренней памяти вашего устройства для воспроизведения музыки.</string>
-    <string name="permission_title">Доступ к хранилищу</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="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Подпишитесь на страницу Retro Music в Pinterest</string>
-    <string name="plain">Гладкое</string>
-    <string name="playList_already_exits">Плейлист уже существует</string>
-    <string name="playback_pitch">Высота</string>
-    <string name="playback_settings">Параметры воспроизведения</string>
-    <string name="playback_speed">Скорость воспроизведения</string>
-    <string name="playing_notification_description">Уведомление в виде плеера позволяет управлять воспроизведением музыки</string>
-    <string name="playing_notification_name">Уведомление в виде плеера</string>
-    <string name="playlist_created_sucessfully">%s успешно создан</string>
-    <string name="playlist_is_empty">Плейлист пуст</string>
-    <string name="playlist_name_empty">Название плейлиста</string>
-    <string name="playlists">Плейлисты</string>
-    <string name="pref_blur_amount_summary">Степень размытия в соответствующих темах. Чем ниже значение размытия, тем выше быстродействие устройства</string>
-    <string name="pref_blur_amount_title">Степень размытия</string>
-    <string name="pref_filter_song_summary">Убрать из списка песни, длительность которых ниже выбранного значения</string>
-    <string name="pref_filter_song_title">Фильтровать песни по длительности</string>
-    <string name="pref_header_advanced">Расширенные настройки</string>
-    <string name="pref_header_album">Стиль альбома</string>
-    <string name="pref_header_audio">Звук</string>
-    <string name="pref_header_blacklist">Черный список</string>
-    <string name="pref_header_controls">Управление</string>
-    <string name="pref_header_general">Оформление</string>
-    <string name="pref_header_images">Изображения</string>
-    <string name="pref_header_library">Библиотека</string>
-    <string name="pref_header_lockscreen">Экран блокировки</string>
-    <string name="pref_header_playlists">Плейлисты</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Ставить музыку на паузу при уменьшении громкости до нуля и продолжать воспроизведение после увеличения громкости. Предупреждение: при увеличении громкости вне приложения, Retro Music также начнёт воспроизведение</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Пауза при нулевой громкости</string>
-    <string name="pref_keep_screen_on_summary">Имейте в виду, что включение этой функции может повлиять время работы от батареи</string>
-    <string name="pref_keep_screen_on_title">Оставлять экран включенным</string>
-    <string name="pref_language_name">Выберите язык</string>
-    <string name="pref_snow_fall_title">Эффект снегопада</string>
-    <string name="pref_summary_album_art_on_lockscreen">Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.</string>
-    <string name="pref_summary_album_artists_only">Показывать исполнителей альбомов во вкладке \"Исполнители\"</string>
-    <string name="pref_summary_audio_ducking">Снижать громкость воспроизведения когда играет системный звук или приходит уведомление</string>
-    <string name="pref_summary_audio_fade">Затухать звук, когда песня приостановлена или воспроизведена</string>
-    <string name="pref_summary_blacklist">Содержимое черного списка скрыто из вашей библиотеки.</string>
-    <string name="pref_summary_bluetooth_playback">Начать воспроизведение сразу же после подключения устройства Bluetooth</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_notification">"Окрашивает уведомление в доминирующий цвет обложки альбома"</string>
-    <string name="pref_summary_cross_fade">Продолжительность кроссфейда между песнями</string>
-    <string name="pref_summary_desaturated_color">Согласно стилю Material Design, в темном режиме цвета должны быть немного обесцвечены</string>
-    <string name="pref_summary_expand_now_playing_panel">Нажатие на уведомление будет показывать экран воспроизведения вместо домашнего экрана</string>
-    <string name="pref_summary_extra_controls">Добавить дополнительные элементы управления для мини-плеера</string>
-    <string name="pref_summary_extra_song_info">Показывать дополнительную информацию о песне, такую как формат файла, битрейт и частота</string>
-    <string name="pref_summary_gapless_playback">"Может вызвать проблемы с воспроизведением на некоторых устройствах."</string>
-    <string name="pref_summary_home_banner">Показывать кнопку Домой</string>
-    <string name="pref_summary_ignore_media_store_artwork">Может повысить качество обложки альбома, но привести к более медленной загрузке изображения. Включайте это только в том случае, если у вас есть проблемы с картинками низкого разрешения</string>
-    <string name="pref_summary_library_categories">Настроить вид и порядок вкладок в библиотеке.</string>
-    <string name="pref_summary_lock_screen">Используйте собственный экран блокировки Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Всегда воспроизводить звук в фоне вне зависимости от других источников звука</string>
-    <string name="pref_summary_open_source_licences">Сведения о лицензии для программного обеспечения с открытым исходным кодом</string>
-    <string name="pref_summary_pause_history">Если включено, то новые песни не будут отображаться в истории</string>
-    <string name="pref_summary_remember_tab">При открытии приложения переходить на последнюю использованную вкладку</string>
-    <string name="pref_summary_show_lyrics">Показывать синхронизированный текст песни поверх обложки альбома</string>
-    <string name="pref_summary_suggestions">Показывать Новый Микс на главном экране</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Включает смену песни по свайпу в любом месте на экране воспроизведения</string>
-    <string name="pref_summary_swipe_to_dismiss">Проведите вниз, чтобы закрыть мини-плеер</string>
-    <string name="pref_summary_toggle_full_screen">Полноэкранный режим</string>
-    <string name="pref_summary_toggle_headset">Начать воспроизведение музыки сразу после подключения наушников</string>
-    <string name="pref_summary_toggle_shuffle">Режим перемешивания выключится при проигрывании нового списка песен</string>
-    <string name="pref_summary_toggle_volume">Если места на экране достаточно, показывать панель регулировки громкости на экране воспроизведения</string>
-    <string name="pref_summary_wallpaper_accent">Использовать цвет акцента из обоев</string>
-    <string name="pref_summary_whitelist">Показывать музыку только из папки /Music</string>
-    <string name="pref_title_album_art_on_lockscreen">Показать обложку альбома</string>
-    <string name="pref_title_album_artists_only">Показывать обложку альбома в разделе исполнители</string>
-    <string name="pref_title_album_cover_style">Оформление обложки альбома</string>
-    <string name="pref_title_album_cover_transform">Эффект смены обложки альбома</string>
-    <string name="pref_title_app_shortcuts">Цветные ярлыки</string>
-    <string name="pref_title_appbar_mode">Стиль верхней панели</string>
-    <string name="pref_title_audio_ducking">Уменьшать громкость при получении уведомления</string>
-    <string name="pref_title_audio_fade">Затухание аудио</string>
-    <string name="pref_title_auto_download_artist_images">Автозагрузка изображений исполнителя</string>
-    <string name="pref_title_blacklist">Черный список</string>
-    <string name="pref_title_bluetooth_playback">Воспроизведение при подключении Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Размывать обложку альбома</string>
-    <string name="pref_title_circle_button">Круглая кнопка воспроизведения</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_cross_fade">Кроссфейд (бета-версия)</string>
-    <string name="pref_title_custom_font">Использовать шрифт Manrope</string>
-    <string name="pref_title_desaturated_color">Обесцвеченный цвет</string>
-    <string name="pref_title_expand_now_playing_panel">Показывать экран воспроизведения</string>
-    <string name="pref_title_extra_controls">Дополнительные элементы управления</string>
-    <string name="pref_title_extra_song_info">Информация о песне</string>
-    <string name="pref_title_gapless_playback">Непрерывное воспроизведение</string>
-    <string name="pref_title_general_theme">Оформление приложения</string>
-    <string name="pref_title_home_album_grid_style">Сетка альбомов</string>
-    <string name="pref_title_home_artist_grid_style">Сетка исполнителей</string>
-    <string name="pref_title_home_banner">Кнопка Домой</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_lyrics_screen_on">Не выключать экран при показе текста</string>
-    <string name="pref_title_lyrics_type">Тип текста песни</string>
-    <string name="pref_title_manage_audio_focus">Всегда проигрывать</string>
-    <string name="pref_title_now_playing_screen_appearance">Оформление экрана воспроизведения</string>
-    <string name="pref_title_open_source_licences">Лицензии с открытым исходным кодом</string>
-    <string name="pref_title_pause_history">Приостановить историю</string>
-    <string name="pref_title_remember_tab">Запоманать последнюю использованную вкладку</string>
-    <string name="pref_title_show_lyrics">Показать текст песни</string>
-    <string name="pref_title_suggestions">Показывать предложения</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Проведите пальцем в любом месте, чтобы сменить песню</string>
-    <string name="pref_title_swipe_to_dismiss">Скрывать мини-плеер свайпом</string>
-    <string name="pref_title_tab_text_mode">Отображение названия вкладок</string>
-    <string name="pref_title_toggle_carousel_effect">Эффект карусели</string>
-    <string name="pref_title_toggle_full_screen">Полноэкранный режим приложения</string>
-    <string name="pref_title_toggle_toggle_headset">Автовоспроизведение</string>
-    <string name="pref_title_toggle_toggle_shuffle">Режим перемешивания</string>
-    <string name="pref_title_toggle_volume">Регулировка громкости</string>
-    <string name="pref_title_wallpaper_accent">Цвет акцента обоев</string>
-    <string name="pref_title_whitelist">Музыка из белого списка</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Черное офромление, больше стилей экрана воспроизведения, эффект карусели и многое другое..</string>
-    <string name="profile">Профиль</string>
-    <string name="purchase">Купить</string>
-    <string name="queue">Очередь воспроизведения</string>
-    <string name="rate_app">Оценить приложение</string>
-    <string name="rate_on_google_play_summary">Понравилось приложение? Напишите нам в Google Play Store о том, как мы можем сделать его еще лучше</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_image">Удалить Изображение</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[Удалить %1$d песен(-и) из плейлиста?]]></string>
-    <string name="rename_playlist_title">Переименовать плейлист</string>
-    <string name="replace_cover">Заменить обложку</string>
-    <string name="report_an_issue">Сообщить об ошибке</string>
-    <string name="report_bug">Сообщить об ошибке</string>
-    <string name="reset_action">Сбросить</string>
-    <string name="reset_artist_image">Сбросить изображение исполнителя</string>
-    <string name="restore">Восстановить</string>
-    <string name="restore_message">Вы уверены, что хотите восстановить резервную копию?</string>
-    <string name="restored_previous_purchase_please_restart">Предыдущая покупка восстановлена. Перезагрузите приложение, чтобы воспользоваться всеми функциями.</string>
-    <string name="restored_previous_purchases">Предыдущие покупки восстановлены.</string>
-    <string name="restoring_purchase">Восстановление покупки…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Приложению требуется разрешение на доступ к изменению настроек вашего устройства, чтобы установливать музыку в качестве мелодии звонка</string>
-    <string name="ringtone_title">Мелодия звонка (необязательно)</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_write_failed">Ошибка при записи файла: %s</string>
-    <string name="save">Сохранить</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Сохранить как...</string>
-    <string name="save_playlists_title">Сохранить как...</string>
-    <string name="saved_playlist_to">Плейлист сохранён в %s.</string>
-    <string name="saving_changes">Сохранение изменений</string>
-    <string name="scan_media">Сканировать медиа-файлы</string>
-    <string name="scanned_files">Просканировано %1$d из %2$d файлов.</string>
-    <string name="scrobbles_label">Скробблинг</string>
-    <string name="select_all">Выбрать все</string>
-    <string name="selected">Выбрано</string>
-    <string name="set">Установить</string>
-    <string name="set_artist_image">Установить изображение исполнителя</string>
-    <string name="share_app">Поделиться приложением</string>
-    <string name="share_summary">Поделитесь приложением со своими друзьями и родственниками</string>
-    <string name="share_to_stories">Поделиться в Историях</string>
-    <string name="show_album_artists">Не показывать исполнителей альбомов</string>
-    <string name="shuffle">Перемешать</string>
-    <string name="simple">Простой</string>
-    <string name="sleep_timer_canceled">Таймер отключения отменен.</string>
-    <string name="sleep_timer_set">Таймер сна установлен на %d минут.</string>
-    <string name="social">Социальный</string>
-    <string name="social_stories">Поделиться в историях</string>
-    <string name="song">Трек</string>
-    <string name="song_duration">Продолжительность трека</string>
-    <string name="songs">Треки</string>
-    <string name="sort_order">Порядок сортировки</string>
-    <string name="sort_order_a_z">По возрастанию</string>
-    <string name="sort_order_album">Альбом</string>
-    <string name="sort_order_artist">Исполнитель</string>
-    <string name="sort_order_composer">Композитор</string>
-    <string name="sort_order_date">Дата добавления</string>
-    <string name="sort_order_date_modified">Дата изменения</string>
-    <string name="sort_order_default">По умолчанию</string>
-    <string name="sort_order_num_songs">Количество треков</string>
-    <string name="sort_order_num_songs_desc">Количество треков по убыванию</string>
-    <string name="sort_order_year">Год</string>
-    <string name="sort_order_z_a">По убыванию</string>
-    <string name="speech_not_supported">Извините! Ваше устройство не поддерживает голосовой ввод</string>
-    <string name="speech_prompt">Поиск в вашей библиотеке</string>
-    <string name="stack">Стопка</string>
-    <string name="start_play_music">Начать воспроизведение музыки.</string>
-    <string name="suggestion_songs">Предложения</string>
-    <string name="support_development">Поддержать разработку</string>
-    <string name="swipe_to_unlock">Проведите, чтобы разблокировать</string>
-    <string name="synced_lyrics">Синхронизированный текст</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Присоединяйтесь в нашу группу в Telegram, чтобы обсуждать ошибки, предлагать улучшения, хвастаться и т.д.</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="tiny_card_style">Крошечная карточка</string>
-    <string name="title">Название</string>
-    <string name="title_new_backup">Новая резервная копия</string>
-    <string name="today">Сегодня</string>
-    <string name="top_albums">Топ альбомов</string>
-    <string name="top_artists">Топ исполнителей</string>
-    <string name="track_hint">"Трек (2 для трека 2 или 3004 для трека 4 диска 3)"</string>
-    <string name="track_list">Номер трека</string>
-    <string name="translate">Помочь с переводом</string>
-    <string name="translate_community">Помогите нам перевести приложение на ваш язык</string>
-    <string name="try_retro_music_premium">Попробуйте Retro Music Premium</string>
-    <string name="twitter_page">Твиттер</string>
-    <string name="twitter_page_summary">Поделитесь своим дизайном Retro Music</string>
-    <string name="unlabeled">Не показывать</string>
-    <string name="unplayable_file">Невозможно проиграть этот трек.</string>
-    <string name="up_next">Следующие треки</string>
-    <string name="update_image">Обновить изображение</string>
-    <string name="updating">Обновление…</string>
-    <string name="user_images_description">Пользовательские изображения</string>
-    <string name="user_name">Имя Пользователя</string>
-    <string name="username">Имя пользователя</string>
-    <string name="version">Версия</string>
-    <string name="vertical_flip">Вертикальный поворт</string>
-    <string name="view_on_telegram">Посмотреть в Telegram</string>
-    <string name="volume">Громкость</string>
-    <string name="web_search">Поиск в интернете</string>
-    <string name="website">Наш сайт</string>
-    <string name="website_summary">Посмотрите наш веб-сайт</string>
-    <string name="welcome">Добро пожаловать,</string>
-    <string name="what_do_you_want_to_share">Чем вы хотите поделиться?</string>
-    <string name="whats_new">Что нового:</string>
-    <string name="window">Окно</string>
-    <string name="window_corner_edges">Закругленные углы</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="you_will_be_forwarded_to_the_issue_tracker_website">Вы будете перенаправлены на сайт системы отслеживания ошибок.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Данные вашей учетной записи используются только для аутентификации.</string>
-</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
new file mode 100644
index 000000000..7968a9f1d
--- /dev/null
+++ b/app/src/main/res/values-ru/strings.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="about_settings_summary">Команда,ссылки на соц.сети</string>
+
+    <string name="accent_color">Основной цвет</string>
+    <string name="accent_color_desc">Основной цвет, по умолчанию зеленовато-голубой.</string>
+
+    <string name="action_about">О программe</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_genre">Перейти к жанру</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_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_sort_order">Порядок сортировки</string>
+
+    <string name="action_tag_editor">Редактор тегов</string>
+
+    <string name="adaptive">Адаптивный</string>
+
+    <string name="add_action">Добавить</string>
+
+    <string name="add_lyrics">Добавить тест песни</string>
+
+    <string name="add_photo">Добавить \nфото</string>
+
+    <string name="add_playlist_title">"Добавить в плейлист"</string>
+
+    <string name="add_time_framed_lryics">Довавить текст песни</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_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="app_widget_text_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="auto">Авто</string>
+
+    <string name="base_color_theme">Основная цветовая тема</string>
+
+    <string name="bass_boost">Усиление баса</string>
+
+    <string name="bio">Биография</string>
+
+    <string name="biography">Биография</string>
+
+    <string name="black_theme_name">Максимально чёрный</string>
+
+    <string name="blacklist">Черный список</string>
+
+    <string name="blur">Размытие</string>
+
+    <string name="blur_card">Карточка с размытием</string>
+
+    <string name="bug_report_failed">Невозможно отправить отчет</string>
+    <string name="bug_report_failed_invalid_token">Недопустимый ключ доступа. Пожалуйста, свяжитесь с разработчиком приложения.</string>
+    <string name="bug_report_failed_issues_not_available">Проблемы не активны в выбранном хранилище. Пожалуйста, свяжитесь с разработчиком приложения.</string>
+    <string name="bug_report_failed_unknown">Произошла непредвиденная ошибка. Пожалуйста, свяжитесь с разработчиком приложения.</string>
+    <string name="bug_report_failed_wrong_credentials">Неверное имя пользователя или пароль</string>
+    <string name="bug_report_issue">Вопрос</string>
+    <string name="bug_report_manual">Отправить вручную</string>
+    <string name="bug_report_no_description">Пожалуйста, введите описание проблемы</string>
+    <string name="bug_report_no_password">Пожалуйста, введите ваш корректный пароль GitHub</string>
+    <string name="bug_report_no_title">Пожалуйста, введите название отчета о проблеме</string>
+    <string name="bug_report_no_username">Пожалуйста, введите корректно ваше имя пользователя GitHub</string>
+    <string name="bug_report_summary">Произошла непредвиденная ошибка. Извините, если это продолжится
+то «Очистите данные приложения»</string>
+    <string name="bug_report_uploading">Загрузка отчета на GitHub…</string>
+    <string name="bug_report_use_account">Отправить с помощью учетной записи GitHub</string>
+
+    <string name="cancel_current_timer">Отменить</string>
+
+    <string name="card">Карточка</string>
+
+    <string name="card_circular_style">Круговой</string>
+
+    <string name="card_color_style">Цветная карточка</string>
+
+    <string name="card_style">Карточка</string>
+
+    <string name="carousal">Карусель</string>
+
+    <string name="carousal_effect_on_now_playing_screen">Эффект карусели на экране текущего воспроизведения</string>
+
+    <string name="cascading">Каскадный</string>
+
+    <string name="cast">Передать на устройство</string>
+
+    <string name="changelog">Список изменений</string>
+
+    <string name="changelog_summary">Список изменений хранится на канале Telegram</string>
+
+    <string name="circular">Круговая</string>
+
+    <string name="classic">Классический</string>
+
+    <string name="clear_action">Очистить</string>
+
+    <string name="clear_app_data">Очистить данные приложения</string>
+
+    <string name="clear_blacklist">Очистить черный список</string>
+
+    <string name="clear_playing_queue">Очистить очередь</string>
+
+    <string name="clear_playlist_title">Очистить плейлист</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>? \u042d\u0442\u043e \u043d\u0435\u043b\u044c\u0437\u044f \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c!]]></string>
+
+    <string name="close_notification">Закрыть</string>
+
+    <string name="color">Цвет</string>
+
+    <string name="color_theme_name">Цвет</string>
+
+    <string name="colors">Цвета</string>
+
+    <string name="composer">Композитор</string>
+
+    <string name="copied_device_info_to_clipboard">Скопировать информацию об устройстве в буфер обмена.</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 \u0441\u043a\u0430\u0447\u0430\u0442\u044c \u043f\u043e\u0434\u0445\u043e\u0434\u044f\u0449\u0443\u044e \u043e\u0431\u043b\u043e\u0436\u043a\u0430 \u0430\u043b\u044c\u0431\u043e\u043c\u0430."</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="credit_title">Участники и помощники</string>
+
+    <string name="currently_listening_to_x_by_x">Сейчас играет %1$s от %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_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="depth">Глубина</string>
+
+    <string name="description">Описание</string>
+
+    <string name="device_info">Информация об устройстве</string>
+
+    <string name="dialog_message_set_ringtone">Разрешить Retro Music изменять настройки звука</string>
+
+    <string name="dialog_title_set_ringtone">Выбрать рингтон</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="edit">Редактировать</string>
+
+    <string name="edit_cover">Изменить обложку</string>
+
+    <string name="empty">Пусто</string>
+
+    <string name="equalizer">Эквалайзер</string>
+
+    <string name="error">Ошибка</string>
+
+    <string name="faq">ЧаВО</string>
+
+    <string name="favorites">Избранное</string>
+
+    <string name="fit">Соответствие</string>
+
+    <string name="flat">Плоский</string>
+
+    <string name="folders">Папки</string>
+
+    <string name="for_you">Для вас</string>
+
+    <string name="full">Полный</string>
+
+    <string name="full_card">Полная карточка</string>
+
+    <string name="general_settings_summary">Изменить тему и цвета приложения</string>
+    <string name="general_settings_title">Внешний вид плеера</string>
+
+    <string name="genre">Жанр</string>
+
+    <string name="genres">Жанры</string>
+
+    <string name="git_hub_summary">Развивай проект на GitHub</string>
+
+    <string name="google_plus_community">Присоединяйся к сообществу Google Plus, где ты можешь попросить о помощи или следить за обновлениями Retro Music</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="hinge">Петля</string>
+
+    <string name="history">История</string>
+
+    <string name="home">Главная</string>
+
+    <string name="horizontal_flip">Горизонтальная ориентация</string>
+
+    <string name="image">Изображение</string>
+
+    <string name="image_settings_summary">Изменение настроек загрузки изображения артиста</string>
+
+    <string name="inserted_x_songs_into_playlist_x">В плейлист %2$s внесено %1$d  песен.</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">Поделитесь своим обзором на приложение Retro Music в Instagram</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="labeled">Помечено</string>
+
+    <string name="last_added">Последние добавленные</string>
+
+    <string name="last_song">Предыдущая песня</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_products">Загрузка товаров...</string>
+
+    <string name="login">Войти</string>
+
+    <string name="lyrics">Текст</string>
+
+    <string name="made_with_love">Сделано с ❤️ в Индии</string>
+
+    <string name="material">Материальный</string>
+
+    <string name="md_error_label">Ошибка</string>
+
+    <string name="md_storage_perm_error">Ошибка разрешения</string>
+
+    <string name="my_name">Моё имя</string>
+
+    <string name="my_top_tracks">Любимые треки</string>
+
+    <string name="never">Никогда</string>
+
+    <string name="new_banner_photo">Новая фото баннера</string>
+
+    <string name="new_playlist_title">Новый плейлист</string>
+
+    <string name="new_profile_photo">Новое фото профиля</string>
+
+    <string name="new_start_directory">%s новая стартовая директория.</string>
+
+    <string name="next_song">"Следующая песня "</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="normal_lyrics">Обычный текст</string>
+
+    <string name="normal_style">Нормальный</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> не найден в media store.]]></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="now_playing_summary">Настроить экран текущего воспроизведения</string>
+    <string name="now_playing_themes">9+ тем экрана текущего воспроизведения</string>
+
+    <string name="only_on_wifi">Только по Wi-Fi</string>
+
+    <string name="other_settings_summary">Расширеные возможности</string>
+
+    <string name="others">Другое</string>
+
+    <string name="password">Пароль</string>
+
+    <string name="past_three_months">Последние 3 месяца</string>
+
+    <string name="paste_lyrics_here">Вставьте тест песни сюда</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="pick_image_intent_text">Выбрать изображение</string>
+
+    <string name="pinterest_page">Pinterest</string>
+    <string name="pinterest_page_summary">Следуйте за страницей Retro Music в Pinterest</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_album_detail_style">Стиль деталей альбома</string>
+
+    <string name="pref_blur_amount_summary">Сила размытия в соответствующих темах; чем ниже, тем меньше нагрузка на устройство</string>
+    <string name="pref_blur_amount_title">Сила размытия</string>
+
+    <string name="pref_filter_song_title">Фильтровать песни по длительности</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_keep_pause_on_zero_volume_summary">Автоматически ставит музыку на паузу при уменьшении громкости до нуля и играет после увеличения громкости. Предупреждение, когда вы увеличиваете громкость не в приложении, то Retro Music также начнёт воспроизведение</string>
+    <string name="pref_keep_pause_on_zero_volume_title">Пауза при нулевой громкости</string>
+    <string name="pref_keep_screen_on_summary">Имейте в виду, что включение этой функции может повлиять на заряд батареи</string>
+    <string name="pref_keep_screen_on_title">Оставить экран включенным</string>
+
+    <string name="pref_now_playing_screen_summary">Нажмите, чтобы открыть экран воспроизведения с прозрачной навигации или проведите чтобы открыть без прозрачной навигации</string>
+    <string name="pref_now_playing_screen_title">Нажмите или Проведите</string>
+
+    <string name="pref_snow_fall_title">Эффект снегопада</string>
+
+    <string name="pref_summary_album_art_on_lockscreen">Использовать обложку альбома текущей песни в качестве обоев на экране блокировки.</string>
+    <string name="pref_summary_audio_ducking">Снизить громкость воспроизведения когда приходить звуковое уве</string>
+    <string name="pref_summary_blacklist">Содержимое черного списка скрыто из вашей библиотеки.</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">Окрашивает ярлыки в главный цвет (Accent). Каждый раз, когда вы меняете цвет, вкл-выкл эту настройку, чтобы изменение вступило в силу</string>
+    <string name="pref_summary_colored_navigation_bar">Окрашивает панель навигации в главный цвет</string>
+    <string name="pref_summary_colored_notification">"\u041e\u043a\u0440\u0430\u0448\u0438\u0432\u0430\u0442\u044c \u0443\u0432\u0435\u0434\u043e\u043c\u043b\u0435\u043d\u0438\u0435 \u0432 \u044f\u0440\u043a\u0438\u0439 \u0446\u0432\u0435\u0442 \u043e\u0431\u043b\u043e\u0436\u043a\u0438 \u0430\u043b\u044c\u0431\u043e\u043c\u0430"</string>
+    <string name="pref_summary_dominant_color">Наиболее доминирующий цвет будет выбран из обложки альбома или исполнителя</string>
+    <string name="pref_summary_extra_controls">Добавить дополнительные элементы управления для мини-плеера</string>
+    <string name="pref_summary_gapless_playback">"Может вызвать проблемы с воспроизведением на некоторых устройствах."</string>
+    <string name="pref_summary_genre_toggle">Включить вкладку жанр</string>
+    <string name="pref_summary_home_banner">Включить кнопку Домой</string>
+    <string name="pref_summary_ignore_media_store_artwork">Может повысить качество обложки альбома, но приведет к более медленной загрузки изображения. Включите это только в том случае, если у вас есть картинки с низким разрешением</string>
+    <string name="pref_summary_lock_screen">Используйте экран блокировки Retro Music</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_shuffle">Режим перемешивания выключится при проигрывании нового списка треков</string>
+    <string name="pref_summary_toggle_volume">Если доступно достаточно места, показывать управление громкостью на экране воспроизведения</string>
+
+    <string name="pref_title_album_art_on_lockscreen">Показать обложку альбома</string>
+    <string name="pref_title_album_cover_style">Тема обложки альбома</string>
+    <string name="pref_title_album_cover_transform">Стиль обложки экрана текущего воспроизведение</string>
+    <string name="pref_title_album_grid_style">Сетка альбомов</string>
+    <string name="pref_title_app_shortcuts">Цветные ярлыки</string>
+    <string name="pref_title_artist_grid_style">Сетка исполнителей</string>
+    <string name="pref_title_audio_ducking">Уменьшить громкость при потере фокуса</string>
+    <string name="pref_title_auto_download_artist_images">Автозагрузка изображений исполнителя</string>
+    <string name="pref_title_blacklist">Черный список</string>
+    <string name="pref_title_blurred_album_art">Размытие обложки альбома</string>
+    <string name="pref_title_choose_equalizer">Выбрать эквалайзер</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_extra_controls">Дополнительные элементы управления</string>
+    <string name="pref_title_gapless_playback">Беспроблемное воспроизведение</string>
+    <string name="pref_title_general_theme">Тема приложения</string>
+    <string name="pref_title_genre_toggle">Показать вкладку жанра</string>
+    <string name="pref_title_home_artist_grid_style">Сетка исполнителя на Главной странице</string>
+    <string name="pref_title_home_banner">Кнопка домой</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_tab_text_mode">Название кнопок</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_toggle_shuffle">Режим перемешивания</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="profile">Профиль</string>
+
+    <string name="purchase">Купить</string>
+
+    <string name="purchase_summary">* Подумайте, прежде чем покупать, не просите возврата.</string>
+
+    <string name="queue">Очередь</string>
+
+    <string name="rate_app">Оценить приложение</string>
+
+    <string name="rate_on_google_play_summary">Любите это приложение? Сообщите нам в Google Play Store, как мы можем сделать его еще лучше</string>
+
+    <string name="recent_albums">Последние альбомы</string>
+
+    <string name="recent_artists">Последние исполнители</string>
+
+    <string name="remove_action">Удалить</string>
+
+    <string name="remove_banner_photo">Удалить фотографию баннера</string>
+
+    <string name="remove_cover">Удалить обложку</string>
+
+    <string name="remove_from_blacklist">Удалить из черного списка</string>
+
+    <string name="remove_profile_photo">Удалить фотографию профиля</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[Удалить %1$d песни(ю) из плейлиста?]]></string>
+
+    <string name="rename_playlist_title">Переименовать плейлист</string>
+
+    <string name="report_an_issue">Сообщить о проблеме</string>
+
+    <string name="report_bug">Сообщить об ошибке</string>
+
+    <string name="reset_artist_image">Сбросить изображение исполнителя</string>
+
+    <string name="restore">Restore</string>
+
+    <string name="restored_previous_purchase_please_restart">Предыдущая покупка восстановлена. Перезагрузите приложение, чтобы использовать все функции.</string>
+    <string name="restored_previous_purchases">Восстановленные предыдущие покупки.</string>
+
+    <string name="restoring_purchase">Восстановление покупки ...</string>
+
+    <string name="retro_equalizer">Эквалайзер Retro Music</string>
+
+    <string name="retro_music_pro">Retro Music Pro</string>
+
+    <string name="save">Сохранить</string>
+
+    <!-- SAF -->
+    <!-- SAF guide -->
+    <string name="save_playlist_title">Сохранить как...</string>
+
+    <string name="save_playlists_title">Сохранить как...</string>
+
+    <string name="saved_playlist_to">Сохраненный список воспроизведения в %s.</string>
+
+    <string name="saving_changes">Сохранение изменений</string>
+
+    <string name="scan_media">Сканировать медиа-файлы</string>
+
+    <string name="scanned_files">Просканировано %1$d из %2$d файлов.</string>
+
+    <string name="search_hint">Найдите свою библиотеку ...</string>
+
+    <string name="select_all">Выбрать все</string>
+
+    <string name="select_banner_photo">Выбрать фото баннера</string>
+
+    <string name="selected">Выбрано</string>
+
+    <string name="send_crash_log">Отправить лог ошибки</string>
+
+    <string name="set">Задавать</string>
+
+    <string name="set_artist_image">Установить изображение исполнителя</string>
+
+    <string name="set_photo">Выбрать фото профиля</string>
+
+    <string name="share_app">Поделиться приложением</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">Провести</string>
+
+    <string name="small">Маленький альбом</string>
+
+    <string name="social">Общее</string>
+
+    <string name="song">Песня</string>
+
+    <string name="song_duration">Длительность песни</string>
+
+    <string name="songs">Песни</string>
+
+    <string name="sort_order">Порядок сортировки</string>
+    <string name="sort_order_a_z">По возрастанию</string>
+    <string name="sort_order_album">Альбом</string>
+    <string name="sort_order_artist">Исполнитель</string>
+    <string name="sort_order_composer">Композитор</string>
+    <string name="sort_order_date">Дата</string>
+    <string name="sort_order_year">Год</string>
+    <string name="sort_order_z_a">По убыванию</string>
+
+    <string name="speech_not_supported">Извините! Ваше устройство не поддерживает ввод с помощью речи</string>
+
+    <string name="speech_prompt">Поиск в вашей библиотеке</string>
+
+    <string name="suggestion_songs">Предложения</string>
+
+    <string name="summary_user_info">Просто покажите свое имя на главном экране</string>
+
+    <string name="support_development">Поддержать разработку</string>
+
+    <string name="swipe_to_unlock">Проведите, чтобы разблокировать</string>
+
+    <string name="synced_lyrics">Синхронизируемый текст</string>
+
+    <string name="system_equalizer">Системный эквалайзер</string>
+
+    <!-- Message displayed when tag editing fails -->
+    <string name="telegram_group">Telegram</string>
+    <string name="telegram_group_summary">Присоединитесь к группе Telegram, чтобы обсуждать ошибки, предлагать улучшения, хвастаться и делать многое другое</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_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 для CD3 трека 4)"</string>
+
+    <string name="track_list">Номер трека</string>
+
+    <string name="translate">Переведите</string>
+
+    <string name="translate_community">Помогите нам перевести приложение на ваш язык</string>
+
+    <string name="twitter_page">Twitter</string>
+    <string name="twitter_page_summary">Поделитесь своим дизайном с Retro Music</string>
+
+    <string name="unlabeled">Не помечено</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_image">Обновить изображение</string>
+
+    <string name="updating">Обновленяется ...</string>
+
+    <string name="username">Имя пользователя</string>
+
+    <string name="version">Версия</string>
+
+    <string name="vertical_flip">Вертикальная ориентация</string>
+
+    <string name="virtualizer">Виртуализация</string>
+
+    <string name="web_search">Поиск в интернете</string>
+
+    <string name="what_do_you_want_to_share">Чем вы хотите поделиться?</string>
+
+    <string name="whats_new">Что нового :</string>
+
+    <string name="window">Окно</string>
+
+    <string name="window_corner_edges">Закругленные углы</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="you_will_be_forwarded_to_the_issue_tracker_website">Вы будете перенаправлены на сайт системы отслеживания ошибок.</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">Данные вашей учетной записи используются только для аутентификации.</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml
deleted file mode 100644
index 276a5ef20..000000000
--- a/app/src/main/res/values-sr-rSP/strings.xml
+++ /dev/null
@@ -1,563 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">О %s</string>
-    <string name="about_settings_summary">Тим и платформе</string>
-    <string name="accent_color">Boja detalja</string>
-    <string name="accent_color_desc">Boja plejera, uobičajena je zelena</string>
-    <string name="action_about">О апликацији</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Dodaj u omiljene</string>
-    <string name="action_add_to_playing_queue">Dodaj u listu za pustanje</string>
-    <string name="action_add_to_playlist">Dodaj na plejlistu</string>
-    <string name="action_cancel">Otkazi trenutni tajmer</string>
-    <string name="action_cast">Cast</string>
-    <string name="action_clear_playing_queue">Izbrisi trenutnu plejlistu za pustanje</string>
-    <string name="action_cycle_repeat">Понављај</string>
-    <string name="action_delete">Obrisi</string>
-    <string name="action_delete_from_device">Izbrisi sa uredjaja</string>
-    <string name="action_details">Detalji</string>
-    <string name="action_edit">Уреди</string>
-    <string name="action_go_to_album">Vidi album</string>
-    <string name="action_go_to_artist">Vidi izvodjaca</string>
-    <string name="action_go_to_genre">Иди на Жанр</string>
-    <string name="action_go_to_lyrics">Иди на текст</string>
-    <string name="action_go_to_start_directory">Idi u pocetni direktorijum</string>
-    <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">Нова Плејлиста</string>
-    <string name="action_next">Sledece</string>
-    <string name="action_play">Pusti</string>
-    <string name="action_play_all">Пусти све</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_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>
-    <string name="action_rename">Promeni naziv</string>
-    <string name="action_save_playing_queue">Sacuvaj plejlistu za trenutno pustanje</string>
-    <string name="action_scan">Skeniraj fajlove</string>
-    <string name="action_search">Pretrazi</string>
-    <string name="action_set">Postavi</string>
-    <string name="action_set_as_ringtone">Postavi kao melodiju zvona</string>
-    <string name="action_set_as_start_directory">Postavi kao pocetni direktorijum</string>
-    <string name="action_settings">"Подешавања"</string>
-    <string name="action_share">Podeli</string>
-    <string name="action_shuffle_all">Nasumicno pusti</string>
-    <string name="action_shuffle_playlist">Nasumicno pusti plejlistu</string>
-    <string name="action_sleep_timer">Tajmer za iskljucivanje</string>
-    <string name="action_sort_order">Сортирање</string>
-    <string name="action_tag_editor">Uredjivac tagova</string>
-    <string name="action_toggle_favorite">Укључи омиљење</string>
-    <string name="action_toggle_shuffle">Укључи насумично пуштање</string>
-    <string name="adaptive">Прилагодљиво</string>
-    <string name="add_action">Додај</string>
-    <string name="add_playlist_title">"Dodaj na plejlistu"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Dodata je 1 pesma na plejlistu"</string>
-    <string name="added_x_titles_to_playing_queue">Dodato %1$d pesama na plejlistu</string>
-    <string name="album">Албум</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Нумера</item>
-        <item quantity="few">Нумере</item>
-        <item quantity="other">Нумера</item>
-    </plurals>
-    <string name="album_artist">Извођач албума</string>
-    <string name="albums">Албуми</string>
-    <plurals name="albums">
-        <item quantity="one">Албум</item>
-        <item quantity="few">Албумa</item>
-        <item quantity="other">Албумa</item>
-    </plurals>
-    <string name="always">Увек</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_widget_big_name">Цела слика</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Извођач</string>
-    <string name="artists">Извођач</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">Zvuk se vec reprodukuje</string>
-    <string name="audio_settings_summary">Change the sound settings and adjust the equalizer controls</string>
-    <string name="auto">Аутоматски</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Направи резерву и обнови песму]]></string>
-    <string name="backup_title">Резервне копије</string>
-    <string name="biography">Biografija</string>
-    <string name="black_theme_name">Perfektno crna</string>
-    <string name="blacklist">Ne trazi muziku u...</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Уређаји у близини</string>
-    <string name="blur">Замагли</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">Немогуће је послати извештај</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">An unexpected error occurred. Please contact the app developer.</string>
-    <string name="bug_report_failed_wrong_credentials">Погрешно корисничко име или лозинка</string>
-    <string name="bug_report_issue">Проблем</string>
-    <string name="bug_report_manual">Пошаљи ручно</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Унесите исправно корисничко име на GitHub-у</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Купи сада</string>
-    <string name="cancel_current_timer">Otkazi trenutni tajmer</string>
-    <string name="card">Картица</string>
-    <string name="card_color_style">Обојена картица</string>
-    <string name="card_square">Квадратна картица</string>
-    <string name="card_style">Картица</string>
-    <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">Izmene</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Изабери слику</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Круг</string>
-    <string name="circular">Кружно</string>
-    <string name="classic">Classic</string>
-    <string name="clear_action">Ocisti</string>
-    <string name="clear_blacklist">Ocisti listu za ignorisanje foldera</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Clear queue</string>
-    <string name="color">Боја</string>
-    <string name="colors">Boje</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Composer</string>
-    <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
-    <string name="could_not_create_playlist">Nemoguce je napraviti plejlistu</string>
-    <string name="could_not_download_album_cover">"Nemoguce je preuzeti odgovarajucu pozadinu albuma"</string>
-    <string name="could_not_restore_purchase">Could not restore purchase.</string>
-    <string name="could_not_scan_files">Nije moguce skenirati %d fajlove</string>
-    <string name="create_action">Napravi</string>
-    <string name="create_new_backup">Napravi</string>
-    <string name="created_playlist_x">Plejlista %1$s je napravljena</string>
-    <string name="credit_title">Members and contributors </string>
-    <string name="currently_listening_to_x_by_x">Trenutno se reprodukuje %1$s izvodjaca %2$s</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Kao tamno</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">Обриши нумеру</string>
-    <string name="delete_song_x"><![CDATA[Izbrisi <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Обриши нумере</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>
-    <string name="deleting_songs">Deleting Songs</string>
-    <string name="depth">Depth</string>
-    <string name="description">Description</string>
-    <string name="device_info">Device info</string>
-    <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
-    <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Da li zelite da ispraznite listu za ignorisanje foldera?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Da li zelite da izbrisete <b>%1$s</b> sa liste za ignorisanje foldera?]]></string>
-    <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="donation_header">Kupi mi</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Nema pesama</string>
-    <string name="equalizer">Ekvilajzer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Име мора постојати</string>
-    <string name="error_load_failed">Учитавање неуспешно</string>
-    <string name="error_share_file">Неуспешно дељење песме</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">ЧП и О</string>
-    <string name="favorites">Favoriti</string>
-    <string name="file_already_exists">Песма већ постоји</string>
-    <string name="finish_last_song">Finish last song</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Ravno</string>
-    <string name="folders">Folderi</string>
-    <string name="follow_system">Follow system</string>
-    <string name="for_you">Za tebe</string>
-    <string name="free">Бесплатно</string>
-    <string name="full">Ispunjen</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">Прилагоди тему и боју</string>
-    <string name="general_settings_title">Изглед и утисак</string>
-    <string name="genre">Zanr</string>
-    <string name="genres">Жанра</string>
-    <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Прелаз</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Grid style</string>
-    <string name="help_summary">Треба помоћ?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">Istorija reprodukovanja</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Опозови</string>
-    <string name="home">Pocetak</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">Слика</string>
-    <string name="image_gradient">Gradient image</string>
-    <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Увези</string>
-    <string name="import_playlist">Увези плејлисту</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">Ubaceno %1$d pesama u plejlistu %2$s.</string>
-    <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
-    <string name="keyboard">Тастатура</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Formatiraj</string>
-    <string name="label_file_name">Naziv datoteke</string>
-    <string name="label_file_path">Lokacija datoteke</string>
-    <string name="label_file_size">Velicina</string>
-    <string name="label_last_modified">Задње додирнуто</string>
-    <string name="label_more_from">More from %s</string>
-    <string name="label_sampling_rate">Brzina uzorkovanja</string>
-    <string name="label_track_length">Duzina trajanja</string>
-    <string name="labeled">Названо</string>
-    <string name="last_added">Poslednje dodato</string>
-    <string name="last_song">Задња песма</string>
-    <string name="lets_go">Хајдемо!</string>
-    <string name="library_categories">Library categories</string>
-    <string name="licenses">Licence</string>
-    <string name="light_theme_name">Perfektno bela</string>
-    <string name="listeners_label">Слушаоци</string>
-    <string name="listing_files">Pronalazenje pesama</string>
-    <string name="loading_products">Ucitavanje datoteka...</string>
-    <string name="login">Пријава</string>
-    <string name="lyrics">Tekst pesme</string>
-    <string name="made_with_love">Направљено с љубављу из Индије</string>
-    <string name="material">Материјал</string>
-    <string name="md_error_label">Грешка</string>
-    <string name="md_storage_perm_error">Немогуће приступити песмама</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Moje ime je</string>
-    <string name="my_top_tracks">Najslusanije numere</string>
-    <string name="never">Nikada</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Nova plejlista</string>
-    <string name="new_start_directory">%s je novi pocetni direktorijum.</string>
-    <string name="next_song">Следећа Песма</string>
-    <string name="no_albums">Nema albuma</string>
-    <string name="no_artists">Nema izvodjaca</string>
-    <string name="no_audio_ID">"Prvo pusti pesmu, a onda pokusaj opet"</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">Nije pronadjen ni jedan ekvilajzer</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">Nema pronadjenog teksta pesme</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">Nema plejliste</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">Nema rezultata</string>
-    <string name="no_songs">Nema pesama</string>
-    <string name="normal">Normalno</string>
-    <string name="normal_lyrics">Нормални текстови</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nije pronadjen u prodavnici pesama]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nema se sta skenirati</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Obavestenja</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Репродукује се</string>
-    <string name="now_playing_queue">Lista za trenutno pustanje</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Samo kada je povezan na WiFi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Prosla 3 meseca</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Dozvola za pristup spoljasnjem skladistu je odbijena</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Приступ складишту</string>
-    <string name="permissions_denied">Dozvola odbijena.</string>
-    <string name="personalize">Персонализуј</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Izaberi iz unutrasnjeg skladista</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Jednostavan</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Брзина репродукције</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_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Plejlista je prazna</string>
-    <string name="playlist_name_empty">Ime plejliste</string>
-    <string name="playlists">Plejliste</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Zvuk</string>
-    <string name="pref_header_blacklist">Ne trazi muziku u...</string>
-    <string name="pref_header_controls">Контроле</string>
-    <string name="pref_header_general">Тема</string>
-    <string name="pref_header_images">Slike</string>
-    <string name="pref_header_library">Библиотека</string>
-    <string name="pref_header_lockscreen">Zakljucan ekran</string>
-    <string name="pref_header_playlists">Plejliste</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Задржи укључен екран</string>
-    <string name="pref_language_name">Изабери језик</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Koristi omot albuma kao pozadinu kada se reprodukuje muzika</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Obavestenja, navigacija itd.</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <string name="pref_summary_blurred_album_art">Zamuti omot albuma na zakljucanom ekranu. (moze izazvati probleme sa drugim aplikacijama i vidzetima)</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_classic_notification">Koristi klasicni stil obavestenja</string>
-    <string name="pref_summary_colored_app">Pozadina i pusti/pauziraj dugme menjaju boju u zavisnosti od boje omota albuma</string>
-    <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_notification">"Oboj obavestenja u boju omota albuma"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Moze prouzrokovati probleme na pojedinim uredjajima."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_library_categories">Configure visibility and order of library categories.</string>
-    <string name="pref_summary_lock_screen">Prikazuj kontrole na zakljucanom ekranu</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">Detalji o licencama za softver otvorenog izvora</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Omoguci ovo za impresivan mod.</string>
-    <string name="pref_summary_toggle_headset">Kada se prikljuce slusalice automatki pusti pesme</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_volume">Ukoliko imas prostora na ekranu za pustanje omoguci kontroler jacine zvuka.</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Prikazi omot albuma</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Obojene ikone aplikacije</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Utisaj zvuk prilikom poziva i drugih obavestenja.</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Automatski preuzmi sliku izvodjaca</string>
-    <string name="pref_title_blacklist">Ne trazi muziku u...</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Zamuti omot albuma</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Klasican stil obavestenja</string>
-    <string name="pref_title_colored_app">Prilagodive boje</string>
-    <string name="pref_title_colored_notification">Obojena obavestenja</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Neuznemiravano reprodukovanje</string>
-    <string name="pref_title_general_theme">Opsta tema</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Aplikacija preko celog ekrana</string>
-    <string name="pref_title_toggle_toggle_headset">Automatsko reprodukovanje</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shuffle mode</string>
-    <string name="pref_title_toggle_volume">Kontroler jacine zvuka</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">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_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</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>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Izbrisi pesmu sa plejliste</string>
-    <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_playlist_title">Promeni ime plejliste</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Resetuj sliku izvodjaca</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Obnovljene su prethodne kupovine</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Sacuvaj kao fajl</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Plej lista sacuvana u %s.</string>
-    <string name="saving_changes">Cuvanje izmena</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Skenirano %1$d od %2$d fajlova</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Postavi sliku izvodjaca</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Nasumicno pusti</string>
-    <string name="simple">Jednostavan</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>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Pesma</string>
-    <string name="song_duration">Trajanje pesme</string>
-    <string name="songs">Pesme</string>
-    <string name="sort_order">Nacin sortiranja</string>
-    <string name="sort_order_a_z">Растуће</string>
-    <string name="sort_order_album">Албум</string>
-    <string name="sort_order_artist">Izvodjac</string>
-    <string name="sort_order_composer">Композитор</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Година</string>
-    <string name="sort_order_z_a">Опадајуће</string>
-    <string name="speech_not_supported">Izvini! Tvoj uredjaj ne podrzava unos govorom</string>
-    <string name="speech_prompt">Pretrazi svoju biblioteku</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Podrzi programera</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</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="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="tiny">Sitno</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Danas</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</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_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Твитер</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Nije moguce pustiti pesmu.</string>
-    <string name="up_next">Sledece</string>
-    <string name="update_image">Azuriraj sliku</string>
-    <string name="updating">Azurira se...</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Verzija</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web pretraga</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">Sta zelis da podelis?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Postavi %1$s kao melodiju zvona.</string>
-    <string name="x_selected">Selektovano %1$d</string>
-    <string name="year">Godina</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 000000000..9532a716f
--- /dev/null
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,434 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources>
+    <string name="accent_color">Boja detalja</string>
+    <string name="accent_color_desc">Boja plejera, uobičajena je zelena</string>
+
+    <string name="action_about">O programerima</string>
+
+    <string name="action_add_to_favorites">Dodaj u omiljene</string>
+    <string name="action_add_to_playing_queue">Dodaj u listu za pustanje</string>
+    <string name="action_add_to_playlist">Dodaj na plejlistu</string>
+
+    <string name="action_clear_playing_queue">Izbrisi trenutnu plejlistu za pustanje</string>
+    <string name="action_clear_playlist">Izbrisi plejlistu</string>
+
+    <string name="action_delete">Obrisi</string>
+    <string name="action_delete_from_device">Izbrisi sa uredjaja</string>
+
+    <string name="action_details">Detalji</string>
+
+    <string name="action_go_to_album">Vidi album</string>
+    <string name="action_go_to_artist">Vidi izvodjaca</string>
+    <string name="action_go_to_start_directory">Idi u pocetni direktorijum</string>
+
+    <string name="action_grant">.</string>
+
+    <string name="action_grid_size">Velicina kartica</string>
+    <string name="action_grid_size_land">.</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_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>
+
+    <string name="action_rename">Promeni naziv</string>
+
+    <string name="action_save_playing_queue">Sacuvaj plejlistu za trenutno pustanje</string>
+
+    <string name="action_scan">Skeniraj fajlove</string>
+
+    <string name="action_search">Pretrazi</string>
+
+    <string name="action_set">Postavi</string>
+    <string name="action_set_as_ringtone">Postavi kao melodiju zvona</string>
+    <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_shuffle_all">Nasumicno pusti</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>
+
+    <string name="add_action">Dodaj</string>
+
+    <string name="add_photo">Dodaj sliku</string>
+
+    <string name="add_playlist_title">"Dodaj na plejlistu"</string>
+
+    <string name="added_title_to_playing_queue">"Dodata je 1 pesma na plejlistu"</string>
+
+    <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_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_widget_big_name">Retro Music - Big</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="artists">Izvodjac</string>
+
+    <string name="audio_focus_denied">Zvuk se vec reprodukuje</string>
+
+    <string name="biography">Biografija</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>
+
+    <string name="changelog">Izmene</string>
+
+    <string name="changelog_summary">Izmene odobrene za Telegram aplikacije</string>
+
+    <string name="clear_action">Ocisti</string>
+
+    <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="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>
+    <string name="could_not_scan_files">Nije moguce skenirati %d fajlove</string>
+
+    <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="dark_theme_name">Kao tamno</string>
+
+    <string name="default_hint">Nema pronadjenih tekstova</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_x"><![CDATA[Izbrisi <b>%1$s</b>?]]></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>
+
+    <string name="do_you_want_to_clear_the_blacklist">Da li zelite da ispraznite listu za ignorisanje foldera?</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Da li zelite da izbrisete <b>%1$s</b> sa liste za ignorisanje foldera?]]></string>
+
+    <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="donation_header">Kupi mi</string>
+
+    <string name="download_from_last_fm">Preuzmi sa Last.fm</string>
+
+    <string name="empty">Nema pesama</string>
+
+    <string name="equalizer">Ekvilajzer</string>
+
+    <string name="favorites">Favoriti</string>
+
+    <string name="flat">Ravno</string>
+
+    <string name="folders">Folderi</string>
+
+    <string name="for_you">Za tebe</string>
+
+    <string name="full">Ispunjen</string>
+
+    <string name="genre">Zanr</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">Istorija reprodukovanja</string>
+
+    <string name="home">Pocetak</string>
+
+    <string name="inserted_x_songs_into_playlist_x">Ubaceno %1$d pesama u plejlistu %2$s.</string>
+
+    <string name="label_bit_rate">Bitrate</string>
+
+    <string name="label_file_format">Formatiraj</string>
+    <string name="label_file_name">Naziv datoteke</string>
+    <string name="label_file_path">Lokacija datoteke</string>
+    <string name="label_file_size">Velicina</string>
+
+    <string name="label_sampling_rate">Brzina uzorkovanja</string>
+
+    <string name="label_track_length">Duzina trajanja</string>
+
+    <string name="last_added">Poslednje dodato</string>
+
+    <string name="lets_play_something">Slusajmo nesto!</string>
+
+    <string name="library">Pretrazi</string>
+
+    <string name="licenses">Licence</string>
+
+    <string name="light_theme_name">Perfektno bela</string>
+
+    <string name="listing_files">Pronalazenje pesama</string>
+
+    <string name="loading_products">Ucitavanje datoteka...</string>
+
+    <string name="lyrics">Tekst pesme</string>
+
+    <string name="my_name">Moje ime je</string>
+
+    <string name="my_top_tracks">Najslusanije numere</string>
+
+    <string name="never">Nikada</string>
+
+    <string name="new_playlist_title">Nova plejlista</string>
+
+    <string name="new_start_directory">%s je novi pocetni direktorijum.</string>
+
+    <string name="no_albums">Nema albuma</string>
+
+    <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_lyrics_found">Nema pronadjenog teksta pesme</string>
+
+    <string name="no_playlists">Nema plejliste</string>
+
+    <string name="no_results">Nema rezultata</string>
+
+    <string name="no_songs">Nema pesama</string>
+
+    <string name="normal">Normalno</string>
+
+    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> nije pronadjen u prodavnici pesama]]></string>
+
+    <string name="nothing_to_scan">Nema se sta skenirati</string>
+
+    <string name="notification">Obavestenja</string>
+
+    <string name="now_playing_queue">Lista za trenutno pustanje</string>
+
+    <string name="only_on_wifi">Samo kada je povezan na WiFi</string>
+
+    <string name="past_three_months">Prosla 3 meseca</string>
+
+    <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="plain">Jednostavan</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>
+
+    <string name="playlist_is_empty">Plejlista je prazna</string>
+
+    <string name="playlist_name_empty">Ime plejliste</string>
+
+    <string name="playlists">Plejliste</string>
+
+    <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_playlists">Plejliste</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>
+    <string name="pref_summary_classic_notification">Koristi klasicni stil obavestenja</string>
+    <string name="pref_summary_colored_app">Pozadina i pusti/pauziraj dugme menjaju boju u zavisnosti od boje omota albuma</string>
+    <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_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">Prikazuj 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_tab_titles">Omoguci/ iskljuci nazive kartica</string>
+    <string name="pref_summary_toggle_full_screen">Omoguci ovo za impresivan mod.</string>
+    <string name="pref_summary_toggle_headset">Kada se prikljuce slusalice automatki pusti pesme</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>
+    <string name="pref_title_app_shortcuts">Obojene ikone aplikacije</string>
+    <string name="pref_title_audio_ducking">Utisaj zvuk prilikom poziva i drugih obavestenja.</string>
+    <string name="pref_title_auto_download_artist_images">Automatski preuzmi sliku izvodjaca</string>
+    <string name="pref_title_blurred_album_art">Zamuti omot albuma</string>
+    <string name="pref_title_classic_notification">Klasican stil obavestenja</string>
+    <string name="pref_title_colored_app">Prilagodive boje</string>
+    <string name="pref_title_colored_notification">Obojena obavestenja</string>
+    <string name="pref_title_gapless_playback">Neuznemiravano reprodukovanje</string>
+    <string name="pref_title_general_theme">Opsta tema</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_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_full_screen">Aplikacija preko celog ekrana</string>
+    <string name="pref_title_toggle_tab_titles">Nazivi kartica</string>
+    <string name="pref_title_toggle_toggle_headset">Automatsko reprodukovanje</string>
+    <string name="pref_title_toggle_volume">Kontroler jacine zvuka</string>
+    <string name="pref_title_user_info">Podaci o korisniku</string>
+
+    <string name="primary_color">Primarna boja</string>
+    <string name="primary_color_desc">Primarna boja, podrazumevna je bela</string>
+
+    <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="remove_action">Izbrisi</string>
+
+    <string name="remove_cover">Izbrisi omot albuma</string>
+
+    <string name="remove_from_blacklist">Izbrisi sa liste za ignorisanje foldera</string>
+
+    <string name="remove_song_from_playlist_title">Izbrisi pesmu sa plejliste</string>
+    <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_playlist_title">Promeni ime plejliste</string>
+
+    <string name="reset_artist_image">Resetuj sliku izvodjaca</string>
+
+    <string name="restored_previous_purchases">Obnovljene su prethodne kupovine</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="scanned_files">Skenirano %1$d od %2$d fajlova</string>
+
+    <string name="search_hint">Pretrazi svoju biblioteku...</string>
+
+    <string name="set_artist_image">Postavi sliku izvodjaca</string>
+
+    <string name="shuffle">Nasumicno pusti</string>
+
+    <string name="simple">Jednostavan</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>
+
+    <string name="song">Pesma</string>
+
+    <string name="song_duration">Trajanje pesme</string>
+
+    <string name="songs">Pesme</string>
+
+    <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_user_info">Prikazuje tvoje ima na pocetnom ekranu</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="tiny">Sitno</string>
+
+    <string name="title_dashboard">Komandna tabla</string>
+
+    <string name="title_good_afternoon">Dobar dan</string>
+    <string name="title_good_day">Dobar dan</string>
+    <string name="title_good_evening">Dobro vece</string>
+    <string name="title_good_morning">Dobro jutro</string>
+    <string name="title_good_night">Laku noc</string>
+
+    <string name="title_user_info">Kako se zoves?</string>
+
+    <string name="today">Danas</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="unplayable_file">Nije moguce pustiti pesmu.</string>
+
+    <string name="up_next">Sledece</string>
+
+    <string name="update_image">Azuriraj sliku</string>
+
+    <string name="updating">Azurira se...</string>
+
+    <string name="version">Verzija</string>
+
+    <string name="web_search">Web pretraga</string>
+
+    <string name="what_do_you_want_to_share">Sta zelis da podelis?</string>
+
+    <string name="x_has_been_set_as_ringtone">Postavi %1$s kao melodiju zvona.</string>
+
+    <string name="x_selected">Selektovano %1$d</string>
+
+    <string name="year">Godina</string>
+    <string name="label_more_from">More from %s</string>
+</resources>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
deleted file mode 100644
index 406bee4a5..000000000
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Om %s</string>
-    <string name="about_settings_summary">Vårt team, länkar</string>
-    <string name="accent_color">Accentfärg</string>
-    <string name="accent_color_desc">Temats accentfärg, standard är lila</string>
-    <string name="action_about">Om</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
-    <string name="action_add_to_favorites">Lägg till i favoriter</string>
-    <string name="action_add_to_playing_queue">Lägg till i spelkön</string>
-    <string name="action_add_to_playlist">Lägg till i spellista</string>
-    <string name="action_cancel">Avbryt</string>
-    <string name="action_cast">Cast</string>
-    <string name="action_clear_playing_queue">Rensa spelkön</string>
-    <string name="action_cycle_repeat">Loopläge</string>
-    <string name="action_delete">Radera</string>
-    <string name="action_delete_from_device">Radera från enheten</string>
-    <string name="action_details">Info</string>
-    <string name="action_edit">Edit</string>
-    <string name="action_go_to_album">Gå till album</string>
-    <string name="action_go_to_artist">Gå till artisten</string>
-    <string name="action_go_to_genre">Gå till genren</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">Gå till startmapp</string>
-    <string name="action_grant">Godkänn</string>
-    <string name="action_grid_size">Rutnätsstorlek</string>
-    <string name="action_grid_size_land">Rutnätsstorlek (land)</string>
-    <string name="action_new_playlist">Ny spellista</string>
-    <string name="action_next">Nästa</string>
-    <string name="action_play">Spela</string>
-    <string name="action_play_all">Spela alla</string>
-    <string name="action_play_next">Spela nästa</string>
-    <string name="action_play_pause">Play/Pause</string>
-    <string name="action_previous">Föregående</string>
-    <string name="action_remove_from_favorites">Ta bort från favoriter</string>
-    <string name="action_remove_from_playing_queue">Ta bort från spelkön</string>
-    <string name="action_remove_from_playlist">Ta bort från spellistan</string>
-    <string name="action_rename">Byt namn</string>
-    <string name="action_save_playing_queue">Spara spelkön</string>
-    <string name="action_scan">Skanna</string>
-    <string name="action_search">Sök</string>
-    <string name="action_set">Start</string>
-    <string name="action_set_as_ringtone">Använd som ringsignal</string>
-    <string name="action_set_as_start_directory">Ställ in som startmapp</string>
-    <string name="action_settings">"Inställningar"</string>
-    <string name="action_share">Dela</string>
-    <string name="action_shuffle_all">Shuffle alla</string>
-    <string name="action_shuffle_playlist">Shuffle spellista</string>
-    <string name="action_sleep_timer">Sömntimer</string>
-    <string name="action_sort_order">Sorteras efter</string>
-    <string name="action_tag_editor">Tag redigerare</string>
-    <string name="action_toggle_favorite">Favorit</string>
-    <string name="action_toggle_shuffle">Shuffleläge</string>
-    <string name="adaptive">Adaptiv</string>
-    <string name="add_action">Lägg till</string>
-    <string name="add_playlist_title">"Lägg till i spellista"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"Lade till en titel i spelkön."</string>
-    <string name="added_x_titles_to_playing_queue">Lade till %1$d titlar i spelkön.</string>
-    <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Låt</item>
-        <item quantity="other">Låtar</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
-    <string name="albums">Album</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Album</item>
-    </plurals>
-    <string name="always">Alltid</string>
-    <string name="app_share">Kolla in den här coola musikspelaren på: 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">Topplåtar</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Kort</string>
-    <string name="app_widget_classic_name">Klassisk</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Liten</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">Artist</string>
-    <string name="artists">Artister</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">Ljudfokus nekas.</string>
-    <string name="audio_settings_summary">Ändra ljudinställningarna och justera equalizer-kontrollerna</string>
-    <string name="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[Backup & Restore]]></string>
-    <string name="backup_title">Backups</string>
-    <string name="biography">Biografi</string>
-    <string name="black_theme_name">Helt svart</string>
-    <string name="blacklist">Svartlista</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Oskärpa</string>
-    <string name="blur_card">Kort med oskärpa</string>
-    <string name="bug_report_failed">Det gick inte att skicka rapport</string>
-    <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
-    <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
-    <string name="bug_report_failed_unknown">Ett oväntat fel uppstod. Kontakta apputvecklaren.</string>
-    <string name="bug_report_failed_wrong_credentials">Fel användarnamn eller lösenord</string>
-    <string name="bug_report_issue">Issue</string>
-    <string name="bug_report_manual">Send manually</string>
-    <string name="bug_report_no_description">Please enter an issue description</string>
-    <string name="bug_report_no_password">Please enter your valid GitHub password</string>
-    <string name="bug_report_no_title">Please enter an issue title</string>
-    <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">Ett oväntat fel uppstod. Tråkigt att du hittade denna bug, om det fortsätter att krascha, testa att \"Rensa appdata\" eller skicka ett e-postmeddelande</string>
-    <string name="bug_report_use_account">Send using GitHub account</string>
-    <string name="buy_now">Köp nu</string>
-    <string name="cancel_current_timer">Avbryt</string>
-    <string name="card">Kort</string>
-    <string name="card_color_style">Färgat kort</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">Kort</string>
-    <string name="carousal_effect_on_now_playing_screen">Karuselleffekt på spelarskärmen</string>
-    <string name="cascading">Släng iväg</string>
-    <string name="changelog">Ändringslogg</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Cirkel</string>
-    <string name="circular">Cirkulär</string>
-    <string name="classic">Klassisk</string>
-    <string name="clear_action">Rensa</string>
-    <string name="clear_blacklist">Rensa svartlista</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">Rensa spelkö</string>
-    <string name="color">Färg</string>
-    <string name="colors">Färger</string>
-    <string name="compact">Compact</string>
-    <string name="composer">Kompositör</string>
-    <string name="copied_device_info_to_clipboard">Kopierade enhetsinfo till urklipp.</string>
-    <string name="could_not_create_playlist">Det gick inte att skapa spellista.</string>
-    <string name="could_not_download_album_cover">"Kunde inte ladda ner ett matchande albumomslag."</string>
-    <string name="could_not_restore_purchase">Det gick inte att återställa köpet.</string>
-    <string name="could_not_scan_files">Det gick inte att skanna %d filer.</string>
-    <string name="create_action">Skapa</string>
-    <string name="create_new_backup">Skapa</string>
-    <string name="created_playlist_x">Skapade spellistan %1$s.</string>
-    <string name="credit_title">Medlemmar och bidragsgivare</string>
-    <string name="currently_listening_to_x_by_x">Lyssnar just nu på %1$s av %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Ganska mörkt</string>
-    <string name="delete_playlist_title">Radera spellista</string>
-    <string name="delete_playlist_x"><![CDATA[Radera spellistan <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Radera spellistor</string>
-    <string name="delete_song_title">Radera låt</string>
-    <string name="delete_song_x"><![CDATA[Radera låten <b>%1$s</b>?]]></string>
-    <string name="delete_songs_title">Radera låtar</string>
-    <string name="delete_x_playlists"><![CDATA[Radera <b>%1$d</b> spellistor?]]></string>
-    <string name="delete_x_songs"><![CDATA[Radera <b>%1$d</b> låtar?]]></string>
-    <string name="deleted_x_songs">%1$d låtar har raderats.</string>
-    <string name="deleting_songs">Deleting Songs</string>
-    <string name="depth">Djup</string>
-    <string name="description">Beskrivning</string>
-    <string name="device_info">Enhetsinformation</string>
-    <string name="dialog_message_set_ringtone">Låt Retro Music ändra ljudinställningar</string>
-    <string name="dialog_title_set_ringtone">Ställ in ringsignal</string>
-    <string name="disc_hint">Disc Number</string>
-    <string name="do_you_want_to_clear_the_blacklist">Vill du rensa svartlistan?</string>
-    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Vill du ta bort <b>%1$s</b> från svartlistan?]]></string>
-    <string name="donate">Donera</string>
-    <string name="donate_summary">Om du tycker att jag förtjänar någon ersättning för mitt arbete, kan du gärna donera lite pengar här</string>
-    <string name="donation_header">Köp mig en:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Förarläge</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
-    <string name="empty">Tom</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">FAQ</string>
-    <string name="favorites">Favoriter</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">Spela färdigt sista låten</string>
-    <string name="fit">Passa</string>
-    <string name="flat">Platt</string>
-    <string name="folders">Mappar</string>
-    <string name="follow_system">Följ systemet</string>
-    <string name="for_you">För dig</string>
-    <string name="free">Fri</string>
-    <string name="full">Full</string>
-    <string name="full_card">Fullt kort</string>
-    <string name="general_settings_summary">Ändra appens tema och färger</string>
-    <string name="general_settings_title">Utseende och känsla</string>
-    <string name="genre">Genre</string>
-    <string name="genres">Genrer</string>
-    <string name="git_hub_summary">Gör en fork av projektet på GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</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="grid_style_label">Rutnätstil</string>
-    <string name="help_summary">Need more help?</string>
-    <string name="hinge">Gångjärn</string>
-    <string name="history">Historik</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">Hem</string>
-    <string name="horizontal_flip">Vänd horisontellt</string>
-    <string name="image">Bild</string>
-    <string name="image_gradient">Tonad bild</string>
-    <string name="image_settings_summary">Ändra inställningar för nedladdning av artistbild</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
-    <string name="inserted_x_songs_into_playlist_x">La till %1$d låtar i spellistan %2$s.</string>
-    <string name="instagram_page_summary">Dela din Retro Music-setup för att visa upp på Instagram</string>
-    <string name="keyboard">Tangentbord</string>
-    <string name="label_bit_rate">Bitrate</string>
-    <string name="label_file_format">Format</string>
-    <string name="label_file_name">Filnamn</string>
-    <string name="label_file_path">Sökväg</string>
-    <string name="label_file_size">Storlek</string>
-    <string name="label_last_modified">Last Modified</string>
-    <string name="label_more_from">Mer från %s</string>
-    <string name="label_sampling_rate">Sampling rate</string>
-    <string name="label_track_length">Längd</string>
-    <string name="labeled">Labeled</string>
-    <string name="last_added">Senast tillagd</string>
-    <string name="last_song">Sista låten</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">Bibliotekskategorier</string>
-    <string name="licenses">Licenser</string>
-    <string name="light_theme_name">Snövitt</string>
-    <string name="listeners_label">Lyssnare</string>
-    <string name="listing_files">Listar filer</string>
-    <string name="loading_products">Laddar produkter…</string>
-    <string name="login">Logga in</string>
-    <string name="lyrics">Låttext</string>
-    <string name="made_with_love">Skapad med ❤️ i Indien</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">Fel</string>
-    <string name="md_storage_perm_error">Behörighetsfel</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">Namn</string>
-    <string name="my_top_tracks">Mest spelade</string>
-    <string name="never">Aldrig</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">Ny spellista</string>
-    <string name="new_start_directory">%s är den nya startmappen.</string>
-    <string name="next_song">Nästa låt</string>
-    <string name="no_albums">Du har inga album</string>
-    <string name="no_artists">Du har inga artister</string>
-    <string name="no_audio_ID">"Spela en låt först och försök igen."</string>
-    <string name="no_backups_found">No Backups Found</string>
-    <string name="no_equalizer">Ingen equalizer hittades</string>
-    <string name="no_genres">Du har inga genrer</string>
-    <string name="no_lyrics_found">Inga låttexter hittade</string>
-    <string name="no_playing_queue">Inga låtar spelas just nu</string>
-    <string name="no_playlists">Du har inga spellistor</string>
-    <string name="no_purchase_found">Inget köp hittades.</string>
-    <string name="no_results">Inga resultat</string>
-    <string name="no_songs">Du har inga låtar</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal låttext</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> är inte listad i Media Store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Inget att skanna.</string>
-    <string name="nothing_to_see">Ingenting att se</string>
-    <string name="notification">Notis</string>
-    <string name="notification_settings_summary">Anpassa utseendet på notisen</string>
-    <string name="now_playing">Spelare</string>
-    <string name="now_playing_queue">Spelkö</string>
-    <string name="now_playing_summary">Anpassa spelarskärmen</string>
-    <string name="now_playing_themes">9+ spelarteman</string>
-    <string name="only_on_wifi">Endast via Wi-Fi</string>
-    <string name="other_settings_summary">Avancerade testfunktioner</string>
-    <string name="others">Övrigt</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Lösenord</string>
-    <string name="past_three_months">De senaste 3 månaderna</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Behörighet att få tillgång till extern lagring nekas.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Behörighet nekas.</string>
-    <string name="personalize">Skräddarsy</string>
-    <string name="personalize_settings_summary">Anpassa appens UI till din smak</string>
-    <string name="pick_from_local_storage">Välj från lokal lagring</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Följ vår Pinterestsida för lite designinspiration till Retro Music</string>
-    <string name="plain">Enkel</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">Notisen har knappar för play/pause etc.</string>
-    <string name="playing_notification_name">Notis</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Spellistan är tom</string>
-    <string name="playlist_name_empty">Namn på spellista</string>
-    <string name="playlists">Spellistor</string>
-    <string name="pref_blur_amount_summary">Mängden oskärpa som används för suddiga teman, lägre är snabbare</string>
-    <string name="pref_blur_amount_title">Oskärpa</string>
-    <string name="pref_filter_song_summary">Filtrera låtar efter dess längd</string>
-    <string name="pref_filter_song_title">Filtrera låtlängd</string>
-    <string name="pref_header_advanced">Avancerad</string>
-    <string name="pref_header_album">Albumstil</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Svartlista</string>
-    <string name="pref_header_controls">Kontroller</string>
-    <string name="pref_header_general">Tema</string>
-    <string name="pref_header_images">Bilder</string>
-    <string name="pref_header_library">Bibliotek</string>
-    <string name="pref_header_lockscreen">Låsskärm</string>
-    <string name="pref_header_playlists">Spellistor</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pausar låten när volymen sänks till noll och börjar spela igen när volymen höjs. Fungerar även utanför appen</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pausa på noll</string>
-    <string name="pref_keep_screen_on_summary">Tänk på att aktivering av den här funktionen kan påverka batteritiden</string>
-    <string name="pref_keep_screen_on_title">Håll skärmen på</string>
-    <string name="pref_language_name">Välj språk</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Använd det spelade albumets omslag som låsskärmsbakgrund</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Sänk volymen när ett systemljud spelas upp eller ett meddelande tas emot</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">Innehållet i svartlistade mappar döljs från ditt bibliotek.</string>
-    <string name="pref_summary_bluetooth_playback">Börja spela direkt när en bluetooth-enhet ansluts</string>
-    <string name="pref_summary_blurred_album_art">Ger albumomslaget oskärpa på låsskärmen. Kan orsaka problem med tredjepartsappar och widgets</string>
-    <string name="pref_summary_carousel_effect">Karuselleffekt för albumomslag på spelarskärmen. Observera att kort- och oskärpa-teman inte kommer att fungera</string>
-    <string name="pref_summary_classic_notification">Använd den klassiska notissdesignen</string>
-    <string name="pref_summary_colored_app">Bakgrunds- och kontrollknapparnas färger ändras enligt albumomslaget från spelarskärmen</string>
-    <string name="pref_summary_colored_app_shortcuts">Färgar appens genvägar i accentfärgen. Se till att aktivera detta varje gång du ändrar färg, för att ändringen ska träda i kraft</string>
-    <string name="pref_summary_colored_notification">"Färgar notisen i albumomslagets framträdande färg"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">I enlighet med riktlinjer för Material Design ska färger desatureras i mörkt läge</string>
-    <string name="pref_summary_expand_now_playing_panel">När du klickar på notisen visas spelarskärmen istället för hemskärmen</string>
-    <string name="pref_summary_extra_controls">Lägg till extra kontroller för minispelaren</string>
-    <string name="pref_summary_extra_song_info">Visa extra låtinformation, till exempel filformat, bitrate och frekvens</string>
-    <string name="pref_summary_gapless_playback">"Kan orsaka uppspelningsproblem på vissa enheter."</string>
-    <string name="pref_summary_home_banner">Visar en banner på hemfliken</string>
-    <string name="pref_summary_ignore_media_store_artwork">Kan öka albumomslagens kvalitet, men orsakar långsammare laddningstider för bilder. Aktivera endast om du har problem med lågupplösta bilder</string>
-    <string name="pref_summary_library_categories">Konfigurera synlighet och ordning för bibliotekskategorier.</string>
-    <string name="pref_summary_lock_screen">Använd Retro Music:s anpassade låsskärmskontroller</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">Licensinformation för programvara med öppen källkod</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Uppslukande läge</string>
-    <string name="pref_summary_toggle_headset">Börja spela direkt då hörlurar ansluts</string>
-    <string name="pref_summary_toggle_shuffle">Shuffleläget stängs av när du spelar en ny lista med låtar</string>
-    <string name="pref_summary_toggle_volume">Visa volymkontroller på spelarskärmen, om det finns tillräckligt med utrymme </string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Visa albumomslag</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Tema för albumomslag</string>
-    <string name="pref_title_album_cover_transform">Nästa albumomslag</string>
-    <string name="pref_title_app_shortcuts">Färgade appgenvägar</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Minska volymen vid fokusförlust</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Ladda ner artistbilder automatiskt</string>
-    <string name="pref_title_blacklist">Svartlista</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth-uppspelning</string>
-    <string name="pref_title_blurred_album_art">Oskärpa hos albumomslaget</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">Klassisk notisssdesign</string>
-    <string name="pref_title_colored_app">Adaptiv färg</string>
-    <string name="pref_title_colored_notification">Färgad notis</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturerad färg</string>
-    <string name="pref_title_expand_now_playing_panel">Öppna spelaren</string>
-    <string name="pref_title_extra_controls">Extra kontroller</string>
-    <string name="pref_title_extra_song_info">Låtinfo</string>
-    <string name="pref_title_gapless_playback">Sömlös uppspelning</string>
-    <string name="pref_title_general_theme">Apptema</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artistruntnät för hem</string>
-    <string name="pref_title_home_banner">Hem-banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignorera omslag i Media Store</string>
-    <string name="pref_title_last_added_interval">Intervall för senast tillagda spellista</string>
-    <string name="pref_title_lock_screen">Helskärmskontroller</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pref_title_now_playing_screen_appearance">Spelartema</string>
-    <string name="pref_title_open_source_licences">Licenser för öppen källkod</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Fliktitlar</string>
-    <string name="pref_title_toggle_carousel_effect">Karuselleffekt</string>
-    <string name="pref_title_toggle_full_screen">Helskärmsapp</string>
-    <string name="pref_title_toggle_toggle_headset">Auto-play</string>
-    <string name="pref_title_toggle_toggle_shuffle">Shuffleläge</string>
-    <string name="pref_title_toggle_volume">Volymkontroller</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profil</string>
-    <string name="purchase">Köp</string>
-    <string name="queue">Spelkö</string>
-    <string name="rate_app">Betygsätt appen</string>
-    <string name="rate_on_google_play_summary">Älskar du den här appen? Låt oss veta i Google Play Store hur vi kan göra den ännu bättre</string>
-    <string name="recent_albums">Senaste album</string>
-    <string name="recent_artists">Senaste artister</string>
-    <string name="remove_action">Ta bort</string>
-    <string name="remove_cover">Ta bort omslag</string>
-    <string name="remove_from_blacklist">Ta bort från svartlistan</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Ta bort låten från spellistan</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Ta bort låten <b>%1$s</b> från spellistan?]]></string>
-    <string name="remove_songs_from_playlist_title">Ta bort låtar från spellistan</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Ta bort <b>%1$d</b> låtar från spellistan?]]></string>
-    <string name="rename_playlist_title">Byt namn på spellista</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Rapportera ett problem</string>
-    <string name="report_bug">Rapportera fel</string>
-    <string name="reset_action">Återställ</string>
-    <string name="reset_artist_image">Återställ artistbild</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Återställde tidigare köp. Starta om appen för att använda alla funktioner.</string>
-    <string name="restored_previous_purchases">Återställde tidigare köp.</string>
-    <string name="restoring_purchase">Återställer köp…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</string>
-    <string name="saf_delete_failed">Radering av fil misslyckades: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Kan inte hämta SAF URI</string>
-    <string name="saf_guide_slide1_description">Öppna navigeringslådan</string>
-    <string name="saf_guide_slide1_description_before_o">Aktivera \'Visa SD-kort\' i overflow-menun</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s behöver SD-kortåtkomst</string>
-    <string name="saf_guide_slide2_description">Du måste välja ditt SD-korts root-directory</string>
-    <string name="saf_guide_slide2_title">Välj ditt SD-kort i navigeringslådan</string>
-    <string name="saf_guide_slide3_description">Öppna inga submappar</string>
-    <string name="saf_guide_slide3_title">Klicka på \'välj\'-knappen längst ner på skärmen</string>
-    <string name="saf_write_failed">Filskrivning misslyckades: %s</string>
-    <string name="save">Spara</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Spara som fil</string>
-    <string name="save_playlists_title">Spara som filer</string>
-    <string name="saved_playlist_to">Sparade spellista till %s.</string>
-    <string name="saving_changes">Sparar ändringar</string>
-    <string name="scan_media">Skanna media</string>
-    <string name="scanned_files">Skannade %1$d av %2$d filer.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Välj alla</string>
-    <string name="selected">Vald</string>
-    <string name="set">Ställ in</string>
-    <string name="set_artist_image">Ställ in artistbild</string>
-    <string name="share_app">Dela app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Dela till Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">Shuffle</string>
-    <string name="simple">Enkel</string>
-    <string name="sleep_timer_canceled">Sömntimer inaktiverad.</string>
-    <string name="sleep_timer_set">Sömntimern är inställd på %d minuter från och med nu.</string>
-    <string name="social">Socialt</string>
-    <string name="social_stories">Dela Story</string>
-    <string name="song">Låt</string>
-    <string name="song_duration">Låtlängd</string>
-    <string name="songs">Låtar</string>
-    <string name="sort_order">Sorteras efter</string>
-    <string name="sort_order_a_z">Stigande</string>
-    <string name="sort_order_album">Album</string>
-    <string name="sort_order_artist">Artist</string>
-    <string name="sort_order_composer">Kompositör</string>
-    <string name="sort_order_date">Tilläggningsdatum</string>
-    <string name="sort_order_date_modified">Ändringsdatum</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">År</string>
-    <string name="sort_order_z_a">Sjunkande</string>
-    <string name="speech_not_supported">Hoppsan! Din enhet stöder inte talinmatning</string>
-    <string name="speech_prompt">Sök i ditt bibliotek</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Börja spela musik.</string>
-    <string name="suggestion_songs">Förslag</string>
-    <string name="support_development">Stöd utvecklingen</string>
-    <string name="swipe_to_unlock">Svep för att låsa upp</string>
-    <string name="synced_lyrics">Synkad låttext</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Gå med i Telegram-gruppen för att diskutera buggar, lämna förslag, briljera och mycket annat</string>
-    <string name="thank_you">Tack!</string>
-    <string name="the_audio_file">Ljudfilen</string>
-    <string name="this_month">Den här månaden</string>
-    <string name="this_week">Denna vecka</string>
-    <string name="this_year">Det här året</string>
-    <string name="tiny">Minimal</string>
-    <string name="tiny_card_style">Litet kort</string>
-    <string name="title">Titel</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">I dag</string>
-    <string name="top_albums">Toppalbum</string>
-    <string name="top_artists">Toppartister</string>
-    <string name="track_hint">"Spår (2 för spår 2 eller 3004 för CD3 spår 4)"</string>
-    <string name="track_list">Spårnummer</string>
-    <string name="translate">Översätt</string>
-    <string name="translate_community">Hjälp oss att översätta appen till ditt språk</string>
-    <string name="try_retro_music_premium">Prova Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Dela din design med Retro Music</string>
-    <string name="unlabeled">Omärkt</string>
-    <string name="unplayable_file">Kunde inte spela den här låten.</string>
-    <string name="up_next">Spelas härnäst</string>
-    <string name="update_image">Uppdatera bilden</string>
-    <string name="updating">Uppdaterar…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Användarnamn</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vänd vertikalt</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volym</string>
-    <string name="web_search">Webbsökning</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Välkommen,</string>
-    <string name="what_do_you_want_to_share">Vad vill du dela?</string>
-    <string name="whats_new">Vad är nytt?</string>
-    <string name="window">Fönster</string>
-    <string name="window_corner_edges">Rundade hörn</string>
-    <string name="x_has_been_set_as_ringtone">Använd %1$s som ringsignal.</string>
-    <string name="x_selected">%1$d valda</string>
-    <string name="year">År</string>
-    <string name="you_have_to_select_at_least_one_category">Du måste välja minst en kategori.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Dina kontodata används endast för verifiering.</string>
-</resources>
diff --git a/app/src/main/res/values-sw600dp/integers.xml b/app/src/main/res/values-sw600dp/integers.xml
index f4fd56db6..826769fc2 100644
--- a/app/src/main/res/values-sw600dp/integers.xml
+++ b/app/src/main/res/values-sw600dp/integers.xml
@@ -8,6 +8,4 @@
 
     <integer name="max_columns">6</integer>
     <integer name="max_columns_land">8</integer>
-    <integer name="permission_orientation">1</integer>
-    <integer name="permission_layout_weight">1</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ta-rIN/strings.xml b/app/src/main/res/values-ta-rIN/strings.xml
deleted file mode 100644
index 921d409ba..000000000
--- a/app/src/main/res/values-ta-rIN/strings.xml
+++ /dev/null
@@ -1,561 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">எங்களை பற்றி %s</string>
-    <string name="about_settings_summary">குழு, சமூக வலைத்தளங்களில்</string>
-    <string name="accent_color">பொத்தான் நிறம்</string>
-    <string name="accent_color_desc">பொத்தான்_நிறம்_பற்றி</string>
-    <string name="action_about">எங்களை பற்றி</string>
-    <string name="action_add_to_blacklist">பிடிக்காதவையில் சேர்</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_cancel">நிராகரி</string>
-    <string name="action_cast">ஒப்பனை</string>
-    <string name="action_clear_playing_queue">பாடல் வரிசையை நீக்கு</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_edit">திருத்து</string>
-    <string name="action_go_to_album">பாடல் படப்பட்டியல் செல்</string>
-    <string name="action_go_to_artist">கலைஞரை காணவும்</string>
-    <string name="action_go_to_genre">தொகுப்பு செல்</string>
-    <string name="action_go_to_lyrics">பாடல் வரிகள்</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_all">அனைத்து பாடலையும் ஒளி</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_sort_order">வரிசை பட்டியல்</string>
-    <string name="action_tag_editor">பாடல் அமைப்பை மாற்று</string>
-    <string name="action_toggle_favorite">பிடித்தவை</string>
-    <string name="action_toggle_shuffle">குழப்பி இயக்கு</string>
-    <string name="adaptive">தகவமை</string>
-    <string name="add_action">சேர்</string>
-    <string name="add_playlist_title">"பாடல் வரிசையில் சேர்"</string>
-    <string name="add_time_framed_lryics">இன்றைக்கும் பட்ட பாடல் வரிகளைச் சேர்</string>
-    <string name="added_song_count_to_playlist">%1$d பாடல்கள் %2$sயில் சேர்க்கப்பட்டுள்ளது</string>
-    <string name="added_title_to_playing_queue">"ஒரு பாடல் வரிசையில் சேர்க்கப்பட்டது."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d பாடல்கள் வரிசையில் சேர்க்கப்பட்டுள்ளது.</string>
-    <string name="album">தொகுப்பு</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">பாடல்கள்</item>
-    </plurals>
-    <string name="album_artist">பாடல் ஆசிரியர்</string>
-    <string name="albums">தொகுப்புகள்</string>
-    <plurals name="albums">
-        <item quantity="one">தொகுப்பு</item>
-        <item quantity="other">தொகுப்புகள்</item>
-    </plurals>
-    <string name="always">எப்பொழுதும்</string>
-    <string name="app_share">இந்தச் செயலியைக் காண: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">குழப்பு</string>
-    <string name="app_shortcut_top_tracks_short">சிறந்த பாடல்கள்</string>
-    <string name="app_widget_big_name">முழு படம்</string>
-    <string name="app_widget_card_name">அட்டை</string>
-    <string name="app_widget_classic_name">பழமையான</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">சிறிய</string>
-    <string name="app_widget_text_name">சிறிய சொல்</string>
-    <string name="artist">பாடகர்</string>
-    <string name="artists">பாடகர்கள்</string>
-    <string name="audio_fade_duration">பாடல் மறையும் நேரம்</string>
-    <string name="audio_focus_denied">ஒலி அனுமதி மறுக்கப்பட்டுள்ளது.</string>
-    <string name="audio_settings_summary">ஒலி அமைப்புகளை மாற்று</string>
-    <string name="auto">தானியங்கி</string>
-    <string name="backup_restore_settings_summary">அமைப்புக்கள் மற்றும் பாடல் கோப்புகளைச் சேமி</string>
-    <string name="backup_restore_title"><![CDATA[மீட்டெடு & பேக்கப்]]></string>
-    <string name="backup_title">பேக்கப்</string>
-    <string name="biography">வாழ்க்கை வரலாறு</string>
-    <string name="black_theme_name">இருட்டு மட்டும்</string>
-    <string name="blacklist">தேவையானவை</string>
-    <string name="bluetooth_summary">இந்தச் செயலிக்குப் பக்கத்தில் உல்ல புலுடூத் சாதனங்களைக் கண்டறிய அனுமதி வேண்டும்</string>
-    <string name="bluetooth_title">பக்கத்தில் உள்ள சாதனங்கள்</string>
-    <string name="blur">மங்குதல்</string>
-    <string name="blur_card">தெளிவற்ற அட்டை</string>
-    <string name="bug_report_failed">அறிக்கையை அனுப்ப முடியவில்லை</string>
-    <string name="bug_report_failed_invalid_token">தவறான டோக்கன். இந்தச் செயலியின் வடிவமைப்பாளரை அனுகவும்.</string>
-    <string name="bug_report_failed_issues_not_available">இப்பிரச்சனை இந்தக் கோப்பிற்கு இல்லை. இந்தச் செய்தியின் வடிவமைப்பாளரை அனுகவும்.</string>
-    <string name="bug_report_failed_unknown">எதிர்பாராத பிழை ஏற்பட்டது. தயவுசெய்து சிறிது நேரம் கழித்து முயற்சிக்கவும்.</string>
-    <string name="bug_report_failed_wrong_credentials">தவறான பயனாளர் பெயர் அல்லது கடவுச்சொல்</string>
-    <string name="bug_report_issue">பிரச்சனை</string>
-    <string name="bug_report_manual">தானாக அனுப்பு</string>
-    <string name="bug_report_no_description">பிரச்சனையை விவரி</string>
-    <string name="bug_report_no_password">சரியான கிட்கப் கடவுச்சொல்லை உள்ளிடவும்</string>
-    <string name="bug_report_no_title">பிரச்சினைக்கான தலைப்பை உள்ளிடு</string>
-    <string name="bug_report_no_username">சரியான கிட்கப் பயனர் பெயரை உள்ளிடவும்</string>
-    <string name="bug_report_success">பிரச்சனை வெற்றிகரமாகத் தெரிவிக்கப்பட்டது</string>
-    <string name="bug_report_summary">தெரியாத தவறு ஏற்ப்பட்டுள்ளது. இடையூறுக்கு மன்னிக்கவும், இவ்வாறு மீண்டும் ஏற்பட்டால் \"தகவல்களை அழிக்கவும்\" அல்லது வடிவமைப்பாளரிடம் தெரிவிக்கலாம் </string>
-    <string name="bug_report_use_account">கிட்கப்பை பயன்படுத்தி அனுப்பவும்</string>
-    <string name="buy_now">இப்போது வாங்கு</string>
-    <string name="cancel_current_timer">இரத்து செய்</string>
-    <string name="card">அட்டை</string>
-    <string name="card_color_style">வண்ண அட்டை</string>
-    <string name="card_square">சதுர அட்டை</string>
-    <string name="card_style">அட்டை</string>
-    <string name="carousal_effect_on_now_playing_screen">படம் மாற்றும் அமைப்பு</string>
-    <string name="cascading">ஒன்றின் மேல் ஒன்று</string>
-    <string name="changelog">மாற்றங்களின் பதிவு</string>
-    <string name="changelog_summary">புதியவை</string>
-    <string name="choose_image">படத்தைத் தேர்வுசெய்</string>
-    <string name="choose_restore_title">மீட்டெடுக்க தேர்வு செய்</string>
-    <string name="circle">வட்டம்</string>
-    <string name="circular">வட்ட</string>
-    <string name="classic">பழமையான</string>
-    <string name="clear_action">அழி</string>
-    <string name="clear_blacklist">தடுப்புப் பட்டியலை நீக்கு</string>
-    <string name="clear_history">வரலாற்றை நீக்கு</string>
-    <string name="clear_playing_queue">வரிசையை அழி</string>
-    <string name="color">வண்ணம்</string>
-    <string name="colors">வண்ணங்கள்</string>
-    <string name="compact">அடக்கமான</string>
-    <string name="composer">இசையமைப்பாளர்</string>
-    <string name="copied_device_info_to_clipboard">சாதனத்தின் விவரங்கள் நகல் எடுக்கப்பட்டுள்ளது.</string>
-    <string name="could_not_create_playlist">இசைப் பட்டியலை உருவாக்க முடியவில்லை.</string>
-    <string name="could_not_download_album_cover">"சரியான படத்தைப் பதிவேற்ற முடியவில்லை."</string>
-    <string name="could_not_restore_purchase">மீட்டெடுத்தல் தோல்வி.</string>
-    <string name="could_not_scan_files">கோப்பு %d\'யைத் தேட இயலவில்லை.</string>
-    <string name="create_action">உருவாக்கு</string>
-    <string name="create_new_backup">உருவாக்கு</string>
-    <string name="created_playlist_x">இசைப்பட்டியலை உருவாக்கு %1$s.</string>
-    <string name="credit_title">உருப்பினர் மற்றும் உதவியவர்கள் </string>
-    <string name="currently_listening_to_x_by_x">தற்போது கேட்கும் பாடல் %1$s கலைஞர் %2$s.</string>
-    <string name="custom_artist_images">சுயட்சி கலைஞர் படம்</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">தவற்றின் விவரத்தை பகிர்</string>
-    <string name="dark_theme_name">இலங்கருப்பு</string>
-    <string name="delete_playlist_title">இசைப் பட்டியலை நீக்கு</string>
-    <string name="delete_playlist_x"><![CDATA[இசைப்பட்டியல் <b>%1$s</b>யை நீக்கு?]]></string>
-    <string name="delete_playlists_title">இசைப்பட்டியல்களை நீக்கு</string>
-    <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="depth">ஆழம்</string>
-    <string name="description">விளக்கம்</string>
-    <string name="device_info">சாதனத்தின் விவரம்</string>
-    <string name="dialog_message_set_ringtone">ஒலி அமைப்புகளை மாற்ற Retro Musicஐ அனுமதி</string>
-    <string name="dialog_title_set_ringtone">அலைபேசி ஒலியாக அமை</string>
-    <string name="disc_hint">பெட்டியின் எண்</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="done">முடிந்தது</string>
-    <string name="drive_mode">ஊர்தி பயனர்</string>
-    <string name="edit_fab">திருத்து</string>
-    <string name="edit_normal_lyrics">பாடல் வரிகளைத் திருத்து</string>
-    <string name="edit_synced_lyrics">இனைக்கப்பட்ட பாடல் வரிகளைத் திருத்து</string>
-    <string name="empty">ஒன்றும் இல்லை</string>
-    <string name="equalizer">சமமாக்கி</string>
-    <string name="error_create_backup">பேக்கப் உருவாக்க முடியவில்லை</string>
-    <string name="error_delete_backup">மேக்கப்பை நீக்க முடியவில்லை</string>
-    <string name="error_empty_name">பெயர் வெறுமையாக இருக்க இயலாது!</string>
-    <string name="error_load_failed">தடங்கள் ஏற்பட்டுள்ளது</string>
-    <string name="error_share_file">கோப்பை பகிர இயலவில்லை</string>
-    <string name="expanded">விரிவாக்கப்பட்டது</string>
-    <string name="faq">வினாக்கள்</string>
-    <string name="favorites">விருப்பமானவை</string>
-    <string name="file_already_exists">இந்த கோப்பு ஏற்கனவே உள்ளது</string>
-    <string name="finish_last_song">கடைசி பாடலுடன் நிருத்திக்கொள்</string>
-    <string name="fit">பொருத்தம்</string>
-    <string name="flat">தட்டையான</string>
-    <string name="folders">கோப்புறைகள்</string>
-    <string name="follow_system">சாதனத்தின் அமைப்பை பின்பற்றவும்</string>
-    <string name="for_you">தங்களுக்காக</string>
-    <string name="free">இலவசம்</string>
-    <string name="full">முழு</string>
-    <string name="full_card">முழு அட்டை</string>
-    <string name="general_settings_summary">செயலியின் வண்ணம் மற்றும் தீமை மாற்றவும்</string>
-    <string name="general_settings_title">திரை அமைப்புகள்</string>
-    <string name="genre">வகைகள்</string>
-    <string name="genres">வகைகள்</string>
-    <string name="git_hub_summary">செயலியை நகலெடுத்து மேம்படுத்து</string>
-    <string name="gradient">க்ரேடியன்ட்டுகள்</string>
-    <string name="grant_access">அனுமதி</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="grid_style_label">பகுதி அளவு</string>
-    <string name="help_summary">மேலும் உதவி வேண்டுமா?</string>
-    <string name="hinge">ஒட்டு</string>
-    <string name="history">வரலாறு</string>
-    <string name="history_cleared">வரலாறு அழிக்கப்பட்டது</string>
-    <string name="history_undo_button">செயல்தவிர்</string>
-    <string name="home">முகப்பு</string>
-    <string name="horizontal_flip">சமமாக சுழற்று</string>
-    <string name="image">படம்</string>
-    <string name="image_gradient">படம் வண்ணம்</string>
-    <string name="image_settings_summary">கலைஞர் படம் தரவுகள் அமைப்பு</string>
-    <string name="import_label">இறக்குமதி</string>
-    <string name="import_playlist">பாடல் வரிசைகளை எடு</string>
-    <string name="import_playlist_message">சாதனத்தில் உள்ள அனைத்து பாடல்களும் இனைக்கப்படும்.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s\'யில் %1$d பாடல்கள் சேர்க்கப்பட்டுள்ளது.</string>
-    <string name="instagram_page_summary">தங்களின் Retro Music அமைப்பை Instagramயில் பகிரவும்</string>
-    <string name="keyboard">விசைப்பலகை</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_last_modified">கடைசியாக மாற்றப்பட்டது</string>
-    <string name="label_more_from">இன்னும் பல %s</string>
-    <string name="label_sampling_rate">மாதிரி விகிதம்</string>
-    <string name="label_track_length">நீளம்</string>
-    <string name="labeled">முத்திரை</string>
-    <string name="last_added">கடைசியாக சேர்த்தது</string>
-    <string name="last_song">இறுதியாகக் கேட்டப் பாடல்</string>
-    <string name="lets_go">வாருங்கள் துவங்கலாம்</string>
-    <string name="library_categories">நூலக வகைகள்</string>
-    <string name="licenses">உரிமங்கள்</string>
-    <string name="light_theme_name">முழுமையான வெள்ளை</string>
-    <string name="listeners_label">கேட்பவர்கள்</string>
-    <string name="listing_files">கேட்கும் கோப்புகள்</string>
-    <string name="loading_products">Loading product…</string>
-    <string name="login">உள்நுழை</string>
-    <string name="lyrics">பாடல் வரிகள்</string>
-    <string name="made_with_love">அன்புடன் இந்தியாவில் உருவாக்கப்பட்டது</string>
-    <string name="material">பொருள்</string>
-    <string name="md_error_label">பிழை</string>
-    <string name="md_storage_perm_error">அனுமதி பிழை</string>
-    <string name="message_backup_create_success">செயலிகள் மறுபிரதிஎடுத்தல் வெற்றி.</string>
-    <string name="message_limit_tabs">5 பொருட்கள் மட்டும்</string>
-    <string name="message_pro_feature">%s ஒரு ப்ரோ அம்சமாகும்.</string>
-    <string name="message_restore_success">மீட்டெடுப்பு வெற்றிகரமாக முடிந்தது.</string>
-    <string name="message_updated">புதுப்பிக்கப்பட்டது</string>
-    <string name="message_welcome"><![CDATA[வணக்கம்! <br>, %sக்கு வரவேற்கிறோம்]]></string>
-    <string name="my_name">பெயர்</string>
-    <string name="my_top_tracks">அதிகம் விளையாடியது</string>
-    <string name="never">ஒருபோதும்</string>
-    <string name="new_music_mix">புதிய இசை கலவை</string>
-    <string name="new_playlist_title">புதிய இசைப்பட்டியல்</string>
-    <string name="new_start_directory">%s என்பது புதிய தொடக்க கோப்பகம்.</string>
-    <string name="next_song">அடுத்த பாடல்</string>
-    <string name="no_albums">உங்களிடம் ஆல்பம் இல்லை</string>
-    <string name="no_artists">உங்களிடம் இசையமைப்பாளர் குறிப்புடு இல்லை</string>
-    <string name="no_audio_ID">"முதலில் பாட்டைத் தொடக்கவும், அதன் பின்பு மீண்டும் முயற்சிக்கவும்."</string>
-    <string name="no_backups_found">மறுபிரதி காணவில்லை</string>
-    <string name="no_equalizer">No equalizer found</string>
-    <string name="no_genres">You have no genres</string>
-    <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
-    <string name="no_playlists">You have no playlists</string>
-    <string name="no_purchase_found">No purchase found.</string>
-    <string name="no_results">No results</string>
-    <string name="no_songs">You have no songs</string>
-    <string name="normal">Normal</string>
-    <string name="normal_lyrics">Normal lyrics</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
-    <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
-    <string name="notification">Notification</string>
-    <string name="notification_settings_summary">Customize the notification style</string>
-    <string name="now_playing">Now playing</string>
-    <string name="now_playing_queue">Now playing queue</string>
-    <string name="now_playing_summary">Customize the now playing screen</string>
-    <string name="now_playing_themes">9+ now playing themes</string>
-    <string name="only_on_wifi">Only on Wi-Fi</string>
-    <string name="other_settings_summary">Advanced testing features</string>
-    <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">Password</string>
-    <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
-    <string name="permissions_denied">Permissions denied.</string>
-    <string name="personalize">Personalize</string>
-    <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
-    <string name="pick_from_local_storage">Pick from local storage</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
-    <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">Playlist is empty</string>
-    <string name="playlist_name_empty">Playlist name</string>
-    <string name="playlists">Playlists</string>
-    <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
-    <string name="pref_blur_amount_title">Blur amount</string>
-    <string name="pref_filter_song_summary">Filter songs by length</string>
-    <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
-    <string name="pref_header_album">Album style</string>
-    <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">தேவையானவை</string>
-    <string name="pref_header_controls">Controls</string>
-    <string name="pref_header_general">Theme</string>
-    <string name="pref_header_images">Images</string>
-    <string name="pref_header_library">Library</string>
-    <string name="pref_header_lockscreen">Lockscreen</string>
-    <string name="pref_header_playlists">Playlists</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
-    <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
-    <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
-    <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
-    <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_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_notification">"Colors the notification in the album cover\u2019s vibrant color"</string>
-    <string name="pref_summary_cross_fade">Duration to crossfade between songs</string>
-    <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
-    <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
-    <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">Immersive mode</string>
-    <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
-    <string name="pref_title_album_cover_style">Album cover theme</string>
-    <string name="pref_title_album_cover_transform">Album cover skip</string>
-    <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
-    <string name="pref_title_blacklist">தேவையானவை</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
-    <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
-    <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
-    <string name="pref_title_gapless_playback">Gapless playback</string>
-    <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ignore Media Store covers</string>
-    <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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">Tab titles mode</string>
-    <string name="pref_title_toggle_carousel_effect">Carousel effect</string>
-    <string name="pref_title_toggle_full_screen">Fullscreen app</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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">Profile</string>
-    <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
-    <string name="rate_app">Rate the app</string>
-    <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
-    <string name="recent_albums">Recent albums</string>
-    <string name="recent_artists">Recent artists</string>
-    <string name="remove_action">Remove</string>
-    <string name="remove_cover">Remove cover</string>
-    <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
-    <string name="remove_song_from_playlist_title">Remove song from playlist</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
-    <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
-    <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">Report an issue</string>
-    <string name="report_bug">Report bug</string>
-    <string name="reset_action">Reset</string>
-    <string name="reset_artist_image">Reset artist image</string>
-    <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
-    <string name="restored_previous_purchases">Restored previous purchases.</string>
-    <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 sub-folders</string>
-    <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
-    <string name="saf_write_failed">File write failed: %s</string>
-    <string name="save">Save</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Save as file</string>
-    <string name="save_playlists_title">Save as files</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">Saving changes</string>
-    <string name="scan_media">Scan media</string>
-    <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">Select all</string>
-    <string name="selected">Selected</string>
-    <string name="set">Set</string>
-    <string name="set_artist_image">Set artist image</string>
-    <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
-    <string name="shuffle">குழப்பு</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">Sleep timer canceled.</string>
-    <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
-    <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
-    <string name="song">Song</string>
-    <string name="song_duration">Song duration</string>
-    <string name="songs">Songs</string>
-    <string name="sort_order">வரிசை பட்டியல்</string>
-    <string name="sort_order_a_z">Ascending</string>
-    <string name="sort_order_album">தொகுப்பு</string>
-    <string name="sort_order_artist">பாடகர்</string>
-    <string name="sort_order_composer">இசையமைப்பாளர்</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
-    <string name="sort_order_year">Year</string>
-    <string name="sort_order_z_a">Descending</string>
-    <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
-    <string name="speech_prompt">Search your library</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">Start playing music.</string>
-    <string name="suggestion_songs">Suggestions</string>
-    <string name="support_development">Support development</string>
-    <string name="swipe_to_unlock">Swipe to unlock</string>
-    <string name="synced_lyrics">Synced lyrics</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
-    <string name="thank_you">Thank you!</string>
-    <string name="the_audio_file">The audio file</string>
-    <string name="this_month">This month</string>
-    <string name="this_week">This week</string>
-    <string name="this_year">This year</string>
-    <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">Today</string>
-    <string name="top_albums">Top albums</string>
-    <string name="top_artists">Top artists</string>
-    <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
-    <string name="track_list">Track number</string>
-    <string name="translate">Translate</string>
-    <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Share your design with Retro Music</string>
-    <string name="unlabeled">Unlabeled</string>
-    <string name="unplayable_file">Couldn\u2019t play this song.</string>
-    <string name="up_next">Up next</string>
-    <string name="update_image">Update image</string>
-    <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
-    <string name="username">Username</string>
-    <string name="version">Version</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
-    <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
-    <string name="welcome">Welcome,</string>
-    <string name="what_do_you_want_to_share">What do you want to share?</string>
-    <string name="whats_new">What\'s New</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
-    <string name="x_selected">%1$d selected</string>
-    <string name="year">Year</string>
-    <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-</resources>
diff --git a/app/src/main/res/values-te-rIN/strings.xml b/app/src/main/res/values-te-rIN/strings.xml
deleted file mode 100644
index 129bf9039..000000000
--- a/app/src/main/res/values-te-rIN/strings.xml
+++ /dev/null
@@ -1,445 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_settings_summary">బృందం, సామాజిక లింకులు</string>
-    <string name="accent_color">యాస రంగు</string>
-    <string name="accent_color_desc">థీమ్ యాస రంగు పర్పుల్ రంగుకు డిఫాల్ట్ అవుతుంది</string>
-    <string name="action_about">గురించి</string>
-    <string name="action_add_to_favorites">ఇష్టమైన వాటికి జోడించండి</string>
-    <string name="action_add_to_playing_queue">క్యూ ఆడటానికి జోడించండి</string>
-    <string name="action_add_to_playlist">పాటల క్రమంలో చేర్చు</string>
-    <string name="action_cast">తారాగణం</string>
-    <string name="action_clear_playing_queue">క్యూ ప్లే చేయడం క్లియర్</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_edit">మార్చు</string>
-    <string name="action_go_to_album">ఆల్బమ్‌కు వెళ్లండి</string>
-    <string name="action_go_to_artist">ఆర్టిస్ట్ వద్దకు వెళ్ళండి</string>
-    <string name="action_go_to_genre">కళా ప్రక్రియకు వెళ్లండి</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">గ్రిడ్ పరిమాణం (land)</string>
-    <string name="action_new_playlist">క్రొత్త ప్లేజాబితా</string>
-    <string name="action_next">తరువాత</string>
-    <string name="action_play">ప్లే</string>
-    <string name="action_play_all">అన్ని ప్లే</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">Share</string>
-    <string name="action_shuffle_all">అన్నీ షఫుల్ చేయండి</string>
-    <string name="action_shuffle_playlist">ప్లేజాబితాను షఫుల్ చేయండి</string>
-    <string name="action_sleep_timer">స్లీప్ టైమర్</string>
-    <string name="action_sort_order">క్రమాన్ని క్రమబద్ధీకరించు</string>
-    <string name="action_tag_editor">ట్యాగ్ ఎడిటర్</string>
-    <string name="action_toggle_favorite">ఇష్టమైన టోగుల్ చేయండి</string>
-    <string name="action_toggle_shuffle">షఫుల్ మోడ్‌ను టోగుల్ చేయండి</string>
-    <string name="adaptive">అనుకూల</string>
-    <string name="add_action">చేర్చు</string>
-    <string name="add_playlist_title">"పాటల క్రమంలో చేర్చు"</string>
-    <string name="add_time_framed_lryics">సమయ ఫ్రేమ్ సాహిత్యాన్ని జోడించండి</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="albums">ఆల్బమ్లు</string>
-    <string name="always">ఎల్లప్పుడూ</string>
-    <string name="app_share">హే ఈ చల్లని మ్యూజిక్ ప్లేయర్‌ను ఇక్కడ చూడండి: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">షఫుల్</string>
-    <string name="app_shortcut_top_tracks_short">అగ్ర ట్రాక్‌లు</string>
-    <string name="app_widget_big_name">రెట్రో సంగీతం - పెద్దది</string>
-    <string name="app_widget_card_name">రెట్రో సంగీతం - కార్డ్</string>
-    <string name="app_widget_classic_name">రెట్రో సంగీతం - క్లాసిక్</string>
-    <string name="app_widget_small_name">రెట్రో సంగీతం - చిన్నది</string>
-    <string name="app_widget_text_name">రెట్రో సంగీతం - టెక్స్ట్</string>
-    <string name="artist">ఆర్టిస్ట్</string>
-    <string name="artists">ఆర్టిస్ట్స్</string>
-    <string name="audio_focus_denied">ఆడియో ఫోకస్ తిరస్కరించబడింది.</string>
-    <string name="audio_settings_summary">ధ్వని సెట్టింగులను మార్చండి మరియు ఈక్వలైజర్ నియంత్రణలను సర్దుబాటు చేయండి</string>
-    <string name="auto">దానంతట అదే</string>
-    <string name="biography">బయోగ్రఫీ</string>
-    <string name="black_theme_name">జస్ట్ బ్లాక్</string>
-    <string name="blacklist">బ్లాక్లిస్ట్</string>
-    <string name="blur">బ్లర్</string>
-    <string name="blur_card">బ్లర్ కార్డ్</string>
-    <string name="bug_report_failed">నివేదిక పంపడం సాధ్యం కాలేదు</string>
-    <string name="bug_report_failed_invalid_token">చెల్లని యాక్యిస్ టోకను. దయచేసి అనువర్తన డెవలపర్‌ను సంప్రదించండి.</string>
-    <string name="bug_report_failed_issues_not_available">ఎంచుకున్న రిపోజిటరీ కోసం సమస్యలు ప్రారంభించబడవు. దయచేసి అనువర్తన డెవలపర్‌ను సంప్రదించండి.</string>
-    <string name="bug_report_failed_unknown">అనుకోని తప్పు జరిగినది. దయచేసి అనువర్తన డెవలపర్‌ను సంప్రదించండి.</string>
-    <string name="bug_report_failed_wrong_credentials">తప్పు వాడుకరి పేరు లేదా తప్పు పాస్ వర్డ్</string>
-    <string name="bug_report_issue">సమస్య</string>
-    <string name="bug_report_manual">మానవీయంగా పంపండి</string>
-    <string name="bug_report_no_description">దయచేసి సమస్య వివరణను నమోదు చేయండి</string>
-    <string name="bug_report_no_password">దయచేసి మీ చెల్లుబాటు అయ్యే GitHub పాస్‌వర్డ్‌ను నమోదు చేయండి</string>
-    <string name="bug_report_no_title">దయచేసి సమస్య శీర్షికను నమోదు చేయండి</string>
-    <string name="bug_report_no_username">దయచేసి మీ చెల్లుబాటు అయ్యే GitHub వినియోగదారు పేరును నమోదు చేయండి</string>
-    <string name="bug_report_summary">అనుకోని తప్పు జరిగినది. క్షమించండి, మీరు ఈ బగ్‌ను కనుగొన్నారు, అది \"అనువర్తన డేటాను క్లియర్ చేయి\" క్రాష్ చేస్తూ ఉంటే లేదా ఇమెయిల్ పంపండి</string>
-    <string name="bug_report_use_account">GitHub ఖాతాను ఉపయోగించి పంపండి</string>
-    <string name="buy_now">ఇప్పుడే కొనండి</string>
-    <string name="cancel_current_timer">రద్దు చేయండి</string>
-    <string name="card">కార్డ్</string>
-    <string name="card_color_style">రంగు కార్డు</string>
-    <string name="card_style">కార్డ్</string>
-    <string name="carousal_effect_on_now_playing_screen">ఇప్పుడు ప్లే అవుతున్న తెరపై రంగులరాట్నం ప్రభావం</string>
-    <string name="cascading">క్యాస్కేడింగ్</string>
-    <string name="changelog">చేంజ్లాగ్</string>
-    <string name="changelog_summary">టెలిగ్రామ్ ఛానెల్‌లో చేంజ్లాగ్ నిర్వహించబడుతుంది</string>
-    <string name="circle">వృత్తం</string>
-    <string name="circular">సర్క్యులర్</string>
-    <string name="classic">క్లాసిక్</string>
-    <string name="clear_action">ప్రశాంతంగా</string>
-    <string name="clear_blacklist">బ్లాక్లిస్ట్ క్లియర్</string>
-    <string name="clear_playing_queue">క్యూ క్లియర్</string>
-    <string name="color">రంగు</string>
-    <string name="colors">రంగులు</string>
-    <string name="composer">కంపోజర్</string>
-    <string name="copied_device_info_to_clipboard">పరికర సమాచారం క్లిప్‌బోర్డ్‌కు కాపీ చేయబడింది</string>
-    <string name="could_not_create_playlist">ప్లేజాబితాను సృష్టించడం సాధ్యం కాలేదు</string>
-    <string name="could_not_download_album_cover">"సరిపోయే ఆల్బమ్ కవర్‌ను డౌన్‌లోడ్ చేయలేము."</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="credit_title">సభ్యులు మరియు సహాయకులు</string>
-    <string name="currently_listening_to_x_by_x">ప్రస్తుతం %2$s ద్వారా %1$s వింటున్నారు.</string>
-    <string name="dark_theme_name">కైండా డార్క్</string>
-    <string name="delete_playlist_title">ప్లేజాబితాను తొలగించండి</string>
-    <string name="delete_playlist_x"><![CDATA[<b>%1$s</b> ప్లేజాబితాను తొలగించాలా?]]></string>
-    <string name="delete_playlists_title">ప్లేజాబితాలను తొలగించండి</string>
-    <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="depth">లోతు</string>
-    <string name="description">వివరణ</string>
-    <string name="device_info">పరికర సమాచారం</string>
-    <string name="dialog_message_set_ringtone">ఆడియో సెట్టింగులను సవరించడానికి రెట్రో సంగీతాన్ని అనుమతించండి</string>
-    <string name="dialog_title_set_ringtone">రింగ్‌టోన్ సెట్ చేయండి</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="drive_mode">డ్రైవ్ మోడ్</string>
-    <string name="empty">ఖాళీ</string>
-    <string name="equalizer">సమం</string>
-    <string name="faq">ఎఫ్ ఎ క్యూ</string>
-    <string name="favorites">ఇష్టమైన</string>
-    <string name="finish_last_song">చివరి పాటను ముగించండి</string>
-    <string name="fit">ఫిట్</string>
-    <string name="flat">ఫ్లాట్</string>
-    <string name="folders">ఫోల్డర్లు</string>
-    <string name="follow_system">వ్యవస్థను అనుసరించండి</string>
-    <string name="for_you">మీ కోసం</string>
-    <string name="free">ఉచిత</string>
-    <string name="full">పూర్తి</string>
-    <string name="full_card">పూర్తి కార్డు</string>
-    <string name="general_settings_summary">అనువర్తనం యొక్క థీమ్ మరియు రంగులను మార్చండి</string>
-    <string name="general_settings_title">చూడండి మరియు అనుభూతి</string>
-    <string name="genre">చూడండి మరియు అనుభూతి</string>
-    <string name="genres">కళలు</string>
-    <string name="git_hub_summary">GitHub లో ప్రాజెక్ట్ను ఫోర్క్ చేయండి</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="grid_style_label">గ్రిడ్ శైలి</string>
-    <string name="hinge">హింగ్</string>
-    <string name="history">చరిత్ర</string>
-    <string name="home">హోమ్</string>
-    <string name="horizontal_flip">క్షితిజసమాంతర ఫ్లిప్</string>
-    <string name="image">చిత్రం</string>
-    <string name="image_gradient">ప్రవణత చిత్రం</string>
-    <string name="image_settings_summary">ఆర్టిస్ట్ ఇమేజ్ డౌన్‌లోడ్ సెట్టింగులను మార్చండి</string>
-    <string name="inserted_x_songs_into_playlist_x">%1$dపాటలను ప్లేజాబితా %2$s లో చేర్చారు.</string>
-    <string name="instagram_page_summary">Instagram లో ప్రదర్శించడానికి మీ రెట్రో మ్యూజిక్ సెటప్‌ను భాగస్వామ్యం చేయండి</string>
-    <string name="keyboard">కీబోర్డ్</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_last_modified">చివరి సవరణ</string>
-    <string name="label_more_from">%s నుండి ఎక్కువ</string>
-    <string name="label_sampling_rate">మాదిరి రేటు</string>
-    <string name="label_track_length">పొడవు</string>
-    <string name="labeled">లేబుల్</string>
-    <string name="last_added">చివరిగా జోడించబడింది</string>
-    <string name="last_song">చివరి పాట</string>
-    <string name="library_categories">లైబ్రరీ వర్గాలు</string>
-    <string name="licenses">లైసెన్సుల</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">శ్రోతలు</string>
-    <string name="listing_files">ఫైళ్ళను జాబితా చేస్తోంది</string>
-    <string name="loading_products">ఉత్పత్తులను లోడ్ చేస్తోంది…</string>
-    <string name="login">ప్రవేశించండి</string>
-    <string name="lyrics">సాహిత్యం</string>
-    <string name="made_with_love">భారతదేశంలో &#128420; తో తయారు చేయబడింది</string>
-    <string name="material">మెటీరియల్</string>
-    <string name="md_error_label">లోపం</string>
-    <string name="md_storage_perm_error">అనుమతి లోపం</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="next_song">తదుపరి పాట</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_playing_queue">పాటలు ఆడటం లేదు</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="normal_lyrics">సాధారణ సాహిత్యం</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s </b> మీడియా స్టోర్‌లో జాబితా చేయబడలేదు.]]></string>
-    <string name="nothing_to_scan">స్కాన్ చేయడానికి ఏమీ లేదు.</string>
-    <string name="nothing_to_see">చూడటానికి ఏమీ లేదు</string>
-    <string name="notification">నోటిఫికేషన్</string>
-    <string name="notification_settings_summary">నోటిఫికేషన్ శైలిని అనుకూలీకరించండి</string>
-    <string name="now_playing">ఇప్పుడు ఆడుతున్నారు</string>
-    <string name="now_playing_queue">ఇప్పుడు క్యూ ఆడుతున్నారు</string>
-    <string name="now_playing_summary">ఇప్పుడు ప్లే అవుతున్న స్క్రీన్‌ను అనుకూలీకరించండి</string>
-    <string name="now_playing_themes">9+ ఇప్పుడు థీమ్‌లను ప్లే చేస్తోంది</string>
-    <string name="only_on_wifi">Wi-Fi లో మాత్రమే</string>
-    <string name="other_settings_summary">అధునాతన పరీక్ష లక్షణాలు</string>
-    <string name="others">ఇతర</string>
-    <string name="password">పాస్వర్డ్</string>
-    <string name="past_three_months">గత 3 నెలలు</string>
-    <string name="paste_lyrics_here">సాహిత్యాన్ని ఇక్కడ అతికించండి</string>
-    <string name="peek">శిఖరం</string>
-    <string name="permission_external_storage_denied">బాహ్య నిల్వను యాక్సెస్ చేయడానికి అనుమతి నిరాకరించబడింది.</string>
-    <string name="permissions_denied">అనుమతులు తిరస్కరించబడ్డాయి.</string>
-    <string name="personalize">వ్యక్తిగతీకరించండి</string>
-    <string name="personalize_settings_summary">మీరు ఇప్పుడు ఆడుతున్న మరియు UI నియంత్రణలను అనుకూలీకరించండి</string>
-    <string name="pick_from_local_storage">స్థానిక నిల్వ నుండి ఎంచుకోండి</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">రెట్రో మ్యూజిక్ డిజైన్ ప్రేరణ కోసం Pinterest పేజీని అనుసరించండి</string>
-    <string name="plain">సాదా</string>
-    <string name="playing_notification_description">ప్లే నోటిఫికేషన్ ఆట / పాజ్ మొదలైన వాటి కోసం చర్యలను అందిస్తుంది.</string>
-    <string name="playing_notification_name">నోటిఫికేషన్ ప్లే అవుతోంది</string>
-    <string name="playlist_is_empty">ప్లేజాబితా ఖాళీగా ఉంది</string>
-    <string name="playlist_name_empty">ప్లేజాబితా పేరు</string>
-    <string name="playlists">ప్లేజాబితాలు</string>
-    <string name="pref_blur_amount_summary">బ్లర్ థీమ్స్ కోసం బ్లర్ మొత్తం వర్తించబడుతుంది, తక్కువ వేగంగా ఉంటుంది</string>
-    <string name="pref_blur_amount_title">అస్పష్టమైన మొత్తం</string>
-    <string name="pref_filter_song_summary">పాటలను పొడవు వడపోత</string>
-    <string name="pref_filter_song_title">పాట వ్యవధిని ఫిల్టర్ చేయండి</string>
-    <string name="pref_header_advanced">ఆధునిక</string>
-    <string name="pref_header_album">ఆల్బమ్ శైలి</string>
-    <string name="pref_header_audio">ఆడియో</string>
-    <string name="pref_header_blacklist">బ్లాక్లిస్ట్</string>
-    <string name="pref_header_controls">నియంత్రణలు</string>
-    <string name="pref_header_general">థీమ్</string>
-    <string name="pref_header_images">చిత్రాలు</string>
-    <string name="pref_header_library">గ్రంధాలయం</string>
-    <string name="pref_header_lockscreen">లాక్ స్క్రీన్</string>
-    <string name="pref_header_playlists">ప్లేజాబితాలు</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">వాల్యూమ్ సున్నాకి తగ్గినప్పుడు మరియు వాల్యూమ్ స్థాయి పెరిగినప్పుడు తిరిగి ప్లే చేయడం ప్రారంభించినప్పుడు పాటను పాజ్ చేస్తుంది.  అనువర్తనం వెలుపల కూడా పనిచేస్తుంది</string>
-    <string name="pref_keep_pause_on_zero_volume_title">సున్నాపై పాజ్ చేయండి</string>
-    <string name="pref_keep_screen_on_summary">ఈ లక్షణాన్ని ప్రారంభించడం బ్యాటరీ జీవితాన్ని ప్రభావితం చేస్తుందని గుర్తుంచుకోండి</string>
-    <string name="pref_keep_screen_on_title">స్క్రీన్‌ను ఆన్‌లో ఉంచండి</string>
-    <string name="pref_snow_fall_title">మంచు పతనం ప్రభావం</string>
-    <string name="pref_summary_album_art_on_lockscreen">ప్రస్తుతం ప్లే అవుతున్న పాట ఆల్బమ్ కవర్‌ను లాక్‌స్క్రీన్ వాల్‌పేపర్‌గా ఉపయోగించండి</string>
-    <string name="pref_summary_audio_ducking">సిస్టమ్ ధ్వనిని ప్లే చేసినప్పుడు లేదా నోటిఫికేషన్ వచ్చినప్పుడు వాల్యూమ్‌ను తగ్గించండి</string>
-    <string name="pref_summary_blacklist">బ్లాక్ లిస్ట్ చేసిన ఫోల్డర్ల కంటెంట్ మీ లైబ్రరీ నుండి దాచబడింది.</string>
-    <string name="pref_summary_bluetooth_playback">బ్లూటూత్ పరికరానికి కనెక్ట్ అయిన వెంటనే ప్లే చేయడం ప్రారంభించండి</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_notification">"ఆల్బమ్ కవర్ in u2019 యొక్క శక్తివంతమైన రంగులోని నోటిఫికేషన్‌ను రంగులు వేస్తుంది"</string>
-    <string name="pref_summary_desaturated_color">మెటీరియల్ డిజైన్ ప్రకారం డార్క్ మోడ్ రంగులలోని గైడ్ పంక్తులు డీసచురేటెడ్ అయి ఉండాలి</string>
-    <string name="pref_summary_expand_now_playing_panel">నోటిఫికేషన్‌పై క్లిక్ చేస్తే హోమ్ స్క్రీన్‌కు బదులుగా ఇప్పుడు ప్లే స్క్రీన్ కనిపిస్తుంది</string>
-    <string name="pref_summary_extra_controls">మినీ ప్లేయర్ కోసం అదనపు నియంత్రణలను జోడించండి</string>
-    <string name="pref_summary_extra_song_info">ఫైల్ ఫార్మాట్, బిట్రేట్ మరియు ఫ్రీక్వెన్సీ వంటి అదనపు పాట సమాచారాన్ని చూపించు</string>
-    <string name="pref_summary_gapless_playback">"కొన్ని పరికరాల్లో ప్లేబ్యాక్ సమస్యలను కలిగిస్తుంది."</string>
-    <string name="pref_summary_home_banner">హోమ్ బ్యానర్ శైలిని టోగుల్ చేయండి</string>
-    <string name="pref_summary_ignore_media_store_artwork">ఆల్బమ్ కవర్ నాణ్యతను పెంచగలదు, కానీ నెమ్మదిగా చిత్రం లోడింగ్ సమయాలకు కారణమవుతుంది.  మీకు తక్కువ రిజల్యూషన్ కళాకృతులతో సమస్యలు ఉంటే మాత్రమే దీన్ని ప్రారంభించండి</string>
-    <string name="pref_summary_library_categories">లైబ్రరీ వర్గాల దృశ్యమానత మరియు క్రమాన్ని కాన్ఫిగర్ చేయండి.</string>
-    <string name="pref_summary_lock_screen">రెట్రో మ్యూజిక్ యొక్క అనుకూల లాక్‌స్క్రీన్ నియంత్రణలను ఉపయోగించండి</string>
-    <string name="pref_summary_open_source_licences">ఓపెన్ సోర్స్ సాఫ్ట్‌వేర్ కోసం లైసెన్స్ వివరాలు</string>
-    <string name="pref_summary_toggle_full_screen">లీనమయ్యే మోడ్</string>
-    <string name="pref_summary_toggle_headset">హెడ్‌ఫోన్‌లు కనెక్ట్ అయిన వెంటనే ప్లే చేయడం ప్రారంభించండి</string>
-    <string name="pref_summary_toggle_shuffle">కొత్త పాటల జాబితాను ప్లే చేసేటప్పుడు షఫుల్ మోడ్ ఆపివేయబడుతుంది</string>
-    <string name="pref_summary_toggle_volume">తగినంత స్థలం అందుబాటులో ఉంటే, ఇప్పుడు ప్లే అవుతున్న స్క్రీన్‌లో వాల్యూమ్ నియంత్రణలను చూపించు</string>
-    <string name="pref_title_album_art_on_lockscreen">ఆల్బమ్ కవర్ చూపించు</string>
-    <string name="pref_title_album_cover_style">ఆల్బమ్ కవర్ థీమ్</string>
-    <string name="pref_title_album_cover_transform">ఆల్బమ్ కవర్ దాటవేయి</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_blacklist">బ్లాక్లిస్ట్</string>
-    <string name="pref_title_bluetooth_playback">బ్లూటూత్ ప్లేబ్యాక్</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_desaturated_color">అసంతృప్త రంగు</string>
-    <string name="pref_title_expand_now_playing_panel">ఇప్పుడు ప్లే స్క్రీన్ చూపించు</string>
-    <string name="pref_title_extra_controls">అదనపు నియంత్రణలు</string>
-    <string name="pref_title_extra_song_info">పాట సమాచారం</string>
-    <string name="pref_title_gapless_playback">గ్యాప్‌లెస్ ప్లేబ్యాక్</string>
-    <string name="pref_title_general_theme">అనువర్తన థీమ్</string>
-    <string name="pref_title_home_artist_grid_style">హోమ్ ఆర్టిస్ట్ గ్రిడ్</string>
-    <string name="pref_title_home_banner">హోమ్ బ్యానర్</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_now_playing_screen_appearance">ఇప్పుడు థీమ్ ప్లే అవుతోంది</string>
-    <string name="pref_title_open_source_licences">ఓపెన్ సోర్స్ లైసెన్సులు</string>
-    <string name="pref_title_tab_text_mode">టాబ్ శీర్షికల మోడ్</string>
-    <string name="pref_title_toggle_carousel_effect">రంగులరాట్నం ప్రభావం</string>
-    <string name="pref_title_toggle_full_screen">పూర్తి స్క్రీన్ అనువర్తనం</string>
-    <string name="pref_title_toggle_toggle_headset">ఆటో ప్లే</string>
-    <string name="pref_title_toggle_toggle_shuffle">షఫుల్ మోడ్</string>
-    <string name="pref_title_toggle_volume">వాల్యూమ్ నియంత్రణలు</string>
-    <string name="pro">ప్రో</string>
-    <string name="pro_summary">బ్లాక్ థీమ్, ఇప్పుడు థీమ్స్ ప్లే, రంగులరాట్నం ప్రభావం మరియు మరిన్ని ..</string>
-    <string name="profile">ప్రొఫైల్</string>
-    <string name="purchase">కొనుగోలు</string>
-    <string name="queue">క్యూ</string>
-    <string name="rate_app">అనువర్తనాన్ని రేట్ చేయండి</string>
-    <string name="rate_on_google_play_summary">ఈ అనువర్తనాన్ని ఇష్టపడుతున్నారా?  దీన్ని మరింత మెరుగ్గా ఎలా చేయవచ్చో గూగుల్ ప్లే స్టోర్‌లో మాకు తెలియజేయండి</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="report_an_issue">సమస్యను నివేదించండి</string>
-    <string name="report_bug">బగ్‌ను నివేదించండి</string>
-    <string name="reset_action">రీసెట్</string>
-    <string name="reset_artist_image">ఆర్టిస్ట్ చిత్రాన్ని రీసెట్ చేయండి</string>
-    <string name="restore">పునరుద్ధరించు</string>
-    <string name="restored_previous_purchase_please_restart">మునుపటి కొనుగోలు పునరుద్ధరించబడింది.  దయచేసి అన్ని లక్షణాలను ఉపయోగించడానికి అనువర్తనాన్ని పున art ప్రారంభించండి.</string>
-    <string name="restored_previous_purchases">మునుపటి కొనుగోళ్లను పునరుద్ధరించారు.</string>
-    <string name="restoring_purchase">కొనుగోలును పునరుద్ధరిస్తోంది…</string>
-    <string name="retro_music_player">రెట్రో మ్యూజిక్ ప్లేయర్</string>
-    <string name="retro_music_pro">రెట్రో మ్యూజిక్ ప్రో</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_write_failed">ఫైల్ రాయడం విఫలమైంది:%s</string>
-    <string name="save">సేవ్</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">ఫైల్‌గా సేవ్ చేయండి</string>
-    <string name="save_playlists_title">ఫైల్‌లుగా సేవ్ చేయండి</string>
-    <string name="saved_playlist_to">Saved playlist to %s.</string>
-    <string name="saving_changes">మార్పులను సేవ్ చేస్తోంది</string>
-    <string name="scan_media">మీడియాను స్కాన్ చేయండి</string>
-    <string name="scanned_files">%2$d ఫైళ్ళలో %1$d స్కాన్ చేయబడింది.</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">అన్ని ఎంచుకోండి</string>
-    <string name="selected">ఎంచుకున్న</string>
-    <string name="set">సెట్</string>
-    <string name="set_artist_image">ఆర్టిస్ట్ చిత్రాన్ని సెట్ చేయండి</string>
-    <string name="share_app">అనువర్తనాన్ని భాగస్వామ్యం చేయండి</string>
-    <string name="share_to_stories">కథలకు భాగస్వామ్యం చేయండి</string>
-    <string name="shuffle">షఫుల్</string>
-    <string name="simple">సాధారణ</string>
-    <string name="sleep_timer_canceled">స్లీప్ టైమర్ రద్దు చేయబడింది.</string>
-    <string name="sleep_timer_set">స్లీప్ టైమర్ ఇప్పటి నుండి %d నిమిషాలు సెట్ చేయబడింది.</string>
-    <string name="social">సామాజిక</string>
-    <string name="social_stories">కథను భాగస్వామ్యం చేయండి</string>
-    <string name="song">సాంగ్</string>
-    <string name="song_duration">పాట వ్యవధి</string>
-    <string name="songs">సాంగ్స్</string>
-    <string name="sort_order">క్రమాన్ని క్రమబద్ధీకరించు</string>
-    <string name="sort_order_a_z">ఆరోహణ</string>
-    <string name="sort_order_album">ఆల్బమ్</string>
-    <string name="sort_order_artist">ఆర్టిస్ట్</string>
-    <string name="sort_order_composer">కంపోజర్</string>
-    <string name="sort_order_date">తేదీ జోడించబడింది</string>
-    <string name="sort_order_date_modified">తేదీ సవరించబడింది</string>
-    <string name="sort_order_year">ఇయర్</string>
-    <string name="sort_order_z_a">అవరోహణ</string>
-    <string name="speech_not_supported">క్షమించాలి!  మీ పరికరం ప్రసంగ ఇన్‌పుట్‌కు మద్దతు ఇవ్వదు</string>
-    <string name="speech_prompt">మీ లైబ్రరీని శోధించండి</string>
-    <string name="stack">స్టాక్</string>
-    <string name="start_play_music">సంగీతం ఆడటం ప్రారంభించండి.</string>
-    <string name="suggestion_songs">సలహాలు</string>
-    <string name="support_development">అభివృద్ధికి మద్దతు ఇవ్వండి</string>
-    <string name="swipe_to_unlock">అన్‌లాక్ చేయడానికి స్వైప్ చేయండి</string>
-    <string name="synced_lyrics">సమకాలీకరించిన సాహిత్యం</string>
-    <!-- Message displayed when tag editing fails -->
-    <string name="telegram_group">టెలిగ్రాం</string>
-    <string name="telegram_group_summary">దోషాలను చర్చించడానికి, సూచనలు చేయడానికి, ప్రదర్శించడానికి మరియు మరిన్ని చేయడానికి టెలిగ్రామ్ సమూహంలో చేరండి</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="tiny_card_style">చిన్న కార్డు</string>
-    <string name="title">శీర్షిక</string>
-    <string name="today">నేడు</string>
-    <string name="top_albums">అగ్ర ఆల్బమ్‌లు</string>
-    <string name="top_artists">అగ్ర కళాకారులు</string>
-    <string name="track_hint">"ట్రాక్ (ట్రాక్ 2 కోసం 2 లేదా సిడి 3 ట్రాక్ 4 కోసం 3004)"</string>
-    <string name="track_list">ట్రాక్ సంఖ్య</string>
-    <string name="translate">అనువదించు</string>
-    <string name="translate_community">మీ భాషకు అనువర్తనాన్ని అనువదించడానికి మాకు సహాయపడండి</string>
-    <string name="twitter_page">ట్విట్టర్</string>
-    <string name="twitter_page_summary">మీ డిజైన్‌ను రెట్రో మ్యూజిక్‌తో పంచుకోండి</string>
-    <string name="unlabeled">అన్ లేబుల్</string>
-    <string name="unplayable_file">ఈ పాటను ప్లే చేయలేదు.</string>
-    <string name="up_next">తదుపరిది</string>
-    <string name="update_image">చిత్రాన్ని నవీకరించండి</string>
-    <string name="updating">నవీకరిస్తోంది…</string>
-    <string name="username">యూజర్ పేరు</string>
-    <string name="version">సంస్కరణ</string>
-    <string name="vertical_flip">లంబ ఫ్లిప్</string>
-    <string name="volume">వాల్యూమ్</string>
-    <string name="web_search">వెబ్ సెర్చ్</string>
-    <string name="welcome">స్వాగతం</string>
-    <string name="what_do_you_want_to_share">మీరు ఏమి భాగస్వామ్యం చేయాలనుకుంటున్నారు?</string>
-    <string name="whats_new">కొత్తది ఏమిటి</string>
-    <string name="window">కిటికీ</string>
-    <string name="window_corner_edges">గుండ్రని మూలలు</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="you_will_be_forwarded_to_the_issue_tracker_website">మీరు ఇష్యూ ట్రాకర్ వెబ్‌సైట్‌కు ఫార్వార్డ్ చేయబడతారు.</string>
-    <string name="your_account_data_is_only_used_for_authentication">మీ ఖాతా డేటా ప్రామాణీకరణ కోసం మాత్రమే ఉపయోగించబడుతుంది.</string>
-</resources>
diff --git a/app/src/main/res/values-th-rTH/strings.xml b/app/src/main/res/values-th-rTH/strings.xml
deleted file mode 100644
index 026766416..000000000
--- a/app/src/main/res/values-th-rTH/strings.xml
+++ /dev/null
@@ -1,559 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">เกี่ยวกับ %s</string>
-    <string name="about_settings_summary">ทีมงาน, โซเชียลลิงค์</string>
-    <string name="accent_color">สีที่ใช้เน้น</string>
-    <string name="accent_color_desc">ธีมของสีที่ใช้เน้น, ค่าเริ่มต้น คือ สีม่วง</string>
-    <string name="action_about">เกี่ยวกับเรา</string>
-    <string name="action_add_to_blacklist">เพิ่มเข้ารายชื่อแบล็คลิสต์</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_cancel">ยกเลิก</string>
-    <string name="action_cast">แคสต์</string>
-    <string name="action_clear_playing_queue">ล้างคิวเพลง</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_edit">แก้ไข</string>
-    <string name="action_go_to_album">ไปยังอัลบัม</string>
-    <string name="action_go_to_artist">ไปยังศิลปิน</string>
-    <string name="action_go_to_genre">ไปยังประเภทเพลง</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
-    <string name="action_go_to_start_directory">ไปที่ 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_all">เล่นทั้งหมด</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">กำหนดเป็น 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_sort_order">เรียงลำดับ</string>
-    <string name="action_tag_editor">แก้ไข Tag</string>
-    <string name="action_toggle_favorite">สลับเพลงโปรด</string>
-    <string name="action_toggle_shuffle">สลับการสุ่ม</string>
-    <string name="adaptive">Adaptive</string>
-    <string name="add_action">เพิ่ม</string>
-    <string name="add_playlist_title">"เพิ่มชื่อเพลย์ลิสต์"</string>
-    <string name="add_time_framed_lryics">เพิ่มเนื้อเพลงในกรอบเวลา</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
-    <string name="added_title_to_playing_queue">"เพิ่ม 1 ชื่อเข้าคิวเพลง"</string>
-    <string name="added_x_titles_to_playing_queue">เพิ่ม %1$d ชื่อเข้าคิวเพลง</string>
-    <string name="album">อัลบัม</string>
-    <plurals name="albumSongs">
-        <item quantity="other">เพลง</item>
-    </plurals>
-    <string name="album_artist">อัลบัมศิลปิน</string>
-    <string name="albums">อัลบัม</string>
-    <plurals name="albums">
-        <item quantity="other">อัลบัม</item>
-    </plurals>
-    <string name="always">ตลอด</string>
-    <string name="app_share">มาลองแอปพลิเคชันเล่นเพลงเจ๋งๆ ได้ที่นี่: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">สุ่ม</string>
-    <string name="app_shortcut_top_tracks_short">เพลงยอดนิยม</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">คลาสสิก</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
-    <string name="artist">ศิลปิน</string>
-    <string name="artists">ศิลปิน</string>
-    <string name="audio_fade_duration">Audio fade duration</string>
-    <string name="audio_focus_denied">การโฟกัสเสียงถูกปฏิเสธ</string>
-    <string name="audio_settings_summary">การตั้งค่าเสียง และ Equalizer</string>
-    <string name="auto">ออโต้</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title"><![CDATA[สำรอง / การคืนค่า]]></string>
-    <string name="backup_title">การสำรองข้อมูล</string>
-    <string name="biography">ประวัติ</string>
-    <string name="black_theme_name">Just Black</string>
-    <string name="blacklist">แบล็คลิสต์</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
-    <string name="blur">Blur</string>
-    <string name="blur_card">Blur Card</string>
-    <string name="bug_report_failed">ไม่สามารถส่งรายการได้</string>
-    <string name="bug_report_failed_invalid_token">เกิดข้อผิดพลาดจาก Access Token, กรุณาติดต่อผู้พัฒนา</string>
-    <string name="bug_report_failed_issues_not_available">ยังไม่ได้เปิดรับปัญหานี้, กรุณาติดต่อผู้พัฒนา</string>
-    <string name="bug_report_failed_unknown">เกิดข้อผิดพลาดบางประการ, กรุณาติดต่อผู้พัฒนา</string>
-    <string name="bug_report_failed_wrong_credentials">ชื่อผู้ใช้งาน หรือ รหัสผ่าน ไม่ถูกต้อง</string>
-    <string name="bug_report_issue">ปัญหา</string>
-    <string name="bug_report_manual">ส่งด้วยตนเอง</string>
-    <string name="bug_report_no_description">กรุณากรอกรายละเอียดของปัญหา</string>
-    <string name="bug_report_no_password">กรุณากรอกรหัสผ่านที่ถูกต้องของ Github</string>
-    <string name="bug_report_no_title">กรุณากรอกหัวข้อของปัญหา</string>
-    <string name="bug_report_no_username">กรุณากรอกชื่อผู้ใช้งานที่ถูกต้องของ Github</string>
-    <string name="bug_report_success">Bug report successful</string>
-    <string name="bug_report_summary">เกิดข้อผิดพลาดบางประการ, ขออภัยในความผิดพลาด, ถ้ายังคงเกิดปัญหาอยู่กรุณา \"Clear app data\" หรือ ส่งอีเมลหาผู้พัฒนา</string>
-    <string name="bug_report_use_account">ส่งโดยใช้บัญชี Github</string>
-    <string name="buy_now">ซื้อทันที</string>
-    <string name="cancel_current_timer">ยกเลิก</string>
-    <string name="card">Card</string>
-    <string name="card_color_style">สีของ Card</string>
-    <string name="card_square">Square Card</string>
-    <string name="card_style">รูปแบบของ Card</string>
-    <string name="carousal_effect_on_now_playing_screen">เปิดการใช้งาน Carousel บนหน้า Now playing</string>
-    <string name="cascading">Cascading</string>
-    <string name="changelog">การอัพเดท</string>
-    <string name="changelog_summary">ดูว่ามีอะไรใหม่!</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
-    <string name="circular">Circular</string>
-    <string name="classic">คลาสสิก</string>
-    <string name="clear_action">ล้างทั้งหมด</string>
-    <string name="clear_blacklist">ล้างรายชื่อแบล็คลิสต์</string>
-    <string name="clear_history">Clear History</string>
-    <string name="clear_playing_queue">ล้างคิวเพลง</string>
-    <string name="color">สี</string>
-    <string name="colors">สี</string>
-    <string name="compact">Compact</string>
-    <string name="composer">ผู้แต่ง</string>
-    <string name="copied_device_info_to_clipboard">คัดลอกข้อมูลเครื่อง</string>
-    <string name="could_not_create_playlist">ไม่สามารถสร้างเพลย์ลิสได้</string>
-    <string name="could_not_download_album_cover">"ไม่สามารถดาวน์โหลดรูปปกอัลบัมได้"</string>
-    <string name="could_not_restore_purchase">ไม่สามารถเรียกคืนการสั่งซื้อได้</string>
-    <string name="could_not_scan_files">ไม่สามารถสแกน %d ไฟล์</string>
-    <string name="create_action">สร้าง</string>
-    <string name="create_new_backup">สร้าง</string>
-    <string name="created_playlist_x">สร้างเพลย์ลิสต์</string>
-    <string name="credit_title">สมาชิกและผู้มีส่วนร่วม</string>
-    <string name="currently_listening_to_x_by_x">กำลังฟัง %1$s ของ %2$s</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
-    <string name="dark_theme_name">Kinda Dark</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="depth">Depth</string>
-    <string name="description">รายละเอียด</string>
-    <string name="device_info">ข้อมูลเครื่อง</string>
-    <string name="dialog_message_set_ringtone">อนุญาตให้ Retro Music สามารถแก้ไขการตั้งค่าเสียงได้</string>
-    <string name="dialog_title_set_ringtone">กำหนดริงโทน</string>
-    <string name="disc_hint">Disc Number</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">Donate</string>
-    <string name="donate_summary">หากคุณพึงพอใจในการใช้งาน สามารถให้ Donate ได้ที่นี่</string>
-    <string name="donation_header">สนับสนุนสิ่งเหล่านี้ให้พวกเราสิ :</string>
-    <string name="done">ตกลง</string>
-    <string name="drive_mode">โหมดขับรถ</string>
-    <string name="edit_fab">ปุ่มแก้ไข</string>
-    <string name="edit_normal_lyrics">ปุ่มเนื้อเพลง</string>
-    <string name="edit_synced_lyrics">ปุ่มซิงค์เนื้อเพลง</string>
-    <string name="empty">ว่างเปล่า</string>
-    <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
-    <string name="faq">คำถามที่พบบ่อย</string>
-    <string name="favorites">เพลงโปรด</string>
-    <string name="file_already_exists">File already exists</string>
-    <string name="finish_last_song">ปิดเมื่อเพลงสุดท้ายจบ</string>
-    <string name="fit">Fit</string>
-    <string name="flat">Flat</string>
-    <string name="folders">โฟลเดอร์</string>
-    <string name="follow_system">ตามการตั้งค่าจากเครื่อง</string>
-    <string name="for_you">สำหรับคุณ</string>
-    <string name="free">ฟรี</string>
-    <string name="full">Full</string>
-    <string name="full_card">Full card</string>
-    <string name="general_settings_summary">เปลี่ยนธีมและสีของแอปพลิเคชัน</string>
-    <string name="general_settings_title">ลักษณะและความสวยงาม</string>
-    <string name="genre">ประเภทเพลง</string>
-    <string name="genres">ประเภทเพลง</string>
-    <string name="git_hub_summary">Fork โปรเจคจาก GitHub</string>
-    <string name="gradient">การไล่ระดับสี</string>
-    <string name="grant_access">Grant access</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="grid_style_label">ขนาดกริด</string>
-    <string name="help_summary">ต้องการความช่วยเหลือเพิ่มเพิม?</string>
-    <string name="hinge">Hinge</string>
-    <string name="history">ประวัติ</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
-    <string name="home">หน้าแรก</string>
-    <string name="horizontal_flip">Horizontal flip</string>
-    <string name="image">รูปภาพ</string>
-    <string name="image_gradient">รูป Gradient</string>
-    <string name="image_settings_summary">ตั้งค่าการเปลี่ยนรูปศิลปิน</string>
-    <string name="import_label">ตกลง</string>
-    <string name="import_playlist">นำเข้าเพลย์ลิสต์</string>
-    <string name="import_playlist_message">นำเข้าเพลย์ลิสต์ทั้งหมดจากในเครื่อง, หากซ้ำจะทำการรวมข้อมูลให้</string>
-    <string name="inserted_x_songs_into_playlist_x">เพิ่ม %1$d เพลงเข้าสู่เพลย์ลิสต์ %2$s แล้ว</string>
-    <string name="instagram_page_summary">แชร์การตั้งค่า Retro Music บน Instagram</string>
-    <string name="keyboard">คีย์บอร์ด</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_last_modified">Last Modified</string>
-    <string name="label_more_from">เพิ่มเติมจาก %s</string>
-    <string name="label_sampling_rate">เรทในการการสุ่มตัวอย่าง</string>
-    <string name="label_track_length">ความยาว</string>
-    <string name="labeled">แสดงตัวหนังสือ</string>
-    <string name="last_added">เพิ่มล่าสุด</string>
-    <string name="last_song">เพลงล่าสุด</string>
-    <string name="lets_go">Let\'s go</string>
-    <string name="library_categories">หมวดหมู่คลังเพลง</string>
-    <string name="licenses">Licenses</string>
-    <string name="light_theme_name">Clearly White</string>
-    <string name="listeners_label">ผู้ฟัง</string>
-    <string name="listing_files">ไฟล์ที่กำลังฟัง</string>
-    <string name="loading_products">กำลังโหลดสินค้า</string>
-    <string name="login">เข้าสู่ระบบ</string>
-    <string name="lyrics">เนื้อเพลง</string>
-    <string name="made_with_love">ทำจาก ❤️ ในอินเดีย</string>
-    <string name="material">Material</string>
-    <string name="md_error_label">เกิดข้อผิดพลาด</string>
-    <string name="md_storage_perm_error">ไม่มีสิทธิ์ในการเข้าถึง</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
-    <string name="my_name">ชื่อ</string>
-    <string name="my_top_tracks">ฟังบ่อย</string>
-    <string name="never">ไม่ต้อง</string>
-    <string name="new_music_mix">New Music Mix</string>
-    <string name="new_playlist_title">เพลย์ลิสต์ใหม่</string>
-    <string name="new_start_directory">%s ถูกกำหนดเป็น Directory เริ่มต้น</string>
-    <string name="next_song">เพลงถัดไป</string>
-    <string name="no_albums">คุณยังไม่มีอัลบัม</string>
-    <string name="no_artists">คุณยังไม่มีศิลปิน</string>
-    <string name="no_audio_ID">"เล่นเพลงก่อนแล้วลองอีกครั้ง"</string>
-    <string name="no_backups_found">ไม่พบ Backup</string>
-    <string name="no_equalizer">ไม่พบ Equalizer</string>
-    <string name="no_genres">คุณยังไม่มีประเภทเพลง</string>
-    <string name="no_lyrics_found">ไม่พบเนื้อเพลง</string>
-    <string name="no_playing_queue">ไม่มีเพลงที่กำลังเล่นอยู่</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">Normal</string>
-    <string name="normal_lyrics">เนื้อเพลงปกติ</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> ไม่อยู่ในรายการมีเดีย]]></string>
-    <string name="not_recently_played">ไม่มีการเล่นล่าสุด</string>
-    <string name="nothing_to_scan">ไม่มีอะไรให้สแกน</string>
-    <string name="nothing_to_see">ไม่มีอะไรให้ดู</string>
-    <string name="notification">การแสดงเตือน</string>
-    <string name="notification_settings_summary">ตั้งค่าการแจ้งเตือน</string>
-    <string name="now_playing">Now Playing</string>
-    <string name="now_playing_queue">คิวที่กำลังเล่นอยู่</string>
-    <string name="now_playing_summary">ตั้งค่าหน้าจอ Now playing</string>
-    <string name="now_playing_themes">9+ ธีม Now playing</string>
-    <string name="only_on_wifi">เฉพาะ Wi-Fi</string>
-    <string name="other_settings_summary">การตั้งค่าขั้นสูง</string>
-    <string name="others">อื่นๆ</string>
-    <string name="over_cover">Over Cover</string>
-    <string name="password">รหัสผ่าน</string>
-    <string name="past_three_months">3 เดือนผ่านไป</string>
-    <string name="paste_lyrics_here">วางเนื้อเพลงที่นี่</string>
-    <string name="paste_timeframe_lyrics_here">วางเนื้อเพลงในกรอบเวลาที่นี่</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
-    <string name="permission_external_storage_denied">สิทธิ์ในการเข้าถึงถูกปฏิเสธ</string>
-    <string name="permission_summary">ต้องการสิทธิ์ในการเข้าถึงข้อมูลในเครื่องเพื่อเล่นเพลง</string>
-    <string name="permission_title">เข้าถึงการจัดเก็บข้อมูล</string>
-    <string name="permissions_denied">สิทธิ์ในการเข้าถึงถูกปฏิเสธ</string>
-    <string name="personalize">ปรับแต่ง</string>
-    <string name="personalize_settings_summary">ตั้งค่าหน้า Now playing และปุ่มต่างๆของคุณ</string>
-    <string name="pick_from_local_storage">เลือกจากในเครื่อง</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">ติดตาม Pinterest ของ Retro Music สำหรับแรงบรรดาลใจในการออกแบบ</string>
-    <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
-    <string name="playing_notification_description">การแจ้งเตือนขณะกำลัง เล่น/หยุด และอื่นๆ</string>
-    <string name="playing_notification_name">การแจ้งเตือนขณะกำลังเล่น</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
-    <string name="playlist_is_empty">เพลย์ลิสต์ว่าง</string>
-    <string name="playlist_name_empty">ชื่อเพลย์ลิสต์</string>
-    <string name="playlists">เพลย์ลิสต์</string>
-    <string name="pref_blur_amount_summary">ค่าการ Blur สำหรับธีม Blur (ค่าน้อยทำงานเร็วกว่า)</string>
-    <string name="pref_blur_amount_title">ค่าการ Blur</string>
-    <string name="pref_filter_song_summary">กรองเพลงจากความยาว</string>
-    <string name="pref_filter_song_title">กรองเพลงจากระยะเวลา</string>
-    <string name="pref_header_advanced">ขั้นสูง</string>
-    <string name="pref_header_album">สไตล์อัลบัม</string>
-    <string name="pref_header_audio">เสียง</string>
-    <string name="pref_header_blacklist">แบล็คลิสต์</string>
-    <string name="pref_header_controls">การควบคุม</string>
-    <string name="pref_header_general">ธีม</string>
-    <string name="pref_header_images">รูป</string>
-    <string name="pref_header_library">คลังเพลง</string>
-    <string name="pref_header_lockscreen">ล็อคสกรีน</string>
-    <string name="pref_header_playlists">เพลย์ลิสต์</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">หยุดเพลงเมื่อเสียงถูกลดเป็นศูนย์ และ เริ่มเล่นอีกครั้งเมื่อเพิ่มเสียง</string>
-    <string name="pref_keep_pause_on_zero_volume_title">หยุดเพลงเมื่อเสียงถูกลดเป็นศูนย์ </string>
-    <string name="pref_keep_screen_on_summary">หากเปิดการใช้งานระยะเวลาในการใช้งานของแบตเตอร์รี่จะลดลง</string>
-    <string name="pref_keep_screen_on_title">เปิดจอไว้เสมอ</string>
-    <string name="pref_language_name">เลือกภาษา</string>
-    <string name="pref_snow_fall_title">Snow fall effect</string>
-    <string name="pref_summary_album_art_on_lockscreen">ใช้รูปปกของอัลบัมของเพลงที่กำลังเล่นอยู่เป็นวอลเปเปอร์หน้าล็อคสกรีน</string>
-    <string name="pref_summary_album_artists_only">แสดงอัลบัมข้องศิลปินในหมวดหมู่ของศิลปิน</string>
-    <string name="pref_summary_audio_ducking">ลดเสียงลงเมื่อมีเสียงจากระบบหรือได้รับการแจ้งเตือน</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
-    <string name="pref_summary_blacklist">เนื้อหาจากโฟลเดอร์แบล็คลิสต์จะถูกซ่อนจากคลังของคุณ</string>
-    <string name="pref_summary_bluetooth_playback">เริ่มเล่นเพลงหลังจากเชื่อมต่อกับอุปกรณ์ Bluetooth</string>
-    <string name="pref_summary_blurred_album_art">เบลอรูปปกอัลบัมบนล็อคสกรีน (อาจจะเกิดปัญหากับแอปอื่นๆได้)</string>
-    <string name="pref_summary_carousel_effect">เปิดการใช้งาน Carousel สำหรับอัลบัมอาร์ตบนหน้าจอ Now playing (ไม่สามารถใช้งานได้กับธีม Card และ Blur Card)</string>
-    <string name="pref_summary_classic_notification">ใช้การแจ้งเตือนปกติ</string>
-    <string name="pref_summary_colored_app">สีพื้นหลังและปุ่มการควบคุมจะขึ้นอยู่กับอัลบัมอาร์ตจากหน้าจอ Now playing</string>
-    <string name="pref_summary_colored_app_shortcuts">การเน้นสีของทางลัดเข้าแอป (หากมีการเปลี่ยนแปลงค่าให้เลือกตรงนี้เพื่อเปิดใช้งาน)</string>
-    <string name="pref_summary_colored_notification">"ใช้สีสดในของการแจ้งเตือน"</string>
-    <string name="pref_summary_cross_fade">ระยะเวลาในการลดเสียงก่อนเปลี่ยนเพลง</string>
-    <string name="pref_summary_desaturated_color">สำหรับแนวทางของ Material Design บนโหมดมืดควรลดความอิ่มตัวของสีลง</string>
-    <string name="pref_summary_expand_now_playing_panel">คลิกที่การแจ้งเตือนจะแสดงหน้าจอ Now Playing แทนที่จะแสดงหน้าแรก</string>
-    <string name="pref_summary_extra_controls">เพิ่มปุ่มควบคุมเพิ่มเติมใน mini player</string>
-    <string name="pref_summary_extra_song_info">แสดงข้อมูลเพลงเพิ่มเติม เช่น ประเภทไฟล์, ความถี่ และ บิตเรท</string>
-    <string name="pref_summary_gapless_playback">"สามารถทำให้เกิดข้อพลาดได้ในบางเครื่อง!"</string>
-    <string name="pref_summary_home_banner">แสดงหรือซ่อนแบนเนอร์หน้าแรก</string>
-    <string name="pref_summary_ignore_media_store_artwork">เพิ่มคุณภาพของรูปปกอัลบัม แต่จะส่งผลให้โหลดรูปภาพช้าขึ้น</string>
-    <string name="pref_summary_library_categories">ตั้งค่าการแสดงผลและจัดเรียงของหมวดหมู่คลังเพลง</string>
-    <string name="pref_summary_lock_screen">ใช้ Retro Music ในหน้าล็อคสกรีน</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
-    <string name="pref_summary_open_source_licences">รายละเอียด License สำหรับ open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">ไปที่แท็บที่ใช้งานล่าสุดเมื่อเริ่มใช้งาน</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</string>
-    <string name="pref_summary_toggle_full_screen">โหมด Immersive</string>
-    <string name="pref_summary_toggle_headset">เล่นทันทีเมื่อเชื่อมต่อกับหูฟัง</string>
-    <string name="pref_summary_toggle_shuffle">โหมดการสุ่มจะถูกปิดเมื่อเล่นรายการเพลงใหม่</string>
-    <string name="pref_summary_toggle_volume">หากพื้นที่ในการแสดงผลเพียงพอให้แสดงปุ่มเพิ่ม/ลดเสียงบนหน้าจอ Now playing </string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">แสดงเฉพาะเพลงจาก Music โฟลเดอร์</string>
-    <string name="pref_title_album_art_on_lockscreen">แสดงรูปปกอัลบัม</string>
-    <string name="pref_title_album_artists_only">นำทางโดยอัลบัมศิลปิน</string>
-    <string name="pref_title_album_cover_style">ธีมของรูปปกอัลบัม</string>
-    <string name="pref_title_album_cover_transform">ข้ามรูปปกอัลบัม</string>
-    <string name="pref_title_app_shortcuts">สีของทางลัดเข้าแอป</string>
-    <string name="pref_title_appbar_mode">Header style</string>
-    <string name="pref_title_audio_ducking">ลบเสียงเมื่อหลุดโฟกัส</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
-    <string name="pref_title_auto_download_artist_images">ดาวน์โหลดรูปศิลปินอัตโนมัติ</string>
-    <string name="pref_title_blacklist">รายชื่อแบล็คลิสต์</string>
-    <string name="pref_title_bluetooth_playback">การเล่นด้วยอุปกรณ์ Bluetooth</string>
-    <string name="pref_title_blurred_album_art">เบลอรูปปกอัลบัม</string>
-    <string name="pref_title_circle_button">Circular play button</string>
-    <string name="pref_title_classic_notification">การแสดงเตือนคลาสสิก</string>
-    <string name="pref_title_colored_app">Adaptive color</string>
-    <string name="pref_title_colored_notification">สีการแจ้งเตือน</string>
-    <string name="pref_title_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
-    <string name="pref_title_desaturated_color">ลดความอิ่มตัวของสี</string>
-    <string name="pref_title_expand_now_playing_panel">แสดงหน้าจอ Now Playing</string>
-    <string name="pref_title_extra_controls">ปุ่มควบความเพิ่มเติม</string>
-    <string name="pref_title_extra_song_info">รายละเอียดเพลง</string>
-    <string name="pref_title_gapless_playback">การเล่นแบบ Gapless</string>
-    <string name="pref_title_general_theme">ธีมของ App</string>
-    <string name="pref_title_home_album_grid_style">อัลบัมกริด</string>
-    <string name="pref_title_home_artist_grid_style">กริดของหน้าศิลปิน</string>
-    <string name="pref_title_home_banner">แบนเนอร์</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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</string>
-    <string name="pref_title_now_playing_screen_appearance">ธีมของ Now Playing</string>
-    <string name="pref_title_open_source_licences">สัญญาอนุญาตสำหรับโอเพนซอร์ส</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
-    <string name="pref_title_tab_text_mode">โหมดการแสดงผลแท็ป</string>
-    <string name="pref_title_toggle_carousel_effect">การใช้งาน Carousel</string>
-    <string name="pref_title_toggle_full_screen">แสดงผลเต็มจอ</string>
-    <string name="pref_title_toggle_toggle_headset">เล่นอัตโนมัติ</string>
-    <string name="pref_title_toggle_toggle_shuffle">โหมดการสุ่ม</string>
-    <string name="pref_title_toggle_volume">ปุ่มควบคุมเสียง</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">โปร</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
-    <string name="profile">โปรไฟล์</string>
-    <string name="purchase">สั่งซื้อ</string>
-    <string name="queue">คิวเพลง</string>
-    <string name="rate_app">ให้คะแนนแอป</string>
-    <string name="rate_on_google_play_summary">ชอบแอปนี้ไหม? บอกพวกเราให้รู้ด้วยการรีวิวบน Google Play Store สิ</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_image">Remove Image</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="replace_cover">Replace Cover</string>
-    <string name="report_an_issue">รายการปัญหา</string>
-    <string name="report_bug">รายงานบัค</string>
-    <string name="reset_action">รีเซ็ท</string>
-    <string name="reset_artist_image">รีเซ็ทรูปศิลปิน</string>
-    <string name="restore">กู้คืนการสั่งซื้อ</string>
-    <string name="restore_message">Do you want to restore backup?</string>
-    <string name="restored_previous_purchase_please_restart">กู้คืนการสั่งซื้อสำเร็จ (กรุณารีสตาร์ทแอปเพื่อใช้งานฟีเจอร์ทั้งหมด)</string>
-    <string name="restored_previous_purchases">กู้คืนการสั่งซื้อสำเร็จ</string>
-    <string name="restoring_purchase">กำลังดำเนินการกู้คืนการสั่งซื้อ</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">ต้องการสิทธิ์เพื่อตั้งค่าริงโทน</string>
-    <string name="ringtone_title">ริงโทน (Optional)</string>
-    <string name="saf_delete_failed">ลบไฟล์ %s ไม่สำเร็จ</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">ไม่สามารถขอข้อมูลจาก SAF URI ได้</string>
-    <string name="saf_guide_slide1_description">เปิด Navigation Drawer</string>
-    <string name="saf_guide_slide1_description_before_o">เปิดการใช้งาน \'แสดง SD card\' บนเมนู</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s ต้องการการเข้าถึง SD card</string>
-    <string name="saf_guide_slide2_description">คุณต้องเลือกจุดเริ่มต้นของ SD card directory ก่อน</string>
-    <string name="saf_guide_slide2_title">เลือก SD card ของคุณบน Navigation Drawer</string>
-    <string name="saf_guide_slide3_description">กรุณาอย่าเปิดไฟล์เดอร์ย่อยอื่นๆ</string>
-    <string name="saf_guide_slide3_title">กดปุ่ม \'เลือก\' ที่ด้านล่างของจอ</string>
-    <string name="saf_write_failed">เขียนไฟล์ %s ไม่สำเร็จ</string>
-    <string name="save">บันทึก</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">บันทึกเป็นไฟล์</string>
-    <string name="save_playlists_title">บันทึกเป็นไฟล์</string>
-    <string name="saved_playlist_to">บันทึกเพลย์ลิสต์ไปที่ %s</string>
-    <string name="saving_changes">กำลังบันทึก</string>
-    <string name="scan_media">สแกนมีเดียไฟล์</string>
-    <string name="scanned_files">สแกนทั้งหมด %1$d จาก %2$d ไฟล์</string>
-    <string name="scrobbles_label">Scrobbles</string>
-    <string name="select_all">เลือกทั้งหมด</string>
-    <string name="selected">ที่เลือก</string>
-    <string name="set">กำหนดค่า</string>
-    <string name="set_artist_image">กำหนดค่ารูปศิลปิน</string>
-    <string name="share_app">แชร์แอป</string>
-    <string name="share_summary">แชร์แอปให้กับเพื่อนและครอบครัวของคุณ</string>
-    <string name="share_to_stories">แชร์ไปที่ Stories</string>
-    <string name="show_album_artists">แสดงอัลบัมศิลปิน</string>
-    <string name="shuffle">สุ่ม</string>
-    <string name="simple">Simple</string>
-    <string name="sleep_timer_canceled">ยกเลิกการตั้งเวลาหยุดเล่น</string>
-    <string name="sleep_timer_set">ตั้งเวลาให้หยุดเล่นใน %d นาทีจากตอนนี้</string>
-    <string name="social">Social</string>
-    <string name="social_stories">แชร์ Story</string>
-    <string name="song">เพลง</string>
-    <string name="song_duration">ระยะเวลาของเพลง</string>
-    <string name="songs">เพลง</string>
-    <string name="sort_order">การจัดเรียง</string>
-    <string name="sort_order_a_z">A-Z</string>
-    <string name="sort_order_album">อัลบัม</string>
-    <string name="sort_order_artist">ศิลปิน</string>
-    <string name="sort_order_composer">ผู้แต่ง</string>
-    <string name="sort_order_date">วันที่เพิ่ม</string>
-    <string name="sort_order_date_modified">วันที่แก้ไข</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">จำนวนเพลง</string>
-    <string name="sort_order_num_songs_desc">จำนวนเพลง (มากไปน้อย)</string>
-    <string name="sort_order_year">ปี</string>
-    <string name="sort_order_z_a">Z-A</string>
-    <string name="speech_not_supported">ขออภัยเครื่องของท่านไม่รองรับ Speech Input</string>
-    <string name="speech_prompt">ค้นหาคลังเพลง</string>
-    <string name="stack">Stack</string>
-    <string name="start_play_music">เริ่มเล่นเพลง</string>
-    <string name="suggestion_songs">แนะนำ</string>
-    <string name="support_development">สนับสนุนนักพัฒนา</string>
-    <string name="swipe_to_unlock">ปัดเพื่อปลดล็อก</string>
-    <string name="synced_lyrics">ซิ้งค์เนื้อเพลง</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">เข้าร่วมกลุ่ม Telegram เพื่อแจ้งบัค, เสนอแนะ หรืออื่นๆ</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">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
-    <string name="title">หัวข้อ</string>
-    <string name="title_new_backup">New Backup</string>
-    <string name="today">วันนี้</string>
-    <string name="top_albums">Top อัลบัม</string>
-    <string name="top_artists">Top ศิลปิน</string>
-    <string name="track_hint">"แทร็ก (2 สำหรับแทร็ก 2 หรือ 3004 สำหรับ CD3 แทร็ก 4)"</string>
-    <string name="track_list">หมายเลขแทร็ก</string>
-    <string name="translate">แปลภาษา</string>
-    <string name="translate_community">ช่วยพวกเราแปลภาษาเป็นภาษาของคุณ</string>
-    <string name="try_retro_music_premium">ลอง Retro Music พรีเมียม</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">แชร์การออกแบบของคุณด้วย Retro Music</string>
-    <string name="unlabeled">ไม่แสดงตัวหนังสือ</string>
-    <string name="unplayable_file">ไม่สามารถเล่นเพลงนี้ได้</string>
-    <string name="up_next">เพลงต่อไป</string>
-    <string name="update_image">เปลี่ยนรูป</string>
-    <string name="updating">กำลังดำเนินการ</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">ชื่อผู้ใช้งาน</string>
-    <string name="username">ชื่อผู้ใช้งาน</string>
-    <string name="version">เวอร์ชัน</string>
-    <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">ดูบน Telegram</string>
-    <string name="volume">เสียง</string>
-    <string name="web_search">ค้นหาจากเว็บไซต์</string>
-    <string name="website">เว็บไซต์</string>
-    <string name="website_summary">ดูเว็บไซต์ของพวกเรา</string>
-    <string name="welcome">ยินดีต้อนรับ</string>
-    <string name="what_do_you_want_to_share">คุณต้องการจะแชร์อะไร?</string>
-    <string name="whats_new">มีอะไรใหม่บ้าง?</string>
-    <string name="window">Window</string>
-    <string name="window_corner_edges">Rounded corners</string>
-    <string name="x_has_been_set_as_ringtone">กำหนดให้ %1$s เป็นริงโทนของคุณ</string>
-    <string name="x_selected">เลือก %1$d</string>
-    <string name="year">ปี</string>
-    <string name="you_have_to_select_at_least_one_category">คุณต้องเลือกอย่างน้อยหนึ่งหมวดหมู่</string>
-    <string name="you_will_be_forwarded_to_the_issue_tracker_website">ท่านจะติดตามการรายงานปัญหาจากเว็บไซต์</string>
-    <string name="your_account_data_is_only_used_for_authentication">ข้อมูลบัญชีของท่านจะใช้สำหรับการเข้าสู่ระบบเท่านั้น</string>
-</resources>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr/strings.xml
similarity index 56%
rename from app/src/main/res/values-tr-rTR/strings.xml
rename to app/src/main/res/values-tr/strings.xml
index 5dbac01b4..7234fa747 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1,27 +1,22 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">%s hakkında</string>
-    <string name="about_settings_summary">Ekip, sosyal medya linkleri</string>
+    <string name="about_settings_summary">Takım, sosyal medya linkleri</string>
     <string name="accent_color">Vurgu rengi</string>
-    <string name="accent_color_desc">Tema vurgu rengi, varsayılan olarak mor renktedir</string>
+    <string name="accent_color_desc">Tema vurgu rengi, varsayılan olarak çamurcun renktedir.</string>
     <string name="action_about">Hakkında</string>
-    <string name="action_add_to_blacklist">Kara listeye ekle</string>
-    <string name="action_add_to_favorites">Favorilere ekle</string>
-    <string name="action_add_to_playing_queue">Oynatma kuyruğuna ekle</string>
+    <string name="action_add_to_favorites">Favorilere Ekle</string>
+    <string name="action_add_to_playing_queue">Oynatma sırasına ekle</string>
     <string name="action_add_to_playlist">Oynatma listesine ekle</string>
-    <string name="action_cancel">İptal et</string>
-    <string name="action_cast">Yayınla</string>
     <string name="action_clear_playing_queue">Oynatma kuyruğunu temizle</string>
+    <string name="action_clear_playlist">Oynatma sırasını temizle</string>
     <string name="action_cycle_repeat">Tekrarlı oynatma modu</string>
     <string name="action_delete">Sil</string>
     <string name="action_delete_from_device">Cihazdan sil</string>
     <string name="action_details">Ayrıntılar</string>
-    <string name="action_edit">Düzenle</string>
     <string name="action_go_to_album">Albüme git</string>
-    <string name="action_go_to_artist">Sanatçıya git</string>
+    <string name="action_go_to_artist">Şarkıcıya git</string>
     <string name="action_go_to_genre">Şarkı türüne git</string>
-    <string name="action_go_to_lyrics">Şarkı Sözlerine git</string>
-    <string name="action_go_to_start_directory">Başlangıç dizinine git</string>
+    <string name="action_go_to_start_directory">Başlangıç dizine git</string>
     <string name="action_grant">Onayla</string>
     <string name="action_grid_size">Izgara boyutu</string>
     <string name="action_grid_size_land">Izgara boyutu (yer)</string>
@@ -33,13 +28,13 @@
     <string name="action_play_pause">Oynat/Durdur</string>
     <string name="action_previous">Önceki</string>
     <string name="action_remove_from_favorites">Favorilerden çıkar</string>
-    <string name="action_remove_from_playing_queue">Oynatma sırasından çıkar</string>
+    <string name="action_remove_from_playing_queue">Oynatma listesinden çıkar</string>
     <string name="action_remove_from_playlist">Oynatma listesinden çıkar</string>
     <string name="action_rename">Yeniden adlandır</string>
     <string name="action_save_playing_queue">Oynatma kuyruğunu kaydet</string>
     <string name="action_scan">Tara</string>
     <string name="action_search">Ara</string>
-    <string name="action_set">Başlat</string>
+    <string name="action_set">Başla</string>
     <string name="action_set_as_ringtone">Zil sesi olarak ayarla</string>
     <string name="action_set_as_start_directory">Başlangıç ​​dizini olarak ayarla</string>
     <string name="action_settings">"Ayarlar"</string>
@@ -47,104 +42,94 @@
     <string name="action_shuffle_all">Hepsini karıştır</string>
     <string name="action_shuffle_playlist">Oynatma listesini karıştır</string>
     <string name="action_sleep_timer">Uyku zamanlayıcısı</string>
-    <string name="action_sort_order">Sıralama tertipi</string>
+    <string name="action_sort_order">Sıralama koşulu</string>
     <string name="action_tag_editor">Şarkı bilgilerini düzenle</string>
     <string name="action_toggle_favorite">Favori değiştir</string>
     <string name="action_toggle_shuffle">Karışık Çal</string>
     <string name="adaptive">Uyarlanabilir</string>
     <string name="add_action">Ekle</string>
+    <string name="add_lyrics">Şarkı sözleri ekle</string>
+    <string name="add_photo">Fotoğraf ekle</string>
     <string name="add_playlist_title">"Oynatma listesine ekle"</string>
-    <string name="add_time_framed_lryics">Zaman Dilimli Sözleri Ekle</string>
-    <string name="added_song_count_to_playlist">%2$s listesine %1$d parça eklendi</string>
+    <string name="add_time_framed_lryics">Süreli şarkı sözleri ekle</string>
     <string name="added_title_to_playing_queue">"Kuyruğa 1 parça eklendi."</string>
-    <string name="added_x_titles_to_playing_queue">%1$d şarkı kuyruğuna eklendi.</string>
+    <string name="added_x_titles_to_playing_queue">%1$d şarkı kuyruğa eklendi.</string>
     <string name="album">Albüm</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Şarkı</item>
-        <item quantity="other">Şarkılar</item>
-    </plurals>
-    <string name="album_artist">Albüm Sanatçısı</string>
+    <string name="album_artist">Albümün sâhibi</string>
+    <string name="album_or_artist_empty">Ya başlık ya da şarkıcı adı boş.</string>
     <string name="albums">Albümler</string>
-    <plurals name="albums">
-        <item quantity="one">Albüm</item>
-        <item quantity="other">Albümler</item>
-    </plurals>
     <string name="always">Her zaman</string>
-    <string name="app_share">Hey, şu havalı müzik çalara şuradan bir göz atmaya ne dersin: https://play.google.com/store/apps/details?id=%s</string>
+    <string name="app_share">Merhaba, harika bir müzik deneyenimi için Retro Müziği şuradan indir: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">Karıştır</string>
-    <string name="app_shortcut_top_tracks_short">Sık oynatılan parçalar</string>
-    <string name="app_widget_big_name">Tüm Resim</string>
-    <string name="app_widget_card_name">Retro müzik - Kart</string>
-    <string name="app_widget_classic_name">Retro müzik - Klasik</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Retro müzik - Küçük</string>
-    <string name="app_widget_text_name">Minimal Metin</string>
-    <string name="artist">Sanatçı</string>
-    <string name="artists">Sanatçılar</string>
-    <string name="audio_fade_duration">Sesin solma süresi</string>
+    <string name="app_shortcut_top_tracks_short">Sık çalınan şarkılar</string>
+    <string name="app_widget_big_name">Retro music - Büyük</string>
+    <string name="app_widget_card_name">Retro Music - Kart</string>
+    <string name="app_widget_classic_name">Retro Music - Alışılageldik</string>
+    <string name="app_widget_small_name">Retro Music - Küçük</string>
+    <string name="app_widget_text_name">Retro Music - Yazı</string>
+    <string name="artist">Şarkıcı</string>
+    <string name="artists">Şarkıcılar</string>
     <string name="audio_focus_denied">Ses odaklaması reddedildi.</string>
-    <string name="audio_settings_summary">Ses ayarlarını değiştirin ve ekolayzır kontrollerini ayarlayın</string>
+    <string name="audio_settings_summary">Ses ayarlarını değiştirin ve ekolayzır denetimlerini gözden geçirin</string>
     <string name="auto">Otomatik</string>
-    <string name="backup_restore_settings_summary">Ayarlarınızı, çalma listelerinizi yedekleyin ve geri yükleyin</string>
-    <string name="backup_restore_title"><![CDATA[Yedekleme & Geri yükleme]]></string>
-    <string name="backup_title">Yedeklemeler</string>
+    <string name="base_color_theme">Temel renk teması</string>
+    <string name="bass_boost">Bas Kuvvetlendirme</string>
+    <string name="bio">Biyografi</string>
     <string name="biography">Yaşam öyküsü</string>
-    <string name="black_theme_name">Sade Siyah</string>
+    <string name="black_theme_name">Siyah</string>
     <string name="blacklist">Kara Liste</string>
-    <string name="bluetooth_summary">Uygulamanın bluetooth cihazlarını kontrol etmek için yakındaki cihazlara erişim iznine ihtiyacı var</string>
-    <string name="bluetooth_title">Yakındaki cihazlar</string>
     <string name="blur">Bulanıklık</string>
     <string name="blur_card">Bulanık kart</string>
-    <string name="bug_report_failed">Bildiri gönderilemiyor</string>
+    <string name="bug_report_failed">Rapor gönderilemiyor</string>
     <string name="bug_report_failed_invalid_token">Geçersiz erişim belirteci. Lütfen uygulama geliştiricisine başvurun.</string>
     <string name="bug_report_failed_issues_not_available">Seçilen depo için sorunlar etkin değil. Lütfen uygulama geliştiricisiyle iletişime geçin.</string>
     <string name="bug_report_failed_unknown">Beklenmedik bir sorun oluştu. Lütfen uygulama geliştiricisine başvurun.</string>
     <string name="bug_report_failed_wrong_credentials">Yanlış kullanıcı adı veya şifre</string>
     <string name="bug_report_issue">Sorun</string>
     <string name="bug_report_manual">Manuel olarak gönder</string>
-    <string name="bug_report_no_description">Lütfen bir sorun açıklaması belirtin</string>
+    <string name="bug_report_no_description">Lütfen sorun açıklamasını yazın</string>
     <string name="bug_report_no_password">Lütfen geçerli GitHub şifrenizi girin</string>
     <string name="bug_report_no_title">Lütfen bir sorun başlığı girin</string>
-    <string name="bug_report_no_username">Lütfen geçerli GitHub kullanıcı adınızı girin</string>
-    <string name="bug_report_success">Hata raporlama başarılı</string>
-    <string name="bug_report_summary">Beklenmedik bir hata oluştu. Bu hatayı bulduğunuz için üzgünüz, eğer durmadan hata veriyorsa \"Verileri Temizleyin\" ya da bir E-posta yollayın </string>
+    <string name="bug_report_no_username">Lütfen geçerli bir GitHub kullanıcı adını gir</string>
+    <string name="bug_report_summary">Beklenmedik bir hata oluştu. Bu hatayı bulduğunuz için üzgünüz, eğer dur madan hata verirse \"Verileri Temizleyin\" ya da Eposta gönderin</string>
+    <string name="bug_report_uploading">Rapor GitHub\'a yükleniyor ...</string>
     <string name="bug_report_use_account">GitHub hesabını kullanarak gönder</string>
-    <string name="buy_now">Şimdi satın alın</string>
+    <string name="buy_now">Şimdi satın al</string>
     <string name="cancel_current_timer">İptal et</string>
     <string name="card">Kart</string>
+    <string name="card_circular_style">Yuvarlak</string>
     <string name="card_color_style">Renkli Kart</string>
-    <string name="card_square">Kare Kart</string>
     <string name="card_style">Kart</string>
-    <string name="carousal_effect_on_now_playing_screen">Şimdi oynatılıyor ekranında atlıkarınca efekti</string>
+    <string name="carousal">Atlıkarınca</string>
+    <string name="carousal_effect_on_now_playing_screen">Şimdi oynatlıyor ekranında atlıkarınca efekti</string>
     <string name="cascading">Basamaklı</string>
-    <string name="changelog">Değişim kayıt günlüğü</string>
-    <string name="changelog_summary">Yeniliklere göz at</string>
-    <string name="choose_image">Resim Seçin</string>
-    <string name="choose_restore_title">Neyi geri yükleyeceğinizi seçin</string>
-    <string name="circle">Çember</string>
+    <string name="cast">Yayınla</string>
+    <string name="changelog">Değişiklik günlüğü</string>
+    <string name="changelog_summary">Sürümlerdeki değişiklik kayıtları Telegram üzerinde tutulmaktadır.</string>
     <string name="circular">Dairesel</string>
     <string name="classic">Klasik</string>
     <string name="clear_action">Temizle</string>
+    <string name="clear_app_data">Uygulama verilerini temizle</string>
     <string name="clear_blacklist">Kara listeyi temizle</string>
-    <string name="clear_history">Geçmişi Temizle</string>
     <string name="clear_playing_queue">Kuyruğu temizle</string>
+    <string name="clear_playlist_title">Oynatma listesini temizle</string>
+    <string name="clear_playlist_x"><![CDATA[<B>% 1 $ s </ b> oynatma listesini temizlemek istedi\u011finizden emin misiniz? Bu i\u015flem kal\u0131c\u0131d\u0131r ve geri al\u0131namaz!]]></string>
+    <string name="close_notification">Kapat</string>
     <string name="color">Renk</string>
+    <string name="color_theme_name">Renk</string>
     <string name="colors">Renkler</string>
-    <string name="compact">Kompakt</string>
-    <string name="composer">Besteci</string>
-    <string name="copied_device_info_to_clipboard">Cihaz bilgileri panoya kopyalandı.</string>
-    <string name="could_not_create_playlist">Oynatma listesi oluşturulamadı\u2019.</string>
-    <string name="could_not_download_album_cover">"Eşleşen albüm kapağı indirilemedi\u2019."</string>
+    <string name="composer">Yazar</string>
+    <string name="copied_device_info_to_clipboard">Cihaz bilgileri panoya kopyalandı</string>
+    <string name="could_not_create_playlist">Oynatma listesi yarat\u0131lamad\u0131.</string>
+    <string name="could_not_download_album_cover">"E\u015fle\u015fen bir alb\u00fcm kapa\u011f\u0131 indirilemedi"</string>
     <string name="could_not_restore_purchase">Satın alma bulunamadı.</string>
-    <string name="could_not_scan_files">%d dosyası taranamadı.</string>
-    <string name="create_action">Oluştur</string>
-    <string name="create_new_backup">Oluştur</string>
-    <string name="created_playlist_x">%1$s adında oynatma listesi oluşturuldu.</string>
+    <string name="could_not_scan_files">Dosya taranamadı</string>
+    <string name="create_action">Yarat</string>
+    <string name="created_playlist_x">%1$s adıyla çalma listesi yaratıldı.</string>
     <string name="credit_title">Üyeler ve katkıda bulunanlar</string>
     <string name="currently_listening_to_x_by_x">Şu anda %2$s şarkıcısından %1$s dinleniyor.</string>
-    <string name="custom_artist_images">Özel Sanatçı Resimleri</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Çökme raporunu paylaş</string>
     <string name="dark_theme_name">Koyu</string>
+    <string name="default_hint">Şarkı sözü yok</string>
     <string name="delete_playlist_title">Çalma listesini sil</string>
     <string name="delete_playlist_x"><![CDATA[Oynatma listesi <b>%1$s</b> silinsin mi?]]></string>
     <string name="delete_playlists_title">Çalma listelerini sil</string>
@@ -154,73 +139,57 @@
     <string name="delete_x_playlists"><![CDATA[<b>%1$d</b> çalma listeleri silinsin mi?]]></string>
     <string name="delete_x_songs"><![CDATA[<b>%1$d</b> parçaları silinsin mi?]]></string>
     <string name="deleted_x_songs">%1$d parça silindi.</string>
-    <string name="deleting_songs">Şarkıları silme</string>
+    <string name="deleting_songs">Şarkılar siliniyor</string>
     <string name="depth">Derinlik</string>
     <string name="description">Açıklama</string>
     <string name="device_info">Cihaz Bilgisi</string>
-    <string name="dialog_message_set_ringtone">Retro Müzik\'in ses ayarlarını değiştirmesine izin verin</string>
+    <string name="dialog_message_set_ringtone">Retro Müzik\'in ses ayarlarını değiştirmesine izin ver</string>
     <string name="dialog_title_set_ringtone">Zil sesini ayarla</string>
-    <string name="disc_hint">Disk numarası</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[Kara listeden <b>%1$s</b>\'i kaldırmak istiyor musunuz?]]></string>
-    <string name="donate">Bağış yapın</string>
-    <string name="donate_summary">Çalışmalarımın karşılığı olarak para hakettiğimi düşünüyorsanız bana biraz bahşiş bırakabilirsiniz</string>
-    <string name="donation_header">Bağışlayacağınız tutar:</string>
-    <string name="done">Tamam</string>
-    <string name="drive_mode">Sürüş modu</string>
-    <string name="edit_fab">Düzenle butonu</string>
-    <string name="edit_normal_lyrics">Sözleri düzenle</string>
-    <string name="edit_synced_lyrics">Senkronize Edilmiş Sözleri Düzenle</string>
+    <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Kara listeden <b>%1$s</b> yolunu kaldırmak istiyor musunuz?]]></string>
+    <string name="donate">Bağış</string>
+    <string name="donate_summary">Çalışmalarımın karşılığı olması gerektiğini düşünüyorsan bana biraz bahşiş bırakabilirsin.</string>
+    <string name="donation_header">Bana bağışlayacağın tutar:</string>
+    <string name="download_from_last_fm">Last.fm\'den yükle</string>
+    <string name="edit">Düzenle</string>
+    <string name="edit_cover">Albüm kapağını düzenle</string>
     <string name="empty">Boş</string>
     <string name="equalizer">Ekolayzır</string>
-    <string name="error_create_backup">Yedek oluşturulamadı</string>
-    <string name="error_delete_backup">Yedek silinemedi</string>
-    <string name="error_empty_name">İsmin boş olamaz!</string>
-    <string name="error_load_failed">Yükleme başarısız</string>
-    <string name="error_share_file">Dosya paylaşılamadı</string>
-    <string name="expanded">Genişletilmiş</string>
+    <string name="error">Hata</string>
     <string name="faq">SSS</string>
-    <string name="favorites">Favoriler</string>
-    <string name="file_already_exists">Dosya zaten mevcut</string>
-    <string name="finish_last_song">Son şarkıyı sonlandır</string>
-    <string name="fit">Uydur</string>
+    <string name="favorites">Gözdeler</string>
+    <string name="finish_last_song">Son şarkıyı bitir</string>
+    <string name="fit">Fit</string>
     <string name="flat">Düz</string>
     <string name="folders">Klasörler</string>
     <string name="follow_system">Sistemi izle</string>
-    <string name="for_you">Sizin için</string>
-    <string name="free">Bedava</string>
+    <string name="for_you">Senin için</string>
     <string name="full">Dolu</string>
-    <string name="full_card">Dolu kart</string>
+    <string name="full_card">Kart dolu</string>
     <string name="general_settings_summary">Uygulamanın arayüzünü ve renklerini değiştirin</string>
     <string name="general_settings_title">Bak ve Hisset</string>
-    <string name="genre">Janr</string>
-    <string name="genres">Janrlar</string>
+    <string name="genre">Tür</string>
+    <string name="genres">Türler</string>
     <string name="git_hub_summary">Projeyi GitHub\'da çatalla</string>
-    <string name="gradient">Gradyan</string>
-    <string name="grant_access">Erişim izni ver</string>
+    <string name="google_plus_community">Yardım isteyebileceğiniz veya Retro Müzik güncellemelerini takip etmek için Google+ topluluğumuza katılın.</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_7">8</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Izgara şekli</string>
-    <string name="help_summary">Daha fazla yardıma mı ihtiyacınız var?</string>
+    <string name="grid_style_label"><![CDATA[Izgaralar & Stil]]></string>
     <string name="hinge">Menteşe</string>
     <string name="history">Geçmiş</string>
-    <string name="history_cleared">Geçmiş temizlendi</string>
-    <string name="history_undo_button">Geri al</string>
     <string name="home">Ana sayfa</string>
     <string name="horizontal_flip">Yatay çevir</string>
     <string name="image">Görüntü</string>
     <string name="image_gradient">Gradyan görüntü</string>
-    <string name="image_settings_summary">Şarkıcı resimlerinin indirme ayarlarını değiştirin</string>
-    <string name="import_label">İçeri aktar</string>
-    <string name="import_playlist">Oynatma listesini içeri aktar</string>
-    <string name="import_playlist_message">Android Medya Hafızası\'nda listelenen tüm çalma listelerini şarkılarla içe aktarır, çalma listesi zaten varsa şarkılar birleştirilir.</string>
-    <string name="inserted_x_songs_into_playlist_x">%2$s listesine %1$d parçalar eklendi.</string>
+    <string name="image_settings_summary">Şarkıcı görüntülerinin indirilme ayarları</string>
+    <string name="inserted_x_songs_into_playlist_x">%2$s listesine %1$d parça eklendi.</string>
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Instagram\'da Retro Müzik temanızı paylaşın</string>
     <string name="keyboard">Klavye</string>
     <string name="label_bit_rate">Bit Hızı</string>
@@ -228,101 +197,82 @@
     <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_last_modified">Son Değiştirme</string>
-    <string name="label_more_from">%s\'dan daha fazla</string>
     <string name="label_sampling_rate">Örnekleme oranı</string>
     <string name="label_track_length">Uzunluk</string>
     <string name="labeled">Etiketli</string>
     <string name="last_added">Son eklenen</string>
     <string name="last_song">Son şarkı</string>
-    <string name="lets_go">Hadi başlayalım</string>
+    <string name="lets_play_something">Hadi, biraz müzik çalı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">Açık Beyaz</string>
-    <string name="listeners_label">Dinleyiciler</string>
+    <string name="light_theme_name">Açıkça Beyaz</string>
     <string name="listing_files">Dosyalar listeleniyor</string>
     <string name="loading_products">Ürünler yükleniyor ...</string>
     <string name="login">Giriş</string>
     <string name="lyrics">Şarkı sözleri</string>
-    <string name="made_with_love">Hindistan\'da ❤️ ile yapıldı</string>
+    <string name="made_with_love">Hindistan\'da ❤️ ile üretildi</string>
     <string name="material">Materyal</string>
     <string name="md_error_label">Hata</string>
     <string name="md_storage_perm_error">İzin hatası</string>
-    <string name="message_backup_create_success">Yedekleme başarılı bir şekilde oluşturuldu.</string>
-    <string name="message_limit_tabs">En fazla 5 öğe</string>
-    <string name="message_pro_feature">%s bir Pro özelliğidir.</string>
-    <string name="message_restore_success">Geri yükleme başarıyla tamamlandı.</string>
-    <string name="message_updated">Güncellendi</string>
-    <string name="message_welcome"><![CDATA[Merhaba! <br>%s\'e<br> hoşgeldin]]></string>
     <string name="my_name">İsim</string>
     <string name="my_top_tracks">Sık oynatılanlar</string>
     <string name="never">Asla</string>
-    <string name="new_music_mix">Yeni Müzik Karışımı</string>
+    <string name="new_banner_photo">Yeni afiş fotoğrafı</string>
     <string name="new_playlist_title">Yeni şarkı listesi</string>
-    <string name="new_start_directory">%s yeni başlangıç dizini.</string>
+    <string name="new_profile_photo">Yeni profil fotoğrafı ekle</string>
+    <string name="new_start_directory">%s yeni başlangıç dizini</string>
     <string name="next_song">Sonraki Şarkı</string>
-    <string name="no_albums">Hiç albümünüz bulunmuyor</string>
-    <string name="no_artists">Hiç sanatçınız bulunmuyor</string>
+    <string name="no_albums">Albüm yok</string>
+    <string name="no_artists">Sanatçı yok</string>
     <string name="no_audio_ID">"Önce bir şarkı çal, sonra tekrar dene"</string>
-    <string name="no_backups_found">Yedekleme bulunamadı</string>
     <string name="no_equalizer">Ekolayzır bulunamadı</string>
-    <string name="no_genres">Hiç janrınız bulunmuyor</string>
-    <string name="no_lyrics_found">Şarkı sözleri bulunamadı</string>
-    <string name="no_playing_queue">Hiç çalan şarkı yok</string>
-    <string name="no_playlists">Hiç oynatma listeniz bulunmuyor</string>
-    <string name="no_purchase_found">Satın alma bulunamadı.</string>
+    <string name="no_genres">Tür yok</string>
+    <string name="no_lyrics_found">Şarkı sözleri yok</string>
+    <string name="no_playlists">Oynatma Listesi Yok</string>
+    <string name="no_purchase_found">Satın alma bulunamadı</string>
     <string name="no_results">Sonuç yok</string>
-    <string name="no_songs">Hiç şarkınız bulunmuyor</string>
+    <string name="no_songs">Şarkı yok</string>
     <string name="normal">Normal</string>
     <string name="normal_lyrics">Normal şarkı sözleri</string>
+    <string name="normal_style">Normal</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> medya deposunda listelenmiyor.]]></string>
-    <string name="not_recently_played">Yakın zamanda oynatılmadı</string>
     <string name="nothing_to_scan">Aranacak herhangi bir şey yok.</string>
-    <string name="nothing_to_see">Hiçbir şey yok</string>
     <string name="notification">Bildirim</string>
     <string name="notification_settings_summary">Bildirim stilini özelleştirin</string>
     <string name="now_playing">Şimdi oynatılıyor</string>
     <string name="now_playing_queue">Şimdi çalınıyor kuyruğu</string>
     <string name="now_playing_summary">Şimdi oynatılıyor ekranını özelleştirin</string>
-    <string name="now_playing_themes">9+ şimdi oynatılıyor teması</string>
-    <string name="only_on_wifi">Sadece Wi-Fi\'da</string>
+    <string name="now_playing_themes">9+ şimdi oynatılıyor temaları</string>
+    <string name="only_on_wifi">Sadece Wi-Fi ile</string>
     <string name="other_settings_summary">Gelişmiş test özellikleri</string>
     <string name="others">Diğer</string>
-    <string name="over_cover">Kapağın Üstüne</string>
     <string name="password">Şifre</string>
     <string name="past_three_months">Son 3 ay</string>
-    <string name="paste_lyrics_here">Sözleri buraya yapıştır</string>
-    <string name="paste_timeframe_lyrics_here">Zaman dilimli şarkı sözlerini buraya yapıştır</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Yakındaki cihazlara erişim izni reddedildi.</string>
-    <string name="permission_external_storage_denied">Harici depolama izni reddedildi.</string>
-    <string name="permission_summary">Uygulamanın müzik çalması için cihazınızın depolama erişimine ihtiyacı var</string>
-    <string name="permission_title">Depolama Erişimi</string>
-    <string name="permissions_denied">İzinler reddedildi.</string>
+    <string name="paste_lyrics_here">Şarkı sözlerini buraya yapıştır</string>
+    <string name="peak">Zirve</string>
+    <string name="permission_external_storage_denied">Depolama izni reddedildi.</string>
+    <string name="permissions_denied">İzinler reddedildi</string>
     <string name="personalize">Kişiselleştirme</string>
-    <string name="personalize_settings_summary">Şimdi çalıyor ve kullanıcı arayüzü kontrollerinizi özelleştirin</string>
+    <string name="personalize_settings_summary">Şimdi çalmakta olan ve kullanıcı arayüzü kontrollerinizi özelleştirin</string>
     <string name="pick_from_local_storage">Yerel depolama alanından seç</string>
+    <string name="pick_image_intent_text">Resim koy</string>
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Retro Müzik tasarım ilhamı almak için Pinterest sayfasını takip edin</string>
+    <string name="pinterest_page_summary">Retro Music tasarımından ilham almak için Pinterest sayfasını takip edin</string>
     <string name="plain">Sade</string>
-    <string name="playList_already_exits">Oynatma listesi zaten var</string>
-    <string name="playback_pitch">Perde</string>
-    <string name="playback_settings">Oynatma Ayarları</string>
-    <string name="playback_speed">Oynatma Hızı</string>
-    <string name="playing_notification_description">Oynatılıyor bildirimi, oynatma/duraklatma vb. için eylemler sağlar.</string>
+    <string name="playing_notification_description">Oynatma bildirimi, oynatma / duraklatma vb. Için eylemler sağlar.</string>
     <string name="playing_notification_name">Oynatılıyor bildirimi</string>
-    <string name="playlist_created_sucessfully">%s başarıyla oluşturuldu</string>
+    <string name="playlist_empty_text">Boş oynatma listesi</string>
     <string name="playlist_is_empty">Oynatma listesi boş</string>
     <string name="playlist_name_empty">Oynatma listesi ismi</string>
     <string name="playlists">Oynatma listeleri</string>
+    <string name="pref_album_detail_style">Albüm detay stili</string>
     <string name="pref_blur_amount_summary">Bulanıklık içeren arayüzler için bulanıklık tutarı, ne kadar azsa o kadar hızlı.</string>
-    <string name="pref_blur_amount_title">Bulanıklık miktarı</string>
-    <string name="pref_filter_song_summary">Şarkıları uzunluğa göre filtrele</string>
+    <string name="pref_blur_amount_title">Bulanıklık tutarı</string>
+    <string name="pref_dialog_corner_title">Diyalog kenarı</string>
     <string name="pref_filter_song_title">Şarkı süresini filtrele</string>
-    <string name="pref_header_advanced">Gelişmiş</string>
     <string name="pref_header_album">Albüm stili</string>
     <string name="pref_header_audio">Ses</string>
-    <string name="pref_header_blacklist">Kara liste</string>
     <string name="pref_header_controls">Kontroller</string>
     <string name="pref_header_general">Tema</string>
     <string name="pref_header_images">Görüntüler</string>
@@ -333,125 +283,103 @@
     <string name="pref_keep_pause_on_zero_volume_title">Sıfırda dur</string>
     <string name="pref_keep_screen_on_summary">Bu özelliği etkinleştirmenin pil ömrünü etkileyebileceğini unutmayın.</string>
     <string name="pref_keep_screen_on_title">Ekranı açık tut</string>
-    <string name="pref_language_name">Dil seçiniz</string>
+    <string name="pref_now_playing_screen_summary">Çalmakta olan ekrana şeffaf gezinme olmadan açmak veya kaydırmak için tıklayın</string>
+    <string name="pref_now_playing_screen_title">Tıkla veya Kaydır</string>
     <string name="pref_snow_fall_title">Kar yağışı efekti</string>
     <string name="pref_summary_album_art_on_lockscreen">Çalmakta olan şarkı albüm kapağını kilit ekranı duvar kağıdı olarak kullanın</string>
-    <string name="pref_summary_album_artists_only">Sanatçı kategorisinde Albüm Sanatçılarını göster</string>
     <string name="pref_summary_audio_ducking">Sistem sesi çalındığında veya bir bildirim alındığında sesi kısın</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">Kara listedeki klasörlerin içeriği kütüphanenizden gizlenir.</string>
-    <string name="pref_summary_bluetooth_playback">Bluetooth cihazına bağlanır bağlanmaz çalmaya başla</string>
-    <string name="pref_summary_blurred_album_art">Albüm kapağını kilit ekranında bulanıklaştır. Üçüncü taraf uygulamalar ve widget\'lar ile sorunlara neden olabilir</string>
+    <string name="pref_summary_blurred_album_art">Albüm kapağını kilitli ekran üzerinde bulanıklaştırır. Üçüncü taraf uygulamaları ve widget\'ları ile sorunlara neden olabilir</string>
     <string name="pref_summary_carousel_effect">Çalmakta olan ekranda albüm resmi için atlıkarınca efekti. Kart ve Bulanıklaştırma Kartı temalarının çalışmayacağını unutmayın</string>
     <string name="pref_summary_classic_notification">Klasik bildirim tasarımını kullanın</string>
     <string name="pref_summary_colored_app">Arka plan ve kontrol düğmesinin renkleri, çalmakta olan ekranda albüm resmine göre değişir</string>
     <string name="pref_summary_colored_app_shortcuts">Vurgu rengindeki uygulama kısayollarını renklendirir. Lütfen rengi her değiştirdiğinizde, etkili olması için bu düğmeyi değiştirin.</string>
+    <string name="pref_summary_colored_navigation_bar">Birincil renkteki gezinme çubuğunu renklendirir.</string>
     <string name="pref_summary_colored_notification">"Alb\u00fcm kapa\u011f\u0131n\u0131n canl\u0131 rengindeki bildirimi renklendirir"</string>
-    <string name="pref_summary_cross_fade">Şarkılar arası çapraz geçiş için süre</string>
     <string name="pref_summary_desaturated_color">Karanlık modda malzeme tasarım kurallarına göre renkler doymamış olmalıdır</string>
-    <string name="pref_summary_expand_now_playing_panel">Bildirime tıklamak ana ekran yerine şimdi oynatılıyor ekranını gösterecek</string>
+    <string name="pref_summary_dominant_color">En baskın renk, albüm veya sanatçı kapağından seçilecektir</string>
     <string name="pref_summary_extra_controls">Mini oynatıcı için ekstra kontroller ekle</string>
-    <string name="pref_summary_extra_song_info">Dosya formatı, bit hızı ve frekans gibi fazladan şarkı bilgilerini göster</string>
     <string name="pref_summary_gapless_playback">"Bazı cihazlarda oynatma sorunlarına neden olabilir"</string>
+    <string name="pref_summary_genre_toggle">Türk sekmesini aktif et</string>
     <string name="pref_summary_home_banner">Ana sayfa afişini etkinleştir</string>
     <string name="pref_summary_ignore_media_store_artwork">Albüm kapağı kalitesini artırabilir, ancak fotoğrafın yavaş yüklenmesine neden olur. Bunu, yalnızca düşük çözünürlüklü resimlerle ilgili sorunlarınız varsa etkinleştirin.</string>
     <string name="pref_summary_library_categories">Kütüphane kategorilerinin görünürlük ve sırasını yapılandırın</string>
     <string name="pref_summary_lock_screen">Retro Müzik\'in özel kilit ekranı kontrollerini kullanın</string>
-    <string name="pref_summary_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">Açık kaynaklı yazılım için lisans detayları</string>
-    <string name="pref_summary_pause_history">Etkinleştirildiğinde, yeni çalınan şarkılar geçmişte gösterilmez</string>
-    <string name="pref_summary_remember_tab">Başlangıçta son kullanılan sekmeye git</string>
-    <string name="pref_summary_show_lyrics">Albüm kapağının üstünde senkronize edilmiş sözleri göster</string>
-    <string name="pref_summary_suggestions">Ana Ekranda Yeni Müzik Karışımını Göster</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Şu anda oynatılan ekranda herhangi bir yere kaydırarak şarkı değiştirmeyi sağlar</string>
-    <string name="pref_summary_swipe_to_dismiss">Mini oynatıcıyı kapatmak için aşağı kaydırın</string>
+    <string name="pref_summary_round_corners">Uygulamanın kenarlarını yuvarlaklaştır</string>
+    <string name="pref_summary_tab_titles">Alt gezinti çubuğu sekmeleri için başlıkları etkinleştir</string>
     <string name="pref_summary_toggle_full_screen">Sürükleyici modu</string>
-    <string name="pref_summary_toggle_headset">Kulaklık bağlandıktan hemen sonra çalmaya başla</string>
-    <string name="pref_summary_toggle_shuffle">Yeni bir şarkı listesi çalınırken karıştırma modu kapanacak</string>
-    <string name="pref_summary_toggle_volume">Eğer yeterli alan varsa ses kontrollerini şimdi oynatılıyor ekranında göster</string>
-    <string name="pref_summary_wallpaper_accent">Vurgu rengini duvar kağıdından al</string>
-    <string name="pref_summary_whitelist">Sadece /Music dosyasından müzik göster</string>
+    <string name="pref_summary_toggle_headset">Kulaklık bağlandıktan hemen sonra çalmaya başlayın.</string>
+    <string name="pref_summary_toggle_shuffle">Yeni bir şarkı listesi çalınırken Karışık modu kapanacak</string>
+    <string name="pref_summary_toggle_volume">Yeterli alan varsa, ses denetimlerini şimdi oynatma ekranında göster</string>
     <string name="pref_title_album_art_on_lockscreen">Albüm kapağını göster</string>
-    <string name="pref_title_album_artists_only">Albüm Sanatçısına göre belirle</string>
     <string name="pref_title_album_cover_style">Albüm kapağı teması</string>
     <string name="pref_title_album_cover_transform">Albüm kapağını atla</string>
+    <string name="pref_title_album_grid_style">Albüm ızgarası</string>
     <string name="pref_title_app_shortcuts">Renkli uygulama kısayolları</string>
-    <string name="pref_title_appbar_mode">Başlık stili</string>
+    <string name="pref_title_artist_grid_style">Sanatçı ızgarası</string>
     <string name="pref_title_audio_ducking">Odak kaybında ses hacmini azaltın</string>
-    <string name="pref_title_audio_fade">Soluk Ses</string>
     <string name="pref_title_auto_download_artist_images">Sanatçı resimlerini otomatik indir</string>
     <string name="pref_title_blacklist">Kara Liste</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth ile oynatma</string>
-    <string name="pref_title_blurred_album_art">Albüm kapağını bulanıklaştır</string>
-    <string name="pref_title_circle_button">Dairesel oynatma düğmesi</string>
+    <string name="pref_title_blurred_album_art">Bulanık albüm kapağı</string>
+    <string name="pref_title_choose_equalizer">Ekolayzır seç</string>
     <string name="pref_title_classic_notification">Klasik bildirim tasarımı</string>
     <string name="pref_title_colored_app">Adaptif renk</string>
     <string name="pref_title_colored_notification">Renkli bildirim</string>
-    <string name="pref_title_cross_fade">Çapraz geçiş (Beta)</string>
-    <string name="pref_title_custom_font">Manrope yazı tipini kullan</string>
     <string name="pref_title_desaturated_color">Doymamış renk</string>
-    <string name="pref_title_expand_now_playing_panel">Şimdi oynatılıyor ekranını göster</string>
     <string name="pref_title_extra_controls">Ekstra kontroller</string>
-    <string name="pref_title_extra_song_info">Şarkı bilgisi</string>
-    <string name="pref_title_gapless_playback">Aralıksız oynatma</string>
+    <string name="pref_title_gapless_playback">Boşluksuz oynatma</string>
     <string name="pref_title_general_theme">Uygulama teması</string>
-    <string name="pref_title_home_album_grid_style">Albüm kapağı</string>
+    <string name="pref_title_genre_toggle">Tür sekmesini göster</string>
     <string name="pref_title_home_artist_grid_style">Ana sayfa sanatçı ızgarası</string>
-    <string name="pref_title_home_banner">Ana sayfa afişi</string>
+    <string name="pref_title_home_banner">Ana sayfa başlığı</string>
     <string name="pref_title_ignore_media_store_artwork">Media Store kapaklarını yoksay</string>
     <string name="pref_title_last_added_interval">Son eklenen çalma listesi aralığı</string>
     <string name="pref_title_lock_screen">Tam ekran kontrolleri</string>
-    <string name="pref_title_lyrics_screen_on">Şarkı sözlerini gösterirken ekranı açık tut</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Her zaman oynat</string>
+    <string name="pref_title_navigation_bar">Renkli gezinme çubuğu</string>
     <string name="pref_title_now_playing_screen_appearance">Şimdi oynatılıyor teması</string>
     <string name="pref_title_open_source_licences">Açık kaynak lisansları</string>
-    <string name="pref_title_pause_history">Geçmişi duraklat</string>
-    <string name="pref_title_remember_tab">Son sekmeyi hatırla</string>
-    <string name="pref_title_show_lyrics">Şarkı sözlerini göster</string>
-    <string name="pref_title_suggestions">Önerileri göster</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Şarkıyı değiştirmek için herhangi bir yere kaydırın</string>
-    <string name="pref_title_swipe_to_dismiss">Aşağı kaydırarak kapatın</string>
+    <string name="pref_title_round_corners">Köşe kenarları</string>
     <string name="pref_title_tab_text_mode">Sekme başlıkları modu</string>
     <string name="pref_title_toggle_carousel_effect">Atlıkarınca efekti</string>
+    <string name="pref_title_toggle_dominant_color">Baskın renk</string>
     <string name="pref_title_toggle_full_screen">Uygulamayı tam ekran yapın</string>
+    <string name="pref_title_toggle_tab_titles">Sekme başlıkları</string>
     <string name="pref_title_toggle_toggle_headset">Otomatik oynatma</string>
     <string name="pref_title_toggle_toggle_shuffle">Karıştır modu</string>
     <string name="pref_title_toggle_volume">Ses kontrolleri</string>
-    <string name="pref_title_wallpaper_accent">Duvar kağıdı vurgu rengi</string>
-    <string name="pref_title_whitelist">Beyaz liste müziği</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pref_title_user_info">Kullanıcı bilgisi</string>
+    <string name="primary_color">Ana renk</string>
+    <string name="primary_color_desc">Ana tema rengi, varsayılanı mavi griye, şimdilik koyu renklerle çalışıyor</string>
+    <string name="pro_summary">Şimdi Oynatılıyor temaları, Atlıkarınca efekti, Renkli tema ve daha fazlası..</string>
     <string name="profile">Profil</string>
     <string name="purchase">Satın al</string>
+    <string name="purchase_summary">Lütfen satın almadan önce düşünün. Para iadesi yapılmaz.</string>
     <string name="queue">Kuyruk</string>
-    <string name="rate_app">Uygulamayı değerlendirin</string>
-    <string name="rate_on_google_play_summary">Bu uygulamayı beğendiniz mi? Nasıl daha iyi yapabileceğimiz konusunda lütfen Google Play Store\'da bize bildirin</string>
+    <string name="rate_app">Uygulamayı Değerlendir</string>
+    <string name="rate_on_google_play_summary">Bu uygulamayı sevdin mi? Daha iyi bir gelişim için lütfen Google Play\'de nasıl daha iyi yapabileceğimizi bildir.</string>
     <string name="recent_albums">Son albümler</string>
     <string name="recent_artists">Son sanatçılar</string>
     <string name="remove_action">Kaldır</string>
+    <string name="remove_banner_photo">Afiş fotoğrafını kaldır</string>
     <string name="remove_cover">Kapağı kaldır</string>
     <string name="remove_from_blacklist">Kara listeden kaldır</string>
-    <string name="remove_image">Resmi Kaldır</string>
+    <string name="remove_profile_photo">Profil fotoğrafını kaldır</string>
     <string name="remove_song_from_playlist_title">Şarkıyı oynatma listesinden kaldır</string>
-    <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> adlı şarkı oynatma listesinden kaldırılsın mı?]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[<b>%1$s</b> şarkısı oynatma listesinden kaldır?]]></string>
     <string name="remove_songs_from_playlist_title">Şarkıları oynatma listesinden kaldır</string>
-    <string name="remove_x_songs_from_playlist"><![CDATA[<b>%1$d</b> adlı şarkılar oynatma listesinden kaldırılsın mı?]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[Bu şarkıları <b>%1$d</b> oynatma listesinden kaldıracağından emin misin?]]></string>
     <string name="rename_playlist_title">Oynatma listesini yeniden adlandır</string>
-    <string name="replace_cover">Kapağı Değiştir</string>
     <string name="report_an_issue">Sorun Bildir</string>
     <string name="report_bug">Hata bildir</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="restore_message">Yedeklemeyi geri yüklemek istiyor musunuz?</string>
     <string name="restored_previous_purchase_please_restart">Önceki satın alma işlemi geri yüklendi. Tüm özelliklerden yararlanmak için lütfen uygulamayı yeniden başlatın.</string>
     <string name="restored_previous_purchases">Önceki satın almalar geri yüklendi.</string>
     <string name="restoring_purchase">Satın alım geri yükleniyor ...</string>
-    <string name="retro_music_player">Retro Müzik Çalar</string>
-    <string name="retro_music_pro">Retro Müzik Pro</string>
-    <string name="ringtone_summary">Müziği zil sesi yapmak için uygulamanın cihaz ayarlarına erişim yetkisi gereklidir</string>
-    <string name="ringtone_title">Zil sesi (İsteğe Bağlı)</string>
+    <string name="retro_equalizer">Retro Music Ekolayzırı</string>
+    <string name="retro_music_pro">Retro Music Pro</string>
     <string name="saf_delete_failed">Dosya silme başarısız oldu: %s</string>
     <!-- SAF -->
     <string name="saf_error_uri">SAF url\'si alınamıyor.</string>
@@ -462,7 +390,7 @@
     <string name="saf_guide_slide2_description">SD kart kök dizini seçmeniz gerekir</string>
     <string name="saf_guide_slide2_title">Navigasyon sekmesinde SD kartınızı 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 kısmındaki \'Seç\' düğmesine dokunun</string>
+    <string name="saf_guide_slide3_title">Ekranın alt kısmındaki\' Seç \' düğmesine dokunun</string>
     <string name="saf_write_failed">Dosya yazma başarısız oldu: %s</string>
     <string name="save">Kaydet</string>
     <!-- SAF -->
@@ -471,57 +399,63 @@
     <string name="save_playlists_title">Dosya olarak kaydet</string>
     <string name="saved_playlist_to">Oynatma listesi %s olarak kaydedildi.</string>
     <string name="saving_changes">Değişiklikler kaydediliyor</string>
-    <string name="scan_media">Medyayı tara</string>
+    <string name="scan_media">Medya tara</string>
     <string name="scanned_files">%1$d / %2$d dosya tarandı.</string>
-    <string name="scrobbles_label">Gönderilen şarkı adları</string>
+    <string name="search_hint">Kütüphanenizi arayın…</string>
     <string name="select_all">Hepsini seç</string>
+    <string name="select_banner_photo">Afiş fotoğrafını seçin</string>
     <string name="selected">Seçilmiş</string>
+    <string name="send_crash_log">Çökme raporu gönder</string>
     <string name="set">Ayarla</string>
     <string name="set_artist_image">Sanatçı resmini ayarla</string>
+    <string name="set_photo">Profil fotoğrafı seç</string>
     <string name="share_app">Uygulamayı paylaş</string>
-    <string name="share_summary">Uygulamayı arkadaşlarınız ve ailenizle paylaşın</string>
-    <string name="share_to_stories">Hikayende paylaş</string>
-    <string name="show_album_artists">Albüm Sanatçılarını Göster</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ı %d dakikaya ayarlandı.</string>
+    <string name="slide">Kaydır</string>
+    <string name="small">Küçük albüm</string>
     <string name="social">Sosyal</string>
-    <string name="social_stories">Hikaye olarak paylaş</string>
     <string name="song">Şarkı</string>
     <string name="song_duration">Şarkı süresi</string>
     <string name="songs">Şarkılar</string>
     <string name="sort_order">Sıralama Ölçütü</string>
-    <string name="sort_order_a_z">Yükselen</string>
+    <string name="sort_order_a_z">yükselen</string>
     <string name="sort_order_album">Albüm</string>
     <string name="sort_order_artist">Sanatçı</string>
     <string name="sort_order_composer">Besteci</string>
-    <string name="sort_order_date">Tarih eklendi</string>
-    <string name="sort_order_date_modified">Zaman ayarlandı</string>
-    <string name="sort_order_default">Varsayılan</string>
-    <string name="sort_order_num_songs">Şarkı sayısı</string>
-    <string name="sort_order_num_songs_desc">Şarkı sayısı açıklaması</string>
+    <string name="sort_order_date">Tarih</string>
     <string name="sort_order_year">Yıl</string>
     <string name="sort_order_z_a">Azalan</string>
     <string name="speech_not_supported">Üzgünüz, ancak cihazın konuşma girişini desteklemiyor.</string>
     <string name="speech_prompt">Kütüphanenizde arayın</string>
-    <string name="stack">Kümele</string>
+    <string name="stack">Stack</string>
     <string name="start_play_music">Müzik çalmayı başlat.</string>
     <string name="suggestion_songs">Öneriler</string>
+    <string name="summary_user_info">İsmini sadece ana ekranda göster</string>
     <string name="support_development">Destek geliştirme</string>
     <string name="swipe_to_unlock">Açmak için kaydırın</string>
-    <string name="synced_lyrics">Senkronize edilmiş sözler</string>
+    <string name="synced_lyrics">Senkronize şarkı sözleri</string>
+    <string name="system_equalizer">Sistem Ekolayzırı</string>
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Hataları tartışmak, önerilerde bulunmak ve daha fazlası için Telegram grubuna katılın</string>
-    <string name="thank_you">Teşekkür ederiz!</string>
+    <string name="thank_you">Teşekkür ederim!</string>
     <string name="the_audio_file">Ses dosyası</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="tiny_card_style">Ufak kart</string>
-    <string name="title">Şarkı adı</string>
-    <string name="title_new_backup">Yeni yedekleme</string>
+    <string name="title">Başlık</string>
+    <string name="title_dashboard">Gösterge paneli</string>
+    <string name="title_good_afternoon">Tünaydın</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_user_info">Adın Ne?</string>
     <string name="today">Bugün</string>
     <string name="top_albums">En iyi albümler</string>
     <string name="top_artists">En iyi sanatçılar</string>
@@ -529,33 +463,27 @@
     <string name="track_list">Parça numarası</string>
     <string name="translate">Çevir</string>
     <string name="translate_community">Uygulamayı diline çevirmek için bize yardımcı ol.</string>
-    <string name="try_retro_music_premium">Retro Müzik Premium\'u deneyin</string>
     <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">Tasarımınızı Retro Müzik\'le paylaşın</string>
+    <string name="twitter_page_summary">Tasarımını Retro Müzik ile paylaşın</string>
     <string name="unlabeled">Etiketsiz</string>
-    <string name="unplayable_file">Bu şarkı oynatılamadı\u2019.</string>
+    <string name="unplayable_file">Bu \u015fark\u0131 oynat\u0131lamad\u0131</string>
     <string name="up_next">Bir sonraki</string>
     <string name="update_image">Resmi güncelle</string>
     <string name="updating">Güncelleniyor ...</string>
-    <string name="user_images_description">Kullanıcı Resimleri</string>
-    <string name="user_name">Kullanıcı Adı</string>
     <string name="username">Kullanıcı Adı</string>
     <string name="version">Sürüm</string>
     <string name="vertical_flip">Dikey çevir</string>
-    <string name="view_on_telegram">Telegram\'da görüntüle</string>
-    <string name="volume">Ses</string>
-    <string name="web_search">İnternette ara</string>
-    <string name="website">Web Sitesi</string>
-    <string name="website_summary">Web sitemize göz atın</string>
-    <string name="welcome">Hoşgeldiniz,</string>
-    <string name="what_do_you_want_to_share">Ne paylaşmak istiyorsunuz?</string>
+    <string name="virtualizer">Sanallaştırıcı</string>
+    <string name="web_search">İnternet\'de ara</string>
+    <string name="welcome">Hoşgeldin,</string>
+    <string name="what_do_you_want_to_share">Ne paylaşmak istiyorsun?</string>
     <string name="whats_new">Yenilikler</string>
     <string name="window">Pencere</string>
     <string name="window_corner_edges">Yuvarlatılmış kenarlar</string>
-    <string name="x_has_been_set_as_ringtone">%1$s\'i zil sesi olarak ayarla.</string>
+    <string name="x_has_been_set_as_ringtone">%1$s zil sesi olarak ayarla.</string>
     <string name="x_selected">%1$d seçildi</string>
     <string name="year">Yıl</string>
-    <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmek zorundasınız.</string>
+    <string name="you_have_to_select_at_least_one_category">En az bir kategori seçmek zorundasın.</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Sorun izleyici web sitesine yönlendirileceksiniz.</string>
     <string name="your_account_data_is_only_used_for_authentication">Hesap verileriniz sadece kimlik doğrulama için kullanılır.</string>
 </resources>
diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml
deleted file mode 100644
index 74255debc..000000000
--- a/app/src/main/res/values-uk-rUA/strings.xml
+++ /dev/null
@@ -1,565 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">Про застосунок %s</string>
-    <string name="about_settings_summary">Команда, посилання на соц. мережі</string>
-    <string name="accent_color">Акцентний колір</string>
-    <string name="accent_color_desc">Акцентний колір, за замовчуванням фіолетовий</string>
-    <string name="action_about">Про застосунок</string>
-    <string name="action_add_to_blacklist">Додати до чорного списку</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_cancel">Скасовувати</string>
-    <string name="action_cast">Трансляція на іншому дисплеї</string>
-    <string name="action_clear_playing_queue">Очистити чергу відтворення</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_edit">Редагувати</string>
-    <string name="action_go_to_album">Перейти до альбому</string>
-    <string name="action_go_to_artist">Перейти до виконавця</string>
-    <string name="action_go_to_genre">Перейти до жанру</string>
-    <string name="action_go_to_lyrics">Перейти до тексту пісень</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_all">Відтворити усі</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_sort_order">Порядок сортування</string>
-    <string name="action_tag_editor">Редактор тегів</string>
-    <string name="action_toggle_favorite">Перемкнути улюблене</string>
-    <string name="action_toggle_shuffle">Перемкнути режим змішування</string>
-    <string name="adaptive">Адаптивний</string>
-    <string name="add_action">Додати</string>
-    <string name="add_playlist_title">"Додати до списку відтворення"</string>
-    <string name="add_time_framed_lryics">Додати часові розмежування тексту</string>
-    <string name="added_song_count_to_playlist">Додано %1$d пісень(ів) до %2$s</string>
-    <string name="added_title_to_playing_queue">"Додано 1 композицію до черги відтворення."</string>
-    <string name="added_x_titles_to_playing_queue">Додано %1$d композицій до черги відтворення.</string>
-    <string name="album">Альбом</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Пісня</item>
-        <item quantity="few">Пісні</item>
-        <item quantity="many">Пісні</item>
-        <item quantity="other">Пісні</item>
-    </plurals>
-    <string name="album_artist">Виконавець альбому</string>
-    <string name="albums">Альбоми</string>
-    <plurals name="albums">
-        <item quantity="one">Альбом</item>
-        <item quantity="few">Альбоми</item>
-        <item quantity="many">Альбомів</item>
-        <item quantity="other">Альбоми</item>
-    </plurals>
-    <string name="always">Завжди</string>
-    <string name="app_share">Привіт, перегляньте цей крутий музичний плеєр за адресою: https://play.google.com/store/apps/details?id=%s</string>
-    <string name="app_shortcut_shuffle_all_short">Перемішати</string>
-    <string name="app_shortcut_top_tracks_short">Кращі треки</string>
-    <string name="app_widget_big_name">Повне зображення</string>
-    <string name="app_widget_card_name">Ретро музика - Картка</string>
-    <string name="app_widget_classic_name">Ретро-музика - Класичний</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Ретро-музика - Малий</string>
-    <string name="app_widget_text_name">Мінімум тексту</string>
-    <string name="artist">Виконавець</string>
-    <string name="artists">Виконавці</string>
-    <string name="audio_fade_duration">Тривалість затухання звуку</string>
-    <string name="audio_focus_denied">В отриманні аудіофокусу відмовлено.</string>
-    <string name="audio_settings_summary">Змінити налаштування звуку та налаштувати параметри еквалайзера</string>
-    <string name="auto">Автоматично</string>
-    <string name="backup_restore_settings_summary">Резервне копіювання та відновлення налаштувань, плейлистів</string>
-    <string name="backup_restore_title"><![CDATA[Резервне копіювання та відновлення]]></string>
-    <string name="backup_title">Резервні копії</string>
-    <string name="biography">Життєпис</string>
-    <string name="black_theme_name">Чорний</string>
-    <string name="blacklist">Чорний список</string>
-    <string name="bluetooth_summary">Застосунку потрібен дозвіл на пристрої поблизу, щоб перевірити наявність пристроїв Bluetooth</string>
-    <string name="bluetooth_title">Пристрої поруч</string>
-    <string name="blur">Розмиття</string>
-    <string name="blur_card">Розмита картка</string>
-    <string name="bug_report_failed">Не вдалося надіслати звіт</string>
-    <string name="bug_report_failed_invalid_token">Недійсний токен доступу. Зв’яжіться з розробником застосунку.</string>
-    <string name="bug_report_failed_issues_not_available">Проблеми не включені для вибраного сховища. Зверніться до розробника застосунку.</string>
-    <string name="bug_report_failed_unknown">Виникла несподівана помилка. Зв\'яжіться з розробником застосунку.</string>
-    <string name="bug_report_failed_wrong_credentials">Неправильне ім\'я користувача або пароль</string>
-    <string name="bug_report_issue">Помилка</string>
-    <string name="bug_report_manual">Надіслати вручну</string>
-    <string name="bug_report_no_description">Введіть опис проблеми</string>
-    <string name="bug_report_no_password">Введіть свій дійсний пароль користувача GitHub</string>
-    <string name="bug_report_no_title">Введіть заголовок проблеми</string>
-    <string name="bug_report_no_username">Введіть своє дійсне ім’я користувача GitHub</string>
-    <string name="bug_report_success">Повідомлення про помилку успішне</string>
-    <string name="bug_report_summary">Сталася неочікувана помилка. Вибачте, що натрапили на цю помилку, якщо вона постійно повторюється, спробуйте \"Очистити дані застосунку\" або надішліть лист на ел. пошту </string>
-    <string name="bug_report_use_account">Надіслати через обліковий запис GitHub</string>
-    <string name="buy_now">Придбайте вже</string>
-    <string name="cancel_current_timer">Відмінити</string>
-    <string name="card">Картка</string>
-    <string name="card_color_style">Кольорова картка</string>
-    <string name="card_square">Квадратна картка</string>
-    <string name="card_style">Картка</string>
-    <string name="carousal_effect_on_now_playing_screen">Карусель на екрані відтворення</string>
-    <string name="cascading">Каскад</string>
-    <string name="changelog">Історія змін</string>
-    <string name="changelog_summary">Перевірте, що нового</string>
-    <string name="choose_image">Виберіть зображення</string>
-    <string name="choose_restore_title">Обирайте, що відновлювати</string>
-    <string name="circle">Коло</string>
-    <string name="circular">Круглий</string>
-    <string name="classic">Класичний</string>
-    <string name="clear_action">Очистити</string>
-    <string name="clear_blacklist">Очистити чорний список</string>
-    <string name="clear_history">Очистити історію</string>
-    <string name="clear_playing_queue">Очистити чергу</string>
-    <string name="color">Колір</string>
-    <string name="colors">Кольори</string>
-    <string name="compact">Компактний</string>
-    <string name="composer">Композитор</string>
-    <string name="copied_device_info_to_clipboard">Скопійовано інформацію про пристрій у буфер обміну.</string>
-    <string name="could_not_create_playlist">Не вдалося створити список відтворення.</string>
-    <string name="could_not_download_album_cover">"Не вдалося завантажити відповідну обкладинку альбому."</string>
-    <string name="could_not_restore_purchase">Не вдалося відновити покупку.</string>
-    <string name="could_not_scan_files">Не вдалося просканувати %d файлів.</string>
-    <string name="create_action">Створити</string>
-    <string name="create_new_backup">Створити</string>
-    <string name="created_playlist_x">Створено список відтворення %1$s.</string>
-    <string name="credit_title">Учасники та меценати </string>
-    <string name="currently_listening_to_x_by_x">Зараз грає %1$s від %2$s.</string>
-    <string name="custom_artist_images">Індивідуальні зображення художників</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Поділитися звітом про помилку</string>
-    <string name="dark_theme_name">Майже темна</string>
-    <string name="delete_playlist_title">Видалити список відтворення</string>
-    <string name="delete_playlist_x"><![CDATA[Видалити список відтворення <b>%1$s</b>?]]></string>
-    <string name="delete_playlists_title">Видалити списки відтворення</string>
-    <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="depth">Глибина</string>
-    <string name="description">Опис</string>
-    <string name="device_info">Інформація про пристрій</string>
-    <string name="dialog_message_set_ringtone">Дозволити Retro Music змінювати налаштування звуку</string>
-    <string name="dialog_title_set_ringtone">Встановити як мелодію дзвінка</string>
-    <string name="disc_hint">Номер диску</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="done">Готово</string>
-    <string name="drive_mode">Режим водія</string>
-    <string name="edit_fab">Кнопка редагування</string>
-    <string name="edit_normal_lyrics">Змінити текст пісні</string>
-    <string name="edit_synced_lyrics">Редагувати синхронізовані тексти</string>
-    <string name="empty">Порожньо</string>
-    <string name="equalizer">Еквалайзер</string>
-    <string name="error_create_backup">Не вдалося створити резервну копію</string>
-    <string name="error_delete_backup">Не можливо\u2019t видалити резервну копію</string>
-    <string name="error_empty_name">Ваше ім\'я не може бути порожнім!</string>
-    <string name="error_load_failed">Не вдалося завантажити</string>
-    <string name="error_share_file">Не вдалося поділитися файлом</string>
-    <string name="expanded">Розширений</string>
-    <string name="faq">ЧаП</string>
-    <string name="favorites">Обране</string>
-    <string name="file_already_exists">Файл вже існує</string>
-    <string name="finish_last_song">Закінчити останню пісню</string>
-    <string name="fit">Вмістити</string>
-    <string name="flat">Плоский</string>
-    <string name="folders">Папки</string>
-    <string name="follow_system">Наслідувати систему</string>
-    <string name="for_you">Для Вас</string>
-    <string name="free">Безкоштовно</string>
-    <string name="full">Повний</string>
-    <string name="full_card">Повна картка</string>
-    <string name="general_settings_summary">Змінити тему і кольори застосунку</string>
-    <string name="general_settings_title">Вигляд</string>
-    <string name="genre">Жанр</string>
-    <string name="genres">Жанри</string>
-    <string name="git_hub_summary">Форк проєкту на GitHub</string>
-    <string name="gradient">Градієнт</string>
-    <string name="grant_access">Надати доступ</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="grid_style_label">Стиль сітки</string>
-    <string name="help_summary">Необхідна додаткова допомога?</string>
-    <string name="hinge">Завіса</string>
-    <string name="history">Історія</string>
-    <string name="history_cleared">Історію очищено</string>
-    <string name="history_undo_button">Скасувати</string>
-    <string name="home">Домашня сторінка</string>
-    <string name="horizontal_flip">Горизонтальне перевернення</string>
-    <string name="image">Зображення</string>
-    <string name="image_gradient">Градієнтне зображення</string>
-    <string name="image_settings_summary">Змінити параметри завантаження зображення виконавця</string>
-    <string name="import_label">Імпорт</string>
-    <string name="import_playlist">Імпортувати плейліст</string>
-    <string name="import_playlist_message">Імпортує всі плейлісти, перелічені в Android Media Store з піснями, якщо в списках відтворення вже є і пісні будуть об\'єднані.</string>
-    <string name="inserted_x_songs_into_playlist_x">Додано %1$d пісень до списку відтворення %2$s.</string>
-    <string name="instagram_page_summary">Похизуйтеся вашими налаштуваннями Retro Music у Instagram</string>
-    <string name="keyboard">Клавіатура</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_last_modified">Дата останньої зміни</string>
-    <string name="label_more_from">Більше від %s</string>
-    <string name="label_sampling_rate">Частота дискретизації</string>
-    <string name="label_track_length">Довжина</string>
-    <string name="labeled">З відміткою</string>
-    <string name="last_added">Нещодавно додане</string>
-    <string name="last_song">Остання пісня</string>
-    <string name="lets_go">Вперед!</string>
-    <string name="library_categories">Категорії бібліотеки</string>
-    <string name="licenses">Ліцензії</string>
-    <string name="light_theme_name">Яскраво-білий</string>
-    <string name="listeners_label">Слухачі</string>
-    <string name="listing_files">Список файлів</string>
-    <string name="loading_products">Завантаження продуктів…</string>
-    <string name="login">Логін</string>
-    <string name="lyrics">Текст</string>
-    <string name="made_with_love">Зроблено з ❤ в Індії</string>
-    <string name="material">Матеріал</string>
-    <string name="md_error_label">Помилка</string>
-    <string name="md_storage_perm_error">Помилка дозволу</string>
-    <string name="message_backup_create_success">Резервну копію успішно створено.</string>
-    <string name="message_limit_tabs">Не більше 5 елементів</string>
-    <string name="message_pro_feature">%s є Pro функцією.</string>
-    <string name="message_restore_success">Відновлення успішно завершено.</string>
-    <string name="message_updated">Оновлено</string>
-    <string name="message_welcome"><![CDATA[Привіт! <br>Вітаємо в %s]]></string>
-    <string name="my_name">Назва</string>
-    <string name="my_top_tracks">Найчастіше відтворювані</string>
-    <string name="never">Ніколи</string>
-    <string name="new_music_mix">Новий мікс</string>
-    <string name="new_playlist_title">Новий список відтворення</string>
-    <string name="new_start_directory">%s є новим початковим каталогом.</string>
-    <string name="next_song">Наступна пісня</string>
-    <string name="no_albums">Немає жодного альбому</string>
-    <string name="no_artists">Немає жодного виконавця</string>
-    <string name="no_audio_ID">"Спочатку відтворіть пісню, а потім спробуйте ще раз."</string>
-    <string name="no_backups_found">Не знайдено резервних копій</string>
-    <string name="no_equalizer">Еквалайзер не знайдено</string>
-    <string name="no_genres">У вас немає жанрів</string>
-    <string name="no_lyrics_found">Текст не знайдено</string>
-    <string name="no_playing_queue">Немає пісень, що відтворюються</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="normal_lyrics">Стандартний текст</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> не вказано в медіа сховищі.]]></string>
-    <string name="not_recently_played">Нещодавно відтворені</string>
-    <string name="nothing_to_scan">Нічого сканувати.</string>
-    <string name="nothing_to_see">Порожньо</string>
-    <string name="notification">Сповіщення</string>
-    <string name="notification_settings_summary">Налаштувати стиль сповіщення</string>
-    <string name="now_playing">Відтворюється зараз</string>
-    <string name="now_playing_queue">Зараз в черзі відтворення</string>
-    <string name="now_playing_summary">Налаштування екрану відтворення</string>
-    <string name="now_playing_themes">9+ тем екрану відтворення</string>
-    <string name="only_on_wifi">Лише через Wi-Fi</string>
-    <string name="other_settings_summary">Розширені функції тестування</string>
-    <string name="others">Інше</string>
-    <string name="over_cover">Обкладинка</string>
-    <string name="password">Пароль</string>
-    <string name="past_three_months">Останні 3 місяці</string>
-    <string name="paste_lyrics_here">Вставити текст сюди</string>
-    <string name="paste_timeframe_lyrics_here">Вставити текст пісні тут</string>
-    <string name="peek">Погляд</string>
-    <string name="permission_bluetooth_denied">Доступ до пристроїв поблизу заборонено.</string>
-    <string name="permission_external_storage_denied">Відмовлено у доступі до зовнішнього сховища.</string>
-    <string name="permission_summary">Застосунку потрібен дозвіл на доступ до пам\'яті пристрою для відтворення музики</string>
-    <string name="permission_title">Доступ до сховища</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="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Слідкуйте за сторінкою Pinterest від Retro Music для натхнення дизайну</string>
-    <string name="plain">Звичайний</string>
-    <string name="playList_already_exits">Список відтворення вже існує</string>
-    <string name="playback_pitch">Тон</string>
-    <string name="playback_settings">Налаштування відтворення</string>
-    <string name="playback_speed">Швидкість Відтворення</string>
-    <string name="playing_notification_description">Сповіщення про відтворення надає дії для відтворення/паузи тощо.</string>
-    <string name="playing_notification_name">Сповіщення про відтворення</string>
-    <string name="playlist_created_sucessfully">%s успішно створено</string>
-    <string name="playlist_is_empty">Список відтворення порожній</string>
-    <string name="playlist_name_empty">Назва списку відтворення</string>
-    <string name="playlists">Списки відтворення</string>
-    <string name="pref_blur_amount_summary">Величина розмиття, що застосовується для розмиття тем, менше - швидше</string>
-    <string name="pref_blur_amount_title">Величина розмиття</string>
-    <string name="pref_filter_song_summary">Сортувати пісні за довжиною</string>
-    <string name="pref_filter_song_title">Сортувати пісні за тривалістю</string>
-    <string name="pref_header_advanced">Додатково</string>
-    <string name="pref_header_album">Стиль альбому</string>
-    <string name="pref_header_audio">Аудіо</string>
-    <string name="pref_header_blacklist">Чорний список</string>
-    <string name="pref_header_controls">Елементи керування</string>
-    <string name="pref_header_general">Тема</string>
-    <string name="pref_header_images">Зображення</string>
-    <string name="pref_header_library">Бібліотека</string>
-    <string name="pref_header_lockscreen">Екран блокування</string>
-    <string name="pref_header_playlists">Списки відтворення</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Призупиняє пісню, коли гучність зменшується до нуля і починає грати під час підвищення гучності. Також працює поза застосунком</string>
-    <string name="pref_keep_pause_on_zero_volume_title">Пауза при нулі</string>
-    <string name="pref_keep_screen_on_summary">Майте на увазі, що увімкнення цієї функції може вплинути на заряд акумулятора</string>
-    <string name="pref_keep_screen_on_title">Не вимикати екран</string>
-    <string name="pref_language_name">Обрати мову</string>
-    <string name="pref_snow_fall_title">Ефект снігопаду</string>
-    <string name="pref_summary_album_art_on_lockscreen">Використовувати обкладинку альбому пісні як шпалери екрана блокування</string>
-    <string name="pref_summary_album_artists_only">Показувати виконавців альбому в категорії виконавця</string>
-    <string name="pref_summary_audio_ducking">Зменшення гучності при відтворенні системного звуку або сповіщення</string>
-    <string name="pref_summary_audio_fade">Приглушити звуку під час паузи або відтворення пісні</string>
-    <string name="pref_summary_blacklist">Вміст тек чорного списку приховано з вашої бібліотеки.</string>
-    <string name="pref_summary_bluetooth_playback">Почати відтворення відразу при під\'єднанні до Bluetooth пристрою</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_notification">"Фарбує повідомлення в обкладинці альбому яскравим кольором"</string>
-    <string name="pref_summary_cross_fade">Тривалість переходу між піснями</string>
-    <string name="pref_summary_desaturated_color">Для Material Design лінії в темному режимі мають бути ненасичені</string>
-    <string name="pref_summary_expand_now_playing_panel">При натисканні на сповіщення буде показано екран відтворення замість домашнього екрану</string>
-    <string name="pref_summary_extra_controls">Додати додаткові елементи керування до міні-програвача</string>
-    <string name="pref_summary_extra_song_info">Показати додаткову інформацію про пісню, таку як формат файлів, бітрейт та частоту</string>
-    <string name="pref_summary_gapless_playback">"Може викликати проблеми з відтворенням на деяких пристроях."</string>
-    <string name="pref_summary_home_banner">Сховати головний банер</string>
-    <string name="pref_summary_ignore_media_store_artwork">Може збільшити якість обкладинки альбому, але збільшує час завантаження зображення. Використовуйте тільки якщо у вас проблеми з обкладинками низької роздільної здатності</string>
-    <string name="pref_summary_library_categories">Налаштувати видимість та порядок категорій бібліотеки.</string>
-    <string name="pref_summary_lock_screen">Використовувати керування музикою на екрані блокування від Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Завжди відтворювати аудіо у фоновому режимі, незважаючи на інше відтворення </string>
-    <string name="pref_summary_open_source_licences">Деталі ліцензії для програмного забезпечення з відкритим кодом</string>
-    <string name="pref_summary_pause_history">Коли увімкнено, нові пісні не відображатимуться в історії</string>
-    <string name="pref_summary_remember_tab">Перейдіть до останньої використаної вкладки при старті</string>
-    <string name="pref_summary_show_lyrics">Відображати текст пісні над обкладинкою альбому</string>
-    <string name="pref_summary_suggestions">Показати новий мікс музики на домашньому екрані</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Дозволяє змінювати пісню, проводячи пальцем по екрану відтворення</string>
-    <string name="pref_summary_swipe_to_dismiss">Проведіть вниз, щоб відхилити міні плеєр</string>
-    <string name="pref_summary_toggle_full_screen">Режим занурення</string>
-    <string name="pref_summary_toggle_headset">Почати відтворення відразу після підключення навушників</string>
-    <string name="pref_summary_toggle_shuffle">Випадковий режим вимкнеться при відтворенні нового списку пісень</string>
-    <string name="pref_summary_toggle_volume">Якщо вистачає місця, показувати панель гучності на екрані відтворення</string>
-    <string name="pref_summary_wallpaper_accent">Використовувати колір акцентів зі шпалери</string>
-    <string name="pref_summary_whitelist">Відображувати музику лише з /Music Folder</string>
-    <string name="pref_title_album_art_on_lockscreen">Показати обкладинку альбому</string>
-    <string name="pref_title_album_artists_only">Перейти за виконавцем альбому</string>
-    <string name="pref_title_album_cover_style">Тема обкладинки альбому</string>
-    <string name="pref_title_album_cover_transform">Пропустити обкладинку альбому</string>
-    <string name="pref_title_app_shortcuts">Кольорові ярлики застосунків</string>
-    <string name="pref_title_appbar_mode">Стиль заголовку</string>
-    <string name="pref_title_audio_ducking">Зменшити гучність при сторонніх звуках</string>
-    <string name="pref_title_audio_fade">Затухання аудіо</string>
-    <string name="pref_title_auto_download_artist_images">Автоматично завантажувати зображення виконавців</string>
-    <string name="pref_title_blacklist">Чорний список</string>
-    <string name="pref_title_bluetooth_playback">Відтворення Bluetooth</string>
-    <string name="pref_title_blurred_album_art">Розмити обкладинку альбому</string>
-    <string name="pref_title_circle_button">Кнопка кругового відтворення</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_cross_fade">Плавний перехід (бета-версія)</string>
-    <string name="pref_title_custom_font">Використовувати шрифт Manrope</string>
-    <string name="pref_title_desaturated_color">Ненасичений колір</string>
-    <string name="pref_title_expand_now_playing_panel">Показувати на екрані відтворення</string>
-    <string name="pref_title_extra_controls">Додаткові елементи керування</string>
-    <string name="pref_title_extra_song_info">Інформація про пісню</string>
-    <string name="pref_title_gapless_playback">Безперервне відтворення</string>
-    <string name="pref_title_general_theme">Тема застосунку</string>
-    <string name="pref_title_home_album_grid_style">Сітка альбому</string>
-    <string name="pref_title_home_artist_grid_style">Домашня сітка виконавця</string>
-    <string name="pref_title_home_banner">Головний банер</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_lyrics_screen_on">Не вимикати екран при відображенні тексту</string>
-    <string name="pref_title_lyrics_type">Тип тексту</string>
-    <string name="pref_title_manage_audio_focus">Завжди грати</string>
-    <string name="pref_title_now_playing_screen_appearance">Тема відтворення</string>
-    <string name="pref_title_open_source_licences">Ліцензії з відкритим кодом</string>
-    <string name="pref_title_pause_history">Призупинити історію</string>
-    <string name="pref_title_remember_tab">Запам‘ятати останню вкладку</string>
-    <string name="pref_title_show_lyrics">Показати текст</string>
-    <string name="pref_title_suggestions">Показувати пропозиції</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Проведіть де завгодно, щоб змінити пісню</string>
-    <string name="pref_title_swipe_to_dismiss">Прибрати свайпом вниз</string>
-    <string name="pref_title_tab_text_mode">Режим назв вкладок</string>
-    <string name="pref_title_toggle_carousel_effect">Ефект Каруселі</string>
-    <string name="pref_title_toggle_full_screen">На весь екран</string>
-    <string name="pref_title_toggle_toggle_headset">Автоматичне відтворення</string>
-    <string name="pref_title_toggle_toggle_shuffle">Режим перемішування</string>
-    <string name="pref_title_toggle_volume">Регулювання гучності</string>
-    <string name="pref_title_wallpaper_accent">Колір акцентів шпалер</string>
-    <string name="pref_title_whitelist">Білий список музики</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Чорна тема, теми відтворення, ефект каруселі та інше..</string>
-    <string name="profile">Профіль</string>
-    <string name="purchase">Придбати</string>
-    <string name="queue">Черга</string>
-    <string name="rate_app">Оцініть застосунок</string>
-    <string name="rate_on_google_play_summary">Подобається цей застосунок? Напишіть відгук нам у Google Play Store, як ми можемо зробити його ще кращим</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_image">Видалити зображення</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="replace_cover">Змінити обкладинку</string>
-    <string name="report_an_issue">Повідомити про помилку</string>
-    <string name="report_bug">Повідомити про помилку</string>
-    <string name="reset_action">Скинути</string>
-    <string name="reset_artist_image">Скинути зображення виконавця</string>
-    <string name="restore">Відновити</string>
-    <string name="restore_message">Бажаєте відновити резервну копію?</string>
-    <string name="restored_previous_purchase_please_restart">Відновлено попередню покупку. Перезапустіть застосунок, щоб скористатися всіма функціями.</string>
-    <string name="restored_previous_purchases">Відновлені попередні покупки.</string>
-    <string name="restoring_purchase">Відновлення покупки…</string>
-    <string name="retro_music_player">Retro Music плеєр</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Застосунку потрібен дозвіл на доступ до налаштувань вашого пристрою для того, щоб встановити музику як рингтон</string>
-    <string name="ringtone_title">Мелодія (Необов\'язково)</string>
-    <string name="saf_delete_failed">Помилка видалення файлу: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Неможливо отримати URI SAF</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_write_failed">Не вдалося записати файл: %s</string>
-    <string name="save">Зберегти</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">Зберегти як файл</string>
-    <string name="save_playlists_title">Зберегти як файли</string>
-    <string name="saved_playlist_to">Збережено список відтворення в %s.</string>
-    <string name="saving_changes">Збереження змін</string>
-    <string name="scan_media">Сканувати медіа</string>
-    <string name="scanned_files">Проскановано %1$d з %2$d файлів.</string>
-    <string name="scrobbles_label">Персоналізація</string>
-    <string name="select_all">Виділити все</string>
-    <string name="selected">Обрано</string>
-    <string name="set">Встановити</string>
-    <string name="set_artist_image">Встановити зображення виконавця</string>
-    <string name="share_app">Поділитися застосунком</string>
-    <string name="share_summary">Поділитися застосунком із друзями та сім\'єю</string>
-    <string name="share_to_stories">Поділитися в Історії</string>
-    <string name="show_album_artists">Показати виконавців альбому</string>
-    <string name="shuffle">Перемішати</string>
-    <string name="simple">Простий</string>
-    <string name="sleep_timer_canceled">Таймер сну скасовано.</string>
-    <string name="sleep_timer_set">Таймер сну спрацює за %d хвилин.</string>
-    <string name="social">Соціальні мережі</string>
-    <string name="social_stories">Поділитися історією</string>
-    <string name="song">Пісня</string>
-    <string name="song_duration">Тривалість пісні</string>
-    <string name="songs">Пісні</string>
-    <string name="sort_order">Порядок сортування</string>
-    <string name="sort_order_a_z">За зростанням</string>
-    <string name="sort_order_album">Альбом</string>
-    <string name="sort_order_artist">Виконавець</string>
-    <string name="sort_order_composer">Композитор</string>
-    <string name="sort_order_date">Дата додавання</string>
-    <string name="sort_order_date_modified">Дата змінення</string>
-    <string name="sort_order_default">За замовчуванням</string>
-    <string name="sort_order_num_songs">Кількість пісень</string>
-    <string name="sort_order_num_songs_desc">Опис кількості пісень</string>
-    <string name="sort_order_year">Рік</string>
-    <string name="sort_order_z_a">За спаданням</string>
-    <string name="speech_not_supported">Вибачте! Ваш пристрій не підтримує введення мови</string>
-    <string name="speech_prompt">Пошук у бібліотеці</string>
-    <string name="stack">Стек</string>
-    <string name="start_play_music">Почати програвати музику.</string>
-    <string name="suggestion_songs">Пропозиції</string>
-    <string name="support_development">Підтримати розробку</string>
-    <string name="swipe_to_unlock">Свайпніть, щоб розблокувати</string>
-    <string name="synced_lyrics">Синхронізовані тексти</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">Приєднуйтесь до групи Telegram щоб обговорити помилки, робити пропозиції та інше</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="tiny_card_style">Крихітна картка</string>
-    <string name="title">Назва</string>
-    <string name="title_new_backup">Нова резервна копія</string>
-    <string name="today">Сьогодні</string>
-    <string name="top_albums">Топ альбомів</string>
-    <string name="top_artists">Топ виконавців</string>
-    <string name="track_hint">"Доріжка (2 для доріжки 2 або 3004 для CD3 доріжки 4)"</string>
-    <string name="track_list">Номер пісні</string>
-    <string name="translate">Перекласти</string>
-    <string name="translate_community">Допоможіть нам перекласти застосунок на вашу мову</string>
-    <string name="try_retro_music_premium">Спробуйте Retro Music Преміум</string>
-    <string name="twitter_page">Твіттер</string>
-    <string name="twitter_page_summary">Поділіться своїм дизайном із Retro Music</string>
-    <string name="unlabeled">Без позначки</string>
-    <string name="unplayable_file">Не можу відтворити пісню.</string>
-    <string name="up_next">Наступне</string>
-    <string name="update_image">Оновити зображення</string>
-    <string name="updating">Оновлення…</string>
-    <string name="user_images_description">Зображення користувача</string>
-    <string name="user_name">Ім\'я користувача</string>
-    <string name="username">Ім\'я користувача</string>
-    <string name="version">Версія додатку</string>
-    <string name="vertical_flip">Вертикальне сальто</string>
-    <string name="view_on_telegram">Переглянути в Telegram</string>
-    <string name="volume">Гучність</string>
-    <string name="web_search">Пошук в інтернеті</string>
-    <string name="website">Сайт</string>
-    <string name="website_summary">Відвідайте наш веб-сайт</string>
-    <string name="welcome">Вітаємо вас,</string>
-    <string name="what_do_you_want_to_share">Чим ви хочете поділитися?</string>
-    <string name="whats_new">Що нового</string>
-    <string name="window">Вікно</string>
-    <string name="window_corner_edges">Закруглені кути</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="you_will_be_forwarded_to_the_issue_tracker_website">Вас буде перенаправлено на сайт відстеження проблем.</string>
-    <string name="your_account_data_is_only_used_for_authentication">Дані вашого облікового запису використовуються лише для автентифікації.</string>
-</resources>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
new file mode 100644
index 000000000..e512f3725
--- /dev/null
+++ b/app/src/main/res/values-v21/styles.xml
@@ -0,0 +1,35 @@
+<resources>
+
+    <style name="Theme.RetroMusic" parent="Theme.RetroMusic.Base">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+    </style>
+
+    <style name="Theme.RetroMusic.Light" parent="Theme.RetroMusic.Base.Light">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+    </style>
+
+    <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+    </style>
+
+    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSharedElementsUseOverlay">false</item>
+        <item name="android:textViewStyle">@style/TextViewStyleIm</item>
+    </style>
+
+    <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" />
+
+    <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
+
+    <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
+        <item name="android:padding">0dp</item>
+    </style>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/bools.xml b/app/src/main/res/values-v23/bools.xml
deleted file mode 100644
index 0a9fcbada..000000000
--- a/app/src/main/res/values-v23/bools.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="isMarshmallow">true</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v23/styles.xml b/app/src/main/res/values-v23/styles.xml
index c70057acf..4c62f6f20 100644
--- a/app/src/main/res/values-v23/styles.xml
+++ b/app/src/main/res/values-v23/styles.xml
@@ -18,9 +18,17 @@
         <item name="android:hyphenationFrequency">none</item>
     </style>
 
-    <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+    <style name="BottomSheetItemTextAppearanceInactive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
         <item name="android:breakStrategy">simple</item>
         <item name="android:hyphenationFrequency">none</item>
-        <item name="android:textSize">13sp</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="BottomSheetItemTextAppearanceActive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+        <item name="android:breakStrategy">simple</item>
+        <item name="android:hyphenationFrequency">none</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="android:textSize">14sp</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v27/styles_parents.xml b/app/src/main/res/values-v27/styles_parents.xml
index c6b398c57..0d3264478 100644
--- a/app/src/main/res/values-v27/styles_parents.xml
+++ b/app/src/main/res/values-v27/styles_parents.xml
@@ -14,46 +14,67 @@
 
 <resources>
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
-        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
-        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowLightNavigationBar">true</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_color_button_text">@color/md_white_1000</item>
+        <item name="md_background_color">@color/darkColorPrimary</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
+        <item name="android:windowLightNavigationBar">false</item>
         <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="android:windowBackground">?colorSurface</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_color_button_text">@color/md_black_1000</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
-        <item name="android:windowBackground">?colorSurface</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="android:windowBackground">@color/md_white_1000</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
+        <item name="android:windowLightNavigationBar">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/bools.xml b/app/src/main/res/values-v31/bools.xml
deleted file mode 100644
index e9ef74c3c..000000000
--- a/app/src/main/res/values-v31/bools.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="md3_available">true</bool>
-    <bool name="md3_enabled">true</bool>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/colors.xml b/app/src/main/res/values-v31/colors.xml
deleted file mode 100644
index 8872a5a73..000000000
--- a/app/src/main/res/values-v31/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="widget_circle_button_color">@android:color/system_accent1_900</color>
-    <color name="widget_md3_button_bg_color">@android:color/system_accent1_50</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-v31/styles.xml b/app/src/main/res/values-v31/styles.xml
deleted file mode 100644
index 0ebd16650..000000000
--- a/app/src/main/res/values-v31/styles.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<resources>
-
-    <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DynamicColors.DayNight">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="roundSelector">@drawable/round_selector</item>
-        <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="android:windowBackground">?attr/colorSurface</item>
-        <item name="windowActionModeOverlay">true</item>
-    </style>
-
-    <style name="Theme.RetroMusic.MD3.Black" parent="@style/Theme.RetroMusic.MD3" />
-
-    <style name="Theme.AppWidget" parent="@android:style/Theme.DeviceDefault.DayNight">
-        <item name="colorSurface">@android:color/system_accent1_50</item>
-    </style>
-
-    <style name="Theme.RetroMusic.SplashScreen" parent="Theme.SplashScreen">
-        <item name="android:windowSplashScreenAnimatedIcon">@drawable/avd_splash</item>
-        <item name="android:windowSplashScreenAnimationDuration">1000</item>
-    </style>
-</resources>
diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi/strings.xml
similarity index 59%
rename from app/src/main/res/values-vi-rVN/strings.xml
rename to app/src/main/res/values-vi/strings.xml
index 307c696d1..8938f22f6 100644
--- a/app/src/main/res/values-vi-rVN/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -1,98 +1,138 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">Thông tin về %s</string>
-    <string name="about_settings_summary">Liên kết đến nhóm, mạng xã hội</string>
-    <string name="accent_color">Màu sắc chủ đạo</string>
-    <string name="accent_color_desc">Màu sắc chủ đạo của chủ đề, mặc định là màu tía</string>
+    <string name="about_settings_summary">Đường dẫn tổ đội, mạng xã hội</string>
+
+    <string name="accent_color">Màu sắc nhấn mạnh</string>
+    <string name="accent_color_desc">Màu sắc chủ đạo của chủ đề, mặc định là xanh ngọc</string>
+
     <string name="action_about">Về chúng tôi</string>
-    <string name="action_add_to_blacklist">Thêm vào danh sách đen</string>
+
     <string name="action_add_to_favorites">Thêm vào yêu thích</string>
-    <string name="action_add_to_playing_queue">Thêm vào danh sách chờ phát</string>
+    <string name="action_add_to_playing_queue">Thêm vào hàng đợi</string>
     <string name="action_add_to_playlist">Thêm vào danh sách phát</string>
-    <string name="action_cancel">Hủy</string>
-    <string name="action_cast">Truyền tới</string>
-    <string name="action_clear_playing_queue">Xoá danh sách chờ phát</string>
-    <string name="action_cycle_repeat">Chế độ lặp lại chu kỳ</string>
+
+    <string name="action_clear_playing_queue">Xoá hàng đợi</string>
+    <string name="action_clear_playlist">Xoá danh sách phát</string>
+
     <string name="action_delete">Xoá</string>
     <string name="action_delete_from_device">Xóa khỏi thiết bị</string>
+
     <string name="action_details">Chi tiết</string>
-    <string name="action_edit">Sửa</string>
+
     <string name="action_go_to_album">Đi đến album</string>
     <string name="action_go_to_artist">Đi đến nghệ sĩ</string>
     <string name="action_go_to_genre">Chuyển đến thể loại</string>
-    <string name="action_go_to_lyrics">Đi tới lời bài hát</string>
     <string name="action_go_to_start_directory">Đến trang bắt đầu</string>
+
     <string name="action_grant">Cho phép</string>
+
     <string name="action_grid_size">Kích thước lưới</string>
     <string name="action_grid_size_land">Kích thước lưới (chiều ngang)</string>
+
     <string name="action_new_playlist">Danh sách phát mới</string>
-    <string name="action_next">Tiếp theo</string>
-    <string name="action_play">Phát</string>
-    <string name="action_play_all">Phát tất cả</string>
-    <string name="action_play_next">Phát tiếp theo</string>
+
+    <string name="action_next">Tiếp</string>
+
+    <string name="action_play">Chơi</string>
+    <string name="action_play_all">Chơi tất cả</string>
+    <string name="action_play_next">Chơi kế tiếp</string>
     <string name="action_play_pause">Phát/Tạm dừng</string>
-    <string name="action_previous">Trước đó</string>
-    <string name="action_remove_from_favorites">Xóa khỏi mục yêu thích</string>
-    <string name="action_remove_from_playing_queue">Xóa khỏi danh sách chờ phát</string>
-    <string name="action_remove_from_playlist">Xóa khỏi danh sách phát</string>
+
+    <string name="action_previous">Trước</string>
+
+    <string name="action_remove_from_favorites">Loại bỏ khỏi mục yêu thích</string>
+    <string name="action_remove_from_playing_queue">Xoá khỏi hàng đợi</string>
+    <string name="action_remove_from_playlist">Xoá khỏi danh sách phát</string>
+
     <string name="action_rename">Đổi tên</string>
-    <string name="action_save_playing_queue">Lưu danh sách chờ phát</string>
+
+    <string name="action_save_playing_queue">Lưu hàng đợi phát</string>
+
     <string name="action_scan">Quét</string>
+
     <string name="action_search">Tìm kiếm</string>
+
     <string name="action_set">Bắt đầu</string>
     <string name="action_set_as_ringtone">Đặt làm nhạc chuông</string>
-    <string name="action_set_as_start_directory">Đặt làm thư mục bắt đầu</string>
+    <string name="action_set_as_start_directory">Đặt làm trang bắt đầu</string>
+
     <string name="action_settings">"Cài đặt"</string>
+
     <string name="action_share">Chia sẻ</string>
+
     <string name="action_shuffle_all">Phát ngẫu nhiên tất cả</string>
     <string name="action_shuffle_playlist">Phát ngẫu nhiên theo danh sách phát</string>
-    <string name="action_sleep_timer">Hẹn giờ ngừng phát</string>
+
+    <string name="action_sleep_timer">Hẹn giờ ngủ</string>
+
     <string name="action_sort_order">Thứ tự sắp xếp</string>
-    <string name="action_tag_editor">Sửa thẻ</string>
-    <string name="action_toggle_favorite">Chuyển đổi mục yêu thích</string>
-    <string name="action_toggle_shuffle">Chuyển đổi chế độ phát ngẫu nhiên</string>
+
+    <string name="action_tag_editor">Chỉnh sửa thẻ</string>
+
     <string name="adaptive">Thích nghi</string>
+
     <string name="add_action">Thêm</string>
+
+    <string name="add_lyrics">Thêm lời bài hát</string>
+
+    <string name="add_photo">Thêm \nhình ảnh</string>
+
     <string name="add_playlist_title">"Thêm vào danh sách phát"</string>
-    <string name="add_time_framed_lryics">Thêm lời theo thời gian</string>
-    <string name="added_song_count_to_playlist">Thêm %1$d bài hát vào %2$s</string>
-    <string name="added_title_to_playing_queue">"Đã thêm 1 bài vào danh sách chờ phát."</string>
-    <string name="added_x_titles_to_playing_queue">Đã thêm %1$d bài vào danh sách chờ phát.</string>
+
+    <string name="add_time_framed_lryics">Thêm khung thời gian cho lời bài hát</string>
+
+    <string name="added_title_to_playing_queue">"Đã thêm 1 bài vào háng đợi phát."</string>
+
+    <string name="added_x_titles_to_playing_queue">Đã thêm %1$d bài vào hàng đợi phát.</string>
+
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="other">Bài hát</item>
-    </plurals>
-    <string name="album_artist">Album nghệ sĩ</string>
-    <string name="albums">Các album</string>
-    <plurals name="albums">
-        <item quantity="other">Album</item>
-    </plurals>
+
+    <string name="album_artist">Album của nghệ sĩ</string>
+
+    <string name="album_or_artist_empty">Tên bài hát hoặc nghệ sĩ để trống</string>
+
+    <string name="albums">Album</string>
+
+    <!-- Android Auto -->
     <string name="always">Luôn luôn</string>
+
     <string name="app_share">Hãy dùng thử trình phát nhạc siêu chất này tại: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
     <string name="app_shortcut_shuffle_all_short">Ngẫu nhiên</string>
     <string name="app_shortcut_top_tracks_short">Bản nhạc hàng đầu</string>
-    <string name="app_widget_big_name">Hình ảnh đầy đủ</string>
-    <string name="app_widget_card_name">Thẻ</string>
-    <string name="app_widget_classic_name">Cổ điển</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Nhỏ</string>
-    <string name="app_widget_text_name">Văn bản nhỏ nhất</string>
+
+    <string name="app_widget_big_name">Retro music - Lớn</string>
+    <string name="app_widget_card_name">Retro music - Thẻ</string>
+    <string name="app_widget_classic_name">Retro music - Cổ điển</string>
+    <string name="app_widget_small_name">Retro music - Nhỏ</string>
+
     <string name="artist">Nghệ sĩ</string>
+
     <string name="artists">Nghệ sĩ</string>
-    <string name="audio_fade_duration">Thời lượng làm mượt âm thanh</string>
+
     <string name="audio_focus_denied">Tập trung âm thanh bị từ chối</string>
+
     <string name="audio_settings_summary">Thay đổi cài đặt âm thanh và điều chỉnh các điều khiển bộ chỉnh âm</string>
+
     <string name="auto">Tự động</string>
-    <string name="backup_restore_settings_summary">Lưu trữ và khôi phục lại tùy chọn, danh sách phát của bạn</string>
-    <string name="backup_restore_title"><![CDATA[Sao lưu & Khôi phục]]></string>
-    <string name="backup_title">Bản sao lưu</string>
+
+    <string name="base_color_theme">Chủ đề màu cơ bản</string>
+
+    <string name="bass_boost">Tăng cường Bass</string>
+
+    <string name="bio">Tiểu sử</string>
+
     <string name="biography">Tiểu sử</string>
+
     <string name="black_theme_name">Đen hoàn toàn</string>
+
     <string name="blacklist">Danh sách đen</string>
-    <string name="bluetooth_summary">Ứng dụng cần quyền các thiết bị lân cận để kiểm tra các thiết bị bluetooth</string>
-    <string name="bluetooth_title">Thiết bị lân cận</string>
+
     <string name="blur">Làm mờ</string>
+
     <string name="blur_card">Thẻ mờ</string>
+
     <string name="bug_report_failed">Không thể gửi báo cáo</string>
     <string name="bug_report_failed_invalid_token">Mã token không hợp lệ. Vui lòng liên hệ với nhà phát triển ứng dụng.</string>
     <string name="bug_report_failed_issues_not_available">Các vấn đề không được kích hoạt cho repository đã chọn. Vui lòng liên hệ với nhà phát triển ứng dụng.</string>
@@ -104,99 +144,151 @@
     <string name="bug_report_no_password">Vui lòng nhập đúng mật khẩu dùng Github của bạn</string>
     <string name="bug_report_no_title">Vui lòng nhập tiêu đề vấn đề</string>
     <string name="bug_report_no_username">Vui lòng nhập đúng tên người dùng Github của bạn</string>
-    <string name="bug_report_success">Báo cáo lỗi thành công</string>
     <string name="bug_report_summary">Đã xảy ra lỗi không mong muốn. Xin lỗi bạn vì lỗi này, nếu nó
 tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
-    <string name="bug_report_use_account">Gửi bằng tài khoản GitHub </string>
-    <string name="buy_now">Mua ngay</string>
+    <string name="bug_report_uploading">Đang tải báo cáo lên Github...</string>
+    <string name="bug_report_use_account">"Gửi bằng tài khoản GitHub "</string>
+
     <string name="cancel_current_timer">Hủy</string>
+
     <string name="card">Thẻ</string>
+
+    <string name="card_circular_style">Tròn</string>
+
     <string name="card_color_style">Thẻ màu</string>
-    <string name="card_square">Thẻ vuông</string>
+
     <string name="card_style">Thẻ</string>
+
+    <string name="carousal">Tiệc tùng</string>
+
     <string name="carousal_effect_on_now_playing_screen">Hiệu ứng băng chuyền trên màn hình đang phát</string>
+
     <string name="cascading">Xếp tầng</string>
+
+    <string name="cast">Truyền</string>
+
     <string name="changelog">Thay đổi</string>
-    <string name="changelog_summary">Xem có gì mới</string>
-    <string name="choose_image">Chọn hình ảnh</string>
-    <string name="choose_restore_title">Chọn mục để khôi phục</string>
-    <string name="circle">Vòng tròn</string>
-    <string name="circular">Dạng tròn</string>
+
+    <string name="changelog_summary">Nhật ký thay đổi được cập nhật trong ứng dụng Telegram</string>
+
+    <string name="circular">Thông tư</string>
+
     <string name="classic">Cổ điển</string>
+
     <string name="clear_action">Xóa</string>
+
+    <string name="clear_app_data">Xóa dữ liệu ứng dụng</string>
+
     <string name="clear_blacklist">Xóa danh sách đen</string>
-    <string name="clear_history">Xóa Lịch sử</string>
-    <string name="clear_playing_queue">Xoá danh sách</string>
+
+    <string name="clear_playing_queue">Xóa hàng đợi</string>
+
+    <string name="clear_playlist_title">Xoá danh sách phát</string>
+    <string name="clear_playlist_x"><![CDATA[Xo\u00e1 danh s\u00e1ch ph\u00e1t <b>%1$s</b>? Thao t\u00e1c kh\u00f4ng th\u1ec3 ho\u00e0n t\u00e1c!]]></string>
+
+    <string name="close_notification">Đóng</string>
+
     <string name="color">Màu sắc</string>
+
+    <string name="color_theme_name">Màu sắc</string>
+
     <string name="colors">Màu sắc</string>
-    <string name="compact">Nhỏ gọn</string>
+
     <string name="composer">Tác giả</string>
+
     <string name="copied_device_info_to_clipboard">Đã sao chép thông tin thiết bị vào clipboard.</string>
+
     <string name="could_not_create_playlist">Kh\u00f4ng th\u1ec3 t\u1ea1o danh s\u00e1ch ph\u00e1t</string>
     <string name="could_not_download_album_cover">"Kh\u00f4ng th\u1ec3 t\u1ea3i xu\u1ed1ng \u1ea3nh b\u00eca album ph\u00f9 h\u1ee3p."</string>
     <string name="could_not_restore_purchase">Không thể khôi phục mua hàng.</string>
     <string name="could_not_scan_files">Không thể quét %d tập tin.</string>
+
     <string name="create_action">Tạo</string>
-    <string name="create_new_backup">Tạo</string>
+
     <string name="created_playlist_x">Đã tạo danh sách phát %1$s.</string>
-    <string name="credit_title">Thành viên và cộng tác viên </string>
+
+    <string name="credit_title">Thành viên và cộng tác viên</string>
+
     <string name="currently_listening_to_x_by_x">Đang nghe %1$s bởi %2$s.</string>
-    <string name="custom_artist_images">Tùy chỉnh ảnh nghệ sĩ</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Chia sẽ báo cáo lỗi</string>
+
     <string name="dark_theme_name">Xám đen</string>
+
+    <string name="default_hint">Không có lời bài hát</string>
+
     <string name="delete_playlist_title">Xoá danh sách phát</string>
     <string name="delete_playlist_x"><![CDATA[Xoá danh sách phát <b>%1$s</b>?]]></string>
+
     <string name="delete_playlists_title">Xoá danh sách phát</string>
+
     <string name="delete_song_title">Xoá bài hát</string>
     <string name="delete_song_x"><![CDATA[Xoá bài hát <b>%1$s</b>?]]></string>
+
     <string name="delete_songs_title">Xoá bài hát</string>
+
     <string name="delete_x_playlists"><![CDATA[Xoá <b>%1$d</b> danh sách phát?]]></string>
     <string name="delete_x_songs"><![CDATA[Xoá <b>%1$d</b> bài hát?]]></string>
     <string name="deleted_x_songs">Đã xoá %1$d bài hát.</string>
-    <string name="deleting_songs">Xóa Các bài hát</string>
+
     <string name="depth">Độ sâu</string>
+
     <string name="description">Mô tả</string>
+
     <string name="device_info">Thông tin thiết bị</string>
+
     <string name="dialog_message_set_ringtone">Cho phép Retro Music cấu hình cài đặt âm thanh</string>
+
     <string name="dialog_title_set_ringtone">Cài làm nhạc chuông</string>
-    <string name="disc_hint">Số đĩa</string>
+
     <string name="do_you_want_to_clear_the_blacklist">Bạn có muốn xóa danh sách đen?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Bạn có muốn gỡ <b>%1$s</b> khỏi danh sách đen?]]></string>
+
     <string name="donate">Ủng hộ</string>
+
     <string name="donate_summary">Nếu bạn nghĩ rằng tôi xứng đáng được thưởng cho công việc này, bạn có thể để lại một số tiền ở đây. Cảm ơn bạn! :D</string>
+
     <string name="donation_header">Mua cho tôi một:</string>
-    <string name="done">Xong</string>
-    <string name="drive_mode">Chế độ lái xe</string>
-    <string name="edit_fab">Sửa nút</string>
-    <string name="edit_normal_lyrics">Sửa lời</string>
-    <string name="edit_synced_lyrics">Sửa Lời Đồng bộ</string>
+
+    <string name="download_from_last_fm">Tải xuống từ Last.fm</string>
+
+    <string name="edit">Chỉnh sửa</string>
+
+    <string name="edit_cover">Chỉnh sửa ảnh bìa</string>
+
     <string name="empty">Trống</string>
+
     <string name="equalizer">Bộ chỉnh âm</string>
-    <string name="error_create_backup">Không thể tạo bản sao lưu</string>
-    <string name="error_delete_backup">Không thể xóa bản sao lưu</string>
-    <string name="error_empty_name">Tên của bạn không được để trống!</string>
-    <string name="error_load_failed">Không thể tải</string>
-    <string name="error_share_file">Không thể chia sẽ tập tin</string>
-    <string name="expanded">Mở rộng</string>
+
+    <string name="error">Lỗi</string>
+
     <string name="faq">Câu hỏi thường gặp</string>
+
     <string name="favorites">Yêu thích</string>
-    <string name="file_already_exists">Tập tin đã tồn tại</string>
+
     <string name="finish_last_song">Kết thúc bài cuối</string>
+
     <string name="fit">Phù hợp</string>
+
     <string name="flat">Phẳng</string>
+
     <string name="folders">Thư mục</string>
-    <string name="follow_system">Theo hệ thống</string>
-    <string name="for_you">Dành cho bạn</string>
-    <string name="free">Miễn phí</string>
+
+    <string name="for_you">Cho bạn</string>
+
     <string name="full">Toàn bộ</string>
+
     <string name="full_card">Thẻ đầy đủ</string>
+
     <string name="general_settings_summary">Thay đổi chủ đề và màu sắc của ứng dụng</string>
     <string name="general_settings_title">Nhìn và cảm nhận</string>
+
     <string name="genre">Thể loại</string>
+
     <string name="genres">Thể loại</string>
+
     <string name="git_hub_summary">Tham gia phát triển dự án trên Github</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Trao quyền truy cập</string>
+
+    <string name="google_plus_community">Tham gia cộng đồng Google Plus, nơi bạn có thể yêu cầu trợ giúp hoặc theo dõi các cập nhật Retro Music</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -205,356 +297,474 @@ tiếp tục xảy ra hãy \"Xóa dữ liệu ứng dụng\"</string>
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Bố trí lưới</string>
-    <string name="help_summary">Bạn cần hỗ trợ thêm?</string>
+
+    <string name="grid_style_label"><![CDATA[Bố trí lưới]]></string>
+
     <string name="hinge">Bản lề</string>
+
     <string name="history">Lịch sử</string>
-    <string name="history_cleared">Đã xóa lịch sử</string>
-    <string name="history_undo_button">Hoàn tác</string>
+
     <string name="home">Trang chủ</string>
+
     <string name="horizontal_flip">Lật ngang</string>
+
     <string name="image">Hình ảnh</string>
+
     <string name="image_gradient">Ảnh màu chuyển sắc</string>
+
     <string name="image_settings_summary">Thay đổi cài đặt tải xuống hình ảnh nghệ sĩ</string>
-    <string name="import_label">Nhập</string>
-    <string name="import_playlist">Nhập danh sách phát</string>
-    <string name="import_playlist_message">Nhập tất cả danh sách phát có trong Android Media Store cùng với các bài hát, nếu danh sách phát đã tồn tại, các bài hát sẽ được gộp lại.</string>
+
     <string name="inserted_x_songs_into_playlist_x">Đã chèn %1$d bài hát vào danh sách phát %2$s.</string>
+
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Chia sẻ thiết lập Retro Music của bạn trong Instagram</string>
+
     <string name="keyboard">Bàn phím</string>
-    <string name="label_bit_rate">Tốc độ bit</string>
+
+    <string name="label_bit_rate">Bitrate</string>
+
     <string name="label_file_format">Định dạng</string>
     <string name="label_file_name">Tên tệp</string>
     <string name="label_file_path">Đường dẫn tệp</string>
     <string name="label_file_size">Kích thước</string>
-    <string name="label_last_modified">Lần chỉnh sửa cuối</string>
-    <string name="label_more_from">Thêm thông tin từ %s</string>
+
     <string name="label_sampling_rate">Tần số lấy mẫu</string>
+
     <string name="label_track_length">Độ dài</string>
+
     <string name="labeled">Được dán nhãn</string>
+
     <string name="last_added">Đã thêm gần đây</string>
+
     <string name="last_song">Bài cuối</string>
-    <string name="lets_go">Hãy bắt đầu</string>
+
+    <string name="lets_play_something">Hãy nghe một vài bản nhạc</string>
+
+    <string name="library">Thư viện</string>
+
     <string name="library_categories">Danh mục thư viện</string>
+
     <string name="licenses">Giấy phép</string>
+
     <string name="light_theme_name">Hoàn toàn trắng</string>
-    <string name="listeners_label">Người nghe</string>
+
     <string name="listing_files">Danh sách tập tin</string>
+
     <string name="loading_products">Đang tải sản phẩm...</string>
+
     <string name="login">Đăng nhập</string>
+
     <string name="lyrics">Lời bài hát</string>
+
     <string name="made_with_love">Được làm bằng ❤️ ở Ấn Độ</string>
+
     <string name="material">Material</string>
+
     <string name="md_error_label">Lỗi</string>
+
     <string name="md_storage_perm_error">Lỗi quyền truy cập</string>
-    <string name="message_backup_create_success">Đã tạo thành công bản sao lưu.</string>
-    <string name="message_limit_tabs">Không nhiều hơn 5 tùy chọn</string>
-    <string name="message_pro_feature">%s là một tính năng Pro.</string>
-    <string name="message_restore_success">Khôi phục thành công.</string>
-    <string name="message_updated">Đã cập nhật</string>
-    <string name="message_welcome"><![CDATA[Xin chào! <br>Chào mừng bạn đến với %s]]></string>
-    <string name="my_name">Tên</string>
+
+    <string name="my_name">Tên của bạn</string>
+
     <string name="my_top_tracks">Phát nhiều nhất</string>
+
     <string name="never">Không bao giờ</string>
-    <string name="new_music_mix">Bản phối nhạc mới</string>
+
+    <string name="new_banner_photo">Ảnh biểu ngữ mới</string>
+
     <string name="new_playlist_title">Danh sách phát mới</string>
+
+    <string name="new_profile_photo">Ảnh tiểu sử mới</string>
+
     <string name="new_start_directory">%s là trang bắt đầu mới.</string>
-    <string name="next_song">Bài tiếp theo</string>
+
+    <string name="next_song">Bài kế</string>
+
     <string name="no_albums">Không có album</string>
+
     <string name="no_artists">Không có nghệ sĩ</string>
+
     <string name="no_audio_ID">"Phát một bài hát trước, sau đó thử lại."</string>
-    <string name="no_backups_found">Không tìm thấy bản sao lưu</string>
+
     <string name="no_equalizer">Không tìm thấy bộ chỉnh âm</string>
+
     <string name="no_genres">Không có thể loại</string>
+
     <string name="no_lyrics_found">Không tìm thấy lời bài hát</string>
-    <string name="no_playing_queue">Không có bài hát nào đang phát</string>
+
     <string name="no_playlists">Không có danh sách phát</string>
+
     <string name="no_purchase_found">Không tìm thấy giao dịch mua.</string>
+
     <string name="no_results">Không có kết quả</string>
+
     <string name="no_songs">Không có bài hát</string>
+
     <string name="normal">Tiêu chuẩn</string>
+
     <string name="normal_lyrics">Lời chuẩn</string>
+
+    <string name="normal_style">Bình thường</string>
+
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> không được liệt kê trong thư mục nhạc.]]></string>
-    <string name="not_recently_played">Không phát gần đây</string>
+
     <string name="nothing_to_scan">Không có gì để quét.</string>
-    <string name="nothing_to_see">Không có gì để hiển thị</string>
+
     <string name="notification">Thông báo</string>
+
     <string name="notification_settings_summary">Tùy chỉnh kiểu thông báo</string>
-    <string name="now_playing">Màn hình phát</string>
-    <string name="now_playing_queue">Đang phát danh sách chờ</string>
-    <string name="now_playing_summary">Tùy chỉnh màn hình phát</string>
-    <string name="now_playing_themes">Hơn 9 giao diện màn hình phát</string>
+
+    <string name="now_playing">Đang phát</string>
+    <string name="now_playing_queue">Đang phát hàng đợi</string>
+    <string name="now_playing_summary">Tùy chỉnh màn hình đang phát</string>
+    <string name="now_playing_themes">Hơn 9 giao diện đang phát</string>
+
     <string name="only_on_wifi">Chỉ khi dùng Wi-Fi</string>
-    <string name="other_settings_summary">Tính năng nâng cao đang kiểm tra</string>
+
+    <string name="other_settings_summary">Tính năng nâng cao đang kiểm thử</string>
+
     <string name="others">Khác</string>
-    <string name="over_cover">Over Cover</string>
+
     <string name="password">Mật khẩu</string>
+
     <string name="past_three_months">Mỗi tháng</string>
-    <string name="paste_lyrics_here">Dán lời ở đây</string>
-    <string name="paste_timeframe_lyrics_here">Dán lời theo thời gian ở đây</string>
-    <string name="peek">Nhìn trước</string>
-    <string name="permission_bluetooth_denied">Quyền truy cập thiết bị lân cận bị từ chối.</string>
+
+    <string name="paste_lyrics_here">Dán lời bài hát tại đây</string>
+
     <string name="permission_external_storage_denied">Quyền truy cập bộ nhớ ngoài bị từ chối.</string>
-    <string name="permission_summary">Ứng dụng cần quyền truy cập bộ nhớ thiết bị của bạn để phát nhạc</string>
-    <string name="permission_title">Truy cập bộ nhớ</string>
+
     <string name="permissions_denied">Quyền đã bị từ chối.</string>
+
     <string name="personalize">Cá nhân hoá</string>
+
     <string name="personalize_settings_summary">Tùy chỉnh màn hình phát và giao diện người dùng</string>
+
     <string name="pick_from_local_storage">Chọn từ bộ nhớ trong</string>
+
+    <string name="pick_image_intent_text">Chọn ảnh</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Theo dõi trang Pinterest để lấy cảm hứng thiết kế Retro Music</string>
+
     <string name="plain">Giản dị</string>
-    <string name="playList_already_exits">Danh sách phát đã tồn tại</string>
-    <string name="playback_pitch">Cao độ</string>
-    <string name="playback_settings">Cài đặt phát lại</string>
-    <string name="playback_speed">Tốc độ phát lại</string>
-    <string name="playing_notification_description">Thanh thông báo đang phát sẽ cho phép bạn phát/tạm dừng, chuyển bài, v.v.</string>
+
+    <string name="playing_notification_description">Thanh thông báo đang phát sẽ cho phép bạn phát nhạc/tạm dừng, chuyển bài,...</string>
     <string name="playing_notification_name">Thông báo đang phát</string>
-    <string name="playlist_created_sucessfully">%s đã tạo thành công</string>
+
+    <string name="playlist_empty_text">Danh sách phát trống</string>
+
     <string name="playlist_is_empty">Danh sách phát trống</string>
+
     <string name="playlist_name_empty">Tên danh sách phát</string>
+
     <string name="playlists">Danh sách phát</string>
+
     <string name="pref_blur_amount_summary">Độ mờ được áp dụng cho các chủ đề mờ, thấp hơn là nhanh hơn</string>
     <string name="pref_blur_amount_title">Độ mờ</string>
-    <string name="pref_filter_song_summary">Lọc bài hát theo độ dài</string>
+
     <string name="pref_filter_song_title">Lọc theo thời lượng bài hát</string>
-    <string name="pref_header_advanced">Nâng cao</string>
+
     <string name="pref_header_album">Kiểu Album</string>
     <string name="pref_header_audio">Âm thanh</string>
-    <string name="pref_header_blacklist">Danh sách đen</string>
     <string name="pref_header_controls">Điều khiển</string>
     <string name="pref_header_general">Chủ đề</string>
     <string name="pref_header_images">Hình ảnh</string>
     <string name="pref_header_library">Thư viện</string>
     <string name="pref_header_lockscreen">Màn hình khoá</string>
     <string name="pref_header_playlists">Danh sách phát</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">Tạm dừng phát khi tắt âm lượng và phát lại sau khi tăng âm lượng. Cảnh báo: Khi bạn tăng âm lượng, bài hát sẽ phát kể cả khi bạn ở ngoài ứng dụng</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">Tạm dừng phát khi tắt âm lượng và phát lại sau khi tăng âm lượng. Cảnh báo: Khi bạn tăng âm lượng, nó sẽ bắt đầu phát ngay cả khi bạn ở ngoài ứng dụng</string>
     <string name="pref_keep_pause_on_zero_volume_title">Tạm dừng phát khi tắt âm lượng</string>
     <string name="pref_keep_screen_on_summary">Lưu ý rằng việc bật tính năng này có thể ảnh hưởng đến tuổi thọ pin</string>
     <string name="pref_keep_screen_on_title">Giữ màn hình luôn bật</string>
-    <string name="pref_language_name">Chọn ngôn ngữ</string>
+
+    <string name="pref_now_playing_screen_summary">Nhấp hoặc trượt để mở mà không cần điều hướng của màn hình đang phát</string>
+    <string name="pref_now_playing_screen_title">Nhấp hoặc Trượt</string>
+
     <string name="pref_snow_fall_title">Hiệu ứng tuyết rơi</string>
+
     <string name="pref_summary_album_art_on_lockscreen">Sử dụng ảnh bìa album bài hát đang phát làm ảnh nền màn hình khóa.</string>
-    <string name="pref_summary_album_artists_only">Hiển thị Album Nghệ sĩ trong danh mục Nghệ sĩ</string>
     <string name="pref_summary_audio_ducking">Giảm âm lượng khi có âm báo hệ thống hoặc khi bạn có thông báo</string>
-    <string name="pref_summary_audio_fade">Làm mượt âm thanh khi tạm dừng hoặc phát bài hát</string>
     <string name="pref_summary_blacklist">Nội dung của các thư mục trong danh sách đen được ẩn khỏi thư viện của bạn.</string>
-    <string name="pref_summary_bluetooth_playback">Tự động phát nhạc sau khi kết nối với thiết bị Bluetooth</string>
     <string name="pref_summary_blurred_album_art">Làm mờ ảnh bìa album trên màn hình khóa. Có thể gây ra sự cố với các ứng dụng và tiện ích của bên thứ ba</string>
-    <string name="pref_summary_carousel_effect">Hiệu ứng băng chuyền cho ảnh bìa album trong màn hình phát. Lưu ý rằng nó không hoạt động với chủ đề Thẻ và Thẻ mờ</string>
-    <string name="pref_summary_classic_notification">Dùng thiết kế thông báo kiểu cổ điển</string>
-    <string name="pref_summary_colored_app">Màu nền và các nút điều khiển sẽ thay đổi theo màu sắc ảnh bìa album từ màn hình phát</string>
+    <string name="pref_summary_carousel_effect">Hiệu ứng băng chuyền cho ảnh bìa album trong màn hình đang phát. Lưu ý rằng nó không hoạt động với chủ đề Thẻ và Thẻ mờ</string>
+    <string name="pref_summary_classic_notification">Dùng thiết kế thông báo cổ điển</string>
+    <string name="pref_summary_colored_app">Màu nền và các nút điều khiển sẽ thay đổi theo màu sắc ảnh bìa album đang phát</string>
     <string name="pref_summary_colored_app_shortcuts">Màu sắc trong lối tắt ứng dụng dùng màu sắc chủ đạo. Mỗi khi bạn thay đổi màu chủ đạo, hãy bật/tắt lại công tắc này để thay đổi có hiệu lực</string>
+    <string name="pref_summary_colored_navigation_bar">Thay đổi màu sắc thanh điều hướng theo màu chủ đề chung</string>
     <string name="pref_summary_colored_notification">"M\u00e0u s\u1eafc th\u00f4ng b\u00e1o thay \u0111\u1ed5i theo m\u00e0u s\u1eafc chi ph\u1ed1i \u1ea3nh b\u00eca album"</string>
-    <string name="pref_summary_cross_fade">Độ dài khoảng lặng giữa các bài hát</string>
-    <string name="pref_summary_desaturated_color">Để phù hợp với Thiết kế Material, màu sắc sẽ được điều chỉnh để tương thích với chế độ tối</string>
-    <string name="pref_summary_expand_now_playing_panel">Nhấn vào thông báo sẽ hiển thị màn hình phát nhạc thay vì màn hình chính</string>
+    <string name="pref_summary_dominant_color">Màu sắc chi phối sẽ được chọn từ ảnh bìa album hoặc nghệ sĩ</string>
     <string name="pref_summary_extra_controls">Thêm điều khiển bổ sung cho trình phát mini</string>
-    <string name="pref_summary_extra_song_info">Hiển thị thêm thông tin Bài hát, như là định dạng, tốc độ bit và tần số</string>
     <string name="pref_summary_gapless_playback">"Có thể gây ra vấn đề phát lại trên một số thiết bị."</string>
-    <string name="pref_summary_home_banner">Hiện hoặc ẩn banner màn hình chính</string>
-    <string name="pref_summary_ignore_media_store_artwork">Có thể tăng chất lượng hiển thị ảnh bìa album, nhưng sẽ làm thời gian tải hình ảnh chậm hơn. Chỉ bật tính năng này nếu bạn không thích chất lượng ảnh gốc</string>
+    <string name="pref_summary_genre_toggle">Bật/tắt thẻ thể loại</string>
+    <string name="pref_summary_home_banner">Ẩn/hiện biểu ngữ trong trang chủ</string>
+    <string name="pref_summary_ignore_media_store_artwork">Có thể tăng chất lượng hiển thị ảnh bìa album, nhưng thời gian tải hình ảnh chậm hơn. Chỉ bật tính năng này nếu bạn không hài lòng với chất lượng ảnh hiện tại</string>
     <string name="pref_summary_library_categories">Khả năng hiển thị và thứ tự của các danh mục trong thư viện.</string>
     <string name="pref_summary_lock_screen">Sử dụng các điều khiển màn hình khóa tùy chỉnh của Retro Music</string>
-    <string name="pref_summary_manage_audio_focus">Luôn phát âm thanh trong nền bất kể các nguồn âm thanh đang phát khác</string>
     <string name="pref_summary_open_source_licences">Chi tiết giấy phép của phần mềm mã nguồn mở</string>
-    <string name="pref_summary_pause_history">Khi được bật, những bài hát mới phát sẽ không xuất hiện trong lịch sử</string>
-    <string name="pref_summary_remember_tab">Điều hướng đến tab được sử dụng gần nhất lúc bắt đầu</string>
-    <string name="pref_summary_show_lyrics">Hiển thị lời bài hát đã đồng bộ trên bìa album</string>
-    <string name="pref_summary_suggestions">Hiện bản phối nhạc mới trên trang chủ</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Cho phép chuyển bài bằng cách vuốt ở bất kì đâu tại màn hình phát</string>
-    <string name="pref_summary_swipe_to_dismiss">Trượt xuống để ẩn trình phát nhỏ</string>
+    <string name="pref_summary_round_corners">Bo tròn các góc ứng dụng</string>
+    <string name="pref_summary_tab_titles">Bật/tắt tiêu đề thanh điều hướng dưới</string>
     <string name="pref_summary_toggle_full_screen">Chế độ hoà nhập</string>
     <string name="pref_summary_toggle_headset">Tự động phát nhạc khi kết nối tai nghe</string>
     <string name="pref_summary_toggle_shuffle">Chế độ phát ngẫu nhiên sẽ tắt khi phát danh sách bài hát mới</string>
-    <string name="pref_summary_toggle_volume">Hiện thanh điều chỉnh âm lượng nếu có không gian trống trong màn hình phát</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Chỉ hiện thị nhạc từ /Thư mục Nhạc</string>
+    <string name="pref_summary_toggle_volume">Hiện thanh điều chỉnh âm lượng nếu có không gian trống trong màn hình đang phát</string>
+
     <string name="pref_title_album_art_on_lockscreen">Hiện ảnh bìa album</string>
-    <string name="pref_title_album_artists_only">Điều hướng theo Album Nghệ sĩ</string>
     <string name="pref_title_album_cover_style">Chủ đề bìa album</string>
     <string name="pref_title_album_cover_transform">Kiểu bìa album đang phát</string>
+    <string name="pref_title_album_grid_style">Lưới album</string>
     <string name="pref_title_app_shortcuts">Đổi màu lối tắt ứng dụng</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_artist_grid_style">Lưới nghệ sĩ</string>
     <string name="pref_title_audio_ducking">Giảm âm lượng khi có âm báo</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Tự động tải xuống hình ảnh nghệ sĩ</string>
     <string name="pref_title_blacklist">Danh sách đen</string>
-    <string name="pref_title_bluetooth_playback">Tự động phát Bluetooth</string>
     <string name="pref_title_blurred_album_art">Làm mờ bìa album</string>
-    <string name="pref_title_circle_button">Circular play button</string>
+    <string name="pref_title_choose_equalizer">Chọn bộ chỉnh âm</string>
     <string name="pref_title_classic_notification">Thiết kế thông báo cổ điển</string>
     <string name="pref_title_colored_app">Màu sắc thích nghi</string>
     <string name="pref_title_colored_notification">Đổi màu thông báo</string>
-    <string name="pref_title_cross_fade">Khoảng lặng (Beta)</string>
-    <string name="pref_title_custom_font">Sử dụng font chữ Manrope</string>
-    <string name="pref_title_desaturated_color">Màu sắc tương thích</string>
-    <string name="pref_title_expand_now_playing_panel">Hiển thị màn hình phát nhạc</string>
     <string name="pref_title_extra_controls">Điều khiển bổ sung</string>
-    <string name="pref_title_extra_song_info">Thông tin bài hát</string>
     <string name="pref_title_gapless_playback">Phát không gián đoạn</string>
     <string name="pref_title_general_theme">Chủ đề ứng dụng</string>
-    <string name="pref_title_home_album_grid_style">Lưới Album</string>
+    <string name="pref_title_genre_toggle">Hiện thẻ thể loại</string>
     <string name="pref_title_home_artist_grid_style">Lưới nghệ sĩ trang chủ</string>
-    <string name="pref_title_home_banner">Banner</string>
-    <string name="pref_title_ignore_media_store_artwork">Ảnh bìa chất lượng cao</string>
+    <string name="pref_title_home_banner">Biểu ngữ trang chủ</string>
+    <string name="pref_title_ignore_media_store_artwork">Ảnh bìa chất lượng nguyên bản</string>
     <string name="pref_title_last_added_interval">Làm mới danh sách thêm gần đây sau</string>
     <string name="pref_title_lock_screen">Điều khiển toàn màn hình.</string>
-    <string name="pref_title_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Luôn luôn phát</string>
-    <string name="pref_title_now_playing_screen_appearance">Giao diện màn hình phát</string>
+    <string name="pref_title_navigation_bar">Đổi màu thanh điều hướng</string>
+    <string name="pref_title_now_playing_screen_appearance">Giao diện đang phát</string>
     <string name="pref_title_open_source_licences">Giấy phép nguồn mở</string>
-    <string name="pref_title_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Hiển thị đề xuất</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
+    <string name="pref_title_round_corners">Bo tròn các góc</string>
     <string name="pref_title_tab_text_mode">Chế độ tiêu đề thẻ</string>
     <string name="pref_title_toggle_carousel_effect">Hiệu ứng quay vòng</string>
+    <string name="pref_title_toggle_dominant_color">Màu sắc chi phối</string>
     <string name="pref_title_toggle_full_screen">Toàn màn hình</string>
+    <string name="pref_title_toggle_tab_titles">Tiêu đề</string>
     <string name="pref_title_toggle_toggle_headset">Tự động phát</string>
     <string name="pref_title_toggle_toggle_shuffle">Chế độ ngẫu nhiên</string>
     <string name="pref_title_toggle_volume">Điều khiển âm lượng</string>
-    <string name="pref_title_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pref_title_user_info">Thông tin người dùng</string>
+
+    <string name="primary_color">Màu chủ đạo</string>
+    <string name="primary_color_desc">Màu sắc chủ đạo, mặc định là màu xanh xám, bây giờ hoạt động với màu tối</string>
+
     <string name="profile">Hồ sơ</string>
+
     <string name="purchase">Mua</string>
-    <string name="queue">Danh sách chờ phát</string>
+
+    <string name="purchase_summary">*Hãy suy nghĩ kĩ trước khi mua, không yêu cầu hoàn tiền.</string>
+
+    <string name="queue">Hàng đợi</string>
+
     <string name="rate_app">Đánh giá ứng dụng</string>
-    <string name="rate_on_google_play_summary">Bạn thích ứng dụng này chứ? Hãy cho chúng tôi biết cảm nhận của bạn trên Cửa hàng Google Play để chúng tôi có thể hoàn thiện sản phẩm tốt hơn nữa nhé</string>
+
+    <string name="rate_on_google_play_summary">Bạn thích ứng dụng này không? Hãy cho chúng tôi biết suy nghĩ của bạn trên Cửa hàng Play để chúng tôi có thể làm cho nó tốt hơn nữa</string>
+
     <string name="recent_albums">Album mới thêm</string>
+
     <string name="recent_artists">Nghệ sĩ mới thêm</string>
+
     <string name="remove_action">Loại bỏ</string>
+
+    <string name="remove_banner_photo">Xóa ảnh biểu ngữ</string>
+
     <string name="remove_cover">Xoá ảnh bìa</string>
+
     <string name="remove_from_blacklist">Xóa khỏi danh sách đen</string>
-    <string name="remove_image">Remove Image</string>
+
+    <string name="remove_profile_photo">Xóa ảnh tiểu sử</string>
+
     <string name="remove_song_from_playlist_title">Xoá bài hát khỏi danh sách phát</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Xoá bài hát <b>%1$s</b> khỏi danh sách phát?]]></string>
+
     <string name="remove_songs_from_playlist_title">Xoá bài hát khỏi danh sách phát</string>
+
     <string name="remove_x_songs_from_playlist"><![CDATA[Xóa <b>%1$d</b> bài hát khỏi danh sách phát?]]></string>
+
     <string name="rename_playlist_title">Đổi tên danh sách phát</string>
-    <string name="replace_cover">Thay thế Ảnh bìa Album</string>
+
     <string name="report_an_issue">Báo cáo vấn đề</string>
+
     <string name="report_bug">Báo cáo lỗi</string>
+
     <string name="reset_action">Cài lại</string>
+
     <string name="reset_artist_image">Đặt lại ảnh nghệ sĩ</string>
+
     <string name="restore">Khôi phục</string>
-    <string name="restore_message">Do you want to restore backup?</string>
+
     <string name="restored_previous_purchase_please_restart">Khôi phục mua trước đó. Vui lòng khởi động lại ứng dụng để sử dụng tất cả các tính năng.</string>
     <string name="restored_previous_purchases">Đã khôi phục lần mua trước.</string>
+
     <string name="restoring_purchase">Đang khôi phục mua hàng...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Bộ chỉnh âm Retro</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">Ứng dụng cần quyền truy cập cài đặt thiết bị của bạn để đặt nhạc làm Nhạc chuông</string>
-    <string name="ringtone_title">Nhạc chuông (Tùy chọn)</string>
-    <string name="saf_delete_failed">Xóa tệp thất bại: %s</string>
-    <!-- SAF -->
-    <string name="saf_error_uri">Không thể lấy SAF URI</string>
-    <string name="saf_guide_slide1_description">Mở ngăn điều hướng</string>
-    <string name="saf_guide_slide1_description_before_o">Cho phép \"hiển thị \'thẻ nhớ\" trong menu tùy chọn</string>
-    <!-- SAF guide -->
-    <string name="saf_guide_slide1_title">%s cần quyền truy cập thẻ nhớ</string>
-    <string name="saf_guide_slide2_description">Bạn cần chọn thư mục thẻ nhớ gốc của mình</string>
-    <string name="saf_guide_slide2_title">Chọn thẻ nhớ của bạn trong ngăn điều hướng</string>
-    <string name="saf_guide_slide3_description">Không được mở bất kỳ thư mục con nào</string>
-    <string name="saf_guide_slide3_title">Nhấn vào nút \'chọn\' ở cuối màn hình</string>
-    <string name="saf_write_failed">Ghi tệp thất bại: %s</string>
+
     <string name="save">Lưu</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Lưu thành</string>
+
     <string name="save_playlists_title">Lưu thành tệp</string>
+
     <string name="saved_playlist_to">Danh sách phát đã lưu đến %s.</string>
+
     <string name="saving_changes">Lưu thay đổi</string>
+
     <string name="scan_media">Quét phương tiện</string>
+
     <string name="scanned_files">Đã sửa %1$d trong %2$d tập tin.</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="search_hint">Tìm kiếm trong thư viện của bạn...</string>
+
     <string name="select_all">Chọn tất cả</string>
+
+    <string name="select_banner_photo">Chọn ảnh biểu ngữ</string>
+
     <string name="selected">Đã chọn</string>
+
+    <string name="send_crash_log">Gửi bản ghi lỗi</string>
+
     <string name="set">Cấu hình</string>
+
     <string name="set_artist_image">Đặt ảnh nghệ sĩ thủ công</string>
+
+    <string name="set_photo">Chọn một hình cá nhân</string>
+
     <string name="share_app">Chia sẽ ứng dụng</string>
-    <string name="share_summary">Chia sẻ ứng dụng với bạn bè và gia đình của bạn</string>
-    <string name="share_to_stories">Chia sẻ đến Các story</string>
-    <string name="show_album_artists">Hiển thị Album Nghệ sĩ</string>
+
     <string name="shuffle">Ngẫu nhiên</string>
+
     <string name="simple">Đơn giản</string>
-    <string name="sleep_timer_canceled">Đã huỷ hẹn giờ ngừng phát.</string>
-    <string name="sleep_timer_set">Ngừng phát nhạc sau %d phút kể từ bây giờ.</string>
+
+    <string name="sleep_timer_canceled">Đã huỷ hẹn giờ ngủ.</string>
+    <string name="sleep_timer_set">Dừng phát nhạc sau %d phút kể từ bây giờ.</string>
+
+    <string name="slide">Trang</string>
+
+    <string name="small">Album nhỏ</string>
+
     <string name="social">Xã hội</string>
-    <string name="social_stories">Chia sẻ story</string>
+
     <string name="song">Bài hát</string>
+
     <string name="song_duration">Thời lượng bài hát</string>
+
     <string name="songs">Bài hát</string>
+
     <string name="sort_order">Thứ tự sắp xếp</string>
     <string name="sort_order_a_z">Tăng dần</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Nghệ sĩ</string>
     <string name="sort_order_composer">Tác giả</string>
     <string name="sort_order_date">Ngày</string>
-    <string name="sort_order_date_modified">Ngày chỉnh sửa</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Số bài hát</string>
-    <string name="sort_order_num_songs_desc">Số bài hát giảm</string>
     <string name="sort_order_year">Năm</string>
     <string name="sort_order_z_a">Giảm dần</string>
+
     <string name="speech_not_supported">Xin lỗi! Thiết bị không hỗ trợ nhập liệu bằng giọng nói</string>
+
     <string name="speech_prompt">Tìm kiếm trong thư viện của bạn</string>
+
     <string name="stack">Ngăn xếp</string>
+
     <string name="start_play_music">Bắt đầu chơi nhạc</string>
+
     <string name="suggestion_songs">Đề nghị</string>
+
+    <string name="summary_user_info">Tên của bạn chỉ hiển thị trên trang chủ</string>
+
     <string name="support_development">Hỗ trợ nhà phát triển</string>
-    <string name="swipe_to_unlock">Trượt để mở khóa</string>
-    <string name="synced_lyrics">Lời Đồng bộ</string>
+
+    <string name="synced_lyrics">Karaoke</string>
+
+    <string name="system_equalizer">Bộ chỉnh âm hệ thống</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Tham gia nhóm Telegram để thảo luận về lỗi, đưa ra đề xuất, và hơn thế nữa</string>
-    <string name="thank_you">Cảm ơn bạn!</string>
+
+    <string name="thank_you">Cảm ơn!</string>
+
     <string name="the_audio_file">Tệp âm thanh</string>
+
     <string name="this_month">Mỗi tháng</string>
+
     <string name="this_week">Mỗi tuần</string>
+
     <string name="this_year">Mỗi năm</string>
+
     <string name="tiny">Nhỏ</string>
-    <string name="tiny_card_style">Thẻ nhỏ</string>
+
     <string name="title">Tiêu đề</string>
-    <string name="title_new_backup">New Backup</string>
+
+    <string name="title_dashboard">Bảng điều khiển</string>
+
+    <string name="title_good_afternoon">Chào buổi chiều</string>
+    <string name="title_good_day">Ngày tốt lành</string>
+    <string name="title_good_evening">Chào buổi tối</string>
+    <string name="title_good_morning">Chào buổi sáng</string>
+    <string name="title_good_night">Chúc ngủ ngon</string>
+
+    <string name="title_user_info">Tên của bạn là gì</string>
+
     <string name="today">Hôm nay</string>
+
     <string name="top_albums">Album hàng đầu</string>
+
     <string name="top_artists">Nghệ sĩ hàng đầu</string>
+
     <string name="track_hint">"Rãnh (2 cho bài số 2 hoặc 3004 cho CD3 bài số 4)"</string>
+
     <string name="track_list">Số rãnh</string>
+
     <string name="translate">Dịch</string>
-    <string name="translate_community">Hãy giúp chúng tôi dịch ứng dụng sang ngôn ngữ của bạn nhé</string>
-    <string name="try_retro_music_premium">Thử Retro Music Premium</string>
+
+    <string name="translate_community">Giúp chúng tôi dịch ứng dụng sang ngôn ngữ của bạn</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Chia sẻ thiết kế của bạn với Retro Music</string>
+
     <string name="unlabeled">Chưa gắn nhãn</string>
-    <string name="unplayable_file">Không thể phát bài hát này.</string>
+
+    <string name="unplayable_file">Kh\u00f4ng th\u1ec3 ph\u00e1t b\u00e0i h\u00e1t n\u00e0y.</string>
+
     <string name="up_next">Tiếp theo</string>
+
     <string name="update_image">Cập nhật hình ảnh</string>
+
     <string name="updating">Đang cập nhật...</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">Người dùng</string>
+
     <string name="username">Tên người dùng</string>
+
     <string name="version">Phiên bản</string>
-    <string name="vertical_flip">Lật dọc</string>
-    <string name="view_on_telegram">Xem trên Telegram</string>
-    <string name="volume">Âm lượng</string>
+
+    <string name="virtualizer">Trình ảo hóa</string>
+
     <string name="web_search">Tìm kiếm trên web</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Xem Website của chúng tôi</string>
+
     <string name="welcome">Chào mừng,</string>
+
     <string name="what_do_you_want_to_share">Bạn muốn chia sẻ gì?</string>
+
     <string name="whats_new">Có gì mới!</string>
+
     <string name="window">Cửa sổ</string>
-    <string name="window_corner_edges">Bo góc</string>
+
+    <string name="window_corner_edges">Góc tròn</string>
+
     <string name="x_has_been_set_as_ringtone">Đặt %1$s làm nhạc chuông.</string>
+
     <string name="x_selected">%1$d đã chọn</string>
+
     <string name="year">Năm</string>
+
     <string name="you_have_to_select_at_least_one_category">Bạn phải chọn ít nhất một danh mục.</string>
+
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">Bạn sẽ được chuyển tiếp đến trang web theo dõi vấn đề.</string>
+
     <string name="your_account_data_is_only_used_for_authentication">Dữ liệu tài khoản của bạn chỉ được sử dụng để xác thực.</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values-xlarge/dimens.xml b/app/src/main/res/values-xlarge/dimens.xml
index a7ffbf07c..0e0dab156 100644
--- a/app/src/main/res/values-xlarge/dimens.xml
+++ b/app/src/main/res/values-xlarge/dimens.xml
@@ -1,7 +1,8 @@
 <resources>
     <dimen name="toolbar_margin_horizontal">64dp</dimen>
     <dimen name="toolbar_height">64dp</dimen>
-    <dimen name="item_song_height">72dp</dimen>
+    <dimen name="toolbar_margin_vertical">16dp</dimen>
+    <dimen name="item_song_height">64dp</dimen>
     <dimen name="button_padding_vertical">16dp</dimen>
-    <dimen name="pref_title_padding">80dp</dimen>
+    <dimen name="button_margin_horizontal">72dp</dimen>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e5dfcc050..857efd336 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -1,201 +1,286 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<resources>
-    <string name="about_album_label">关于 %s</string>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
     <string name="about_settings_summary">团队，社交链接</string>
-    <string name="accent_color">强调色</string>
-    <string name="accent_color_desc">主题强调色，默认为紫色</string>
+
+    <string name="accent_color">主题色</string>
+    <string name="accent_color_desc">主题强调色，默认为青色。</string>
+
     <string name="action_about">关于</string>
-    <string name="action_add_to_blacklist">加入黑名单</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_cancel">取消</string>
-    <string name="action_cast">投射</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_cycle_repeat">循环重复模式</string>
+    <string name="action_clear_playlist">清空播放队列</string>
+
     <string name="action_delete">删除</string>
-    <string name="action_delete_from_device">从设备中删除</string>
+    <string name="action_delete_from_device">从设备中移除</string>
+
     <string name="action_details">详情</string>
-    <string name="action_edit">编辑</string>
-    <string name="action_go_to_album">查看专辑</string>
+
+    <string name="action_go_to_album">查看此专辑</string>
     <string name="action_go_to_artist">查看艺术家</string>
     <string name="action_go_to_genre">查看流派</string>
-    <string name="action_go_to_lyrics">查看歌词</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_grid_size_land">网格大小（横向）</string>
+
     <string name="action_next">下一首</string>
+
     <string name="action_play">播放</string>
-    <string name="action_play_all">播放全部</string>
-    <string name="action_play_next">下一首播放</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_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_all">全部随机播放</string>
     <string name="action_shuffle_playlist">随机播放列表</string>
+
     <string name="action_sleep_timer">睡眠定时器</string>
+
     <string name="action_sort_order">排序</string>
+
     <string name="action_tag_editor">标签编辑器</string>
-    <string name="action_toggle_favorite">切换收藏夹</string>
-    <string name="action_toggle_shuffle">切换随机播放模式</string>
+
     <string name="adaptive">自适应</string>
+
     <string name="add_action">添加</string>
-    <string name="add_playlist_title">"加入播放列表"</string>
-    <string name="add_time_framed_lryics">添加同步歌词</string>
-    <string name="added_song_count_to_playlist">已将 %1$d 首歌添加到 %2$s</string>
-    <string name="added_title_to_playing_queue">"已添加 1 首歌到播放队列。"</string>
-    <string name="added_x_titles_to_playing_queue">已添加 %1$d 首歌到播放队列。</string>
+
+    <string name="add_lyrics">添加歌词</string>
+
+    <string name="add_photo" tools:keep="@string/add_photo">添加\n头像</string>
+
+    <string name="add_playlist_title">"添加到播放列表"</string>
+
+    <string name="add_time_framed_lryics">添加时间戳歌词</string>
+
+    <string name="added_title_to_playing_queue">"已加入播放队列"</string>
+
+    <string name="added_x_titles_to_playing_queue">已添加 %1$d 首歌到播放队列</string>
+
     <string name="album">专辑</string>
-    <plurals name="albumSongs">
-        <item quantity="other">歌曲</item>
-    </plurals>
+
     <string name="album_artist">专辑艺术家</string>
+
+    <string name="album_or_artist_empty">标题或艺术家是空的</string>
+
     <string name="albums">专辑</string>
-    <plurals name="albums">
-        <item quantity="other">专辑</item>
-    </plurals>
+
+    <!-- Android Auto -->
     <string name="always">始终</string>
-    <string name="app_share">嘿，快来瞧瞧这个酷炫的音乐播放器：https://play.google.com/store/apps/details?id=%s</string>
+
+    <string name="app_share">嘿，快来瞧瞧这个酷炫的音乐播放器：https://play.google.com/store/apps/details? id =％s</string>
+
+    <!-- App Shortcuts -->
     <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_card_name">卡片</string>
-    <string name="app_widget_classic_name">经典</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">小巧</string>
-    <string name="app_widget_text_name">极简文字</string>
-    <string name="artist">艺术家</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="app_widget_text_name">Retro music - 文本</string>
+
+    <string name="artist">歌手</string>
+
     <string name="artists">艺术家</string>
-    <string name="audio_fade_duration">音乐淡入淡出时长</string>
-    <string name="audio_focus_denied">音频焦点丢失。</string>
+
+    <string name="audio_focus_denied">音频焦点丢失</string>
+
     <string name="audio_settings_summary">更改声音设置或调整均衡器</string>
+
     <string name="auto">自动</string>
-    <string name="backup_restore_settings_summary">备份、恢复您的设置和播放列表</string>
-    <string name="backup_restore_title"><![CDATA[备份与还原]]></string>
-    <string name="backup_title">备份</string>
+
+    <string name="base_color_theme" tools:keep="@string/base_color_theme">基础颜色主题</string>
+
+    <string name="bass_boost" tools:keep="@string/bass_boost">低音增强</string>
+
+    <string name="bio">个性签名</string>
+
     <string name="biography">简介</string>
-    <string name="black_theme_name">纯黑</string>
+
+    <string name="black_theme_name">A屏黑</string>
+
     <string name="blacklist">黑名单</string>
-    <string name="bluetooth_summary">应用需要附近设备权限才能检查蓝牙设备</string>
-    <string name="bluetooth_title">附近设备</string>
+
     <string name="blur">模糊</string>
+
     <string name="blur_card">模糊卡片</string>
+
     <string name="bug_report_failed">无法提交报告</string>
     <string name="bug_report_failed_invalid_token">无效的访问令牌，请联系应用开发者。</string>
-    <string name="bug_report_failed_issues_not_available">所选仓库未启用议题。请联系应用开发者。</string>
+    <string name="bug_report_failed_issues_not_available">目的仓库的 Issues 未启用，请联系应用开发者。</string>
     <string name="bug_report_failed_unknown">发生未知错误，请联系应用开发者。</string>
     <string name="bug_report_failed_wrong_credentials">错误的用户名或密码</string>
     <string name="bug_report_issue">问题</string>
-    <string name="bug_report_manual">手动发送</string>
+    <string name="bug_report_manual">自动发送</string>
     <string name="bug_report_no_description">请输入问题描述</string>
-    <string name="bug_report_no_password">请您输入有效的 GitHub 密码</string>
+    <string name="bug_report_no_password">请输入您有效的GitHub密码</string>
     <string name="bug_report_no_title">请输入问题标题</string>
-    <string name="bug_report_no_username">请您输入有效的 GitHub 用户名</string>
-    <string name="bug_report_success">错误报告成功</string>
-    <string name="bug_report_summary">发生未知错误。很抱歉让您遇到此错误，如一直崩溃，请尝试“清除应用数据”或发送邮件</string>
+    <string name="bug_report_no_username">请输入您有效的 GitHub 用户名</string>
+    <string name="bug_report_summary">出错了，如一直崩溃请尝试清除应用数据或发送邮件给开发者</string>
+    <string name="bug_report_uploading" tools:keep="@string/bug_report_uploading">提交此报告</string>
     <string name="bug_report_use_account">使用 GitHub 帐户发送</string>
-    <string name="buy_now">立即购买</string>
+
     <string name="cancel_current_timer">取消</string>
+
     <string name="card">卡片</string>
+
+    <string name="card_circular_style">圆形</string>
+
     <string name="card_color_style">彩色卡片</string>
-    <string name="card_square">方形卡片</string>
+
     <string name="card_style">卡片</string>
-    <string name="carousal_effect_on_now_playing_screen">在播放页使用轮播效果</string>
+
+    <string name="carousal" tools:keep="@string/carousal">圆盘传送带</string>
+
+    <string name="carousal_effect_on_now_playing_screen">在播放界面使用轮播效果</string>
+
     <string name="cascading">层叠</string>
-    <string name="changelog">变更日志</string>
-    <string name="changelog_summary">看看新变化</string>
-    <string name="choose_image">选择图片</string>
-    <string name="choose_restore_title">选择要还原的内容</string>
-    <string name="circle">唱盘</string>
+
+    <string name="cast" tools:keep="@string/cast">投射</string>
+
+    <string name="changelog">更新日志</string>
+
+    <string name="changelog_summary">在Telegram频道上维护更新日志</string>
+
     <string name="circular">圆形</string>
-    <string name="classic">经典</string>
+
+    <string name="classic" tools:keep="@string/classic">古典</string>
+
     <string name="clear_action">清空</string>
+
+    <string name="clear_app_data">清除应用数据</string>
+
     <string name="clear_blacklist">清空黑名单</string>
-    <string name="clear_history">清除历史记录</string>
+
     <string name="clear_playing_queue">清空队列</string>
+
+    <string name="clear_playlist_title">清除播放列表</string>
+    <string name="clear_playlist_x"><![CDATA[\u786e\u8ba4\u6e05\u9664\u64ad\u653e\u5217\u8868 <b>%1$s</b> \u5417\uff1f\u8bf7\u6ce8\u610f\uff0c\u6b64\u64cd\u4f5c\u4e0d\u53ef\u6062\u590d\uff01]]></string>
+
+    <string name="close_notification">关闭</string>
+
     <string name="color">颜色</string>
+
+    <string name="color_theme_name" tools:keep="@string/color_theme_name">颜色</string>
+
     <string name="colors">更多颜色</string>
-    <string name="compact">紧凑</string>
+
     <string name="composer">作曲家</string>
+
     <string name="copied_device_info_to_clipboard">已复制设备信息到剪贴板。</string>
-    <string name="could_not_create_playlist">无法创建播放列表。</string>
-    <string name="could_not_download_album_cover">"无法下载匹配的专辑封面。"</string>
-    <string name="could_not_restore_purchase">无法恢复购买。</string>
-    <string name="could_not_scan_files">无法扫描 %d 个文件。</string>
-    <string name="create_action">创建</string>
-    <string name="create_new_backup">创建</string>
-    <string name="created_playlist_x">已创建播放列表 %1$s。</string>
+
+    <string name="could_not_create_playlist">\u65e0\u6cd5\u521b\u5efa\u64ad\u653e\u5217\u8868</string>
+    <string name="could_not_download_album_cover">"\u65e0\u6cd5\u4e0b\u8f7d\u5339\u914d\u7684\u4e13\u8f91\u5c01\u9762"</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="credit_title">开发团队和贡献者</string>
-    <string name="currently_listening_to_x_by_x">正在收听 %2$s 的 %1$s。</string>
-    <string name="custom_artist_images">自定义艺术家图像</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">分享崩溃报告</string>
-    <string name="dark_theme_name">深色</string>
+
+    <string name="currently_listening_to_x_by_x">当前通过 %2$s 收听 %1$s</string>
+
+    <string name="dark_theme_name">暗夜黑</string>
+
+    <string name="default_hint" tools:keep="@string/default_hint">暂无歌词</string>
+
     <string name="delete_playlist_title">删除播放列表</string>
-    <string name="delete_playlist_x"><![CDATA[确定删除播放列表 <b>%1$s</b> 吗？]]></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="delete_song_x"><![CDATA[删除歌曲<b>％1 $ s </ b>吗？]]></string>
+
+    <string name="delete_x_playlists"><![CDATA[删除播放列表 <b>%1$s</b> 吗？]]></string>
+    <string name="delete_x_songs"><![CDATA[删除歌曲 <b>%1$s</b> 吗？]]></string>
+    <string name="deleted_x_songs">已删除 %1$d 首歌曲</string>
+
     <string name="depth">深度</string>
+
     <string name="description">详情</string>
+
     <string name="device_info">设备信息</string>
+
     <string name="dialog_message_set_ringtone">允许 Retro Music 修改声音设置</string>
-    <string name="dialog_title_set_ringtone">设为铃声</string>
-    <string name="disc_hint">盘片编号</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="dialog_title_set_ringtone">设置为铃声</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="donate_summary">如果你认为应用还不错，可以通过捐赠支持我们</string>
+
     <string name="donation_header">用以下方式捐赠：</string>
-    <string name="done">完成</string>
-    <string name="drive_mode">驾驶模式</string>
-    <string name="edit_fab">编辑按钮</string>
-    <string name="edit_normal_lyrics">编辑歌词</string>
-    <string name="edit_synced_lyrics">编辑同步歌词</string>
+
+    <string name="download_from_last_fm">从 Last.fm 下载</string>
+
+    <string name="edit">编辑</string>
+
+    <string name="edit_cover" tools:keep="@string/edit_cover">编辑专辑封面</string>
+
     <string name="empty">空空如也</string>
+
     <string name="equalizer">均衡器</string>
-    <string name="error_create_backup">无法创建备份</string>
-    <string name="error_delete_backup">无法删除备份</string>
-    <string name="error_empty_name">您的名字不能为空！</string>
-    <string name="error_load_failed">加载失败</string>
-    <string name="error_share_file">无法分享文件</string>
-    <string name="expanded">展开</string>
+
+    <string name="error">错误</string>
+
     <string name="faq">常见问题和解答</string>
+
     <string name="favorites">收藏夹</string>
-    <string name="file_already_exists">文件已存在</string>
-    <string name="finish_last_song">播放完最后一首歌曲</string>
+
     <string name="fit">填充</string>
+
     <string name="flat">扁平</string>
+
     <string name="folders">文件夹</string>
-    <string name="follow_system">跟随系统</string>
+
     <string name="for_you">私人订制</string>
-    <string name="free">免费</string>
+
     <string name="full">全屏</string>
+
     <string name="full_card">填充卡片</string>
+
     <string name="general_settings_summary">更改应用的主题和颜色</string>
     <string name="general_settings_title">界面与外观</string>
+
     <string name="genre">流派</string>
+
     <string name="genres">流派</string>
-    <string name="git_hub_summary">在 GitHub 上克隆项目</string>
-    <string name="gradient">渐变</string>
-    <string name="grant_access">允许访问</string>
+
+    <string name="git_hub_summary">在GitHub上克隆项目</string>
+
+    <string name="google_plus_community" tools:keep="@string/google_plus_community">加入Google+社区获得帮助或者更新信息</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -204,357 +289,465 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">网格样式</string>
-    <string name="help_summary">需要更多帮助？</string>
-    <string name="hinge">旋转</string>
+
+    <string name="hinge">关键</string>
+
     <string name="history">历史记录</string>
-    <string name="history_cleared">已清除历史记录</string>
-    <string name="history_undo_button">撤销</string>
+
     <string name="home">主页</string>
+
     <string name="horizontal_flip">水平翻转</string>
+
     <string name="image">图片</string>
-    <string name="image_gradient">渐变图片</string>
-    <string name="image_settings_summary">更改艺术家图像下载设置</string>
-    <string name="import_label">导入</string>
-    <string name="import_playlist">导入播放列表</string>
-    <string name="import_playlist_message">这会导入 Android 媒体存储中的所有播放列表，并合并重复的播放列表</string>
-    <string name="inserted_x_songs_into_playlist_x">已将 %1$d 首歌曲加入列表 %2$s。</string>
-    <string name="instagram_page_summary">将您的 Retro Music 配置晒到 Instagram</string>
-    <string name="keyboard">键盘</string>
+
+    <string name="image_settings_summary">更改下载歌手图像方式</string>
+
+    <string name="inserted_x_songs_into_playlist_x">将歌曲%1$d加入%2$s列表</string>
+
+    <string name="instagram_page">Instagram</string>
+    <string name="instagram_page_summary">将你的设置分享到Instagram</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_last_modified">最后修改</string>
-    <string name="label_more_from">来自 %s 的更多歌曲</string>
+    <string name="label_file_size">尺寸大小</string>
+
     <string name="label_sampling_rate">采样率</string>
+
     <string name="label_track_length">长度</string>
-    <string name="labeled">有标签</string>
+
+    <string name="labeled">有标签的</string>
+
     <string name="last_added">最近添加</string>
+
     <string name="last_song">最后一首</string>
-    <string name="lets_go">让我们开始吧</string>
-    <string name="library_categories">媒体库分类</string>
+
+    <string name="lets_play_something" tools:keep="@string/lets_play_something">来点音乐吧！</string>
+
+    <string name="library">音乐库</string>
+
     <string name="licenses">许可</string>
-    <string name="light_theme_name">浅色</string>
-    <string name="listeners_label">听众</string>
-    <string name="listing_files">正在列出文件</string>
-    <string name="loading_products">正在加载产品...</string>
+
+    <string name="light_theme_name">质感白</string>
+
+    <string name="listing_files">正在罗列所有文件</string>
+
+    <string name="loading_products">加载产品...</string>
+
     <string name="login">登录</string>
+
     <string name="lyrics">歌词</string>
-    <string name="made_with_love">用❤️创造，印度出品</string>
+
+    <string name="made_with_love">Made with ❤️ in India</string>
+
     <string name="material">质感</string>
+
     <string name="md_error_label">错误</string>
+
     <string name="md_storage_perm_error">权限错误</string>
-    <string name="message_backup_create_success">备份创建成功。</string>
-    <string name="message_limit_tabs">不超过 5 项</string>
-    <string name="message_pro_feature">%s 是高级版功能。</string>
-    <string name="message_restore_success">还原成功完成。</string>
-    <string name="message_updated">已更新</string>
-    <string name="message_welcome"><![CDATA[您好！ <br>欢迎使用 %s]]></string>
+
     <string name="my_name">我的名字</string>
-    <string name="my_top_tracks">最常播放</string>
+
+    <string name="my_top_tracks">播放最多</string>
+
     <string name="never">从不</string>
-    <string name="new_music_mix">新歌混烧</string>
-    <string name="new_playlist_title">新建播放列表</string>
-    <string name="new_start_directory">%s 是新的起始目录。</string>
+
+    <string name="new_banner_photo">新横幅图片</string>
+
+    <string name="new_playlist_title">新的播放列表</string>
+
+    <string name="new_profile_photo">新的头像</string>
+
+    <string name="new_start_directory">%s是新的主目录</string>
+
     <string name="next_song">下一曲</string>
+
     <string name="no_albums">暂无专辑</string>
+
     <string name="no_artists">暂无艺术家</string>
+
     <string name="no_audio_ID">"请播放歌曲后重试"</string>
-    <string name="no_backups_found">没有找到备份</string>
+
     <string name="no_equalizer">找不到均衡器</string>
+
     <string name="no_genres">暂无流派</string>
+
     <string name="no_lyrics_found">找不到歌词</string>
-    <string name="no_playing_queue">没有播放的歌曲</string>
+
     <string name="no_playlists">暂无播放列表</string>
-    <string name="no_purchase_found">没有找到购买记录</string>
+
+    <string name="no_purchase_found">找不到支付记录</string>
+
     <string name="no_results">暂无结果</string>
+
     <string name="no_songs">暂无歌曲</string>
+
     <string name="normal">正常</string>
+
     <string name="normal_lyrics">正常歌词</string>
-    <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> 未在媒体存储中列出。]]></string>
-    <string name="not_recently_played">最近未播放歌曲</string>
-    <string name="nothing_to_scan">无可检索。</string>
-    <string name="nothing_to_see">空空如也</string>
-    <string name="notification">通知</string>
-    <string name="notification_settings_summary">自定义通知样式</string>
+
+    <string name="normal_style">正常</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="now_playing_summary">定制播放界面</string>
+    <string name="now_playing_queue">播放队列</string>
+    <string name="now_playing_summary">自定义播放界面</string>
     <string name="now_playing_themes">多于 9 种播放主题</string>
-    <string name="only_on_wifi">仅限 Wi-Fi 网络</string>
-    <string name="other_settings_summary">高级测试功能</string>
+
+    <string name="only_on_wifi">仅限Wi-Fi网络</string>
+
+    <string name="other_settings_summary">高级功能测试</string>
+
     <string name="others">其他</string>
-    <string name="over_cover">覆盖封面</string>
+
     <string name="password">密码</string>
+
     <string name="past_three_months">最近三个月</string>
-    <string name="paste_lyrics_here">在此粘贴歌词</string>
-    <string name="paste_timeframe_lyrics_here">在此粘贴时段歌词</string>
-    <string name="peek">预览</string>
-    <string name="permission_bluetooth_denied">附近设备权限被拒绝。</string>
-    <string name="permission_external_storage_denied">访问外部存储权限被拒绝。</string>
-    <string name="permission_summary">应用需要设备存储访问权限来播放音乐</string>
-    <string name="permission_title">存储空间权限</string>
-    <string name="permissions_denied">权限被拒绝。</string>
+
+    <string name="paste_lyrics_here">在此处粘贴歌词</string>
+
+    <string name="permission_external_storage_denied">访问外部存储权限被拒绝</string>
+
+    <string name="permissions_denied">无权访问</string>
+
     <string name="personalize">个性化</string>
+
     <string name="personalize_settings_summary">自定义正在播放控件和UI控件</string>
-    <string name="pick_from_local_storage">从本地存储选取</string>
+
+    <string name="pick_from_local_storage">从本地选取</string>
+
+    <string name="pick_image_intent_text" tools:keep="@string/pick_image_intent_text">选择图片</string>
+
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">在 Pintrest 页面关注 Retro Music 的设计灵感</string>
+
     <string name="plain">简洁</string>
-    <string name="playList_already_exits">播放列表已存在</string>
-    <string name="playback_pitch">音高</string>
-    <string name="playback_settings">播放设置</string>
-    <string name="playback_speed">播放速度</string>
-    <string name="playing_notification_description">播放通知提供播放暂停等操作。</string>
-    <string name="playing_notification_name">播放通知</string>
-    <string name="playlist_created_sucessfully">%s 创建成功</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_album_detail_style" tools:keep="@string/pref_album_detail_style">专辑详细风格</string>
+
     <string name="pref_blur_amount_summary">应用于模糊主题，数值越低加载越快</string>
-    <string name="pref_blur_amount_title">模糊程度</string>
-    <string name="pref_filter_song_summary">按长度筛选歌曲</string>
+    <string name="pref_blur_amount_title">模糊值</string>
+
     <string name="pref_filter_song_title">筛选歌曲时长</string>
-    <string name="pref_header_advanced">高级</string>
-    <string name="pref_header_album">专辑样式</string>
+
     <string name="pref_header_audio">音频</string>
-    <string name="pref_header_blacklist">黑名单</string>
-    <string name="pref_header_controls">控件</string>
     <string name="pref_header_general">主题</string>
     <string name="pref_header_images">图片</string>
-    <string name="pref_header_library">媒体库</string>
     <string name="pref_header_lockscreen">锁屏</string>
     <string name="pref_header_playlists">播放列表</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">在音量为0时暂停播放，并在提高音量后自动播放。注意：当您提高音量后，它甚至会在您使用其他应用时开始播放</string>
+
+    <string name="pref_keep_pause_on_zero_volume_summary">在音量为0时暂停播放，并在提高音量后自动播放。注意：当你提高音量后，它甚至会在你使用其他应用时开始播放</string>
     <string name="pref_keep_pause_on_zero_volume_title">静音暂停</string>
     <string name="pref_keep_screen_on_summary">请注意，启用此功能可能会降低电池续航时间</string>
     <string name="pref_keep_screen_on_title">保持屏幕常亮</string>
-    <string name="pref_language_name">选择语言</string>
-    <string name="pref_snow_fall_title">降雪效果</string>
+
+    <string name="pref_now_playing_screen_summary" tools:keep="@string/pref_now_playing_screen_summary">点击打开或者滑动到非正在播放界面的透明导航栏</string>
+    <string name="pref_now_playing_screen_title" tools:keep="@string/pref_now_playing_screen_title">单击或划动</string>
+
+
+    <string name="pref_snow_fall_title" tools:keep="@string/pref_snow_fall_title">降雪效果</string>
+
     <string name="pref_summary_album_art_on_lockscreen">将正在播放的歌曲专辑封面设置为锁屏壁纸</string>
-    <string name="pref_summary_album_artists_only">在艺术家类别中显示专辑艺术家</string>
-    <string name="pref_summary_audio_ducking">当系统播放声音或收到通知时降低音量</string>
-    <string name="pref_summary_audio_fade">当歌曲暂停或播放时，淡入淡出音频</string>
-    <string name="pref_summary_blacklist">在媒体库中隐藏列入黑名单的文件夹内容。</string>
-    <string name="pref_summary_bluetooth_playback">连接到蓝牙设备后立即开始播放</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_audio_ducking">系统音响起或消息提醒时降低音量</string>
+    <string name="pref_summary_blacklist">在音乐库中隐藏列入黑名单的文件夹内容</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_notification">"将通知颜色设为专辑封面的强调色"</string>
-    <string name="pref_summary_cross_fade">曲目间淡入淡出的时长</string>
-    <string name="pref_summary_desaturated_color">根据质感设计规范，深色模式下应使用低饱和度颜色</string>
-    <string name="pref_summary_expand_now_playing_panel">点击通知将显示正在播放页，而不是主页</string>
-    <string name="pref_summary_extra_controls">给播放栏添加额外控件</string>
-    <string name="pref_summary_extra_song_info">显示额外的歌曲信息，例如文件格式、比特率和频率</string>
+    <string name="pref_summary_colored_navigation_bar" tools:keep="@string/pref_summary_colored_navigation_bar">修改导航栏颜色为主调色</string>
+    <string name="pref_summary_colored_notification">"\u4ee5\u5c01\u9762\u7684\u4e3b\u8272\u8c03\u914d\u7f6e\u901a\u77e5\u680f\u989c\u8272"</string>
+    <string name="pref_summary_dominant_color">从专辑封面或艺术家图中选取主色调</string>
+    <string name="pref_summary_extra_controls">给迷你播放器添加额外控件</string>
     <string name="pref_summary_gapless_playback">"在一些设备上可能会播放异常"</string>
-    <string name="pref_summary_home_banner">是否显示主页横幅</string>
-    <string name="pref_summary_ignore_media_store_artwork">可以提高封面质量，但加载时间较慢。请仅在图片分辨率过低时开启。</string>
-    <string name="pref_summary_library_categories">配置媒体库的可见性和顺序</string>
-    <string name="pref_summary_lock_screen">使用 Retro Music 的自定义锁屏</string>
-    <string name="pref_summary_manage_audio_focus">其他内容播放时，在后台继续播放音频</string>
+    <string name="pref_summary_genre_toggle" tools:keep="@string/pref_summary_genre_toggle">切换流派标签</string>
+    <string name="pref_summary_home_banner">切换主页横幅样式</string>
+    <string name="pref_summary_ignore_media_store_artwork">可以提高封面质量，但加载时间较慢
+（建议只在不满意图片分辨率过低时开启）</string>
+    <string name="pref_summary_lock_screen">使用Retro Music的自定义锁屏</string>
     <string name="pref_summary_open_source_licences">开源许可详情</string>
-    <string name="pref_summary_pause_history">启用后，新播放的歌曲不会显示在历史记录中</string>
-    <string name="pref_summary_remember_tab">启动时打开上次使用的页面</string>
-    <string name="pref_summary_show_lyrics">在专辑封面上显示同步歌词</string>
-    <string name="pref_summary_suggestions">在主屏上显示新歌混烧</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">在正在播放界面中启用任意位置滑动切歌</string>
-    <string name="pref_summary_swipe_to_dismiss">向下滑动以关闭播放栏</string>
-    <string name="pref_summary_toggle_full_screen">沉浸模式</string>
-    <string name="pref_summary_toggle_headset">连接耳机后立即开始播放</string>
+    <string name="pref_summary_round_corners">使应用边角圆滑</string>
+    <string name="pref_summary_tab_titles" tools:keep="@string/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_shuffle">播放新列表时关闭随机播放</string>
-    <string name="pref_summary_toggle_volume">空间充足时，在播放页显示音量控制</string>
-    <string name="pref_summary_wallpaper_accent">从壁纸中提取主题色</string>
-    <string name="pref_summary_whitelist">仅显示 /Music 目录的音乐</string>
+    <string name="pref_summary_toggle_volume">空间充足时在播放界面显示音量控制控件</string>
+
     <string name="pref_title_album_art_on_lockscreen">显示专辑封面</string>
-    <string name="pref_title_album_artists_only">按专辑艺术家排序</string>
     <string name="pref_title_album_cover_style">专辑封面主题</string>
-    <string name="pref_title_album_cover_transform">专辑封面切换</string>
-    <string name="pref_title_app_shortcuts">着色应用快捷方式</string>
-    <string name="pref_title_appbar_mode">顶栏样式</string>
-    <string name="pref_title_audio_ducking">焦点丢失时降低音量</string>
-    <string name="pref_title_audio_fade">音频淡入淡出</string>
+    <string name="pref_title_album_cover_transform">专辑封面跳过</string>
+    <string name="pref_title_album_grid_style">专辑网格</string>
+    <string name="pref_title_app_shortcuts">带颜色的快捷方式</string>
+    <string name="pref_title_artist_grid_style">艺术家网格</string>
+    <string name="pref_title_audio_ducking">不显示的时候降低音量</string>
     <string name="pref_title_auto_download_artist_images">自动下载艺术家图片</string>
     <string name="pref_title_blacklist">黑名单</string>
-    <string name="pref_title_bluetooth_playback">蓝牙播放</string>
     <string name="pref_title_blurred_album_art">模糊专辑封面</string>
-    <string name="pref_title_circle_button">圆形播放按钮</string>
-    <string name="pref_title_classic_notification">经典通知样式</string>
+    <string name="pref_title_choose_equalizer" tools:keep="@string/pref_title_choose_equalizer">选择均衡器</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_cross_fade">淡入淡出（测试）</string>
-    <string name="pref_title_custom_font">使用 Manrope 字体</string>
-    <string name="pref_title_desaturated_color">低饱和颜色</string>
-    <string name="pref_title_expand_now_playing_panel">显示正在播放界面</string>
+    <string name="pref_title_colored_notification">带颜色的通知栏</string>
     <string name="pref_title_extra_controls">额外控件</string>
-    <string name="pref_title_extra_song_info">歌曲信息</string>
-    <string name="pref_title_gapless_playback">无缝播放</string>
+    <string name="pref_title_gapless_playback">无间隙连续播放</string>
     <string name="pref_title_general_theme">应用主题</string>
-    <string name="pref_title_home_album_grid_style">专辑网格</string>
+    <string name="pref_title_genre_toggle" tools:keep="@string/pref_title_genre_toggle">显示流派标签</string>
     <string name="pref_title_home_artist_grid_style">主页艺术家网格</string>
     <string name="pref_title_home_banner">主页横幅</string>
-    <string name="pref_title_ignore_media_store_artwork">忽略媒体存储封面</string>
-    <string name="pref_title_last_added_interval">最近播放列表时间间隔</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_lyrics_screen_on">显示歌词时屏幕常亮</string>
-    <string name="pref_title_lyrics_type">歌词类型</string>
-    <string name="pref_title_manage_audio_focus">始终播放</string>
-    <string name="pref_title_now_playing_screen_appearance">正在播放主题</string>
+    <string name="pref_title_navigation_bar" tools:keep="@string/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_pause_history">暂停历史记录</string>
-    <string name="pref_title_remember_tab">记住最后打开页面</string>
-    <string name="pref_title_show_lyrics">显示歌词</string>
-    <string name="pref_title_suggestions">显示建议</string>
-    <string name="pref_title_swipe_anywhere_now_playing">任意位置滑动切歌</string>
-    <string name="pref_title_swipe_to_dismiss">下滑关闭</string>
-    <string name="pref_title_tab_text_mode">标签页标题模式</string>
+    <string name="pref_title_round_corners">边角</string>
+    <string name="pref_title_tab_text_mode">标签标题模式</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_toggle_headset">自动播放</string>
+    <string name="pref_title_toggle_tab_titles" tools:keep="@string/pref_title_toggle_tab_titles">标签标题</string>
+    <string name="pref_title_toggle_toggle_headset">音频播放</string>
     <string name="pref_title_toggle_toggle_shuffle">随机播放</string>
     <string name="pref_title_toggle_volume">音量控件</string>
-    <string name="pref_title_wallpaper_accent">壁纸主题色</string>
-    <string name="pref_title_whitelist">白名单音乐</string>
-    <string name="pro">高级版</string>
-    <string name="pro_summary">黑色主题、播放页主题、轮播效果以及更多功能…</string>
-    <string name="profile">个人信息</string>
+    <string name="pref_title_user_info" tools:keep="@string/pref_title_user_info">用户信息</string>
+
+    <string name="primary_color" tools:keep="@string/primary_color">主颜色</string>
+    <string name="primary_color_desc" tools:keep="@string/primary_color_desc">默认蓝灰色为主要颜色，目前使用深色</string>
+
+    <string name="profile">个人概况</string>
+
     <string name="purchase">购买</string>
-    <string name="queue">播放队列</string>
-    <string name="rate_app">评价应用</string>
-    <string name="rate_on_google_play_summary">喜欢这个应用？去 Google Play 商店告诉我们怎样才能让它更好</string>
+
+    <string name="purchase_summary" tools:keep="@string/purchase_summary">*购买前请先考虑，不要征询退款。</string>
+
+    <string name="queue">队列</string>
+
+    <string name="rate_app">评价</string>
+
+    <string name="rate_on_google_play_summary">喜欢这个应用？去 Google Play Store 中告诉我们怎样才能让它更好</string>
+
     <string name="recent_albums">最近专辑</string>
+
     <string name="recent_artists">最近艺术家</string>
-    <string name="remove_action">移除</string>
+
+    <string name="remove_action">删除</string>
+
+    <string name="remove_banner_photo">删除横幅图像</string>
+
     <string name="remove_cover">移除封面</string>
+
     <string name="remove_from_blacklist">从黑名单中移除</string>
-    <string name="remove_image">移除图像</string>
+
+    <string name="remove_profile_photo">删除简介照片</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_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="remove_x_songs_from_playlist"><![CDATA[从播放列表中删除歌曲<b>%1$d</b>？]]></string>
+
     <string name="rename_playlist_title">重命名播放列表</string>
-    <string name="replace_cover">替换封面</string>
+
     <string name="report_an_issue">报告问题</string>
-    <string name="report_bug">报告错误</string>
-    <string name="reset_action">重置</string>
+
+    <string name="report_bug">反馈</string>
+
     <string name="reset_artist_image">重置艺术家图片</string>
+
     <string name="restore">恢复</string>
-    <string name="restore_message">您想要恢复备份吗？</string>
-    <string name="restored_previous_purchase_please_restart">恢复以前的购买。请重新启动应用以使用所有功能。</string>
-    <string name="restored_previous_purchases">恢复之前的购买。</string>
-    <string name="restoring_purchase">正在恢复购买…</string>
-    <string name="retro_music_player">Retro Music 播放器</string>
-    <string name="retro_music_pro">Retro Music 高级版</string>
-    <string name="ringtone_summary">应用需要系统设置访问权限，才能将音乐设置为为铃声</string>
-    <string name="ringtone_title">铃声（可选）</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_write_failed">文件写入失败：%s</string>
+
+    <string name="restored_previous_purchase_please_restart">恢复以前的购买。请重新启动应用以充分利用所有功能。</string>
+    <string name="restored_previous_purchases">恢复之前购买</string>
+
+    <string name="restoring_purchase">恢复购买中 ...</string>
+
+    <string name="retro_equalizer" tools:keep="@string/retro_equalizer">Retro Music 均衡器</string>
+
+    <string name="retro_music_pro">Retro Music高级版</string>
+
     <string name="save">保存</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">保存为文件</string>
+
     <string name="save_playlists_title">保存为文件</string>
-    <string name="saved_playlist_to">保存播放列表到 %s。</string>
+
+    <string name="saved_playlist_to">保存播放列表到%s</string>
+
     <string name="saving_changes">保存修改</string>
+
     <string name="scan_media">扫描媒体</string>
+
     <string name="scanned_files">已扫描 %1$d 个，共计 %2$d 个文件。</string>
-    <string name="scrobbles_label">音乐记录</string>
+
+    <string name="search_hint">搜索库</string>
+
     <string name="select_all">全选</string>
-    <string name="selected">仅选中</string>
+
+    <string name="select_banner_photo">选择横幅图像</string>
+
+    <string name="selected">被选择</string>
+
+    <string name="send_crash_log">发送崩溃日志</string>
+
     <string name="set">设置</string>
+
     <string name="set_artist_image">设置艺术家图片</string>
+
+    <string name="set_photo">设置个人资料照片</string>
+
     <string name="share_app">分享应用</string>
-    <string name="share_summary">与您的朋友和家人分享此应用</string>
-    <string name="share_to_stories">分享到故事</string>
-    <string name="show_album_artists">显示专辑艺术家</string>
+
     <string name="shuffle">随机播放</string>
+
     <string name="simple">简单</string>
-    <string name="sleep_timer_canceled">睡眠定时已取消。</string>
-    <string name="sleep_timer_set">睡眠定时器设置为 %d 分钟。</string>
+
+    <string name="sleep_timer_canceled">睡眠定时已取消</string>
+    <string name="sleep_timer_set">睡眠定时器设置为%d分钟。</string>
+
+    <string name="slide" tools:keep="@string/slide">滑动</string>
+
+    <string name="small" tools:keep="@string/small">小专辑</string>
+
     <string name="social">社交</string>
-    <string name="social_stories">分享故事</string>
+
     <string name="song">歌曲</string>
+
     <string name="song_duration">歌曲时长</string>
+
     <string name="songs">歌曲</string>
+
     <string name="sort_order">排序</string>
     <string name="sort_order_a_z">升序</string>
     <string name="sort_order_album">专辑</string>
     <string name="sort_order_artist">艺术家</string>
     <string name="sort_order_composer">作曲家</string>
     <string name="sort_order_date">日期</string>
-    <string name="sort_order_date_modified">修改日期</string>
-    <string name="sort_order_default">默认</string>
-    <string name="sort_order_num_songs">歌曲数量</string>
-    <string name="sort_order_num_songs_desc">歌曲数量降序</string>
-    <string name="sort_order_year">年份</string>
+    <string name="sort_order_year">年</string>
     <string name="sort_order_z_a">降序</string>
-    <string name="speech_not_supported">抱歉！您的设备不支持语音输入</string>
+
+    <string name="speech_not_supported">抱歉!您的设备不支持语音输入</string>
+
     <string name="speech_prompt">搜索媒体库</string>
-    <string name="stack">堆叠</string>
-    <string name="start_play_music">开始播放音乐。</string>
-    <string name="suggestion_songs">建议</string>
+
+    <string name="suggestion_songs" tools:keep="@string/suggestion_songs">建议</string>
+
+    <string name="summary_user_info" tools:keep="@string/summary_user_info">仅仅在主页上显示你的名字</string>
+
     <string name="support_development">支持开发者</string>
+
     <string name="swipe_to_unlock">滑动以解锁</string>
+
     <string name="synced_lyrics">滚动歌词</string>
+
+    <string name="system_equalizer" tools:keep="@string/system_equalizer">系统均衡器</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">加入 Telegram 群组，讨论错误，提出建议，水群聊天等等</string>
-    <string name="thank_you">谢谢您！</string>
+    <string name="telegram_group_summary">加入 telegram 团队，讨论错误、提出建议、展示和更多信息</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="this_year">本年</string>
+
     <string name="tiny">细小</string>
-    <string name="tiny_card_style">小卡片</string>
+
     <string name="title">标题</string>
-    <string name="title_new_backup">新建备份</string>
+
+    <string name="title_dashboard" tools:keep="@string/title_dashboard">仪表盘</string>
+
+    <string name="title_good_afternoon" tools:keep="@string/title_good_afternoon">下午好</string>
+    <string name="title_good_day" tools:keep="@string/title_good_day">美好的一天</string>
+    <string name="title_good_evening" tools:keep="@string/title_good_evening">傍晚好</string>
+    <string name="title_good_morning" tools:keep="@string/title_good_morning">早上好</string>
+    <string name="title_good_night" tools:keep="@string/title_good_night">晚上好</string>
+
+    <string name="title_user_info" tools:keep="@string/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 张盘的第 4 条音轨）"</string>
-    <string name="track_list">音轨编号</string>
+
+    <string name="track_hint">"歌曲"</string>
+
+    <string name="track_list">歌曲编号</string>
+
     <string name="translate">翻译</string>
+
     <string name="translate_community">帮助我们将应用翻译成您的语言</string>
-    <string name="try_retro_music_premium">试试 Retro Music 高级版</string>
+
     <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">与 Retro Music 分享您的设计</string>
-    <string name="unlabeled">无标签</string>
-    <string name="unplayable_file">无法播放这首歌曲。</string>
+    <string name="twitter_page_summary">与Retro Music分享您的设计</string>
+
+    <string name="unlabeled">无标签的</string>
+
+    <string name="unplayable_file">\u65e0\u6cd5\u64ad\u653e\u8fd9\u9996\u6b4c\u3002</string>
+
     <string name="up_next">下一首</string>
+
     <string name="update_image">更新图片</string>
-    <string name="updating">正在更新…</string>
-    <string name="user_images_description">用户图像</string>
-    <string name="user_name">用户名</string>
+
+    <string name="updating">更新中...</string>
+
     <string name="username">用户名</string>
+
     <string name="version">版本</string>
-    <string name="vertical_flip">垂直翻转</string>
-    <string name="view_on_telegram">在 Telegram 上查看</string>
-    <string name="volume">音量</string>
+
+    <string name="vertical_flip">垂直滚动</string>
+
+    <string name="virtualizer" tools:keep="@string/virtualizer">虚拟器</string>
+
     <string name="web_search">网络搜索</string>
-    <string name="website">网站</string>
-    <string name="website_summary">查看我们的网站</string>
-    <string name="welcome">欢迎，</string>
-    <string name="what_do_you_want_to_share">您有什么想分享的吗？</string>
+
+    <string name="what_do_you_want_to_share">你想分享什么？</string>
+
     <string name="whats_new">更新内容</string>
+
     <string name="window">窗口</string>
+
     <string name="window_corner_edges">圆角</string>
-    <string name="x_has_been_set_as_ringtone">将 %1$s 设置为铃声。</string>
-    <string name="x_selected">已选择 %1$d 项</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="you_will_be_forwarded_to_the_issue_tracker_website">将跳转至问题追踪网站。</string>
-    <string name="your_account_data_is_only_used_for_authentication">您的账户数据仅用于验证。</string>
+
+    <string name="you_have_to_select_at_least_one_category">请至少选择一个分类</string>
+
+    <string name="you_will_be_forwarded_to_the_issue_tracker_website">将跳转至问题追踪网站</string>
+
+    <string name="your_account_data_is_only_used_for_authentication">你的账户数据仅用于验证。</string>
+    <string name="label_more_from">More from %s</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 e4c88da7c..99b2b0c98 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
     <string name="about_settings_summary">我們的團隊，以及社交媒體</string>
     <string name="accent_color">主題色</string>
@@ -8,6 +8,7 @@
     <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>
@@ -47,27 +48,33 @@
     <string name="action_toggle_shuffle">切換隨機播放模式</string>
     <string name="adaptive">自適應</string>
     <string name="add_action">增加</string>
+    <string name="add_lyrics">增加歌詞</string>
+    <string name="add_photo">增加\n相片</string>
     <string name="add_playlist_title">"加入至播放清單"</string>
     <string name="add_time_framed_lryics">增加時間同步歌詞</string>
     <string name="added_title_to_playing_queue">"已經將1首歌曲新增至播放列表。"</string>
-    <string name="added_x_titles_to_playing_queue">已經將 %1$d 首歌曲新增至播放列表。</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>
     <string name="always">經常</string>
-    <string name="app_share">哈囉！來看看這個很有型的播放器吧: https://play.google.com/store/apps/details?id=%s</string>
+    <string name="app_share">嗨，看看這個很有型的播放器吧: https://play.google.com/store/apps/details?id=%s</string>
     <string name="app_shortcut_shuffle_all_short">隨機播放</string>
     <string name="app_shortcut_top_tracks_short">歌曲榜</string>
-    <string name="app_widget_big_name">大型模式</string>
-    <string name="app_widget_card_name">卡片模式</string>
-    <string name="app_widget_classic_name">經典模式</string>
-    <string name="app_widget_small_name">小型模式</string>
-    <string name="app_widget_text_name">文字模式</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="app_widget_text_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="auto">自動</string>
+    <string name="base_color_theme">基色主題</string>
+    <string name="bass_boost">低音增強</string>
+    <string name="bio">個人簡歷</string>
     <string name="biography">演出者資料</string>
     <string name="black_theme_name">純黑</string>
     <string name="blacklist">黑名單</string>
@@ -75,7 +82,7 @@
     <string name="blur_card">模糊卡片</string>
     <string name="bug_report_failed">無法上傳報告</string>
     <string name="bug_report_failed_invalid_token">存取金鑰無效。請與程式開發人員聯絡。</string>
-    <string name="bug_report_failed_issues_not_available">已選的資源庫並未針對此問題而啟用。請與程式開發人員聯絡。</string>
+    <string name="bug_report_failed_issues_not_available">已選的版本庫(repo)並未針對此問題而啟用。請與程式開發人員聯絡。</string>
     <string name="bug_report_failed_unknown">發生未預期的錯誤。請與程式開發人員聯絡。</string>
     <string name="bug_report_failed_wrong_credentials">用戶名稱或密碼錯誤</string>
     <string name="bug_report_issue">問題</string>
@@ -84,44 +91,53 @@
     <string name="bug_report_no_password">請輸入您的有效GitHub密碼</string>
     <string name="bug_report_no_title">請輸入問題標題</string>
     <string name="bug_report_no_username">請輸入您的有效GitHub用戶名稱</string>
-    <string name="bug_report_summary">發生未預期的錯誤。真抱歉您發現了這個bug，如果一直死機請嘗試\"清除程式數據\"，或者傳送電郵給我們 </string>
+    <string name="bug_report_summary">發生未預期的錯誤。真抱歉您發現了這個bug，如果一直崩潰請\"清除程式數據\"，或者傳送電郵給我們</string>
+    <string name="bug_report_uploading">正在上傳報告至GitHub...</string>
     <string name="bug_report_use_account">使用Github帳戶傳送</string>
-    <string name="buy_now">立即購買</string>
+    <string name="buy_now">現在購買</string>
     <string name="cancel_current_timer">取消</string>
     <string name="card">卡片</string>
+    <string name="card_circular_style">圓形化</string>
     <string name="card_color_style">彩色卡片</string>
     <string name="card_style">卡片</string>
+    <string name="carousal">轉盤</string>
     <string name="carousal_effect_on_now_playing_screen">在現在播放的轉盤效果</string>
     <string name="cascading">階層式</string>
+    <string name="cast">投放</string>
     <string name="changelog">版本最新動向</string>
     <string name="changelog_summary">在Telegram頻道取得更新動向</string>
-    <string name="circle">圓形</string>
     <string name="circular">圓盤</string>
     <string name="classic">基本</string>
     <string name="clear_action">清除</string>
+    <string name="clear_app_data">清除程式數據</string>
     <string name="clear_blacklist">清除黑名單</string>
     <string name="clear_playing_queue">清除列表</string>
+    <string name="clear_playlist_title">清除播放清單</string>
+    <string name="clear_playlist_x"><![CDATA[\u8981\u6e05\u9664<b>%1$s</b>\u64ad\u653e\u6e05\u55ae\u55ce?\u8acb\u6ce8\u610f\u9019\u4e0d\u80fd\u5fa9\u539f!]]></string>
+    <string name="close_notification">關閉</string>
     <string name="color">彩色</string>
+    <string name="color_theme_name">彩色</string>
     <string name="colors">色彩</string>
     <string name="composer">作曲者</string>
     <string name="copied_device_info_to_clipboard">已複製裝置內容到剪貼簿</string>
-    <string name="could_not_create_playlist">無法建立播放清單。</string>
-    <string name="could_not_download_album_cover">"無法下載符合的專輯圖片。"</string>
+    <string name="could_not_create_playlist">\u7121\u6cd5\u5efa\u7acb\u64ad\u653e\u6e05\u55ae\u3002</string>
+    <string name="could_not_download_album_cover">"\u7121\u6cd5\u4e0b\u8f09\u5408\u9069\u7684\u5c08\u8f2f\u5716\u7247\u3002"</string>
     <string name="could_not_restore_purchase">無法恢復購買狀態。</string>
-    <string name="could_not_scan_files">無法掃描%d個檔案。</string>
+    <string name="could_not_scan_files">無法掃描 %d 個檔案。</string>
     <string name="create_action">新增</string>
     <string name="created_playlist_x">已新增%1$s播放清單。</string>
-    <string name="credit_title">成員和貢獻者 </string>
-    <string name="currently_listening_to_x_by_x">我在聽由 %2$s 唱的 %1$s 。</string>
+    <string name="credit_title">成員和貢獻者</string>
+    <string name="currently_listening_to_x_by_x">我在聽由 %2$s 唱的 %1$s</string>
     <string name="dark_theme_name">暗黑</string>
-    <string name="delete_playlist_title">刪除播放清單</string>
-    <string name="delete_playlist_x"><![CDATA[要刪除<b>%1$s</b>播放清單嗎?]]></string>
-    <string name="delete_playlists_title">刪除多個播放清單</string>
+    <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_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="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="depth">深度式</string>
@@ -129,23 +145,25 @@
     <string name="device_info">裝置內容</string>
     <string name="dialog_message_set_ringtone">允許Retro Music更改音效設定</string>
     <string name="dialog_title_set_ringtone">設定鈴聲</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="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="drive_mode">駕駛模式</string>
+    <string name="download_from_last_fm">由Last.fm下載</string>
+    <string name="edit">編輯</string>
+    <string name="edit_cover">編輯專輯圖片</string>
     <string name="empty">空白</string>
     <string name="equalizer">等化器</string>
+    <string name="error">錯誤</string>
     <string name="faq">常見問題</string>
     <string name="favorites">我的最愛</string>
     <string name="finish_last_song">最後一首已經結束播放</string>
-    <string name="fit">合身</string>
+    <string name="fit">Fit</string>
     <string name="flat">平面</string>
     <string name="folders">資料夾</string>
-    <string name="follow_system">依照系統</string>
+    <string name="follow_system">跟隨系統</string>
     <string name="for_you">給您的</string>
-    <string name="free">免費</string>
     <string name="full">全螢幕</string>
     <string name="full_card">完整卡片</string>
     <string name="general_settings_summary">更改程式主題及色彩</string>
@@ -153,6 +171,7 @@
     <string name="genre">類型</string>
     <string name="genres">類型</string>
     <string name="git_hub_summary">在Github參與專案</string>
+    <string name="google_plus_community">加入Google+社交圈，在那裡您可以提出疑問或追蹤Retro Music的更新</string>
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -161,7 +180,7 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">網格及樣式</string>
+    <string name="grid_style_label"><![CDATA[網格及樣式]]></string>
     <string name="hinge">鉸鏈式</string>
     <string name="history">歷史</string>
     <string name="home">主頁</string>
@@ -170,6 +189,7 @@
     <string name="image_gradient">漸變圖像</string>
     <string name="image_settings_summary">更改下載歌手相片設定</string>
     <string name="inserted_x_songs_into_playlist_x">已新增%1$d首歌曲到%2$s播放清單。</string>
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">在Instagram分享以展示您的RetroMusic版面</string>
     <string name="keyboard">鍵盤</string>
     <string name="label_bit_rate">位元率</string>
@@ -177,17 +197,16 @@
     <string name="label_file_name">檔案名</string>
     <string name="label_file_path">檔案位址</string>
     <string name="label_file_size">大小</string>
-    <string name="label_last_modified">最后修改</string>
-    <string name="label_more_from">來自%s的更多資訊</string>
     <string name="label_sampling_rate">取樣頻率</string>
     <string name="label_track_length">長度</string>
     <string name="labeled">已標記</string>
     <string name="last_added">最近新增</string>
     <string name="last_song">最後一首</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="listeners_label">聽眾</string>
     <string name="listing_files">正在列出檔案</string>
     <string name="loading_products">載入中...</string>
     <string name="login">登入</string>
@@ -199,7 +218,9 @@
     <string name="my_name">名字</string>
     <string name="my_top_tracks">最常播放</string>
     <string name="never">永不</string>
+    <string name="new_banner_photo">新橫幅圖片</string>
     <string name="new_playlist_title">新播放清單</string>
+    <string name="new_profile_photo">新個人資料圖片</string>
     <string name="new_start_directory">最新的主目錄是%s。</string>
     <string name="next_song">下一首</string>
     <string name="no_albums">沒有專輯</string>
@@ -208,16 +229,15 @@
     <string name="no_equalizer">找不到等化器</string>
     <string name="no_genres">無類型</string>
     <string name="no_lyrics_found">找不到歌詞</string>
-    <string name="no_playing_queue">沒有歌曲正在播放</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="normal_lyrics">正常歌詞</string>
+    <string name="normal_style">常用</string>
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b>不在媒體庫。]]></string>
     <string name="nothing_to_scan">沒有項目可以掃描。</string>
-    <string name="nothing_to_see">沒有什麼可以看的</string>
     <string name="notification">通知欄</string>
     <string name="notification_settings_summary">個人化通知欄樣式</string>
     <string name="now_playing">現在播放</string>
@@ -230,28 +250,29 @@
     <string name="password">密碼</string>
     <string name="past_three_months">在3個月內</string>
     <string name="paste_lyrics_here">在此貼上歌詞</string>
-    <string name="peek">波紋</string>
+    <string name="peak">波紋</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="pick_image_intent_text">選擇圖片</string>
     <string name="pinterest_page">Pinterest</string>
     <string name="pinterest_page_summary">加入我們的Pinterest來知道更多Retro Music的設計靈感</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_album_detail_style">專輯詳細樣式</string>
     <string name="pref_blur_amount_summary">給模糊模式主題的值，每值愈低就愈快</string>
     <string name="pref_blur_amount_title">模糊值</string>
-    <string name="pref_filter_song_summary">以歌曲長度過濾歌曲</string>
+    <string name="pref_dialog_corner_title">對話框圓角</string>
     <string name="pref_filter_song_title">過濾歌曲長度</string>
-    <string name="pref_header_advanced">進階</string>
     <string name="pref_header_album">專輯樣式</string>
     <string name="pref_header_audio">音樂</string>
-    <string name="pref_header_blacklist">黑名單</string>
     <string name="pref_header_controls">控制</string>
     <string name="pref_header_general">主題</string>
     <string name="pref_header_images">圖片</string>
@@ -262,26 +283,31 @@
     <string name="pref_keep_pause_on_zero_volume_title">無音量時暫停</string>
     <string name="pref_keep_screen_on_summary">請記住當您啟用此選項後或會影響電池壽命</string>
     <string name="pref_keep_screen_on_title">螢幕保持開啟</string>
+    <string name="pref_now_playing_screen_summary">點擊或滑動開啟無透明現在播放導航欄</string>
+    <string name="pref_now_playing_screen_title">點擊或滑動</string>
     <string name="pref_snow_fall_title">雪花效果</string>
     <string name="pref_summary_album_art_on_lockscreen">使用現在播放歌曲的專輯圖片來用作鎖定畫面背景圖片</string>
     <string name="pref_summary_audio_ducking">當播放系統聲音或收到通知時降低音量</string>
     <string name="pref_summary_blacklist">列入黑名單的資料夾內的資料會在您的媒體庫隱藏。</string>
-    <string name="pref_summary_bluetooth_playback">連接到藍牙裝置後立即開始播放</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">"\u5f9e\u5c08\u8f2f\u5716\u7247\u4e2d\u6700\u9bae\u660e\u7684\u8272\u5f69\u4f86\u6311\u9078\u901a\u77e5\u6b04\u8272\u5f69"</string>
     <string name="pref_summary_desaturated_color">根據物質設計指南(Material Design guide)，在暗黑模式下的顏色應完全去飽和化</string>
+    <string name="pref_summary_dominant_color">大多數主色會從專輯或歌手圖片中挑選</string>
     <string name="pref_summary_extra_controls">在迷你播放器增加控制項</string>
-    <string name="pref_summary_extra_song_info">顯示更多歌曲資料，如檔案格式、位元率及頻率</string>
     <string name="pref_summary_gapless_playback">"或會引致某些裝置播放功能無法正常運作。"</string>
+    <string name="pref_summary_genre_toggle">切換類型標籤</string>
     <string name="pref_summary_home_banner">切換首頁橫幅樣式</string>
     <string name="pref_summary_ignore_media_store_artwork">可以提升專輯圖片質素，但這會引致加長圖片載入時間。建議只有當您的載入專輯圖片時質素較差時啟用</string>
     <string name="pref_summary_library_categories">修改類別的可視性及順序。</string>
     <string name="pref_summary_lock_screen">使用Retro Music自訂鎖定螢幕控制</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_shuffle">播放新清單時會關閉隨機播放模式</string>
@@ -289,45 +315,56 @@
     <string name="pref_title_album_art_on_lockscreen">顯示專輯圖片</string>
     <string name="pref_title_album_cover_style">專輯圖片主題</string>
     <string name="pref_title_album_cover_transform">專輯圖片轉場</string>
+    <string name="pref_title_album_grid_style">專輯網格</string>
     <string name="pref_title_app_shortcuts">彩色化程式捷徑</string>
+    <string name="pref_title_artist_grid_style">歌手網格</string>
     <string name="pref_title_audio_ducking">失去音頻焦點時降低音量</string>
     <string name="pref_title_auto_download_artist_images">自動下載歌手相片</string>
     <string name="pref_title_blacklist">黑名單</string>
-    <string name="pref_title_bluetooth_playback">藍牙播放</string>
     <string name="pref_title_blurred_album_art">模糊化專輯圖片</string>
+    <string name="pref_title_choose_equalizer">選擇等化器</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_desaturated_color">飽和色</string>
     <string name="pref_title_extra_controls">額外控制項</string>
-    <string name="pref_title_extra_song_info">歌曲內容</string>
     <string name="pref_title_gapless_playback">無縫播放</string>
     <string name="pref_title_general_theme">應用主題</string>
+    <string name="pref_title_genre_toggle">顯示類型標籤</string>
     <string name="pref_title_home_artist_grid_style">首頁歌手網格</string>
     <string name="pref_title_home_banner">首頁橫幅</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_tab_text_mode">標題標籤模式</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_toggle_shuffle">隨機模式</string>
     <string name="pref_title_toggle_volume">音量控制</string>
-    <string name="pro">Pro</string>
+    <string name="pref_title_user_info">使用者資料</string>
+    <string name="primary_color">原色</string>
+    <string name="primary_color_desc">主原色預設為灰藍色，現在適用於深色色彩</string>
     <string name="pro_summary">現時播放主題、轉盤效果，還有更多...</string>
     <string name="profile">個人資料</string>
     <string name="purchase">購買</string>
+    <string name="purchase_summary">*購買前要三思，切勿要求退款</string>
     <string name="queue">播放列表</string>
     <string name="rate_app">為這個App評分</string>
     <string name="rate_on_google_play_summary">喜歡這個App嗎?請讓我們知道如何提供更好的體驗</string>
     <string name="recent_albums">近期專輯</string>
     <string name="recent_artists">近期歌手</string>
     <string name="remove_action">移除</string>
+    <string name="remove_banner_photo">移除橫幅圖片</string>
     <string name="remove_cover">移除專輯圖片</string>
     <string name="remove_from_blacklist">由黑名單中移除</string>
+    <string name="remove_profile_photo">移除個人資料圖片</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>
@@ -341,7 +378,7 @@
     <string name="restored_previous_purchase_please_restart">已恢復上次購買狀態。請重新啟動程式來應用所有功能。</string>
     <string name="restored_previous_purchases">回復購買狀態</string>
     <string name="restoring_purchase">正在恢復購買狀態...</string>
-    <string name="retro_music_player">Retro Music Player</string>
+    <string name="retro_equalizer">Retro等化器</string>
     <string name="retro_music_pro">Retro Music Pro</string>
     <string name="saf_delete_failed">刪除檔案失敗: %s</string>
     <!-- SAF -->
@@ -364,19 +401,22 @@
     <string name="saving_changes">儲存</string>
     <string name="scan_media">掃描媒體</string>
     <string name="scanned_files">成功掃描 %2$d 項目 中的 %1$d 項目。</string>
-    <string name="scrobbles_label">塗鴉</string>
+    <string name="search_hint">搜尋媒體庫...</string>
     <string name="select_all">選擇全部</string>
+    <string name="select_banner_photo">選擇橫幅圖片</string>
     <string name="selected">已選</string>
+    <string name="send_crash_log">傳送報告</string>
     <string name="set">設定</string>
     <string name="set_artist_image">設定歌手相片</string>
+    <string name="set_photo">設定個人資料圖片</string>
     <string name="share_app">分享程式</string>
-    <string name="share_to_stories">分享到故事</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">滑動</string>
+    <string name="small">迷你專輯</string>
     <string name="social">社交</string>
-    <string name="social_stories">分享故事</string>
     <string name="song">歌曲</string>
     <string name="song_duration">歌曲長度</string>
     <string name="songs">歌曲</string>
@@ -386,7 +426,6 @@
     <string name="sort_order_artist">歌手</string>
     <string name="sort_order_composer">作曲者</string>
     <string name="sort_order_date">日期</string>
-    <string name="sort_order_date_modified">修改日期</string>
     <string name="sort_order_year">年份</string>
     <string name="sort_order_z_a">遞減</string>
     <string name="speech_not_supported">對不起！您的裝置不支援語音服務</string>
@@ -394,9 +433,11 @@
     <string name="stack">堆疊</string>
     <string name="start_play_music">開始播放音樂。</string>
     <string name="suggestion_songs">建議</string>
+    <string name="summary_user_info">只會在首頁顯示您的名字</string>
     <string name="support_development">開發支援</string>
     <string name="swipe_to_unlock">滑動螢幕以解鎖</string>
     <string name="synced_lyrics">同步歌詞</string>
+    <string name="system_equalizer">系統等化器</string>
     <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">加入Telegram群組，討論程式錯誤、給予建議、炫耀一下，還有更多</string>
@@ -407,6 +448,13 @@
     <string name="this_year">這年</string>
     <string name="tiny">迷你</string>
     <string name="title">標題</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>
@@ -424,7 +472,7 @@
     <string name="username">用戶名稱</string>
     <string name="version">版本</string>
     <string name="vertical_flip">垂直翻轉式</string>
-    <string name="volume">音量</string>
+    <string name="virtualizer">音樂效果</string>
     <string name="web_search">網路搜尋</string>
     <string name="welcome">歡迎，</string>
     <string name="what_do_you_want_to_share">有什麼內容想分享的?</string>
@@ -437,7 +485,4 @@
     <string name="you_have_to_select_at_least_one_category">您必須選擇最少一項類別。</string>
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">您將會轉到問題跟蹤網站。</string>
     <string name="your_account_data_is_only_used_for_authentication">您的帳戶只會用於認證用途。</string>
-    <string name="pref_title_expand_now_playing_panel">顯示現在播放</string>
-    <string name="pref_summary_expand_now_playing_panel">點擊現在播放將顯示現在播放而非主頁</string>
-    <string name="tiny_card_style">迷你卡片</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 af56e2b1d..7a4417777 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -1,201 +1,150 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">關於 %s</string>
-    <string name="about_settings_summary">團隊和社群連結</string>
-    <string name="accent_color">強調色</string>
-    <string name="accent_color_desc">強調色，預設為紫色</string>
+    <string name="accent_color">重點色調</string>
+    <string name="accent_color_desc">重點色調，預設為粉紅色。</string>
+
     <string name="action_about">關於</string>
-    <string name="action_add_to_blacklist">新增至黑名單</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_cancel">取消</string>
-    <string name="action_cast">投放</string>
-    <string name="action_clear_playing_queue">清除播放佇列</string>
-    <string name="action_cycle_repeat">循環重複模式</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_delete_from_device">刪除</string>
+
     <string name="action_details">詳細資訊</string>
-    <string name="action_edit">編輯</string>
-    <string name="action_go_to_album">前往專輯頁面</string>
-    <string name="action_go_to_artist">前往藝人頁面</string>
-    <string name="action_go_to_genre">前往風格類型</string>
-    <string name="action_go_to_lyrics">前往歌詞頁面</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_grant">取得</string>
+
     <string name="action_grid_size">網格大小</string>
-    <string name="action_grid_size_land">網格大小 (land)</string>
-    <string name="action_new_playlist">新增播放清單</string>
+    <string name="action_grid_size_land">網格大小</string>
+
     <string name="action_next">下一首</string>
+
     <string name="action_play">播放</string>
-    <string name="action_play_all">全部播放</string>
-    <string name="action_play_next">接下來播放</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_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">設定</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_sort_order">排序</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="adaptive">適應風</string>
-    <string name="add_action">新增</string>
-    <string name="add_playlist_title">"新增至播放清單"</string>
-    <string name="add_time_framed_lryics">新增動態歌詞</string>
-    <string name="added_song_count_to_playlist">已新增 %1$d 首歌至 %2$s</string>
-    <string name="added_title_to_playing_queue">"已新增 1 首歌至播放佇列。"</string>
-    <string name="added_x_titles_to_playing_queue">已新增 %1$d 首歌至播放佇列。</string>
+
+    <string name="add_playlist_title">"加入播放清單"</string>
+
+    <string name="added_title_to_playing_queue">"已將 1 首歌加到播放佇列"</string>
+
+    <string name="added_x_titles_to_playing_queue">已將 %1$d 首歌加到播放佇列。</string>
+
     <string name="album">專輯</string>
-    <plurals name="albumSongs">
-        <item quantity="other">歌曲</item>
-    </plurals>
-    <string name="album_artist">專輯藝人</string>
+
+    <string name="album_artist">專輯演出者</string>
+
+    <string name="album_or_artist_empty">專輯名稱或演出者欄是空的。</string>
+
     <string name="albums">專輯</string>
-    <plurals name="albums">
-        <item quantity="other">專輯</item>
-    </plurals>
+
     <string name="always">永遠</string>
-    <string name="app_share">嗨！邀請您使用這個好用的音樂播放器: https://play.google.com/store/apps/details?id=%s</string>
+
+    <!-- App Shortcuts -->
     <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_card_name">卡牌型</string>
-    <string name="app_widget_classic_name">經典型</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">小型</string>
-    <string name="app_widget_text_name">少字型</string>
-    <string name="artist">藝人</string>
-    <string name="artists">藝人</string>
-    <string name="audio_fade_duration">音訊淡出/淡入的持續時間</string>
-    <string name="audio_focus_denied">音訊焦點被拒。</string>
-    <string name="audio_settings_summary">變更音效設定和調整等化器</string>
-    <string name="auto">自動</string>
-    <string name="backup_restore_settings_summary">備份和復原您的各項設定、播放清單</string>
-    <string name="backup_restore_title"><![CDATA[備份和復原]]></string>
-    <string name="backup_title">備份</string>
+
+    <string name="app_widget_big_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="biography">簡介</string>
-    <string name="black_theme_name">純黑色</string>
-    <string name="blacklist">黑名單</string>
-    <string name="bluetooth_summary">應用程式必須取得鄰近裝置權限以檢查藍芽裝置</string>
-    <string name="bluetooth_title">鄰近裝置</string>
-    <string name="blur">模糊風</string>
-    <string name="blur_card">模糊卡牌風</string>
-    <string name="bug_report_failed">無法傳送報告</string>
-    <string name="bug_report_failed_invalid_token">存取權杖無效。請聯絡應用程式開發人員。</string>
-    <string name="bug_report_failed_issues_not_available">選取之存取庫並未啟用議題。請聯絡應用程式開發人員。</string>
-    <string name="bug_report_failed_unknown">發生意外錯誤。請聯絡應用程式開發人員。</string>
-    <string name="bug_report_failed_wrong_credentials">使用者名稱或密碼錯誤</string>
-    <string name="bug_report_issue">問題</string>
-    <string name="bug_report_manual">手動傳送</string>
-    <string name="bug_report_no_description">請輸入問題敘述</string>
-    <string name="bug_report_no_password">請輸入有效的 GitHub 密碼</string>
-    <string name="bug_report_no_title">請輸入問題標題</string>
-    <string name="bug_report_no_username">請輸入有效的 GitHub 使用者名稱</string>
-    <string name="bug_report_success">成功回報錯誤</string>
-    <string name="bug_report_summary">發生意外錯誤。很抱歉讓您遇到這項錯誤，若應用程式仍處在當機狀態，請「清除應用程式儲存空間」或透過電子郵件與我們聯繫 </string>
-    <string name="bug_report_use_account">透過 GitHub 帳戶傳送</string>
-    <string name="buy_now">立即購買</string>
-    <string name="cancel_current_timer">取消</string>
-    <string name="card">卡牌風</string>
-    <string name="card_color_style">彩色卡牌風</string>
-    <string name="card_square">方形卡牌風</string>
-    <string name="card_style">卡牌風</string>
-    <string name="carousal_effect_on_now_playing_screen">現正播放的輪播效果</string>
-    <string name="cascading">層疊風</string>
-    <string name="changelog">更新日誌</string>
-    <string name="changelog_summary">檢視最新動向</string>
-    <string name="choose_image">選擇圖片</string>
-    <string name="choose_restore_title">選擇欲還原的項目</string>
-    <string name="circle">唱片風</string>
-    <string name="circular">環形風</string>
-    <string name="classic">經典風</string>
-    <string name="clear_action">清除</string>
-    <string name="clear_blacklist">清除黑名單</string>
-    <string name="clear_history">清除歷史記錄</string>
-    <string name="clear_playing_queue">清除佇列</string>
-    <string name="color">彩色風</string>
-    <string name="colors">顏色</string>
-    <string name="compact">壓縮</string>
-    <string name="composer">作曲者</string>
-    <string name="copied_device_info_to_clipboard">已複製裝置資訊至剪貼簿。</string>
-    <string name="could_not_create_playlist">無法建立播放清單。</string>
-    <string name="could_not_download_album_cover">"無法下載相應的專輯封面。"</string>
-    <string name="could_not_restore_purchase">無法復原購買。</string>
-    <string name="could_not_scan_files">無法掃描 %d。</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="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>
+    <string name="could_not_scan_files">不能掃描 %d。</string>
+
     <string name="create_action">建立</string>
-    <string name="create_new_backup">建立</string>
-    <string name="created_playlist_x">已建立播放清單 %1$s。</string>
-    <string name="credit_title">成員和貢獻者 </string>
-    <string name="currently_listening_to_x_by_x">正在收聽 %2$s 的 %1$s。</string>
-    <string name="custom_artist_images">自訂藝人圖片</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">回報當機記錄</string>
-    <string name="dark_theme_name">深色</string>
+
+    <string name="created_playlist_x">已新增播放清單 %1$s。</string>
+
+    <string name="currently_listening_to_x_by_x">我正在聽 %2$s 的 %1$s ！</string>
+
+    <string name="dark_theme_name">暗沉</string>
+
     <string name="delete_playlist_title">刪除播放清單</string>
     <string name="delete_playlist_x"><![CDATA[確定要刪除播放清單 <b>%1$s</b> 嗎？]]></string>
-    <string name="delete_playlists_title">刪除播放清單</string>
-    <string name="delete_song_title">刪除歌曲</string>
+
+    <string name="delete_playlists_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_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="depth">深度風</string>
-    <string name="description">描述</string>
-    <string name="device_info">裝置資訊</string>
-    <string name="dialog_message_set_ringtone">允許 Retro Music 修改音訊設定</string>
-    <string name="dialog_title_set_ringtone">設定鈴聲</string>
-    <string name="disc_hint">光碟編號</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="done">完成</string>
-    <string name="drive_mode">駕駛模式</string>
-    <string name="edit_fab">編輯按鈕</string>
-    <string name="edit_normal_lyrics">編輯歌詞</string>
-    <string name="edit_synced_lyrics">編輯動態歌詞</string>
-    <string name="empty">沒有內容</string>
+
+    <string name="donate_summary">如果你認為我的努力值得回報，你可以在這裡留幾塊錢。</string>
+
+    <string name="download_from_last_fm">從 Last.fm 下載</string>
+
+    <string name="empty">空的</string>
+
     <string name="equalizer">等化器</string>
-    <string name="error_create_backup">無法建立備份</string>
-    <string name="error_delete_backup">無法刪除備份</string>
-    <string name="error_empty_name">名稱不得為空！</string>
-    <string name="error_load_failed">載入失敗</string>
-    <string name="error_share_file">無法分享檔案</string>
-    <string name="expanded">展開</string>
-    <string name="faq">常見問題</string>
+
     <string name="favorites">最愛</string>
-    <string name="file_already_exists">檔案已存在</string>
-    <string name="finish_last_song">播放完最後一首歌曲</string>
-    <string name="fit">緊貼風</string>
-    <string name="flat">方角風</string>
-    <string name="folders">資料夾</string>
-    <string name="follow_system">系統預設</string>
-    <string name="for_you">為您推薦</string>
-    <string name="free">免費</string>
-    <string name="full">全景風</string>
-    <string name="full_card">全景卡牌風</string>
-    <string name="general_settings_summary">變更應用程式的佈景主題和顏色</string>
-    <string name="general_settings_title">介面和外觀</string>
-    <string name="genre">風格類型</string>
-    <string name="genres">風格類型</string>
-    <string name="git_hub_summary">在 GitHub 上分支這項專案</string>
-    <string name="gradient">漸層風</string>
-    <string name="grant_access">授予權限</string>
+
+    <string name="flat">方角</string>
+
+    <string name="folders">文件夾</string>
+
+    <string name="genre">類型</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -204,356 +153,187 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">網格樣式</string>
-    <string name="help_summary">需要更多幫助嗎？</string>
-    <string name="hinge">旋轉風</string>
-    <string name="history">歷史記錄</string>
-    <string name="history_cleared">已清除歷史記錄</string>
-    <string name="history_undo_button">復原</string>
+
+    <string name="history">記錄</string>
+
     <string name="home">首頁</string>
-    <string name="horizontal_flip">水平翻轉風</string>
-    <string name="image">圖片風</string>
-    <string name="image_gradient">漸變圖片風</string>
-    <string name="image_settings_summary">變更下載藝人圖片設定</string>
-    <string name="import_label">匯入</string>
-    <string name="import_playlist">匯入播放清單</string>
-    <string name="import_playlist_message">這將匯入於 Android 媒體商店內全部的播放清單和歌曲，若播放清單已存在，相關的歌曲將會被合併。</string>
-    <string name="inserted_x_songs_into_playlist_x">已插入 %1$d 首歌至播放清單 %2$s 。</string>
-    <string name="instagram_page_summary">在 Instagram 上分享 Retro Music 的配置消息</string>
-    <string name="keyboard">鍵盤</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_last_modified">最後修改</string>
-    <string name="label_more_from">更多來自 %s 的內容</string>
+
     <string name="label_sampling_rate">取樣率</string>
+
     <string name="label_track_length">長度</string>
-    <string name="labeled">顯示標籤</string>
+
     <string name="last_added">最後新增</string>
-    <string name="last_song">最後一首</string>
-    <string name="lets_go">開始吧</string>
-    <string name="library_categories">音樂庫類別</string>
+
+    <string name="library">音樂庫</string>
+
     <string name="licenses">原始碼授權</string>
-    <string name="light_theme_name">淺色</string>
-    <string name="listeners_label">全球聽眾</string>
+
+    <string name="light_theme_name">明亮</string>
+
     <string name="listing_files">清單文件</string>
-    <string name="loading_products">正在載入…</string>
-    <string name="login">登入</string>
+
+    <string name="loading_products">正在載入</string>
+
     <string name="lyrics">歌詞</string>
-    <string name="made_with_love">Made with ❤️ in India</string>
-    <string name="material">材質風</string>
-    <string name="md_error_label">錯誤</string>
-    <string name="md_storage_perm_error">權限錯誤</string>
-    <string name="message_backup_create_success">已成功建立備份。</string>
-    <string name="message_limit_tabs">不得多於 5 個項目</string>
-    <string name="message_pro_feature">%s 為 Pro 版功能。</string>
-    <string name="message_restore_success">已成功完成復原。</string>
-    <string name="message_updated">已更新</string>
-    <string name="message_welcome"><![CDATA[嗨！<br> 歡迎使用 %s]]></string>
-    <string name="my_name">名稱</string>
-    <string name="my_top_tracks">最佳單曲</string>
+
+    <string name="my_top_tracks">我的最佳單曲</string>
+
     <string name="never">永不</string>
-    <string name="new_music_mix">新歌快選</string>
+
     <string name="new_playlist_title">新增播放清單</string>
-    <string name="new_start_directory">%s 為新起始目錄。</string>
-    <string name="next_song">下一首</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_backups_found">找不到備份</string>
-    <string name="no_equalizer">找不到等化器</string>
-    <string name="no_genres">沒有風格類型</string>
-    <string name="no_lyrics_found">找不到歌詞</string>
-    <string name="no_playing_queue">沒有現正播放的歌曲</string>
+
+    <string name="no_artists">沒有演唱者</string>
+
+    <string name="no_audio_ID">"請先播放一首歌後再重試一遍。"</string>
+
+    <string name="no_equalizer">找不到等化器。</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="normal_lyrics">一般歌詞</string>
-    <string name="not_listed_in_media_store"><![CDATA[媒體商店未收錄 <b>%s</b> 。]]></string>
-    <string name="not_recently_played">鮮少播放</string>
-    <string name="nothing_to_scan">沒有可掃描的內容。</string>
-    <string name="nothing_to_see">沒有內容</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="now_playing_summary">自訂現正播放畫面</string>
-    <string name="now_playing_themes">9+ 為現正播放畫面設計的佈景主題</string>
-    <string name="only_on_wifi">只在 Wi-Fi 連線時</string>
-    <string name="other_settings_summary">進階測試功能</string>
-    <string name="others">其他</string>
-    <string name="over_cover">於封面上層顯示</string>
-    <string name="password">密碼</string>
-    <string name="past_three_months">過去 3 個月</string>
-    <string name="paste_lyrics_here">在此貼上歌詞</string>
-    <string name="paste_timeframe_lyrics_here">在此貼上動態歌詞</string>
-    <string name="peek">懸浮風</string>
-    <string name="permission_bluetooth_denied">鄰近裝置存取被拒。</string>
+
+    <string name="only_on_wifi">只在有 Wi-Fi 連接時</string>
+
     <string name="permission_external_storage_denied">無法取得存取外部儲存空間的權限。</string>
-    <string name="permission_summary">應用程式必須取得權限以存取您的裝置和媒體</string>
-    <string name="permission_title">檔案和媒體權限</string>
-    <string name="permissions_denied">存取被拒。</string>
-    <string name="personalize">個人化</string>
-    <string name="personalize_settings_summary">自訂現正播放畫面 UI</string>
-    <string name="pick_from_local_storage">從裝置選擇</string>
-    <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">追蹤我們的 Pinterest 專頁以興起 Retro Music 設計靈感</string>
-    <string name="plain">簡潔風</string>
-    <string name="playList_already_exits">播放清單已存在</string>
-    <string name="playback_pitch">音高</string>
-    <string name="playback_settings">播放設定</string>
-    <string name="playback_speed">播放速度</string>
-    <string name="playing_notification_description">播放通知欄可提供您進行播放/暫停等操作。</string>
-    <string name="playing_notification_name">播放通知</string>
-    <string name="playlist_created_sucessfully">已成功建立 %s</string>
-    <string name="playlist_is_empty">播放清單為空</string>
+
+    <string name="permissions_denied">存取被拒</string>
+
+    <string name="pick_from_local_storage">從手機裡選擇（SD卡或記憶體）</string>
+
+    <string name="playlist_empty_text">播放清單是空的</string>
+
     <string name="playlist_name_empty">播放清單名稱</string>
+
     <string name="playlists">播放清單</string>
-    <string name="pref_blur_amount_summary">模糊程度用於「模糊風」主題。數值越低，載入越快</string>
-    <string name="pref_blur_amount_title">模糊程度</string>
-    <string name="pref_filter_song_summary">依長度篩選歌曲</string>
-    <string name="pref_filter_song_title">依時長篩選歌曲</string>
-    <string name="pref_header_advanced">進階</string>
-    <string name="pref_header_album">專輯風格</string>
+
     <string name="pref_header_audio">音訊</string>
-    <string name="pref_header_blacklist">黑名單</string>
-    <string name="pref_header_controls">控制</string>
-    <string name="pref_header_general">主題</string>
     <string name="pref_header_images">圖片</string>
-    <string name="pref_header_library">音樂庫</string>
     <string name="pref_header_lockscreen">鎖定螢幕</string>
-    <string name="pref_header_playlists">播放清單</string>
-    <string name="pref_keep_pause_on_zero_volume_summary">當音量降至靜音時自動暫停播放，音量升高時反之。支援背景播放</string>
-    <string name="pref_keep_pause_on_zero_volume_title">靜音時暫停</string>
-    <string name="pref_keep_screen_on_summary">請注意，這項功能可能影響電池續航力</string>
-    <string name="pref_keep_screen_on_title">保持螢幕開啟</string>
-    <string name="pref_language_name">選取語言</string>
-    <string name="pref_snow_fall_title">下雪效果</string>
-    <string name="pref_summary_album_art_on_lockscreen">以現正播放的歌曲專輯封面作為鎖定螢幕桌布</string>
-    <string name="pref_summary_album_artists_only">於藝人分類中顯示專輯藝人</string>
-    <string name="pref_summary_audio_ducking">於系統音效響鈴或接收到通知時降低音量</string>
-    <string name="pref_summary_audio_fade">當歌曲暫停/播放時，淡入/淡出音效</string>
-    <string name="pref_summary_blacklist">於黑名單內的資料夾將從音樂庫中隱藏。</string>
-    <string name="pref_summary_bluetooth_playback">當連線至藍芽裝置時，自動播放音樂</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_notification">"以鮮豔的專輯封面色調作為通知欄顏色"</string>
-    <string name="pref_summary_cross_fade">歌曲淡化/淡出的持續時間</string>
-    <string name="pref_summary_desaturated_color">根據 Material Design 指引，於深色模式時，顏色應不飽和</string>
-    <string name="pref_summary_expand_now_playing_panel">按兩下通知欄以顯示現正播放畫面，而非首頁</string>
-    <string name="pref_summary_extra_controls">於迷你播放列顯示更多控制鍵</string>
-    <string name="pref_summary_extra_song_info">顯示更多歌曲資訊，例如檔案格式、位元速率、頻率</string>
-    <string name="pref_summary_gapless_playback">"可能會在某些裝置上發生播放問題。"</string>
-    <string name="pref_summary_home_banner">顯示或隱藏首頁橫幅</string>
-    <string name="pref_summary_ignore_media_store_artwork">可提升專輯封面的成像品質，但會造成較長的讀取時間。建議只有在低畫質專輯封面發生問題時再啟用此選項</string>
-    <string name="pref_summary_library_categories">調整音樂庫類別的顯示和排序。</string>
-    <string name="pref_summary_lock_screen">使用 Retro Music 自訂化鎖定畫面</string>
-    <string name="pref_summary_manage_audio_focus">無論其他應用程式正在播放為何，永遠於背景播放音訊</string>
-    <string name="pref_summary_open_source_licences">開源軟體授權詳細資訊</string>
-    <string name="pref_summary_pause_history">啟用此選項後，新播放的歌曲將不再顯示於歷史記錄</string>
-    <string name="pref_summary_remember_tab">開啟應用程式後，自動顯示最後瀏覽的畫面</string>
-    <string name="pref_summary_show_lyrics">於專輯封面上顯示動態歌詞</string>
-    <string name="pref_summary_suggestions">於主畫面顯示新歌快選</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">啟用於現正播放畫面，可隨意滑動以切換歌曲</string>
-    <string name="pref_summary_swipe_to_dismiss">向下滑動以關閉迷你播放器</string>
-    <string name="pref_summary_toggle_full_screen">沉浸模式</string>
-    <string name="pref_summary_toggle_headset">當連接耳機後，自動播放音樂</string>
-    <string name="pref_summary_toggle_shuffle">當播放新播放清單時，關閉隨機模式</string>
-    <string name="pref_summary_toggle_volume">若螢幕仍有充足空間，則在現正播放畫面，顯示音量控制欄</string>
-    <string name="pref_summary_wallpaper_accent">從桌布上擷取主題顏色</string>
-    <string name="pref_summary_whitelist">僅顯示來自 /Music 資料夾內的歌曲</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_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\u4e00\u81f4"</string>
+    <string name="pref_summary_gapless_playback">"可能會在某些裝置上出現播放問題。"</string>
+    <string name="pref_summary_ignore_media_store_artwork">提高專輯封面的成像品質，但會造成較長的讀取時間。建議只有在您對低畫質的專輯封面有問題時才開啟此選項。</string>
+    <string name="pref_summary_round_corners">使視窗邊角為圓形邊角</string>
+
     <string name="pref_title_album_art_on_lockscreen">顯示專輯封面</string>
-    <string name="pref_title_album_artists_only">依專輯藝人導覽</string>
-    <string name="pref_title_album_cover_style">專輯封面主題</string>
-    <string name="pref_title_album_cover_transform">略過專輯封面</string>
-    <string name="pref_title_app_shortcuts">彩色應用程式捷徑</string>
-    <string name="pref_title_appbar_mode">標題樣式</string>
-    <string name="pref_title_audio_ducking">於焦點音訊響起時降低音量</string>
-    <string name="pref_title_audio_fade">淡入/淡出音訊</string>
-    <string name="pref_title_auto_download_artist_images">自動下載藝人圖片</string>
-    <string name="pref_title_blacklist">黑名單</string>
-    <string name="pref_title_bluetooth_playback">藍牙播放</string>
-    <string name="pref_title_blurred_album_art">模糊化專輯圖片</string>
-    <string name="pref_title_circle_button">圓形播放鍵</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_cross_fade">淡入/淡出 (測試中)</string>
-    <string name="pref_title_custom_font">使用 Manrope 字型</string>
-    <string name="pref_title_desaturated_color">不飽和顏色</string>
-    <string name="pref_title_expand_now_playing_panel">顯示現正播放畫面</string>
-    <string name="pref_title_extra_controls">更多控制項</string>
-    <string name="pref_title_extra_song_info">音樂資訊</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_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_home_album_grid_style">專輯網格</string>
-    <string name="pref_title_home_artist_grid_style">藝人網格</string>
-    <string name="pref_title_home_banner">橫幅</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_lyrics_screen_on">顯示歌詞時不關閉螢幕</string>
-    <string name="pref_title_lyrics_type">歌詞類型</string>
-    <string name="pref_title_manage_audio_focus">永遠播放</string>
-    <string name="pref_title_now_playing_screen_appearance">現正播放佈景主題</string>
+    <string name="pref_title_general_theme">主題</string>
+    <string name="pref_title_ignore_media_store_artwork">忽略音訊檔內嵌的專輯封面</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_pause_history">暫停記錄</string>
-    <string name="pref_title_remember_tab">記住最後一個類別畫面</string>
-    <string name="pref_title_show_lyrics">顯示歌詞</string>
-    <string name="pref_title_suggestions">顯示建議</string>
-    <string name="pref_title_swipe_anywhere_now_playing">隨意滑動以切換歌曲</string>
-    <string name="pref_title_swipe_to_dismiss">向下滑動以關閉</string>
-    <string name="pref_title_tab_text_mode">索引標籤模式</string>
-    <string name="pref_title_toggle_carousel_effect">輪播效果</string>
-    <string name="pref_title_toggle_full_screen">全螢幕應用程式</string>
-    <string name="pref_title_toggle_toggle_headset">自動播放</string>
-    <string name="pref_title_toggle_toggle_shuffle">隨機播放模式</string>
-    <string name="pref_title_toggle_volume">音量控制</string>
-    <string name="pref_title_wallpaper_accent">桌布強調色</string>
-    <string name="pref_title_whitelist">白名單音樂</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">暗色主題、現正播放主題、輪播效果以及更多...</string>
-    <string name="profile">個人資料</string>
-    <string name="purchase">購買</string>
+    <string name="pref_title_round_corners">圓形邊角</string>
+
+    <string name="primary_color">主色調</string>
+
     <string name="queue">播放佇列</string>
+
     <string name="rate_app">評分</string>
-    <string name="rate_on_google_play_summary">您還喜歡 Retro Music 嗎？歡迎在 Play 商店上評論，使我們能日臻完善</string>
-    <string name="recent_albums">最近專輯</string>
-    <string name="recent_artists">最近藝人</string>
+
+    <string name="rate_on_google_play_summary">如果您喜歡 Retro music，在 Play 商店給個好評吧 ！</string>
+
     <string name="remove_action">移除</string>
+
     <string name="remove_cover">移除封面</string>
-    <string name="remove_from_blacklist">從黑名單移除</string>
-    <string name="remove_image">移除圖片</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="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="replace_cover">隱藏封面</string>
-    <string name="report_an_issue">回報問題</string>
-    <string name="report_bug">回報錯誤</string>
-    <string name="reset_action">重設</string>
-    <string name="reset_artist_image">重設藝人圖片</string>
-    <string name="restore">復原</string>
-    <string name="restore_message">確定要復原備份嗎？</string>
-    <string name="restored_previous_purchase_please_restart">已復原先前的購買。請重新開啟應用程式以啟用全數功能。</string>
-    <string name="restored_previous_purchases">已復原先前購買。</string>
-    <string name="restoring_purchase">正在復原購買…</string>
-    <string name="retro_music_player">Retro Music Player</string>
-    <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">應用程式需要取得權限以存取您的裝置設定，並將歌曲設為鈴聲</string>
-    <string name="ringtone_title">鈴聲 (可選)</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_write_failed">寫入檔案失敗：%s</string>
-    <string name="save">儲存</string>
-    <!-- SAF -->
-    <!-- SAF guide -->
-    <string name="save_playlist_title">另存新檔</string>
-    <string name="save_playlists_title">另存新檔</string>
-    <string name="saved_playlist_to">已儲存播放清單至 %s。</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="scan_media">掃描媒體</string>
-    <string name="scanned_files">已掃描 %1$d 個檔案，共 %2$d 個。</string>
-    <string name="scrobbles_label">音樂記錄</string>
-    <string name="select_all">選取全部</string>
-    <string name="selected">僅顯示已選取的標籤</string>
-    <string name="set">設定</string>
-    <string name="set_artist_image">設定藝人圖片</string>
-    <string name="share_app">分享應用程式</string>
-    <string name="share_summary">與家人和朋友分享程式</string>
-    <string name="share_to_stories">分享至限時動態</string>
-    <string name="show_album_artists">顯示專輯藝人</string>
+
+    <string name="scanned_files">已掃描 %2$d 個檔案夾中的 %1$d 個。</string>
+
+    <string name="search_hint">搜尋音樂庫…</string>
+
     <string name="shuffle">隨機播放</string>
-    <string name="simple">簡單風</string>
-    <string name="sleep_timer_canceled">已取消睡眠計時器。</string>
-    <string name="sleep_timer_set">睡眠計時器將從現在計時 %d 分鐘。</string>
-    <string name="social">社群</string>
-    <string name="social_stories">分享至限時動態</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="sort_order_a_z">遞增</string>
-    <string name="sort_order_album">專輯</string>
-    <string name="sort_order_artist">藝人</string>
-    <string name="sort_order_composer">作曲者</string>
-    <string name="sort_order_date">新增日期</string>
-    <string name="sort_order_date_modified">修改日期</string>
-    <string name="sort_order_default">預設</string>
-    <string name="sort_order_num_songs">歌曲數量</string>
-    <string name="sort_order_num_songs_desc">歌曲數量資訊</string>
-    <string name="sort_order_year">年份</string>
-    <string name="sort_order_z_a">遞減</string>
-    <string name="speech_not_supported">抱歉！您的裝置不支援語音輸入</string>
+
+    <string name="speech_not_supported">抱歉！你的裝置不支援語音輸入</string>
+
     <string name="speech_prompt">搜尋音樂庫</string>
-    <string name="stack">堆疊風</string>
-    <string name="start_play_music">開始播放音樂。</string>
-    <string name="suggestion_songs">建議</string>
-    <string name="support_development">支持開發</string>
-    <string name="swipe_to_unlock">滑動以解鎖</string>
-    <string name="synced_lyrics">動態歌詞</string>
-    <string name="telegram_group">Telegram</string>
-    <string name="telegram_group_summary">加入 Telegram 群組以討論臭蟲、提供建議、交流，以及探索更多</string>
-    <string name="thank_you">感謝您！</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="tiny">簡易風</string>
-    <string name="tiny_card_style">小卡牌風</string>
-    <string name="title">標題</string>
-    <string name="title_new_backup">新增備份</string>
-    <string name="today">今日</string>
-    <string name="top_albums">熱門專輯</string>
-    <string name="top_artists">熱門藝人</string>
-    <string name="track_hint">"曲目 (2 代表曲目 2，或以 3004 代表 CD3 曲目 4)"</string>
-    <string name="track_list">曲目編號</string>
+
+    <string name="track_hint">"音軌（用2表示第2首歌或用3004表示 CD3 的第4首歌）"</string>
+
     <string name="translate">翻譯</string>
-    <string name="translate_community">協助我們將應用程式本地化成您的語言</string>
-    <string name="try_retro_music_premium">立即嘗試 Retro Music Premium</string>
-    <string name="twitter_page">Twitter</string>
-    <string name="twitter_page_summary">分享您為 Retro Music 的設計</string>
-    <string name="unlabeled">隱藏標籤</string>
-    <string name="unplayable_file">無法播放這首歌。</string>
+
+    <string name="unplayable_file">\u7121\u6cd5\u64ad\u653e\u9019\u9996\u6b4c\u3002</string>
+
     <string name="up_next">即將播放</string>
+
     <string name="update_image">更新圖片</string>
+
     <string name="updating">正在更新…</string>
-    <string name="user_images_description">使用者圖片</string>
-    <string name="user_name">使用者名稱</string>
-    <string name="username">使用者名稱</string>
+
     <string name="version">版本</string>
-    <string name="vertical_flip">垂直翻轉風</string>
-    <string name="view_on_telegram">在 Telegram 上檢視</string>
-    <string name="volume">音量</string>
-    <string name="web_search">網頁搜尋</string>
-    <string name="website">網站</string>
-    <string name="website_summary">在官網上瞭解更多</string>
-    <string name="welcome">歡迎，</string>
-    <string name="what_do_you_want_to_share">您想分享哪些內容？</string>
-    <string name="whats_new">最新動向</string>
-    <string name="window">視窗</string>
-    <string name="window_corner_edges">圓角</string>
+
+    <string name="web_search">網路搜尋</string>
+
+    <string name="what_do_you_want_to_share">你想分享哪些內容？</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="you_will_be_forwarded_to_the_issue_tracker_website">您將被重新導向至議題追蹤器網頁。</string>
-    <string name="your_account_data_is_only_used_for_authentication">您的帳戶資料僅用於驗證。</string>
+    <string name="label_more_from">More from %s</string>
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 5497f4091..15178800f 100755
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <array name="pref_album_cover_transform_entries">
+    <array name="pref_album_cover_transform_entities">
         <item>@string/normal</item>
         <item>@string/cascading</item>
         <item>@string/depth</item>
@@ -8,7 +8,6 @@
         <item>@string/horizontal_flip</item>
         <item>@string/hinge</item>
         <item>@string/stack</item>
-        <item>@string/simple</item>
     </array>
 
     <string-array name="pref_album_cover_transform_values">
@@ -19,19 +18,8 @@
         <item>4</item>
         <item>5</item>
         <item>6</item>
-        <item>7</item>
     </string-array>
 
-    <string-array name="pref_lyrics_type_values">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
-    <array name="pref_lyrics_type_entries">
-        <item>@string/replace_cover</item>
-        <item>@string/over_cover</item>
-    </array>
-
     <string-array name="pref_tab_text_mode_values">
         <item>0</item>
         <item>1</item>
@@ -52,58 +40,69 @@
         <item>@string/unlabeled</item>
     </array>
 
-    <array name="pref_appbar_mode_titles">
-        <item>@string/expanded</item>
-        <item>@string/compact</item>
-    </array>
-
-    <string-array name="pref_appbar_mode_values">
-        <item>0</item>
-        <item>1</item>
-    </string-array>
-
     <string-array name="pref_general_theme_list_titles">
         <item>@string/light_theme_name</item>
         <item>@string/dark_theme_name</item>
         <item>@string/follow_system</item>
     </string-array>
-
     <string-array name="pref_general_theme_list_values">
         <item>light</item>
         <item>dark</item>
         <item>auto</item>
     </string-array>
+    <string-array name="pref_grid_style_list_titles">
+        <item>@string/normal_style</item>
+        <item>@string/card_style</item>
+        <item>@string/card_color_style</item>
+        <item>@string/card_circular_style</item>
+        <item>@string/image</item>
+        <item>@string/image_gradient</item>
+    </string-array>
+
+    <string-array name="pref_grid_style_list_values">
+        <item>0</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+    </string-array>
+
+    <array name="pref_grid_style_layout">
+        <item>@layout/item_grid</item>
+        <item>@layout/item_card</item>
+        <item>@layout/item_card_color</item>
+        <item>@layout/item_grid_circle</item>
+        <item>@layout/image</item>
+        <item>@layout/item_image_gradient</item>
+    </array>
 
     <string-array name="pref_home_grid_style_list_titles">
         <item>@string/circular</item>
         <item>@string/card_color_style</item>
         <item>@string/card_style</item>
-        <item>@string/tiny_card_style</item>
-        <item>@string/card_square</item>
     </string-array>
 
     <string-array name="pref_home_grid_style_list_values">
         <item>0</item>
         <item>1</item>
         <item>2</item>
-        <item>3</item>
-        <item>4</item>
     </string-array>
 
     <array name="pref_home_grid_style_layout">
         <item>@layout/item_artist</item>
         <item>@layout/item_artist_square</item>
         <item>@layout/item_album_card</item>
-        <item>@layout/item_artist_card</item>
-        <item>@layout/item_image</item>
     </array>
 
+
     <array name="pref_auto_download_images_values">
         <item>always</item>
         <item>only_wifi</item>
         <item>never</item>
     </array>
 
+
     <string-array name="pref_playlists_last_added_interval_titles">
         <item>@string/today</item>
         <item>@string/this_week</item>
@@ -120,97 +119,61 @@
         <item>this_year</item>
     </string-array>
 
+    <string-array name="night">
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/44.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/40.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/36.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/32.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/28.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/24.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/20.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/16.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/12.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/8.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/4.png</item>
+    </string-array>
+    <string-array name="evening">
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/43.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/39.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/35.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/31.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/27.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/23.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/19.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/15.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/11.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/7.png</item>
+    </string-array>
+    <string-array name="after_noon">
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/42.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/38.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/34.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/30.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/26.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/22.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/18.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/14.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/10.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/6.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/2.png</item>
+    </string-array>
+    <string-array name="morning">
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/41.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/37.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/33.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/29.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/25.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/21.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/17.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/13.png</item>
+        <item>https://cdn.techjuice.pk/wp-content/uploads/2016/07/9.png</item>
+        <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>
+
+
+    <array name="pref_album_details_style_layout">
+        <item>@layout/activity_album</item>
+    </array>
 
-    <string-array name="pref_language_names">
-        <item>System default</item>
-        <item>Arabic</item>
-        <item>Basque</item>
-        <item>Burmese</item>
-        <item>Simplified Chinese</item>
-        <item>Traditional Chinese(Hong Kong)</item>
-        <item>Traditional Chinese(Taiwan)</item>
-        <item>Croatian</item>
-        <item>Czech</item>
-        <item>Danish</item>
-        <item>Dutch</item>
-        <item>English</item>
-        <item>Filipino</item>
-        <item>French</item>
-        <item>German</item>
-        <item>Greek</item>
-        <item>Hindi</item>
-        <item>Hungarian</item>
-        <item>Indonesian</item>
-        <item>Italian</item>
-        <item>Japanese</item>
-        <item>Kannada</item>
-        <item>Korean</item>
-        <item>Kurmanji Kurdish</item>
-        <item>Latvian</item>
-        <item>Malayalam</item>
-        <item>Persian</item>
-        <item>Polish</item>
-        <item>Portuguese(Brazil)</item>
-        <item>Portuguese(Portugal)</item>
-        <item>Romanian</item>
-        <item>Russian</item>
-        <item>Serbian</item>
-        <item>Spanish</item>
-        <item>Spanish(Latin America)</item>
-        <item>Swedish</item>
-        <item>Tamil</item>
-        <item>Telugu</item>
-        <item>Thai</item>
-        <item>Turkish</item>
-        <item>Ukrainian</item>
-        <item>Vietnamese</item>
-    </string-array>
-    <string-array name="pref_language_codes">
-        <item>auto</item>
-        <item>ar-SA</item>
-        <item>eu-ES</item>
-        <item>my-MM</item>
-        <item>zh-CN</item>
-        <item>zh-HK</item>
-        <item>zh-TW</item>
-        <item>hr</item>
-        <item>cs-cz</item>
-        <item>da-DK</item>
-        <item>nl-NL</item>
-        <item>en</item>
-        <item>fil-PH</item>
-        <item>fr</item>
-        <item>de</item>
-        <item>el</item>
-        <item>hi</item>
-        <item>hu</item>
-        <item>in</item>
-        <item>it</item>
-        <item>ja</item>
-        <item>kn</item>
-        <item>ko</item>
-        <item>kmr-TR</item>
-        <item>lv-LV</item>
-        <item>ml</item>
-        <item>fa</item>
-        <item>pl</item>
-        <item>pt-BR</item>
-        <item>pt-PT</item>
-        <item>ro</item>
-        <item>ru</item>
-        <item>sr</item>
-        <item>es</item>
-        <item>es-419</item>
-        <item>sv</item>
-        <item>ta</item>
-        <item>te</item>
-        <item>th-TH</item>
-        <item>tr</item>
-        <item>uk</item>
-        <item>vi</item>
-    </string-array>
-    <string-array name="image_settings_options">
-        <item>@string/choose_image</item>
-        <item>@string/remove_image</item>
-    </string-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 d2db61cfb..60eed3676 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -3,13 +3,80 @@
 
     <attr name="roundSelector" format="reference" />
     <attr name="rectSelector" format="reference" />
+
     <attr name="defaultFooterColor" format="color" />
+
     <attr name="toolbarPopupTheme" format="reference" />
-    <attr name="lineHeightHint" format="dimension" />
+
+    <attr name="iconColor" format="color" />
+    <attr name="dividerColor" format="color" />
+
+
+    <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 name="url_link" format="string" />
     </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>
 
+    <declare-styleable name="InsettableFrameLayout_Layout">
+        <attr name="layout_ignoreInsets" format="boolean" />
+    </declare-styleable>
+    <declare-styleable name="ColorIconsImageView">
+        <attr name="iconBackgroundColor" format="color" />
+        <attr name="colorIconColor" format="color" />
+        <attr name="icon" format="reference" />
+    </declare-styleable>
+
+    <declare-styleable name="OptionMenuItemView">
+        <attr name="optionTitle" format="reference" />
+        <attr name="optionIcon" format="reference" />
+    </declare-styleable>
+
+
+    <declare-styleable name="LrcView">
+        <attr name="lrcTextSize" format="dimension" />
+        <attr name="lrcLineSpaceSize" format="dimension" />
+        <attr name="lrcNormalTextColor" format="reference|color" />
+        <attr name="lrcCurrentTextColor" format="reference|color" />
+        <attr name="lrcTouchDelay" format="integer" />
+        <attr name="noLrcTextSize" format="dimension" />
+        <attr name="noLrcTextColor" format="reference|color" />
+        <attr name="indicatorLineHeight" format="dimension" />
+        <attr name="indicatorTextSize" format="dimension" />
+        <attr name="indicatorTextColor" format="reference|color" />
+        <attr name="currentIndicateLrcColor" format="reference|color" />
+        <attr name="indicatorTouchDelay" format="integer" />
+        <attr name="indicatorLineColor" format="reference|color" />
+        <attr name="indicatorStartEndMargin" format="dimension" />
+        <attr name="iconLineGap" format="dimension" />
+        <attr name="playIconWidth" format="dimension" />
+        <attr name="playIconHeight" format="dimension" />
+        <attr name="playIcon" format="reference" />
+    </declare-styleable>
+
+    <attr name="lineHeightHint" format="dimension" />
+
+    <declare-styleable name="BaselineGridTextView">
+        <attr name="lineHeightMultiplierHint" format="float" />
+        <attr name="lineHeightHint" />
+        <attr name="maxLinesByHeight" format="boolean" />
+        <attr name="android:textAppearance" />
+        <attr name="android:fontFamily" />
+    </declare-styleable>
+
+    <declare-styleable name="CircleRectView">
+        <attr name="circleRadius" format="dimension" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/bools.xml b/app/src/main/res/values/bools.xml
deleted file mode 100644
index 5e9f24c9f..000000000
--- a/app/src/main/res/values/bools.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <bool name="md3_available">false</bool>
-    <bool name="md3_enabled">false</bool>
-
-    <bool name="allowBackup">true</bool>
-
-    <bool name="isMarshmallow">false</bool>
-</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 2615a4a29..51e143a1c 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,41 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <color name="window_color">@color/md_white_1000</color>
-    <color name="window_color_light">@color/md_white_1000</color>
-    <color name="window_color_dark">@android:color/black</color>
-
     <color name="twenty_percent_black_overlay">#34000000</color>
+    <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="md_indigo_A400">#3D5AFE</color>
     <color name="dark_color">#202124</color>
+    <color name="dark_grey">#17181a</color>
+    <color name="card_dark_color">#222326</color>
     <color name="black_color">#202124</color>
 
+    <color name="lightColorPrimary">#FFFFFF</color>
+    <color name="lightColorOnPrimary">#202020</color>
+    <color name="lightColorSecondary">#FEFEFE</color>
+    <color name="lightColorBackground">#FFFFFF</color>
+    <color name="lightColorSurface">#FEFEFE</color>
+
     <color name="darkColorPrimary">#202124</color>
+    <color name="darkColorOnPrimary">#ffffff</color>
+    <color name="darkColorSecondary">#202124</color>
+    <color name="darkColorBackground">#202124</color>
     <color name="darkColorSurface">#202124</color>
 
-    <color name="darkerColorSurface">#353535</color>
-    <color name="lighterColorSurface">#dddddd</color>
-
+    <color name="blackColorPrimary">#000000</color>
+    <color name="blackColorOnPrimary">#ffffff</color>
+    <color name="blackColorSecondary">#000000</color>
+    <color name="blackColorBackground">#000000</color>
     <color name="blackColorSurface">#000000</color>
 
     <color name="transparent">#00000000</color>
-    <color name="semi_transparent">#20000000</color>
     <!-- card colors -->
     <color name="card_background">#ffffff</color>
     <color name="card_shadow_1">#d4d4d4</color>
     <color name="card_shadow_2">#dddddd</color>
-
-    <color name="progress_gray">#FFD8D8D8</color>
-    <color name="default_blue_light">#ff33b5e5</color>
-
-    <color name="bottomSheetColorLight">#FFFFFF</color>
-    <color name="bottomSheetColorDark">#202020</color>
-    <color name="bottomSheetColorBlack">#000000</color>
-
-    <color name="bottomSheetColor">#FFFFFF</color>
-    <color name="widget_md3_bg_color">@color/lighterColorSurface</color>
-    <color name="widget_circle_button_color">@color/md_indigo_A400</color>
-    <color name="widget_md3_button_bg_color">@color/lighterColorSurface</color>
+    <color name="card_detailing">#eee</color>
 </resources>
diff --git a/app/src/main/res/values/colors_md3.xml b/app/src/main/res/values/colors_md3.xml
deleted file mode 100644
index 471f25f8a..000000000
--- a/app/src/main/res/values/colors_md3.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="elevationOverlayLight">@color/md_grey_500</color>
-    <color name="elevationOverlayDark">@color/md_grey_500</color>
-    <color name="elevationOverlayBlack">@color/md_black_1000</color>
-    <color name="elevationOverlay">@color/elevationOverlayLight</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 891e44a46..e8228ada1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,17 +3,18 @@
     <dimen name="status_bar_padding">0dp</dimen>
     <dimen name="toolbar_elevation">4dp</dimen>
 
+    <dimen name="card_elevation">2dp</dimen>
+
     <dimen name="progress_container_height">20dp</dimen>
 
+
     <dimen name="tab_height">48dp</dimen>
 
     <dimen name="notification_big_image_size">112dp</dimen>
 
     <dimen name="list_item_image_icon_padding">8dp</dimen>
 
-    <dimen name="mini_player_height">56dp</dimen>
-    <dimen name="bottom_nav_height">80dp</dimen>
-    <dimen name="bottom_nav_mini_player_height">136dp</dimen>
+    <dimen name="mini_player_height">48dp</dimen>
 
     <dimen name="app_widget_classic_height">96dp</dimen>
     <dimen name="app_widget_classic_image_size">96dp</dimen>
@@ -34,37 +35,15 @@
     <dimen name="app_widget_card_radius">2dp</dimen>
     <dimen name="now_playing_top_margin">12dp</dimen>
 
-    <dimen name="app_widget_md3_height">90dp</dimen>
-    <dimen name="app_widget_md3_image_size">70dp</dimen>
-
-    <dimen name="app_widget_circle_min_width">180dp</dimen>
-    <dimen name="app_widget_circle_min_height">100dp</dimen>
-    <dimen name="app_widget_circle_max_width">250dp</dimen>
-    <dimen name="app_widget_circle_max_height">250dp</dimen>
-
     <dimen name="icon_notification_dimen">32dp</dimen>
+    <dimen name="mini_player_height_expanded">104dp</dimen>
+    <dimen name="progress_slider_height">30dp</dimen>
     <dimen name="toolbar_margin_horizontal">8dp</dimen>
     <dimen name="toolbar_height">48dp</dimen>
-    <dimen name="item_song_height">60dp</dimen>
+    <dimen name="toolbar_margin_vertical">0dp</dimen>
+    <dimen name="item_song_height">52dp</dimen>
     <dimen name="button_padding_vertical">10dp</dimen>
-    <dimen name="list_pref_guideline_begin">56dp</dimen>
-    <dimen name="pref_title_padding">72dp</dimen>
-    <dimen name="slider_thumb_radius">6dp</dimen>
-    <dimen name="slider_track_height">3dp</dimen>
-    <dimen name="adaptive_icon_size">46dp</dimen>
-    <dimen name="adaptive_icon_padding">12dp</dimen>
-    <dimen name="about_card_radius">16dp</dimen>
-
-    <dimen name="normal_lyrics_padding">20dp</dimen>
-    <dimen name="lyrics_text_size">18sp</dimen>
-    <dimen name="indicator_radius">10dp</dimen>
-    <dimen name="lyrics_dialog_radius">20dp</dimen>
-
-    <dimen name="m3_card_corner_radius">16dp</dimen>
-    <dimen name="m3_card_medium_radius">24dp</dimen>
-    <dimen name="m3_card_large_radius">40dp</dimen>
-    <dimen name="m3_dialog_corner_size">28dp</dimen>
-    <dimen name="padding_album_cover">16dp</dimen>
-
-    <dimen name="seekbar_padding">16dp</dimen>
+    <dimen name="button_margin_horizontal">16dp</dimen>
+    <dimen name="home_icon_padding">14dp</dimen>
+    <dimen name="button_corner">24dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml
index 595e2fbe5..7bcd51415 100755
--- a/app/src/main/res/values/donottranslate.xml
+++ b/app/src/main/res/values/donottranslate.xml
@@ -8,24 +8,16 @@
         <item>code_name_monkey_donate_5</item>
         <item>code_name_monkey_donate_6</item>
         <item>code_name_monkey_donate_7</item>
-        <item>code_name_monkey_donate_8</item>
     </string-array>
 
-    <string name="app_name" translatable="false">Metro</string>
+    <string name="app_name" translatable="false">Retro Music</string>
     <string name="git_hub" translatable="false">GitHub</string>
 
+
     <string name="app_shortcut_last_added_long" translatable="false">@string/last_added</string>
     <string name="app_shortcut_last_added_short" translatable="false">@string/last_added</string>
     <string name="app_shortcut_shuffle_all_long" translatable="false">@string/action_shuffle_all</string>
     <string name="app_shortcut_top_tracks_long" translatable="false">@string/my_top_tracks</string>
 
-    <string name="empty_text_emoji" translatable="false">&#128561;</string>
-
-    <!-- Material You -->
-    <string name="pref_title_md3">Material You</string>
-
-    <string name="sort_order_album_artist">@string/album_artist</string>
-    <string name="app_widget_circle_name">@string/circle</string>
-
-    <string name="download_policy">always</string>
+    <string name="empty_text_emoji" translatable="false">&#129300;</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 1ebc829d9..a6e2fa36f 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -1,31 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="action_settings" type="id" />
-    <item name="action_search" type="id" />
+    <item name="action_new_playlist" type="id" />
     <item name="action_show_lyrics" type="id" />
     <item name="action_genre" type="id" />
+    <item name="action_playing_queue" type="id" />
     <item name="action_album_sort_order_asc" type="id" />
     <item name="action_album_sort_order_desc" type="id" />
     <item name="action_album_sort_order_artist" type="id" />
     <item name="action_album_sort_order_year" type="id" />
-    <item name="action_album_sort_order_num_songs" type="id" />
-    <item name="action_import_playlist" type="id" />
     <item name="action_artist_sort_order_asc" type="id" />
     <item name="action_artist_sort_order_desc" type="id" />
-    <item name="action_song_default_sort_order" type="id" />
     <item name="action_song_sort_order_asc" type="id" />
     <item name="action_song_sort_order_desc" type="id" />
-    <item name="action_playlist_sort_order_desc" type="id" />
-    <item name="action_playlist_sort_order" type="id" />
-    <item name="action_album_artist" type="id" />
-    <item name="action_sort_order" type="id" />
     <item name="action_song_sort_order_artist" type="id" />
-    <item name="action_song_sort_order_album_artist" type="id" />
     <item name="action_song_sort_order_album" type="id" />
     <item name="action_song_sort_order_year" type="id" />
     <item name="action_song_sort_order_date" type="id" />
     <item name="action_song_sort_order_composer" type="id" />
-    <item name="action_song_sort_order_date_modified" type="id" />
     <item name="action_multi_select_adapter_check_all" type="id" />
-    <item name="action_go_to_start_directory" type="id" />
+    <item name="action_folder" type="id" />
 </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 7f46eabf7..3402473b7 100644
--- a/app/src/main/res/values/integers.xml
+++ b/app/src/main/res/values/integers.xml
@@ -4,14 +4,12 @@
     <integer name="default_grid_columns_land">4</integer>
 
     <integer name="default_list_columns">1</integer>
+    <integer name="default_list_artist_columns">2</integer>
     <integer name="default_list_columns_land">2</integer>
+    <integer name="default_list_artist_columns_land">4</integer>
 
     <integer name="max_columns">4</integer>
     <integer name="max_columns_land">6</integer>
 
     <integer name="anim_duration_medium">200</integer>
-    <integer name="permission_orientation">1</integer>
-    <integer name="permission_layout_weight">0</integer>
-
-    <integer name="overScrollMode">2</integer>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/lrc_colors.xml b/app/src/main/res/values/lrc_colors.xml
deleted file mode 100644
index e2e3dda81..000000000
--- a/app/src/main/res/values/lrc_colors.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="lrc_normal_text_color">#9E9E9E</color>
-    <color name="lrc_current_text_color">#FF4081</color>
-    <color name="lrc_timeline_text_color">#F8BBD0</color>
-    <color name="lrc_timeline_color">#809E9E9E</color>
-    <color name="lrc_time_text_color">#809E9E9E</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/lrc_dimens.xml b/app/src/main/res/values/lrc_dimens.xml
deleted file mode 100644
index b022d846b..000000000
--- a/app/src/main/res/values/lrc_dimens.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <integer name="lrc_animation_duration">1000</integer>
-    <dimen name="lrc_text_size">20sp</dimen>
-    <dimen name="lrc_time_text_size">16sp</dimen>
-    <dimen name="lrc_divider_height">16dp</dimen>
-    <dimen name="lrc_timeline_height">1dp</dimen>
-    <dimen name="lrc_drawable_width">30dp</dimen>
-    <dimen name="lrc_time_width">40dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/lrc_view_attrs.xml b/app/src/main/res/values/lrc_view_attrs.xml
deleted file mode 100644
index ff3cc693a..000000000
--- a/app/src/main/res/values/lrc_view_attrs.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2019 Hemanth Savarala.
-  ~
-  ~ Licensed under the GNU General Public License v3
-  ~
-  ~ This is free software: you can redistribute it and/or modify it under
-  ~ the terms of the GNU General Public License as published by
-  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
-  ~
-  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
-  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-  ~ See the GNU General Public License for more details.
-  -->
-
-<resources>
-    <declare-styleable name="LrcView">
-        <attr name="lrcTextSize" format="dimension" />
-        <attr name="lrcNormalTextSize" format="dimension" />
-        <attr name="lrcDividerHeight" format="dimension" />
-        <attr name="lrcNormalTextColor" format="reference|color" />
-        <attr name="lrcCurrentTextColor" format="reference|color" />
-        <attr name="lrcTimelineTextColor" format="reference|color" />
-        <attr name="lrcAnimationDuration" format="integer" />
-        <attr name="lrcLabel" format="string" />
-        <attr name="lrcPadding" format="dimension" />
-        <attr name="lrcTimelineColor" format="reference|color" />
-        <attr name="lrcTimelineHeight" format="dimension" />
-        <attr name="lrcPlayDrawable" format="reference" />
-        <attr name="lrcTimeTextColor" format="reference|color" />
-        <attr name="lrcTimeTextSize" format="dimension" />
-        <attr name="lrcTextGravity">
-            <enum name="center" value="0" />
-            <enum name="left" value="1" />
-            <enum name="right" value="2" />
-        </attr>
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/metal_recycler_view_attrs.xml b/app/src/main/res/values/metal_recycler_view_attrs.xml
new file mode 100644
index 000000000..84e779f95
--- /dev/null
+++ b/app/src/main/res/values/metal_recycler_view_attrs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="MetalRecyclerViewPager">
+        <attr name="itemMargin" format="dimension" />
+    </declare-styleable>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/permission_item.xml b/app/src/main/res/values/permission_item.xml
deleted file mode 100644
index 3147cd4e6..000000000
--- a/app/src/main/res/values/permission_item.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <declare-styleable name="PermissionItem">
-        <attr name="permissionTitle" format="string" localization="suggested" />
-        <attr name="permissionTitleSubTitle" format="string" localization="suggested" />
-        <attr name="permissionTitleNumber" format="string" />
-        <attr name="permissionIcon" format="reference" />
-        <attr name="permissionButtonTitle" format="string" localization="suggested" />
-    </declare-styleable>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/seekarc_attrs.xml b/app/src/main/res/values/seekarc_attrs.xml
deleted file mode 100644
index 2526d7b8c..000000000
--- a/app/src/main/res/values/seekarc_attrs.xml
+++ /dev/null
@@ -1,48 +0,0 @@
-<!--
-  The MIT License (MIT)
-
-  Copyright (c) 2013 Triggertrap Ltd
-  Author Neil Davies
-
-  Permission is hereby granted, free of charge, to any person obtaining a copy of
-  this software and associated documentation files (the "Software"), to deal in
-  the Software without restriction, including without limitation the rights to
-  use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-  the Software, and to permit persons to whom the Software is furnished to do so,
-  subject to the following conditions:
-
-  The above copyright notice and this permission notice shall be included in all
-  copies or substantial portions of the Software.
-
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-  FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-  COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--->
-<resources>
-
-    <declare-styleable name="SeekArc">
-        <attr name="thumb" format="reference" />
-        <attr name="thumbOffset" format="dimension" />
-        <attr name="max" format="integer" />
-        <attr name="progressWidth" format="dimension" />
-        <attr name="arcWidth" format="dimension" />
-        <attr name="seekProgress" format="integer" />
-        <attr name="rotation" format="integer" />
-        <attr name="startAngle" format="integer" />
-        <attr name="sweepAngle" format="integer" />
-        <attr name="arcColor" format="color" />
-        <attr name="progressColor" format="color" />
-        <attr name="roundEdges" format="boolean" />
-        <attr name="touchInside" format="boolean" />
-        <attr name="clockwise" format="boolean" />
-        <attr name="enabled" format="boolean" />
-    </declare-styleable>
-
-    <declare-styleable name="SeekArcTheme">
-        <attr name="seekArcStyle" format="reference" />
-    </declare-styleable>
-
-</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 e9609c7c1..1d828b357 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,102 +1,142 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <resources>
-    <string name="about_album_label">About %s</string>
     <string name="about_settings_summary">Team, social links</string>
+
     <string name="accent_color">Accent color</string>
     <string name="accent_color_desc">The theme accent color, defaults to purple</string>
+
     <string name="action_about">About</string>
-    <string name="action_add_to_blacklist">Add to Blacklist</string>
+
     <string name="action_add_to_favorites">Add to favorites</string>
     <string name="action_add_to_playing_queue">Add to playing queue</string>
     <string name="action_add_to_playlist">Add to playlist</string>
-    <string name="action_cancel">Cancel</string>
-    <string name="action_cast">Cast</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>
-    <string name="action_edit">Edit</string>
+
     <string name="action_go_to_album">Go to album</string>
     <string name="action_go_to_artist">Go to artist</string>
     <string name="action_go_to_genre">Go to genre</string>
-    <string name="action_go_to_lyrics">Go to Lyrics</string>
     <string name="action_go_to_start_directory">Go to start directory</string>
+
     <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_all">Play all</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_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>
+
     <string name="action_rename">Rename</string>
+
     <string name="action_save_playing_queue">Save playing queue</string>
+
     <string name="action_scan">Scan</string>
+
     <string name="action_search">Search</string>
+
     <string name="action_set">Start</string>
     <string name="action_set_as_ringtone">Set as ringtone</string>
     <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_shuffle_all">Shuffle all</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>
+
     <string name="add_action">Add</string>
+
+    <string name="add_lyrics">Add lyrics</string>
+
+    <string name="add_photo">Add \nphoto</string>
+
     <string name="add_playlist_title">"Add to playlist"</string>
-    <string name="add_time_framed_lryics">Add Time Framed Lyrics</string>
-    <string name="added_song_count_to_playlist">Added %1$d song(s) to %2$s</string>
+
+    <string name="add_time_framed_lryics">Add time frame lyrics</string>
+
     <string name="added_title_to_playing_queue">"Added 1 title to the playing queue."</string>
+
     <string name="added_x_titles_to_playing_queue">Added %1$d titles to the playing queue.</string>
+
     <string name="album">Album</string>
-    <plurals name="albumSongs">
-        <item quantity="one">Song</item>
-        <item quantity="other">Songs</item>
-    </plurals>
-    <string name="album_artist">Album Artist</string>
+
+    <string name="album_artist">Album artist</string>
+
+    <string name="album_or_artist_empty">The title or artist is empty.</string>
+
     <string name="albums">Albums</string>
-    <plurals name="albums">
-        <item quantity="one">Album</item>
-        <item quantity="other">Albums</item>
-    </plurals>
+
     <string name="always">Always</string>
+
     <string name="app_share">Hey check out this cool music player at: https://play.google.com/store/apps/details?id=%s</string>
+
     <string name="app_shortcut_shuffle_all_short">Shuffle</string>
     <string name="app_shortcut_top_tracks_short">Top Tracks</string>
-    <string name="app_widget_big_name">Full Image</string>
-    <string name="app_widget_card_name">Card</string>
-    <string name="app_widget_classic_name">Classic</string>
-    <string name="app_widget_md3_name">MD3</string>
-    <string name="app_widget_small_name">Small</string>
-    <string name="app_widget_text_name">Minimal Text</string>
+
+    <string name="app_widget_big_name">Retro music - Big</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="app_widget_text_name">Retro music - Text</string>
+
     <string name="artist">Artist</string>
+
     <string name="artists">Artists</string>
-    <string name="audio_fade_duration">Audio fade duration</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="auto">Auto</string>
-    <string name="backup_restore_settings_summary">Backup and restore your settings, playlists</string>
-    <string name="backup_restore_title">
-        <![CDATA[Backup & Restore]]>
-    </string>
-    <string name="backup_title">Backups</string>
+
+    <string name="base_color_theme">Base color theme</string>
+
+    <string name="bass_boost">Bass Boost</string>
+
+    <string name="bio">Bio</string>
+
     <string name="biography">Biography</string>
+
     <string name="black_theme_name">Just Black</string>
+
     <string name="blacklist">Blacklist</string>
-    <string name="bluetooth_summary">The app needs nearby devices permission to check for bluetooth devices</string>
-    <string name="bluetooth_title">Nearby devices</string>
+
     <string name="blur">Blur</string>
+
     <string name="blur_card">Blur Card</string>
+
     <string name="bug_report_failed">Unable to send report</string>
     <string name="bug_report_failed_invalid_token">Invalid access token. Please contact the app developer.</string>
     <string name="bug_report_failed_issues_not_available">Issues are not enabled for the selected repository. Please contact the app developer.</string>
@@ -108,98 +148,156 @@
     <string name="bug_report_no_password">Please enter your valid GitHub password</string>
     <string name="bug_report_no_title">Please enter an issue title</string>
     <string name="bug_report_no_username">Please enter your valid GitHub username</string>
-    <string name="bug_report_success">Bug report successful</string>
     <string name="bug_report_summary">An unexpected error occurred. Sorry you found this bug, if it keeps crashing \"Clear app data\" or send an Email </string>
+    <string name="bug_report_uploading">Uploading report to GitHub…</string>
     <string name="bug_report_use_account">Send using GitHub account</string>
+
     <string name="buy_now">Buy now</string>
+
     <string name="cancel_current_timer">Cancel</string>
+
     <string name="card">Card</string>
+
+    <string name="card_circular_style">Circular</string>
+
     <string name="card_color_style">Colored Card</string>
-    <string name="card_square">Square Card</string>
+
     <string name="card_style">Card</string>
+
+    <string name="carousal">Carousel</string>
+
     <string name="carousal_effect_on_now_playing_screen">Carousel effect on the now playing screen</string>
+
     <string name="cascading">Cascading</string>
+
+    <string name="cast">Cast</string>
+
     <string name="changelog">Changelog</string>
-    <string name="changelog_summary">Check out What\'s New</string>
-    <string name="choose_image">Choose Image</string>
-    <string name="choose_restore_title">Choose what to restore</string>
-    <string name="circle">Circle</string>
+
+    <string name="changelog_summary">Changelog maintained on the Telegram channel</string>
+
     <string name="circular">Circular</string>
+
     <string name="classic">Classic</string>
+
     <string name="clear_action">Clear</string>
+
+    <string name="clear_app_data">Clear app data</string>
+
     <string name="clear_blacklist">Clear blacklist</string>
-    <string name="clear_history">Clear History</string>
+
     <string name="clear_playing_queue">Clear queue</string>
+
+    <string name="clear_playlist_title">Clear playlist</string>
+    <string name="clear_playlist_x"><![CDATA[Clear the playlist <b>%1$s</b>? This can\u2019t be undone!]]></string>
+
+    <string name="close_notification">Close</string>
+
     <string name="color">Color</string>
+
+    <string name="color_theme_name">Color</string>
+
     <string name="colors">Colors</string>
-    <string name="compact">Compact</string>
+
     <string name="composer">Composer</string>
+
     <string name="copied_device_info_to_clipboard">Copied device info to clipboard.</string>
+
     <string name="could_not_create_playlist">Couldn\u2019t create playlist.</string>
     <string name="could_not_download_album_cover">"Couldn\u2019t download a matching album cover."</string>
     <string name="could_not_restore_purchase">Could not restore purchase.</string>
     <string name="could_not_scan_files">Could not scan %d files.</string>
+
     <string name="create_action">Create</string>
-    <string name="create_new_backup">Create</string>
+
     <string name="created_playlist_x">Created playlist %1$s.</string>
+
     <string name="credit_title">Members and contributors </string>
+
     <string name="currently_listening_to_x_by_x">Currently listening to %1$s by %2$s.</string>
-    <string name="custom_artist_images">Custom Artist Images</string>
-    <string name="customactivityoncrash_error_activity_error_details_share">Share Crash Report</string>
+
     <string name="dark_theme_name">Kinda Dark</string>
+
+    <string name="default_hint">No Lyrics</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="deleting_songs">Deleting songs</string>
+
     <string name="depth">Depth</string>
+
     <string name="description">Description</string>
+
     <string name="device_info">Device info</string>
+
     <string name="dialog_message_set_ringtone">Allow Retro Music to modify audio settings</string>
+
     <string name="dialog_title_set_ringtone">Set ringtone</string>
-    <string name="disc_hint">Disc Number</string>
+
     <string name="do_you_want_to_clear_the_blacklist">Do you want to clear the blacklist?</string>
     <string name="do_you_want_to_remove_from_the_blacklist"><![CDATA[Do you want to remove <b>%1$s</b> from the blacklist?]]></string>
+
     <string name="donate">Donate</string>
+
     <string name="donate_summary">If you think I deserve to get paid for my work, you can leave some money here</string>
+
     <string name="donation_header">Buy me a:</string>
-    <string name="done">Done</string>
-    <string name="drive_mode">Drive mode</string>
-    <string name="edit_fab">Edit Button</string>
-    <string name="edit_normal_lyrics">Edit Lyrics</string>
-    <string name="edit_synced_lyrics">Edit Synced Lyrics</string>
+
+    <string name="download_from_last_fm">Download from Last.fm</string>
+
+    <string name="edit">Edit</string>
+
+    <string name="edit_cover">Edit cover</string>
+
     <string name="empty">Empty</string>
+
     <string name="equalizer">Equalizer</string>
-    <string name="error_create_backup">Couldn\u2019t create backup</string>
-    <string name="error_delete_backup">Couldn\u2019t delete backup</string>
-    <string name="error_empty_name">Your name can\'t be empty!</string>
-    <string name="error_load_failed">Load failed</string>
-    <string name="error_share_file">Couldn\'t share file</string>
-    <string name="expanded">Expanded</string>
+
+    <string name="error">Error</string>
+
     <string name="faq">FAQ</string>
+
     <string name="favorites">Favorites</string>
-    <string name="file_already_exists">File already exists</string>
+
     <string name="finish_last_song">Finish last song</string>
+
     <string name="fit">Fit</string>
+
     <string name="flat">Flat</string>
+
     <string name="folders">Folders</string>
+
     <string name="follow_system">Follow system</string>
+
     <string name="for_you">For you</string>
-    <string name="free">Free</string>
+
     <string name="full">Full</string>
+
     <string name="full_card">Full card</string>
+
     <string name="general_settings_summary">Change the theme and colors of the app</string>
     <string name="general_settings_title">Look and feel</string>
+
     <string name="genre">Genre</string>
+
     <string name="genres">Genres</string>
+
     <string name="git_hub_summary">Fork the project on GitHub</string>
-    <string name="gradient">Gradient</string>
-    <string name="grant_access">Grant access</string>
+
+    <string name="google_plus_community">Join the Google Plus community where you can ask for help or follow Retro Music updates</string>
+
     <string name="grid_size_1">1</string>
     <string name="grid_size_2">2</string>
     <string name="grid_size_3">3</string>
@@ -208,257 +306,331 @@
     <string name="grid_size_6">6</string>
     <string name="grid_size_7">7</string>
     <string name="grid_size_8">8</string>
-    <string name="grid_style_label">Grid style</string>
-    <string name="help_summary">Need more help?</string>
+
+    <string name="grid_style_label"><![CDATA[Grids & Style]]></string>
+
     <string name="hinge">Hinge</string>
+
     <string name="history">History</string>
-    <string name="history_cleared">History cleared</string>
-    <string name="history_undo_button">Undo</string>
+
     <string name="home">Home</string>
+
     <string name="horizontal_flip">Horizontal flip</string>
+
     <string name="image">Image</string>
+
     <string name="image_gradient">Gradient image</string>
+
     <string name="image_settings_summary">Change artist image download settings</string>
-    <string name="import_label">Import</string>
-    <string name="import_playlist">Import playlist</string>
-    <string name="import_playlist_message">It imports all playlists listed in the Android Media Store with songs, if the playlists already exists, the songs will get merged.</string>
+
     <string name="inserted_x_songs_into_playlist_x">Inserted %1$d songs into the playlist %2$s.</string>
-    <string name="instagram_page" translatable="false">Instagram</string>
+
+    <string name="instagram_page">Instagram</string>
     <string name="instagram_page_summary">Share your Retro Music setup to showcase on Instagram</string>
+
     <string name="keyboard">Keyboard</string>
+
     <string name="label_bit_rate">Bitrate</string>
+
     <string name="label_file_format">Format</string>
     <string name="label_file_name">File name</string>
     <string name="label_file_path">File path</string>
     <string name="label_file_size">Size</string>
-    <string name="label_last_modified">Last Modified</string>
+
     <string name="label_more_from">More from %s</string>
+
     <string name="label_sampling_rate">Sampling rate</string>
+
     <string name="label_track_length">Length</string>
+
     <string name="labeled">Labeled</string>
+
     <string name="last_added">Last added</string>
+
     <string name="last_song">Last song</string>
-    <string name="lets_go">Let\'s go</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="listeners_label">Listeners</string>
+
     <string name="listing_files">Listing files</string>
+
     <string name="loading_products">Loading products…</string>
+
     <string name="login">Login</string>
+
     <string name="lyrics">Lyrics</string>
+
     <string name="made_with_love">Made with ❤️ in India</string>
+
     <string name="material">Material</string>
-    <string name="md3" translatable="false">MD3</string>
+
     <string name="md_error_label">Error</string>
+
     <string name="md_storage_perm_error">Permission error</string>
-    <string name="message_backup_create_success">Backup created successfully.</string>
-    <string name="message_limit_tabs">Not more than 5 items</string>
-    <string name="message_pro_feature">%s is a Pro feature.</string>
-    <string name="message_restore_success">Restore completed successfully.</string>
-    <string name="message_updated">Updated</string>
-    <string name="message_welcome"><![CDATA[Hello there! <br>Welcome to %s]]></string>
+
     <string name="my_name">Name</string>
+
     <string name="my_top_tracks">Most played</string>
+
     <string name="never">Never</string>
-    <string name="new_music_mix">New Music Mix</string>
+
+    <string name="new_banner_photo">New banner photo</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>
+
     <string name="next_song">Next Song</string>
+
     <string name="no_albums">You have no albums</string>
+
     <string name="no_artists">You have no artists</string>
+
     <string name="no_audio_ID">"Play a song first, then try again."</string>
-    <string name="no_backups_found">No Backups Found</string>
+
     <string name="no_equalizer">No equalizer found</string>
+
     <string name="no_genres">You have no genres</string>
+
     <string name="no_lyrics_found">No lyrics found</string>
-    <string name="no_playing_queue">No songs playing</string>
+
     <string name="no_playlists">You have no playlists</string>
+
     <string name="no_purchase_found">No purchase found.</string>
+
     <string name="no_results">No results</string>
+
     <string name="no_songs">You have no songs</string>
+
     <string name="normal">Normal</string>
+
     <string name="normal_lyrics">Normal lyrics</string>
+
+    <string name="normal_style">Normal</string>
+
     <string name="not_listed_in_media_store"><![CDATA[<b>%s</b> is not listed in the media store.]]></string>
-    <string name="not_recently_played">Not recently played</string>
+
     <string name="nothing_to_scan">Nothing to scan.</string>
-    <string name="nothing_to_see">Nothing to see</string>
+
     <string name="notification">Notification</string>
+
     <string name="notification_settings_summary">Customize the notification style</string>
+
     <string name="now_playing">Now playing</string>
     <string name="now_playing_queue">Now playing queue</string>
     <string name="now_playing_summary">Customize the now playing screen</string>
     <string name="now_playing_themes">9+ now playing themes</string>
+
     <string name="only_on_wifi">Only on Wi-Fi</string>
+
     <string name="other_settings_summary">Advanced testing features</string>
+
     <string name="others">Other</string>
-    <string name="over_cover">Over Cover</string>
+
     <string name="password">Password</string>
+
     <string name="past_three_months">Past 3 months</string>
-    <string name="paste_lyrics_here">Paste Lyrics Here</string>
-    <string name="paste_timeframe_lyrics_here">Paste timeframe lyrics here</string>
-    <string name="peek">Peek</string>
-    <string name="permission_bluetooth_denied">Nearby devices permission denied.</string>
+
+    <string name="paste_lyrics_here">Paste lyrics here</string>
+
+    <string name="peak">Peak</string>
+
     <string name="permission_external_storage_denied">Permission to access external storage denied.</string>
-    <string name="permission_summary">The app needs permission to access your device storage for playing music</string>
-    <string name="permission_title">Storage Access</string>
+
     <string name="permissions_denied">Permissions denied.</string>
+
     <string name="personalize">Personalize</string>
+
     <string name="personalize_settings_summary">Customize your now playing and UI controls</string>
+
     <string name="pick_from_local_storage">Pick from local storage</string>
+
+    <string name="pick_image_intent_text">Pick image</string>
+
     <string name="pinterest_page">Pinterest</string>
-    <string name="pinterest_page_summary">Follow Pinterest page for Retro Music design inspiration</string>
+    <string name="pinterest_page_summary">Follow Pintrest page for Retro Music design inspiration</string>
+
     <string name="plain">Plain</string>
-    <string name="playList_already_exits">Playlist already exists</string>
-    <string name="playback_pitch">Pitch</string>
-    <string name="playback_settings">Playback Settings</string>
-    <string name="playback_speed">Playback Speed</string>
+
     <string name="playing_notification_description">The playing notification provides actions for play/pause etc.</string>
     <string name="playing_notification_name">Playing notification</string>
-    <string name="playlist_created_sucessfully">%s created successfully</string>
+
+    <string name="playlist_empty_text">Empty playlist</string>
+
     <string name="playlist_is_empty">Playlist is empty</string>
+
     <string name="playlist_name_empty">Playlist name</string>
+
     <string name="playlists">Playlists</string>
+
+    <string name="pref_album_detail_style">Album detail style</string>
+
     <string name="pref_blur_amount_summary">Amount of blur applied for blur themes, lower is faster</string>
     <string name="pref_blur_amount_title">Blur amount</string>
+
+    <string name="pref_dialog_corner_summary">Adjust the bottom sheet dialog corners</string>
+    <string name="pref_dialog_corner_title">Dialog corner</string>
+
     <string name="pref_filter_song_summary">Filter songs by length</string>
     <string name="pref_filter_song_title">Filter song duration</string>
-    <string name="pref_header_advanced">Advanced</string>
+
     <string name="pref_header_album">Album style</string>
     <string name="pref_header_audio">Audio</string>
-    <string name="pref_header_blacklist">Blacklist</string>
     <string name="pref_header_controls">Controls</string>
     <string name="pref_header_general">Theme</string>
     <string name="pref_header_images">Images</string>
     <string name="pref_header_library">Library</string>
     <string name="pref_header_lockscreen">Lockscreen</string>
     <string name="pref_header_playlists">Playlists</string>
+
     <string name="pref_keep_pause_on_zero_volume_summary">Pauses the song when the volume decreases to zero and starts playing back when the volume level rises. Also works outside the app</string>
     <string name="pref_keep_pause_on_zero_volume_title">Pause on zero</string>
     <string name="pref_keep_screen_on_summary">Keep in mind that enabling this feature may affect battery life</string>
     <string name="pref_keep_screen_on_title">Keep the screen on</string>
-    <string name="pref_language_name">Select language</string>
+
+    <string name="pref_now_playing_screen_summary">Click to open with or slide to without transparent navigation of now playing screen</string>
+    <string name="pref_now_playing_screen_title">Click or Slide</string>
+
     <string name="pref_snow_fall_title">Snow fall effect</string>
+
     <string name="pref_summary_album_art_on_lockscreen">Use the currently playing song album cover as the lockscreen wallpaper</string>
-    <string name="pref_summary_album_artists_only">Show Album Artists in the Artist category</string>
     <string name="pref_summary_audio_ducking">Lower the volume when a system sound is played or a notification is received</string>
-    <string name="pref_summary_audio_fade">Fade audio when song is paused or played</string>
     <string name="pref_summary_blacklist">The content of blacklisted folders is hidden from your library.</string>
-    <string name="pref_summary_bluetooth_playback">Start playing as soon as connected to bluetooth device</string>
     <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_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_cross_fade">Duration to crossfade between songs</string>
     <string name="pref_summary_desaturated_color">As per Material Design guide lines in dark mode colors should be desaturated</string>
-    <string name="pref_summary_expand_now_playing_panel">Clicking on the notification will show now playing screen instead of the home screen</string>
+    <string name="pref_summary_dominant_color">Most dominant color will be picked from the album or artist cover</string>
     <string name="pref_summary_extra_controls">Add extra controls for mini player</string>
-    <string name="pref_summary_extra_song_info">Show extra Song information, such as file format, bitrate and frequency</string>
     <string name="pref_summary_gapless_playback">"Can cause playback issues on some devices."</string>
-    <string name="pref_summary_home_banner">Show or hide the home banner</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_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_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_manage_audio_focus">Always play audio in background regardless of anything else being played</string>
     <string name="pref_summary_open_source_licences">License details for open source software</string>
-    <string name="pref_summary_pause_history">When enabled, newly played songs won\'t show in history</string>
-    <string name="pref_summary_remember_tab">Navigate to the last used tab on start</string>
-    <string name="pref_summary_show_lyrics">Display synced lyrics over album cover</string>
-    <string name="pref_summary_suggestions">Show New Music Mix on homescreen</string>
-    <string name="pref_summary_swipe_anywhere_now_playing">Enables changing song by swiping anywhere on the now playing screen</string>
-    <string name="pref_summary_swipe_to_dismiss">Swipe down to dismiss mini player</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_full_screen">Immersive mode</string>
     <string name="pref_summary_toggle_headset">Start playing immediately after headphones are connected</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_volume">If enough space is available, show volume controls in the now playing screen</string>
-    <string name="pref_summary_wallpaper_accent">Extract accent color from wallpaper</string>
-    <string name="pref_summary_whitelist">Only show music from /Music Folder</string>
+
     <string name="pref_title_album_art_on_lockscreen">Show album cover</string>
-    <string name="pref_title_album_artists_only">Navigate by Album Artist</string>
     <string name="pref_title_album_cover_style">Album cover theme</string>
     <string name="pref_title_album_cover_transform">Album cover skip</string>
+    <string name="pref_title_album_grid_style">Album grid</string>
     <string name="pref_title_app_shortcuts">Colored app shortcuts</string>
-    <string name="pref_title_appbar_mode">Header style</string>
+    <string name="pref_title_artist_grid_style">Artist grid</string>
     <string name="pref_title_audio_ducking">Reduce volume on focus loss</string>
-    <string name="pref_title_audio_fade">Fade audio</string>
     <string name="pref_title_auto_download_artist_images">Auto-download artist images</string>
     <string name="pref_title_blacklist">Blacklist</string>
-    <string name="pref_title_bluetooth_playback">Bluetooth playback</string>
     <string name="pref_title_blurred_album_art">Blur album cover</string>
-    <string name="pref_title_circle_button">Circular play button</string>
+    <string name="pref_title_choose_equalizer">Choose equalizer</string>
     <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_cross_fade">Crossfade (Beta)</string>
-    <string name="pref_title_custom_font">Use Manrope font</string>
     <string name="pref_title_desaturated_color">Desaturated color</string>
-    <string name="pref_title_expand_now_playing_panel">Show now playing screen</string>
     <string name="pref_title_extra_controls">Extra controls</string>
-    <string name="pref_title_extra_song_info">Song info</string>
     <string name="pref_title_gapless_playback">Gapless playback</string>
     <string name="pref_title_general_theme">App theme</string>
-    <string name="pref_title_home_album_grid_style">Album grid</string>
-    <string name="pref_title_home_artist_grid_style">Artist grid</string>
-    <string name="pref_title_home_banner">Banner</string>
+    <string name="pref_title_genre_toggle">Show genre tab</string>
+    <string name="pref_title_home_artist_grid_style">Home artist grid</string>
+    <string name="pref_title_home_banner">Home banner</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_lyrics_screen_on">Keep screen on when showing lyrics</string>
-    <string name="pref_title_lyrics_type">Lyrics type</string>
-    <string name="pref_title_manage_audio_focus">Always play</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_pause_history">Pause history</string>
-    <string name="pref_title_remember_tab">Remember last tab</string>
-    <string name="pref_title_show_lyrics">Show lyrics</string>
-    <string name="pref_title_suggestions">Show suggestions</string>
-    <string name="pref_title_swipe_anywhere_now_playing">Swipe anywhere to change song</string>
-    <string name="pref_title_swipe_to_dismiss">Dismiss with swipe down</string>
+    <string name="pref_title_round_corners">Corner edges</string>
     <string name="pref_title_tab_text_mode">Tab titles mode</string>
     <string name="pref_title_toggle_carousel_effect">Carousel effect</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_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_wallpaper_accent">Wallpaper accent color</string>
-    <string name="pref_title_whitelist">Whitelist music</string>
-    <string name="pro">Pro</string>
-    <string name="pro_summary">Black theme, Now playing themes, Carousel effect and more..</string>
+    <string name="pref_title_user_info">User info</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>
+
+    <string name="pro_summary">Now playing themes, Carousel effect and more..</string>
+
     <string name="profile">Profile</string>
+
     <string name="purchase">Purchase</string>
-    <string name="queue">Playing Queue</string>
+
+    <string name="purchase_summary">*Think before buying, don\'t ask for refund.</string>
+
+    <string name="queue">Queue</string>
+
     <string name="rate_app">Rate the app</string>
+
     <string name="rate_on_google_play_summary">Love this app? Let us know in the Google Play Store how we can make it even better</string>
+
     <string name="recent_albums">Recent albums</string>
+
     <string name="recent_artists">Recent artists</string>
+
     <string name="remove_action">Remove</string>
+
+    <string name="remove_banner_photo">Remove banner photo</string>
+
     <string name="remove_cover">Remove cover</string>
+
     <string name="remove_from_blacklist">Remove from blacklist</string>
-    <string name="remove_image">Remove Image</string>
+
+    <string name="remove_profile_photo">Remove profile photo</string>
+
     <string name="remove_song_from_playlist_title">Remove song from playlist</string>
     <string name="remove_song_x_from_playlist"><![CDATA[Remove the song <b>%1$s</b> from the playlist?]]></string>
+
     <string name="remove_songs_from_playlist_title">Remove songs from playlist</string>
+
     <string name="remove_x_songs_from_playlist"><![CDATA[Remove <b>%1$d</b> songs from the playlist?]]></string>
+
     <string name="rename_playlist_title">Rename playlist</string>
-    <string name="replace_cover">Replace Cover</string>
+
     <string name="report_an_issue">Report an issue</string>
+
     <string name="report_bug">Report bug</string>
+
     <string name="reset_action">Reset</string>
+
     <string name="reset_artist_image">Reset artist image</string>
+
     <string name="restore">Restore</string>
-    <string name="restore_message">Do you want to restore backup?</string>
+
     <string name="restored_previous_purchase_please_restart">Restored previous purchase. Please restart the app to make use of all features.</string>
     <string name="restored_previous_purchases">Restored previous purchases.</string>
+
     <string name="restoring_purchase">Restoring purchase…</string>
-    <string name="retro_music_player">Retro Music Player</string>
+
+    <string name="retro_equalizer">Retro Music Equalizer</string>
+
     <string name="retro_music_pro">Retro Music Pro</string>
-    <string name="ringtone_summary">The app needs permission to access your device settings in order to set music as Ringtone</string>
-    <string name="ringtone_title">Ringtone (Optional)</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 -->
@@ -467,100 +639,179 @@
     <string name="saf_guide_slide2_title">Select your SD card in navigation drawer</string>
     <string name="saf_guide_slide3_description">Do not open any sub-folders</string>
     <string name="saf_guide_slide3_title">Tap \'select\' button at the bottom of the screen</string>
+
     <string name="saf_write_failed">File write failed: %s</string>
+
     <string name="save">Save</string>
+
     <!-- SAF -->
     <!-- SAF guide -->
     <string name="save_playlist_title">Save as file</string>
+
     <string name="save_playlists_title">Save as files</string>
+
     <string name="saved_playlist_to">Saved playlist to %s.</string>
+
     <string name="saving_changes">Saving changes</string>
+
     <string name="scan_media">Scan media</string>
+
     <string name="scanned_files">Scanned %1$d of %2$d files.</string>
-    <string name="scrobbles_label">Scrobbles</string>
+
+    <string name="search_hint">Search your library…</string>
+
     <string name="select_all">Select all</string>
+
+    <string name="select_banner_photo">Select banner photo</string>
+
     <string name="selected">Selected</string>
+
+    <string name="send_crash_log">Send crash log</string>
+
     <string name="set">Set</string>
+
     <string name="set_artist_image">Set artist image</string>
+
+    <string name="set_photo">Set a profile photo</string>
+
     <string name="share_app">Share app</string>
-    <string name="share_summary">Share the app with your friends and family</string>
-    <string name="share_to_stories">Share to Stories</string>
-    <string name="show_album_artists">Show Album Artists</string>
+
     <string name="shuffle">Shuffle</string>
+
     <string name="simple">Simple</string>
+
     <string name="sleep_timer_canceled">Sleep timer canceled.</string>
     <string name="sleep_timer_set">Sleep timer set for %d minutes from now.</string>
+
+    <string name="slide">Slide</string>
+
+    <string name="small">Small album</string>
+
     <string name="social">Social</string>
-    <string name="social_stories">Share story</string>
+
     <string name="song">Song</string>
+
     <string name="song_duration">Song duration</string>
+
     <string name="songs">Songs</string>
+
     <string name="sort_order">Sort order</string>
     <string name="sort_order_a_z">Ascending</string>
     <string name="sort_order_album">Album</string>
     <string name="sort_order_artist">Artist</string>
     <string name="sort_order_composer">Composer</string>
-    <string name="sort_order_date">Date added</string>
-    <string name="sort_order_date_modified">Date modified</string>
-    <string name="sort_order_default">Default</string>
-    <string name="sort_order_num_songs">Song count</string>
-    <string name="sort_order_num_songs_desc">Song count desc</string>
+    <string name="sort_order_date">Date</string>
     <string name="sort_order_year">Year</string>
     <string name="sort_order_z_a">Descending</string>
+
     <string name="speech_not_supported">Sorry! Your device doesn\'t support speech input</string>
+
     <string name="speech_prompt">Search your library</string>
+
     <string name="stack">Stack</string>
+
     <string name="start_play_music">Start playing music.</string>
+
     <string name="suggestion_songs">Suggestions</string>
+
+    <string name="summary_user_info">Just show your name on home screen</string>
+
     <string name="support_development">Support development</string>
+
     <string name="swipe_to_unlock">Swipe to unlock</string>
+
     <string name="synced_lyrics">Synced lyrics</string>
+
+    <string name="system_equalizer">System Equalizer</string>
+
+    <!-- Message displayed when tag editing fails -->
     <string name="telegram_group">Telegram</string>
     <string name="telegram_group_summary">Join the Telegram group to discuss bugs, make suggestions, show off and more</string>
+
     <string name="thank_you">Thank you!</string>
+
     <string name="the_audio_file">The audio file</string>
+
     <string name="this_month">This month</string>
+
     <string name="this_week">This week</string>
+
     <string name="this_year">This year</string>
+
     <string name="tiny">Tiny</string>
-    <string name="tiny_card_style">Tiny card</string>
+
     <string name="title">Title</string>
-    <string name="title_new_backup">New Backup</string>
+
+    <string name="title_dashboard">Dashboard</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_user_info">What\'s Your Name</string>
+
     <string name="today">Today</string>
+
     <string name="top_albums">Top albums</string>
+
     <string name="top_artists">Top artists</string>
+
     <string name="track_hint">"Track (2 for track 2 or 3004 for CD3 track 4)"</string>
+
     <string name="track_list">Track number</string>
+
     <string name="translate">Translate</string>
+
     <string name="translate_community">Help us translate the app to your language</string>
-    <string name="try_retro_music_premium">Try Retro Music Premium</string>
+
     <string name="twitter_page">Twitter</string>
     <string name="twitter_page_summary">Share your design with Retro Music</string>
+
     <string name="unlabeled">Unlabeled</string>
+
     <string name="unplayable_file">Couldn\u2019t play this song.</string>
+
     <string name="up_next">Up next</string>
+
     <string name="update_image">Update image</string>
+
     <string name="updating">Updating…</string>
-    <string name="user_images_description">User Images</string>
-    <string name="user_name">User Name</string>
+
     <string name="username">Username</string>
+
     <string name="version">Version</string>
+
     <string name="vertical_flip">Vertical flip</string>
-    <string name="view_on_telegram">View on Telegram</string>
-    <string name="volume">Volume</string>
+
+    <string name="virtualizer">Virtualizer</string>
+
     <string name="web_search">Web search</string>
-    <string name="website">Website</string>
-    <string name="website_summary">Check out our Website</string>
+
     <string name="welcome">Welcome,</string>
+
     <string name="what_do_you_want_to_share">What do you want to share?</string>
+
     <string name="whats_new">What\'s New</string>
+
     <string name="window">Window</string>
+
     <string name="window_corner_edges">Rounded corners</string>
+
     <string name="x_has_been_set_as_ringtone">Set %1$s as your ringtone.</string>
+
     <string name="x_selected">%1$d selected</string>
+
     <string name="year">Year</string>
+
     <string name="you_have_to_select_at_least_one_category">You have to select at least one category.</string>
+
     <string name="you_will_be_forwarded_to_the_issue_tracker_website">You will be forwarded to the issue tracker website.</string>
+
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
-    <string name="could_not_write_tags_to_file">Could not write tags to the music file!</string>
+    <string name="pref_header_advanced">Advanced</string>
+    <string name="pref_header_blacklist">Blacklist</string>
+    <string name="no_playing_queue">No songs playing</string>
+    <string name="nothing_to_see">Nothing to see</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9cfed1a10..4deecbd47 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,23 +6,14 @@
 
     <style name="Theme.RetroMusic.Black" parent="Theme.RetroMusic.Base.Black" />
 
-    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive">
-        <item name="android:windowBackground">?colorSurface</item>
-    </style>
-
-    <style name="Theme.RetroMusic.MD3" parent="@style/Theme.Material3.DayNight.NoActionBar">
-        <item name="roundSelector">@drawable/round_selector</item>
-        <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-    </style>
+    <style name="Theme.RetroMusic.FollowSystem" parent="Theme.RetroMusic.Base.Adaptive" />
 
     <style name="Theme.RetroMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
 
     <style name="Theme.RetroMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
 
     <style name="OverFlowButton">
-        <item name="srcCompat">@drawable/ic_more_vert</item>
+        <item name="srcCompat">@drawable/ic_more_vert_white_24dp</item>
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">48dp</item>
         <item name="android:scaleType">center</item>
@@ -32,21 +23,24 @@
     </style>
 
     <style name="MusicProgressSlider" parent="MusicProgressSliderParent">
-        <item name="android:padding">0dp</item>
+        <item name="android:thumbOffset">0dp</item>
     </style>
 
-    <style name="Toolbar" parent="Widget.Material3.Toolbar">
+    <style name="Toolbar" parent="Widget.MaterialComponents.Toolbar">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">48dp</item>
         <item name="popupTheme">?toolbarPopupTheme</item>
         <item name="android:transitionName" tools:ignore="NewApi">toolbar</item>
         <item name="layout_collapseMode">pin</item>
         <item name="contentInsetStartWithNavigation">0dp</item>
         <item name="contentInsetStart">0dp</item>
         <item name="titleMarginStart">16dp</item>
+        <item name="android:fontFamily">@font/circular</item>
     </style>
 
-    <style name="mcab_overflow_style" parent="Widget.AppCompat.ActionButton.Overflow">
-        <item name="srcCompat">@drawable/ic_more_vert</item>
-        <item name="android:tint">?colorSurface</item>
+
+    <style name="ToolbarTextAppearanceSearch" parent="ThemeOverlay.MaterialComponents.Toolbar.Surface">
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="ToolbarTextAppearanceNormal">
@@ -57,6 +51,16 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
+    <style name="BigTitleTextAppearanceToolbar">
+        <item name="android:textAppearance">@style/TextAppearance.MaterialComponents.Headline6
+        </item>
+        <item name="android:fontFamily">@font/circular_std_medium</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_gravity">center</item>
+        <item name="android:gravity">center</item>
+    </style>
+
     <style name="SubTitleTextAppearance">
         <item name="android:textAppearance">@style/TextViewOverline</item>
         <item name="android:layout_gravity">start|center_vertical</item>
@@ -65,47 +69,86 @@
         <item name="android:layout_height">wrap_content</item>
     </style>
 
-    <style name="BottomSheetItemTextAppearance" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
-        <item name="android:textSize">13sp</item>
+    <style name="BottomSheetItemTextAppearanceInactive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="android:textSize">14sp</item>
+    </style>
+
+    <style name="BottomSheetItemTextAppearanceActive" parent="Widget.MaterialComponents.BottomNavigationView.Colored">
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="android:textSize">14sp</item>
     </style>
 
     <style name="Fab" parent="FabParent" />
 
-    <style name="TextViewNormal" parent="">
+    <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
+        <item name="android:textAllCaps">false</item>
+        <item name="textAllCaps">false</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+
+    <style name="TabLayoutStyle" parent="Base.Widget.Design.TabLayout">
+        <item name="tabIndicator">@drawable/tab_indicator</item>
+        <item name="tabIndicatorFullWidth">false</item>
+        <item name="tabMode">fixed</item>
+        <item name="tabIndicatorAnimationDuration">@integer/anim_duration_medium</item>
+        <item name="tabIndicatorHeight">4dp</item>
+        <item name="tabInlineLabel">true</item>
+        <item name="tabTextAppearance">@style/TabTextAppearance</item>
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+    </style>
+
+    <style name="ErrorHandlingTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
+
+    </style>
+
+    <style name="TextViewNormal">
+        <item name="android:fontFamily">@font/circular</item>
         <item name="android:textSize">14sp</item>
     </style>
 
-    <style name="TextViewNormalCompress" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="android:textSize">14sp</item>
+    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4">
+        <item name="android:fontFamily">@font/circular</item>
     </style>
 
-    <style name="TextViewHeadline4.Compress" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="android:textSize">32sp</item>
+    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5">
+        <item name="android:fontFamily">@font/circular</item>
     </style>
 
-    <style name="TextViewHeadline4" parent="TextAppearance.MaterialComponents.Headline4" />
+    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
-    <style name="TextViewHeadline5" parent="TextAppearance.MaterialComponents.Headline5" />
+    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
-    <style name="TextViewCaption" parent="TextAppearance.MaterialComponents.Caption" />
+    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
-    <style name="TextViewHeadline6" parent="TextAppearance.MaterialComponents.Headline6" />
+    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
-    <style name="TextViewHeadline3" parent="TextAppearance.MaterialComponents.Headline3" />
+    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
-    <style name="TextViewHeadline2" parent="TextAppearance.MaterialComponents.Headline2" />
+    <style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1">
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="lineHeightHint">24sp</item>
+    </style>
 
-    <style name="TextViewSubtitle1" parent="TextAppearance.MaterialComponents.Subtitle1" />
+    <style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2">
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="lineHeightHint">24sp</item>
+    </style>
 
-    <style name="TextViewSubtitle2" parent="TextAppearance.MaterialComponents.Subtitle2" />
-
-    <style name="TextViewBody1" parent="TextAppearance.MaterialComponents.Body1" />
-
-    <style name="TextViewButton" parent="TextAppearance.MaterialComponents.Button" />
-
-    <style name="TextViewBody2" parent="TextAppearance.MaterialComponents.Body2" />
-
-    <style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline" />
+    <style name="TextViewOverline" parent="TextAppearance.MaterialComponents.Overline">
+        <item name="android:fontFamily">@font/circular</item>
+    </style>
 
     <style name="TopCornerCardView">
         <item name="cornerFamilyTopLeft">rounded</item>
@@ -114,151 +157,27 @@
         <item name="cornerSizeTopRight">16dp</item>
     </style>
 
-    <style name="ClassicThemeOverLay">
-        <item name="cornerFamily">cut</item>
-        <item name="cornerSize">0dp</item>
+    <style name="ToolbarCornerCardView">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSize">8dp</item>
     </style>
 
-    <style name="Theme.RetroMusic.SplashScreen" parent="Theme.AppCompat.DayNight.NoActionBar">
+    <style name="TopCornerCardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
+        <item name="shapeAppearanceOverlay">@style/ShapeAppearanceOverlayCardViewTopCorners</item>
+    </style>
+
+
+    <style name="ShapeAppearanceOverlayCardViewTopCorners" parent="">
+        <item name="cornerFamily">rounded</item>
+        <item name="cornerSizeTopRight">16dp</item>
+        <item name="cornerSizeTopLeft">16dp</item>
+        <item name="cornerSizeBottomRight">0dp</item>
+        <item name="cornerSizeBottomLeft">0dp</item>
+    </style>
+
+    <style name="SplashTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="android:windowBackground">@drawable/splash</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
 
-    <style name="MaterialPopupMenuStyle" parent="Widget.Material3.PopupMenu">
-        <item name="android:popupBackground">@drawable/popup_background</item>
-    </style>
-
-    <style name="CenteredCheckBoxTheme">
-        <item name="checkboxStyle">@style/CheckBoxStyle</item>
-    </style>
-
-    <style name="CheckBoxStyle" parent="@style/Widget.AppCompat.CompoundButton.CheckBox">
-        <item name="android:gravity">center_vertical|end</item>
-    </style>
-
-    <style name="MaterialAlertDialogTheme" parent="ThemeOverlay.Material3.MaterialAlertDialog" />
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Button" parent="Widget.MaterialComponents.Button.TextButton">
-        <item name="android:textSize">16sp</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:padding">0dp</item>
-    </style>
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Body" parent="MaterialAlertDialog.Material3.Body.Text">
-        <item name="android:textAppearance">@style/TextViewBody1</item>
-        <item name="android:paddingTop">16dp</item>
-    </style>
-
-    <style name="AppTextAppearance.MaterialAlertDialog.Title" parent="MaterialAlertDialog.Material3.Title.Text">
-        <item name="android:textAppearance">@style/TextViewHeadline6</item>
-        <item name="android:textStyle">bold</item>
-    </style>
-
-    <style name="MaterialButtonTheme" parent="Widget.Material3.Button">
-        <item name="cornerRadius">6dp</item>
-        <item name="iconGravity">textStart</item>
-        <item name="iconTint">?attr/colorControlNormal</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textAppearance">@style/TextViewNormal</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:paddingTop">@dimen/button_padding_vertical</item>
-        <item name="android:paddingBottom">@dimen/button_padding_vertical</item>
-    </style>
-
-    <style name="BottomSheetStyle" parent="Widget.Material3.BottomSheet">
-        <item name="paddingBottomSystemWindowInsets">false</item>
-        <item name="android:maxWidth">@empty</item>
-        <item name="shapeAppearance">?attr/shapeAppearanceCornerMedium</item>
-    </style>
-
-    <style name="MaterialCardViewStroke">
-        <item name="cardUseCompatPadding">true</item>
-        <item name="strokeWidth">1dp</item>
-        <item name="strokeColor">?android:attr/colorButtonNormal</item>
-        <item name="cardElevation">0dp</item>
-    </style>
-
-    <!-- This will set the fade in animation on all your activities by default -->
-    <style name="WindowAnimationTransition">
-        <item name="android:windowEnterAnimation">@android:anim/fade_in</item>
-        <item name="android:windowExitAnimation">@android:anim/fade_out</item>
-    </style>
-
-    <style name="circleImageView" parent="ShapeAppearance.MaterialComponents">
-        <item name="cornerSize">40dp</item>
-    </style>
-
-    <style name="SearchChipStyle" parent="Widget.Material3.Chip.Filter">
-        <item name="android:checked">false</item>
-        <item name="android:textSize">16sp</item>
-        <item name="checkedIconVisible">false</item>
-        <item name="chipEndPadding">10dp</item>
-        <item name="chipMinHeight">40dp</item>
-        <item name="chipStartPadding">10dp</item>
-    </style>
-    <!--Bottom Sheet Dialog Style-->
-    <style name="BottomSheetDialogStyle" parent="Theme.Design.BottomSheetDialog">
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSoftInputMode">adjustResize|stateVisible</item>
-    </style>
-
-    <style name="HomeActionButton" parent="Widget.Material3.Button.ElevatedButton.Icon">
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
-        <item name="android:textColor">?attr/colorOnSurface</item>
-        <item name="shapeAppearanceOverlay">
-            @style/ShapeAppearanceOverlay.Material3.FloatingActionButton
-        </item>
-        <item name="iconPadding">16dp</item>
-        <item name="iconGravity">start</item>
-        <item name="android:gravity">start|center_vertical</item>
-        <item name="android:textAppearance">@style/TextViewBody2</item>
-    </style>
-
-    <style name="CarTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="colorPrimaryDark">@color/md_deep_purple_700</item>
-        <item name="colorAccent">@color/md_deep_purple_A400</item>
-        <item name="colorPrimary">@color/md_deep_purple_500</item>
-    </style>
-
-    <style name="Theme.RetroMusic.Dialog" parent="Theme.Material3.DayNight.Dialog">
-        <item name="windowNoTitle">true</item>
-        <item name="android:windowIsFloating">true</item>
-        <item name="android:windowIsTranslucent">true</item>
-        <item name="android:windowBackground">@drawable/rounded_drawable</item>
-        <item name="android:windowFrame">@null</item>
-        <item name="background">@color/transparent</item>
-    </style>
-
-    <style name="FontThemeOverlay">
-        <item name="fontFamily">@font/manrope</item>
-        <item name="android:fontFamily">@font/manrope</item>
-    </style>
-
-    <style name="CircleFABOverlay">
-        <item name="floatingActionButtonStyle">
-            @style/Widget.MaterialComponents.FloatingActionButton
-        </item>
-    </style>
-
-    <style name="RoundedFABOverlay">
-        <item name="floatingActionButtonStyle">
-            @style/Widget.Material3.FloatingActionButton.Primary
-        </item>
-    </style>
-
-    <style name="Theme.AppWidget" parent="">
-        <item name="colorSurface">@color/md_black_1000</item>
-    </style>
-
-    <style name="ShapeAppearance.Material3.Circle" parent="">
-        <item name="cornerSize">50%</item>
-    </style>
-
-    <style name="Widget.Retro.Slider" parent="Widget.Material3.Slider">
-        <item name="labelBehavior">gone</item>
-        <item name="thumbRadius">6dp</item>
-        <item name="haloRadius">18dp</item>
-    </style>
 </resources>
diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml
index 672abc62b..7e6c0ec82 100644
--- a/app/src/main/res/values/styles_parents.xml
+++ b/app/src/main/res/values/styles_parents.xml
@@ -1,68 +1,87 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.Material3.DayNight.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
+    <style name="Theme.RetroMusic.Base.Adaptive" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
+        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
-        <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
-        <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="popupWindowStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>T
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="android:windowActionModeOverlay">false</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base" parent="Theme.Material3.Dark.NoActionBar">
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
+    <style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_color_button_text">@color/md_white_1000</item>
+        <item name="md_background_color">@color/darkColorSurface</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
+        <item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
+
+        <!--Manual setting colors-->
         <item name="colorSurface">@color/darkColorSurface</item>
-        <item name="android:windowBackground">?colorSurface</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlay</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Black" parent="Theme.Material3.Dark.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_background_color">@color/blackColorSurface</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
         <item name="colorSurface">@color/blackColorSurface</item>
-        <item name="android:windowBackground">?colorSurface</item>
         <item name="colorOnBackground">@color/blackColorSurface</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Dark</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayDark</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
-    <style name="Theme.RetroMusic.Base.Light" parent="Theme.Material3.Light.NoActionBar">
+    <style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
+        <item name="md_font_title">@font/circular</item>
+        <item name="md_font_body">@font/circular</item>
+        <item name="md_font_button">@font/circular</item>
+        <item name="md_color_button_text">@color/md_black_1000</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
         <item name="roundSelector">@drawable/round_selector</item>
         <item name="rectSelector">@drawable/rect_selector</item>
-        <item name="toolbarPopupTheme">@style/ThemeOverlay.Material3.Light</item>
-        <item name="android:windowBackground">?colorSurface</item>
+        <item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
+        <item name="android:windowBackground">@color/md_white_1000</item>
         <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
+        <item name="android:windowActivityTransitions">true</item>
+        <item name="android:fontFamily">@font/circular</item>
+        <item name="windowActionBar">false</item>
         <item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
         <item name="materialButtonStyle">@style/MaterialButtonTheme</item>
-        <item name="popupMenuStyle">@style/MaterialPopupMenuStyle</item>
-        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
-        <item name="elevationOverlayColor">@color/elevationOverlayLight</item>
-        <item name="popupMenuBackground">@drawable/popup_background</item>
-        <item name="windowActionModeOverlay">true</item>
     </style>
 
+
     <style name="MusicProgressSliderParent">
         <item name="android:progressDrawable">@android:color/transparent</item>
         <item name="android:layout_width">match_parent</item>
@@ -80,4 +99,20 @@
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
     </style>
+
+
+    <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.Dialog">
+        <item name="android:dialogCornerRadius" tools:targetApi="p">12dp</item>
+    </style>
+
+    <style name="MaterialButtonTheme" parent="Widget.MaterialComponents.Button">
+        <item name="cornerRadius">8dp</item>
+        <item name="iconGravity">textStart</item>
+        <item name="iconTint">?attr/colorControlNormal</item>
+        <item name="android:textColor">?android:attr/textColorPrimary</item>
+        <item name="android:textAppearance">@style/TextViewNormal</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:paddingTop">@dimen/button_padding_vertical</item>
+        <item name="android:paddingBottom">@dimen/button_padding_vertical</item>
+    </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index c6369ab2a..88b7edd3d 100755
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -7,5 +7,7 @@
     <string name="transition_artist_image" translatable="false">artist_image_transition</string>
     <string name="transition_artist_name" translatable="false" tools:keep="@string/transition_artist_name">artist_image_transition</string>
     <string name="transition_artist_text" translatable="false" tools:keep="@string/transition_artist_text">artist_image_transition</string>
+    <string name="transition_mini_player" translatable="false">mini_player_transition</string>
+    <string name="transition_toolbar" translatable="false">toolbar_transition</string>
     <string name="transition_lyrics" translatable="false">toolbar_transition</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/xml/allowed_media_browser_callers.xml b/app/src/main/res/xml/allowed_media_browser_callers.xml
deleted file mode 100644
index a1b85d3a8..000000000
--- a/app/src/main/res/xml/allowed_media_browser_callers.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-Copyright (C) 2017 The Android Open Source Project
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-   http://www.apache.org/licenses/LICENSE-2.0
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-<!--
-  If you add a new signing_certificate to allowed_callers and you don't know its signature,
-  PackageValidator by default will print to logcat (INFO level) a message with the proper base64
-  version of the caller's certificate that has not been validated. You can copy from logcat and
-  paste it here.
-  Spaces and newlines are ignored.
--->
-<allowed_callers>
-    <signature name="Android Auto" package="com.google.android.projection.gearhead">
-        <key release="false">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-        <key release="false">70:81:1a:3e:ac:fd:2e:83:e1:8d:a9:bf:ed:e5:2d:f1:6c:e9:1f:2e:69:a4:4d:21:f1:8a:b6:69:91:13:07:71</key>
-        <key release="true">fd:b0:0c:43:db:de:8b:51:cb:31:2a:a8:1d:3b:5f:a1:77:13:ad:b9:4b:28:f5:98:d7:7f:8e:b8:9d:ac:ee:df</key>
-    </signature>
-
-    <signature name="WearOS" package="com.google.android.wearable.app">
-        <key release="false">69:d0:72:16:9a:2c:6b:2f:5a:cc:59:0c:e4:33:a1:1a:c3:df:55:1a:df:ee:5d:5f:63:c0:83:b7:22:76:2e:19</key>
-        <key release="true">85:cd:59:73:54:1b:e6:f4:77:d8:47:a0:bc:c6:aa:25:27:68:4b:81:9c:d5:96:85:29:66:4c:b0:71:57:b6:fe</key>
-    </signature>
-
-    <signature name="Android Auto Simulator" package="com.google.android.autosimulator">
-        <key release="true">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-    </signature>
-
-    <signature name="Google" package="com.google.android.googlequicksearchbox">
-        <key release="false">19:75:b2:f1:71:77:bc:89:a5:df:f3:1f:9e:64:a6:ca:e2:81:a5:3d:c1:d1:d5:9b:1d:14:7f:e1:c8:2a:fa:00</key>
-        <key release="true">f0:fd:6c:5b:41:0f:25:cb:25:c3:b5:33:46:c8:97:2f:ae:30:f8:ee:74:11:df:91:04:80:ad:6b:2d:60:db:83</key>
-    </signature>
-</allowed_callers>
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_big_info.xml b/app/src/main/res/xml/app_widget_big_info.xml
index 3f37d6309..e219579c7 100755
--- a/app/src/main/res/xml/app_widget_big_info.xml
+++ b/app/src/main/res/xml/app_widget_big_info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:initialLayout="@layout/app_widget_big"
     android:minWidth="@dimen/app_widget_big_min_width"
     android:minHeight="@dimen/app_widget_big_min_height"
-    android:previewImage="@drawable/widget_big_info"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
+
+    <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_card_info.xml b/app/src/main/res/xml/app_widget_card_info.xml
index 7298e5eac..d5f7a6220 100755
--- a/app/src/main/res/xml/app_widget_card_info.xml
+++ b/app/src/main/res/xml/app_widget_card_info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:initialLayout="@layout/app_widget_card"
     android:minWidth="@dimen/app_widget_card_min_width"
     android:minHeight="@dimen/app_widget_small_min_height"
-    android:previewImage="@drawable/widget_card_info"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
+
+    <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_circle_info.xml b/app/src/main/res/xml/app_widget_circle_info.xml
deleted file mode 100644
index e1b5cf6ed..000000000
--- a/app/src/main/res/xml/app_widget_circle_info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:initialLayout="@layout/app_widget_circle"
-    android:minResizeWidth="@dimen/app_widget_circle_min_width"
-    android:minResizeHeight="@dimen/app_widget_circle_min_height"
-    android:minWidth="@dimen/app_widget_circle_min_width"
-    android:minHeight="@dimen/app_widget_circle_min_height"
-    android:maxResizeHeight="@dimen/app_widget_circle_max_height"
-    android:maxResizeWidth="@dimen/app_widget_circle_max_width"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen"
-    tools:ignore="UnusedAttribute" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_classic_info.xml b/app/src/main/res/xml/app_widget_classic_info.xml
index 70eb5376f..0ec4b8247 100755
--- a/app/src/main/res/xml/app_widget_classic_info.xml
+++ b/app/src/main/res/xml/app_widget_classic_info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:initialLayout="@layout/app_widget_classic"
     android:minWidth="@dimen/app_widget_classic_min_width"
     android:minHeight="@dimen/app_widget_classic_min_height"
-    android:previewImage="@drawable/widget_classic"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
+
+    <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_md3_info.xml b/app/src/main/res/xml/app_widget_md3_info.xml
deleted file mode 100644
index 70eb5376f..000000000
--- a/app/src/main/res/xml/app_widget_md3_info.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/app_widget_classic"
-    android:minWidth="@dimen/app_widget_classic_min_width"
-    android:minHeight="@dimen/app_widget_classic_min_height"
-    android:previewImage="@drawable/widget_classic"
-    android:resizeMode="horizontal|vertical"
-    android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_small_info.xml b/app/src/main/res/xml/app_widget_small_info.xml
index 0665451f5..6a93e85d9 100644
--- a/app/src/main/res/xml/app_widget_small_info.xml
+++ b/app/src/main/res/xml/app_widget_small_info.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:initialLayout="@layout/app_widget_small"
     android:minWidth="@dimen/app_widget_small_min_width"
     android:minHeight="@dimen/app_widget_small_min_height"
-    android:previewImage="@drawable/widget_small"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
-    android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
+    android:widgetCategory="keyguard|home_screen"
+    tools:ignore="UnusedAttribute" />
+
+    <!--android:previewImage="@drawable/app_widget_classic"-->
\ No newline at end of file
diff --git a/app/src/main/res/xml/app_widget_text.xml b/app/src/main/res/xml/app_widget_text.xml
index 181b8f9d0..c6ff62fb7 100644
--- a/app/src/main/res/xml/app_widget_text.xml
+++ b/app/src/main/res/xml/app_widget_text.xml
@@ -3,7 +3,6 @@
     android:initialLayout="@layout/app_widget_text"
     android:minWidth="@dimen/app_widget_small_min_width"
     android:minHeight="@dimen/app_widget_small_min_height"
-    android:previewImage="@drawable/widget_text"
     android:resizeMode="horizontal|vertical"
     android:updatePeriodMillis="0"
     android:widgetCategory="keyguard|home_screen" />
\ No newline at end of file
diff --git a/app/src/main/res/xml/automotive_app_desc.xml b/app/src/main/res/xml/automotive_app_desc.xml
deleted file mode 100644
index 0f739ff8f..000000000
--- a/app/src/main/res/xml/automotive_app_desc.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<automotiveApp>
-    <uses name="media" />
-</automotiveApp>
\ No newline at end of file
diff --git a/app/src/main/res/xml/locales_config.xml b/app/src/main/res/xml/locales_config.xml
deleted file mode 100644
index d11dda98d..000000000
--- a/app/src/main/res/xml/locales_config.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
-    <locale android:name="en" />
-    <locale android:name="ar-SA" />
-    <locale android:name="eu-ES" />
-    <locale android:name="my-MM" />
-    <locale android:name="zh-CN" />
-    <locale android:name="zh-HK" />
-    <locale android:name="zh-TW" />
-    <locale android:name="hr" />
-    <locale android:name="cs-cz" />
-    <locale android:name="da-DK" />
-    <locale android:name="nl-NL" />
-    <locale android:name="en" />
-    <locale android:name="fil-PH" />
-    <locale android:name="fr" />
-    <locale android:name="de" />
-    <locale android:name="el" />
-    <locale android:name="hi" />
-    <locale android:name="hu" />
-    <locale android:name="in" />
-    <locale android:name="it" />
-    <locale android:name="ja" />
-    <locale android:name="kn" />
-    <locale android:name="ko" />
-    <locale android:name="kmr-TR" />
-    <locale android:name="lv-LV" />
-    <locale android:name="ml" />
-    <locale android:name="fa" />
-    <locale android:name="pl" />
-    <locale android:name="pt-BR" />
-    <locale android:name="pt-PT" />
-    <locale android:name="ro" />
-    <locale android:name="ru" />
-    <locale android:name="sr" />
-    <locale android:name="es" />
-    <locale android:name="es-419" />
-    <locale android:name="sv" />
-    <locale android:name="ta" />
-    <locale android:name="te" />
-    <locale android:name="th-TH" />
-    <locale android:name="tr" />
-    <locale android:name="uk" />
-    <locale android:name="vi" />
-</locale-config>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index 52cb14c3e..c6ef3c1b7 100755
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -1,26 +1,24 @@
 <?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.ATEPreferenceCategory
+        android:layout="@layout/preference_category_title"
+        android:title="@string/pref_header_blacklist">
 
-    <code.name.monkey.retromusic.preferences.BlacklistPreference
-        android:key="blacklist"
-        android:layout="@layout/list_item_view"
-        android:summary="@string/pref_summary_blacklist"
-        android:title="@string/pref_header_blacklist"
-        app:icon="@drawable/ic_music_note_off" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="whitelist_music"
-        android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_summary_whitelist"
-        android:title="@string/pref_title_whitelist" />
+        <code.name.monkey.retromusic.preferences.BlacklistPreference
+            android:key="blacklist"
+            android:layout="@layout/list_item_view"
+            android:summary="@string/pref_summary_blacklist"
+            android:title="@string/pref_title_blacklist"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_music_note_off_white_24dp" />
 
+    </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_playlists">
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
             android:defaultValue="this_month"
             android:entries="@array/pref_playlists_last_added_interval_titles"
             android:entryValues="@array/pref_playlists_last_added_interval_values"
@@ -29,7 +27,8 @@
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
             android:title="@string/pref_title_last_added_interval"
-            app:icon="@drawable/ic_playlist_add" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_playlist_add_white_24dp" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
@@ -43,7 +42,8 @@
             android:max="60"
             android:summary="@string/pref_filter_song_summary"
             android:title="@string/pref_filter_song_title"
-            app:icon="@drawable/ic_filter_song"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_filter_song_white_24dp"
             app:showSeekBarValue="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
@@ -52,7 +52,8 @@
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_keep_pause_on_zero_volume_summary"
             android:title="@string/pref_keep_pause_on_zero_volume_title"
-            app:icon="@drawable/ic_pause" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_pause_white_24dp" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
@@ -60,18 +61,19 @@
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_keep_screen_on_summary"
             android:title="@string/pref_keep_screen_on_title"
-            app:icon="@drawable/ic_settings_brightness" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_settings_brigntness_white_24dp" />
 
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
+            android:defaultValue="16"
+            android:key="dialog_corner"
+            android:layout="@layout/list_item_view_seekbar"
+            android:max="50"
+            android:summary="@string/pref_dialog_corner_summary"
+            android:title="@string/pref_dialog_corner_title"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_rounded_corner"
+            app:showSeekBarValue="true" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-        android:defaultValue="auto"
-        android:entries="@array/pref_language_names"
-        android:entryValues="@array/pref_language_codes"
-        android:key="language_name"
-        android:layout="@layout/list_item_view"
-        android:negativeButtonText="@null"
-        android:positiveButtonText="@null"
-        android:title="@string/pref_language_name"
-        app:icon="@drawable/ic_language" />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_audio.xml b/app/src/main/res/xml/pref_audio.xml
index 6bf54069c..50de28b13 100755
--- a/app/src/main/res/xml/pref_audio.xml
+++ b/app/src/main/res/xml/pref_audio.xml
@@ -2,42 +2,29 @@
 <androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <code.name.monkey.retromusic.preferences.DurationPreference
-        android:defaultValue="0"
-        android:key="audio_fade_duration"
-        android:layout="@layout/list_item_view"
-        android:summary="@string/pref_summary_audio_fade"
-        android:title="@string/pref_title_audio_fade" />
-
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="manage_audio_focus"
+        android:defaultValue="true"
+        android:key="audio_ducking"
         android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_summary_manage_audio_focus"
-        android:title="@string/pref_title_manage_audio_focus" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
-        android:defaultValue="0"
-        android:key="cross_fade_duration"
-        android:layout="@layout/list_item_view_seekbar"
-        app:ateKey_pref_unit="s"
-        android:max="12"
-        android:summary="@string/pref_summary_cross_fade"
-        android:title="@string/pref_title_cross_fade"
-        app:showSeekBarValue="true" />
+        android:summary="@string/pref_summary_audio_ducking"
+        android:title="@string/pref_title_audio_ducking"
+        app:enableCopying="true"
+        app:icon="@drawable/ic_volume_down_white_24dp" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
         android:key="gapless_playback"
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_gapless_playback"
-        android:title="@string/pref_title_gapless_playback" />
+        android:title="@string/pref_title_gapless_playback"
+        app:enableCopying="true" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreference
         android:key="equalizer"
         android:layout="@layout/list_item_view_no_title"
         android:title="@string/equalizer"
-        app:icon="@drawable/ic_equalizer" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_equalizer_white_24dp" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
@@ -45,13 +32,16 @@
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_toggle_headset"
         android:title="@string/pref_title_toggle_toggle_headset"
-        app:icon="@drawable/ic_play_arrow" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_play_arrow_white_32dp" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="false"
-        android:key="bluetooth_playback"
+        android:key="toggle_shuffle"
         android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_summary_bluetooth_playback"
-        android:title="@string/pref_title_bluetooth_playback" />
+        android:summary="@string/pref_summary_toggle_shuffle"
+        android:title="@string/pref_title_toggle_toggle_shuffle"
+        app:enableCopying="true"
+        app:icon="@drawable/ic_shuffle_white_24dp" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index c27bfbe14..eb46f3e9a 100755
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -5,80 +5,68 @@
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_general">
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-            android:defaultValue="auto"
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
+            android:defaultValue="dark"
             android:entries="@array/pref_general_theme_list_titles"
             android:entryValues="@array/pref_general_theme_list_values"
             android:key="general_theme"
             android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
             android:title="@string/pref_title_general_theme"
-            app:icon="@drawable/ic_palette_outline" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_color_lens_white_24dp" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:key="black_theme"
             android:layout="@layout/list_item_view_switch_no_title"
-            android:title="@string/black_theme_name" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="@bool/md3_enabled"
-            android:disableDependentsState="true"
-            android:key="material_you"
-            android:layout="@layout/list_item_view_switch_no_title"
-            android:title="@string/pref_title_md3"
-            app:isPreferenceVisible="@bool/md3_available" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="custom_font"
-            android:layout="@layout/list_item_view_switch_no_title"
-            android:title="@string/pref_title_custom_font" />
+            android:title="@string/black_theme_name"
+            app:enableCopying="true" />
 
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:key="category_color"
         android:layout="@layout/preference_category_title"
         android:title="@string/colors">
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="wallpaper_accent"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_wallpaper_accent"
-            android:title="@string/pref_title_wallpaper_accent" />
-
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEColorPreference
-            android:dependency="material_you"
             android:key="accent_color"
-            android:layout="@layout/list_item_color_view"
+            android:layout="@layout/list_item_view"
             android:persistent="false"
             android:summary="@string/accent_color_desc"
             android:title="@string/accent_color"
-            app:icon="@drawable/ic_colorize" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_colorize_white_24dp" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
-            android:dependency="material_you"
             android:key="desaturated_color"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_desaturated_color"
-            android:title="@string/pref_title_desaturated_color" />
+            android:title="@string/pref_title_desaturated_color"
+            app:enableCopying="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="adaptive_color_app"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_colored_app"
-            android:title="@string/pref_title_colored_app" />
+            android:title="@string/pref_title_colored_app"
+            app:enableCopying="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
-            android:dependency="material_you"
             android:key="should_color_app_shortcuts"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_colored_app_shortcuts"
-            android:title="@string/pref_title_app_shortcuts" />
+            android:title="@string/pref_title_app_shortcuts"
+            app:enableCopying="true" />
+
+        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
+            android:defaultValue="false"
+            android:key="dominant_color"
+            android:layout="@layout/list_item_view_switch"
+            android:summary="@string/pref_summary_dominant_color"
+            android:title="@string/pref_title_toggle_dominant_color"
+            app:enableCopying="true" />
+
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_images.xml b/app/src/main/res/xml/pref_images.xml
index 1318029c3..bc521a666 100755
--- a/app/src/main/res/xml/pref_images.xml
+++ b/app/src/main/res/xml/pref_images.xml
@@ -3,11 +3,20 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="true"
+        android:defaultValue="false"
         android:key="ignore_media_store_artwork"
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_ignore_media_store_artwork"
         android:title="@string/pref_title_ignore_media_store_artwork"
-        app:icon="@drawable/ic_image" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_image_white_24dp" />
 
+    <code.name.monkey.retromusic.preferences.MaterialListPreference
+        android:defaultValue="only_wifi"
+        android:entries="@array/pref_auto_download_images_titles"
+        android:entryValues="@array/pref_auto_download_images_values"
+        android:key="auto_download_images_policy"
+        android:layout="@layout/list_item_view"
+        android:title="@string/pref_title_auto_download_artist_images"
+        app:enableCopying="true" />
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index 6f55aa5fa..c293e2ded 100755
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -7,13 +7,15 @@
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_classic_notification"
         android:title="@string/pref_title_classic_notification"
-        app:icon="@drawable/ic_notification_classic" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_cellphone_lock_white_24dp" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
         android:defaultValue="true"
         android:key="colored_notification"
         android:layout="@layout/list_item_view_switch"
         android:summary="@string/pref_summary_colored_notification"
-        android:title="@string/pref_title_colored_notification" />
+        android:title="@string/pref_title_colored_notification"
+        app:enableCopying="true" />
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index 63f4e7403..30f466518 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -6,48 +6,8 @@
         android:key="now_playing_screen_id"
         android:layout="@layout/list_item_view"
         android:title="@string/pref_title_now_playing_screen_appearance"
-        app:icon="@drawable/ic_play_circle_filled" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="extra_song_info"
-        android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_summary_extra_song_info"
-        android:title="@string/pref_title_extra_song_info" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="snowfall"
-        android:layout="@layout/list_item_view_switch_no_title"
-        android:title="@string/pref_snow_fall_title" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-        android:defaultValue="0"
-        android:entries="@array/pref_lyrics_type_entries"
-        android:entryValues="@array/pref_lyrics_type_values"
-        android:key="lyrics_type"
-        android:layout="@layout/list_item_view"
-        android:title="@string/pref_title_lyrics_type" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="screen_on_lyrics"
-        android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_keep_screen_on_summary"
-        android:title="@string/pref_title_lyrics_screen_on" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="false"
-        android:key="circle_play_button"
-        android:layout="@layout/list_item_view_switch_no_title"
-        android:title="@string/pref_title_circle_button" />
-
-    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-        android:defaultValue="true"
-        android:key="swipe_anywhere_now_playing"
-        android:layout="@layout/list_item_view_switch"
-        android:summary="@string/pref_summary_swipe_anywhere_now_playing"
-        android:title="@string/pref_title_swipe_anywhere_now_playing" />
+        app:enableCopying="true"
+        app:icon="@drawable/ic_play_circle_filled_white_24dp" />
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
@@ -57,20 +17,23 @@
             android:key="album_cover_style_id"
             android:layout="@layout/list_item_view"
             android:title="@string/pref_title_album_cover_style"
-            app:icon="@drawable/ic_image" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_image_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
             android:defaultValue="0"
-            android:entries="@array/pref_album_cover_transform_entries"
+            android:entries="@array/pref_album_cover_transform_entities"
             android:entryValues="@array/pref_album_cover_transform_values"
             android:key="album_cover_transform"
             android:layout="@layout/list_item_view"
-            android:title="@string/pref_title_album_cover_transform" />
+            android:title="@string/pref_title_album_cover_transform"
+            app:enableCopying="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:layout="@layout/list_item_view_switch"
             app:defaultValue="false"
-            app:icon="@drawable/ic_view_carousel"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_view_carousel_black_24dp"
             app:key="carousel_effect"
             app:summary="@string/pref_summary_carousel_effect"
             app:title="@string/pref_title_toggle_carousel_effect" />
@@ -83,43 +46,31 @@
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:layout="@layout/list_item_view_switch"
             app:defaultValue="false"
-            app:key="swipe_to_dismiss"
-            app:summary="@string/pref_summary_swipe_to_dismiss"
-            app:title="@string/pref_title_swipe_to_dismiss" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:layout="@layout/list_item_view_switch"
-            app:defaultValue="false"
-            app:icon="@drawable/ic_play_arrow"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_play_arrow_white_32dp"
             app:key="toggle_add_controls"
             app:summary="@string/pref_summary_extra_controls"
             app:title="@string/pref_title_extra_controls" />
 
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:layout="@layout/list_item_view_switch"
             app:defaultValue="false"
-            app:icon="@drawable/ic_volume_up"
+            app:icon="@drawable/ic_volume_up_white_24dp"
             app:key="toggle_volume"
             app:summary="@string/pref_summary_toggle_volume"
             app:title="@string/pref_title_toggle_volume" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:layout="@layout/list_item_view_switch"
-            app:defaultValue="false"
-            app:icon="@drawable/ic_expand_less"
-            app:key="expand_now_playing_panel"
-            app:summary="@string/pref_summary_expand_now_playing_panel"
-            app:title="@string/pref_title_expand_now_playing_panel" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
-            android:defaultValue="12"
-            android:key="new_blur_amount"
-            android:layout="@layout/list_item_view_seekbar"
-            android:max="25"
-            android:summary="@string/pref_blur_amount_summary"
-            android:title="@string/pref_blur_amount_title"
-            app:ateKey_pref_unit="px"
-            app:icon="@drawable/ic_blur_on"
-            app:showSeekBarValue="true" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
+
+    <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
+        android:defaultValue="12"
+        android:key="new_blur_amount"
+        android:layout="@layout/list_item_view_seekbar"
+        android:max="25"
+        android:summary="@string/pref_blur_amount_summary"
+        android:title="@string/pref_blur_amount_title"
+        app:enableCopying="true"
+        app:icon="@drawable/ic_blur_on_white_24dp"
+        app:showSeekBarValue="true" />
+
 </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 3517e949b..405383069 100644
--- a/app/src/main/res/xml/pref_ui.xml
+++ b/app/src/main/res/xml/pref_ui.xml
@@ -3,9 +3,33 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
-        app:title="@string/home">
+        app:title="@string/grid_style_label">
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
+            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:layout="@layout/list_item_view"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_album_grid_style"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_album_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
+            android:defaultValue="0"
+            android:entries="@array/pref_grid_style_list_titles"
+            android:entryValues="@array/pref_grid_style_list_values"
+            android:key="artist_grid_style"
+            android:layout="@layout/list_item_view"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/pref_title_artist_grid_style"
+            app:enableCopying="true"
+            app:icon="@drawable/ic_artist_white_24dp" />
+
+
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
             android:defaultValue="0"
             android:entries="@array/pref_home_grid_style_list_titles"
             android:entryValues="@array/pref_home_grid_style_list_values"
@@ -14,17 +38,8 @@
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
             android:title="@string/pref_title_home_artist_grid_style"
-            app:icon="@drawable/ic_home" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-            android:defaultValue="4"
-            android:entries="@array/pref_home_grid_style_list_titles"
-            android:entryValues="@array/pref_home_grid_style_list_values"
-            android:key="home_album_grid_style"
-            android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_home_album_grid_style" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_home_white_24dp" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
@@ -33,20 +48,6 @@
             android:summary="@string/pref_summary_home_banner"
             android:title="@string/pref_title_home_banner" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="true"
-            android:key="toggle_suggestions"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_suggestions"
-            android:title="@string/pref_title_suggestions" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="false"
-            android:key="pause_history"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_pause_history"
-            android:title="@string/pref_title_pause_history" />
-
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
@@ -58,16 +59,10 @@
             android:layout="@layout/list_item_view"
             android:summary="@string/pref_summary_library_categories"
             android:title="@string/library_categories"
-            app:icon="@drawable/ic_library_music" />
+            app:enableCopying="true"
+            app:icon="@drawable/ic_library_music_white_24dp" />
 
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
-            android:defaultValue="true"
-            android:key="remember_last_tab"
-            android:layout="@layout/list_item_view_switch"
-            android:summary="@string/pref_summary_remember_tab"
-            android:title="@string/pref_title_remember_tab" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
+        <code.name.monkey.retromusic.preferences.MaterialListPreference
             android:defaultValue="0"
             android:entries="@array/pref_tab_text_mode_titles"
             android:entryValues="@array/pref_tab_text_mode_values"
@@ -75,56 +70,48 @@
             android:layout="@layout/list_item_view"
             android:negativeButtonText="@null"
             android:positiveButtonText="@null"
-            android:title="@string/pref_title_tab_text_mode" />
-
-        <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference
-            android:defaultValue="1"
-            android:entries="@array/pref_appbar_mode_titles"
-            android:entryValues="@array/pref_appbar_mode_values"
-            android:key="appbar_mode"
-            android:layout="@layout/list_item_view"
-            android:negativeButtonText="@null"
-            android:positiveButtonText="@null"
-            android:title="@string/pref_title_appbar_mode" />
+            android:title="@string/pref_title_tab_text_mode"
+            app:enableCopying="true" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         android:title="@string/window">
 
+
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="toggle_full_screen"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_toggle_full_screen"
             android:title="@string/pref_title_toggle_full_screen"
-            app:icon="@drawable/ic_fullscreen" />
+            app:icon="@drawable/ic_cellphone_white_24dp" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
-
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory
         android:layout="@layout/preference_category_title"
         android:title="@string/pref_header_lockscreen">
-
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="true"
-            android:key="album_art_on_lock_screen"
+            android:key="album_art_on_lockscreen"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_album_art_on_lockscreen"
-            android:title="@string/pref_title_album_art_on_lockscreen" />
+            android:title="@string/pref_title_album_art_on_lockscreen"
+            app:enableCopying="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
-            android:dependency="album_art_on_lock_screen"
+            android:dependency="album_art_on_lockscreen"
             android:key="blurred_album_art"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_blurred_album_art"
-            android:title="@string/pref_title_blurred_album_art" />
+            android:title="@string/pref_title_blurred_album_art"
+            app:enableCopying="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
             android:key="lock_screen"
             android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_summary_lock_screen"
-            android:title="@string/pref_title_lock_screen" />
+            android:title="@string/pref_title_lock_screen"
+            app:enableCopying="true" />
     </code.name.monkey.appthemehelper.common.prefs.supportv7.ATEPreferenceCategory>
 </androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
index fafa14f89..ffa74ab56 100644
--- a/app/src/main/res/xml/provider_paths.xml
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -1,6 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<paths>
-    <external-path
-        name="external_files"
-        path="." />
+<paths xmlns:android="http://schemas.android.com/apk/res/android">
+    <external-path name="external_files" path="."/>
 </paths>
\ No newline at end of file
diff --git a/appthemehelper/.gitignore b/appthemehelper/.gitignore
new file mode 100644
index 000000000..796b96d1c
--- /dev/null
+++ b/appthemehelper/.gitignore
@@ -0,0 +1 @@
+/build
diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle
index 2a5e0f50d..0b5cf00ba 100644
--- a/appthemehelper/build.gradle
+++ b/appthemehelper/build.gradle
@@ -1,22 +1,23 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-android-extensions'
 android {
-    compileSdk 33
-    namespace "code.name.monkey.appthemehelper"
-
+    compileSdkVersion 29
     defaultConfig {
-        minSdk 21
-        targetSdk 33
+        minSdkVersion 21
+        targetSdkVersion 28
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
     }
     buildTypes {
         release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    lint {
-        abortOnError false
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -24,7 +25,15 @@ android {
 }
 
 dependencies {
-    implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "com.google.android.material:material:$mdc_version"
-    implementation "androidx.preference:preference-ktx:$preference_version"
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'com.google.android.material:material:1.2.0-alpha01'
+    implementation 'androidx.preference:preference:1.1.0'
+    implementation 'androidx.cardview:cardview:1.0.0'
+    // Used for the list preference classes
+    implementation 'com.afollestad.material-dialogs:core:3.1.1'
+    implementation 'com.afollestad.material-dialogs:input:3.1.1'
+    implementation 'com.afollestad.material-dialogs:color:3.1.1'
+    implementation 'com.afollestad.material-dialogs:bottomsheets:3.1.1'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
 }
diff --git a/appthemehelper/src/androidTest/java/code/name/monkey/appthemehelper/ExampleInstrumentedTest.java b/appthemehelper/src/androidTest/java/code/name/monkey/appthemehelper/ExampleInstrumentedTest.java
new file mode 100644
index 000000000..7cf7cddfc
--- /dev/null
+++ b/appthemehelper/src/androidTest/java/code/name/monkey/appthemehelper/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package code.name.monkey.appthemehelper;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() throws Exception {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("code.name.monkey.appthemehelper.test", appContext.getPackageName());
+    }
+}
diff --git a/appthemehelper/src/main/AndroidManifest.xml b/appthemehelper/src/main/AndroidManifest.xml
index cc947c567..a0b00a102 100644
--- a/appthemehelper/src/main/AndroidManifest.xml
+++ b/appthemehelper/src/main/AndroidManifest.xml
@@ -1 +1 @@
-<manifest />
+<manifest package="code.name.monkey.appthemehelper" />
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
index aca848b08..0669aaaca 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt
@@ -1,29 +1,110 @@
 package code.name.monkey.appthemehelper
 
+import android.annotation.SuppressLint
 import android.app.Activity
 import android.app.ActivityManager
 import android.content.Context
 import android.os.Build
 import android.view.View
 import android.view.View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
-import android.view.WindowInsetsController
-import android.view.WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS
 import androidx.annotation.ColorInt
+import androidx.appcompat.widget.Toolbar
 import code.name.monkey.appthemehelper.util.ColorUtil
 import code.name.monkey.appthemehelper.util.TintHelper
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
 object ATH {
 
+    @SuppressLint("CommitPrefEdits")
     fun didThemeValuesChange(context: Context, since: Long): Boolean {
-        return ThemeStore.isConfigured(context) && ThemeStore.prefs(context).getLong(
-            ThemeStorePrefKeys.VALUES_CHANGED,
-            -1
-        ) > since
+        return ThemeStore.isConfigured(context) && ThemeStore.prefs(context).getLong(ThemeStorePrefKeys.VALUES_CHANGED, -1) > since
+    }
+
+    fun setStatusbarColorAuto(activity: Activity) {
+        setStatusbarColor(activity, ThemeStore.statusBarColor(activity))
+    }
+
+    fun setStatusbarColor(activity: Activity, color: Int) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            activity.window.statusBarColor = color
+            setLightStatusbarAuto(activity, color)
+        }
+    }
+
+    fun setLightStatusbarAuto(activity: Activity, bgColor: Int) {
+        setLightStatusbar(activity, ColorUtil.isColorLight(bgColor))
+    }
+
+    fun setLightStatusbar(activity: Activity, enabled: Boolean) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            val decorView = activity.window.decorView
+            val systemUiVisibility = decorView.systemUiVisibility
+            if (enabled) {
+                decorView.systemUiVisibility = systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+            } else {
+                decorView.systemUiVisibility = systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv()
+            }
+        }
+    }
+
+    fun setLightNavigationbar(activity: Activity, enabled: Boolean) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            val decorView = activity.window.decorView
+            var systemUiVisibility = decorView.systemUiVisibility
+            systemUiVisibility = if (enabled) {
+                systemUiVisibility or SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR
+            } else {
+                systemUiVisibility and SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR.inv()
+            }
+            decorView.systemUiVisibility = systemUiVisibility
+        }
+    }
+
+    fun setLightNavigationbarAuto(activity: Activity, bgColor: Int) {
+        setLightNavigationbar(activity, ColorUtil.isColorLight(bgColor))
+    }
+
+    fun setNavigationbarColorAuto(activity: Activity) {
+        setNavigationbarColor(activity, ThemeStore.navigationBarColor(activity))
+    }
+
+    fun setNavigationbarColor(activity: Activity, color: Int) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            activity.window.navigationBarColor = color
+        } else {
+            activity.window.navigationBarColor = ColorUtil.darkenColor(color)
+        }
+        setLightNavigationbarAuto(activity, color)
+    }
+
+    fun setActivityToolbarColorAuto(activity: Activity, toolbar: Toolbar?) {
+        setActivityToolbarColor(activity, toolbar, ThemeStore.primaryColor(activity))
+    }
+
+    fun setActivityToolbarColor(activity: Activity, toolbar: Toolbar?,
+                                color: Int) {
+        if (toolbar == null) {
+            return
+        }
+        toolbar.setBackgroundColor(color)
+        ToolbarContentTintHelper.setToolbarContentColorBasedOnToolbarColor(activity, toolbar, color)
+    }
+
+    fun setTaskDescriptionColorAuto(activity: Activity) {
+        setTaskDescriptionColor(activity, ThemeStore.primaryColor(activity))
+    }
+
+    fun setTaskDescriptionColor(activity: Activity, @ColorInt color: Int) {
+        var colorFinal = color
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            // Task description requires fully opaque color
+            colorFinal = ColorUtil.stripAlpha(colorFinal)
+            // Sets color of entry in the system recents page
+            activity.setTaskDescription(ActivityManager.TaskDescription(activity.title as String?, null, colorFinal))
+        }
     }
 
     fun setTint(view: View, @ColorInt color: Int) {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
index 826550823..b0497ccfc 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATHActivity.kt
@@ -1,8 +1,10 @@
 package code.name.monkey.appthemehelper
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
-import android.os.Looper
+
+import androidx.annotation.StyleRes
 import androidx.appcompat.app.AppCompatActivity
 
 /**
@@ -24,13 +26,13 @@ open class ATHActivity : AppCompatActivity() {
         }
     }
 
-    private fun onThemeChanged() {
+    fun onThemeChanged() {
         postRecreate()
     }
 
     fun postRecreate() {
         // hack to prevent java.lang.RuntimeException: Performing pause of activity that is not resumed
         // makes sure recreate() is called right after and not in onResume()
-        Handler(Looper.getMainLooper()).post { recreate() }
+        Handler().post { recreate() }
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
old mode 100644
new mode 100755
index 1b5ad709e..98546ba1c
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStore.kt
@@ -1,26 +1,25 @@
 package code.name.monkey.appthemehelper
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.content.SharedPreferences
 import android.graphics.Color
 import androidx.annotation.*
 import androidx.annotation.IntRange
 import androidx.core.content.ContextCompat
-import androidx.core.content.edit
-import androidx.preference.PreferenceManager
-import code.name.monkey.appthemehelper.util.ATHUtil.isWindowBackgroundDark
-import code.name.monkey.appthemehelper.util.ATHUtil.resolveColor
+import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.ColorUtil
-import code.name.monkey.appthemehelper.util.VersionUtils
-
 
 /**
  * @author Aidan Follestad (afollestad), Karim Abou Zeid (kabouzeid)
  */
-class ThemeStore
+class ThemeStore @SuppressLint("CommitPrefEdits")
 private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeStoreInterface {
+    private val mEditor: SharedPreferences.Editor
 
-    private val mEditor: SharedPreferences.Editor = prefs(mContext).edit()
+    init {
+        mEditor = prefs(mContext).edit()
+    }
 
     override fun activityTheme(@StyleRes theme: Int): ThemeStore {
         mEditor.putInt(ThemeStorePrefKeys.KEY_ACTIVITY_THEME, theme)
@@ -39,7 +38,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun primaryColorAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return primaryColor(resolveColor(mContext, colorAttr))
+        return primaryColor(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun primaryColorDark(@ColorInt color: Int): ThemeStore {
@@ -52,7 +51,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun primaryColorDarkAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return primaryColorDark(resolveColor(mContext, colorAttr))
+        return primaryColorDark(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun accentColor(@ColorInt color: Int): ThemeStore {
@@ -60,35 +59,12 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         return this
     }
 
-    override fun wallpaperColor(context: Context, color: Int): ThemeStore {
-        if (ColorUtil.isColorLight(color)) {
-            mEditor.putInt(ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_DARK, color)
-            mEditor.putInt(
-                ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_LIGHT,
-                ColorUtil.getReadableColorLight(
-                    color,
-                    Color.WHITE
-                )
-            )
-        } else {
-            mEditor.putInt(ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_LIGHT, color)
-            mEditor.putInt(
-                ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_DARK,
-                ColorUtil.getReadableColorDark(
-                    color,
-                    Color.parseColor("#202124")
-                )
-            )
-        }
-        return this
-    }
-
     override fun accentColorRes(@ColorRes colorRes: Int): ThemeStore {
         return accentColor(ContextCompat.getColor(mContext, colorRes))
     }
 
     override fun accentColorAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return accentColor(resolveColor(mContext, colorAttr))
+        return accentColor(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun statusBarColor(@ColorInt color: Int): ThemeStore {
@@ -101,7 +77,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun statusBarColorAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return statusBarColor(resolveColor(mContext, colorAttr))
+        return statusBarColor(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun navigationBarColor(@ColorInt color: Int): ThemeStore {
@@ -118,7 +94,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     // Static getters
 
     override fun navigationBarColorAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return navigationBarColor(resolveColor(mContext, colorAttr))
+        return navigationBarColor(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun textColorPrimary(@ColorInt color: Int): ThemeStore {
@@ -131,7 +107,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun textColorPrimaryAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return textColorPrimary(resolveColor(mContext, colorAttr))
+        return textColorPrimary(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun textColorPrimaryInverse(@ColorInt color: Int): ThemeStore {
@@ -144,7 +120,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun textColorPrimaryInverseAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return textColorPrimaryInverse(resolveColor(mContext, colorAttr))
+        return textColorPrimaryInverse(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun textColorSecondary(@ColorInt color: Int): ThemeStore {
@@ -157,7 +133,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun textColorSecondaryAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return textColorSecondary(resolveColor(mContext, colorAttr))
+        return textColorSecondary(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun textColorSecondaryInverse(@ColorInt color: Int): ThemeStore {
@@ -170,7 +146,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
     }
 
     override fun textColorSecondaryInverseAttr(@AttrRes colorAttr: Int): ThemeStore {
-        return textColorSecondaryInverse(resolveColor(mContext, colorAttr))
+        return textColorSecondaryInverse(ATHUtil.resolveColor(mContext, colorAttr))
     }
 
     override fun coloredStatusBar(colored: Boolean): ThemeStore {
@@ -190,8 +166,8 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
 
     override fun commit() {
         mEditor.putLong(ThemeStorePrefKeys.VALUES_CHANGED, System.currentTimeMillis())
-            .putBoolean(ThemeStorePrefKeys.IS_CONFIGURED_KEY, true)
-            .commit()
+                .putBoolean(ThemeStorePrefKeys.IS_CONFIGURED_KEY, true)
+                .commit()
     }
 
     companion object {
@@ -202,10 +178,7 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
 
         @CheckResult
         fun prefs(context: Context): SharedPreferences {
-            return context.getSharedPreferences(
-                ThemeStorePrefKeys.CONFIG_PREFS_KEY_DEFAULT,
-                Context.MODE_PRIVATE
-            )
+            return context.getSharedPreferences(ThemeStorePrefKeys.CONFIG_PREFS_KEY_DEFAULT, Context.MODE_PRIVATE)
         }
 
         fun markChanged(context: Context) {
@@ -221,41 +194,29 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         @CheckResult
         @ColorInt
         fun primaryColor(context: Context): Int {
-            return prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_PRIMARY_COLOR,
-                resolveColor(context, androidx.appcompat.R.attr.colorPrimary, Color.parseColor("#455A64"))
-            )
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_PRIMARY_COLOR, ATHUtil.resolveColor(context, R.attr.colorPrimary, Color.parseColor("#455A64")))
+        }
+
+        @CheckResult
+        @ColorInt
+        fun primaryColorDark(context: Context): Int {
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_PRIMARY_COLOR_DARK, ATHUtil.resolveColor(context, R.attr.colorPrimaryDark, Color.parseColor("#37474F")))
         }
 
         @CheckResult
         @ColorInt
         fun accentColor(context: Context): Int {
-            // Set MD3 accent if MD3 is enabled or in-app accent otherwise
-            if (isMD3Enabled(context) && VersionUtils.hasS()) {
-                return ContextCompat.getColor(context, R.color.m3_accent_color)
-            }
             val desaturatedColor = prefs(context).getBoolean("desaturated_color", false)
-            val color = if (isWallpaperAccentEnabled(context)) {
-                wallpaperColor(context, isWindowBackgroundDark(context))
-            } else {
-                prefs(context).getInt(
-                    ThemeStorePrefKeys.KEY_ACCENT_COLOR,
-                    resolveColor(context, androidx.appcompat.R.attr.colorAccent, Color.parseColor("#263238"))
-                )
-            }
-            return if (isWindowBackgroundDark(context) && desaturatedColor) ColorUtil.desaturateColor(
-                color,
-                0.4f
-            ) else color
+            val color = prefs(context).getInt(ThemeStorePrefKeys.KEY_ACCENT_COLOR, ATHUtil.resolveColor(context, R.attr.colorAccent, Color.parseColor("#263238")))
+            return if (ATHUtil.isWindowBackgroundDark(context) && desaturatedColor) ColorUtil.desaturateColor(color, 0.4f) else color
         }
 
         @CheckResult
         @ColorInt
-        fun wallpaperColor(context: Context, isDarkMode: Boolean): Int {
-            return prefs(context).getInt(
-                if (isDarkMode) ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_DARK else ThemeStorePrefKeys.KEY_WALLPAPER_COLOR_LIGHT,
-                resolveColor(context, androidx.appcompat.R.attr.colorAccent, Color.parseColor("#263238"))
-            )
+        fun statusBarColor(context: Context): Int {
+            return if (!coloredStatusBar(context)) {
+                Color.BLACK
+            } else prefs(context).getInt(ThemeStorePrefKeys.KEY_STATUS_BAR_COLOR, primaryColorDark(context))
         }
 
         @CheckResult
@@ -263,18 +224,36 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
         fun navigationBarColor(context: Context): Int {
             return if (!coloredNavigationBar(context)) {
                 Color.BLACK
-            } else prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_NAVIGATION_BAR_COLOR,
-                primaryColor(context)
-            )
+            } else prefs(context).getInt(ThemeStorePrefKeys.KEY_NAVIGATION_BAR_COLOR, primaryColor(context))
+        }
+
+        @CheckResult
+        @ColorInt
+        fun textColorPrimary(context: Context): Int {
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_TEXT_COLOR_PRIMARY, ATHUtil.resolveColor(context, android.R.attr.textColorPrimary))
+        }
+
+        @CheckResult
+        @ColorInt
+        fun textColorPrimaryInverse(context: Context): Int {
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_TEXT_COLOR_PRIMARY_INVERSE, ATHUtil.resolveColor(context, android.R.attr.textColorPrimaryInverse))
+        }
+
+        @CheckResult
+        @ColorInt
+        fun textColorSecondary(context: Context): Int {
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_TEXT_COLOR_SECONDARY, ATHUtil.resolveColor(context, android.R.attr.textColorSecondary))
+        }
+
+        @CheckResult
+        @ColorInt
+        fun textColorSecondaryInverse(context: Context): Int {
+            return prefs(context).getInt(ThemeStorePrefKeys.KEY_TEXT_COLOR_SECONDARY_INVERSE, ATHUtil.resolveColor(context, android.R.attr.textColorSecondaryInverse))
         }
 
         @CheckResult
         fun coloredStatusBar(context: Context): Boolean {
-            return prefs(context).getBoolean(
-                ThemeStorePrefKeys.KEY_APPLY_PRIMARYDARK_STATUSBAR,
-                true
-            )
+            return prefs(context).getBoolean(ThemeStorePrefKeys.KEY_APPLY_PRIMARYDARK_STATUSBAR, true)
         }
 
         @CheckResult
@@ -292,65 +271,15 @@ private constructor(private val mContext: Context) : ThemeStorePrefKeys, ThemeSt
             return prefs(context).getBoolean(ThemeStorePrefKeys.IS_CONFIGURED_KEY, false)
         }
 
-        @CheckResult
-        @ColorInt
-        fun textColorPrimary(context: Context): Int {
-            return prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_TEXT_COLOR_PRIMARY,
-                resolveColor(context, android.R.attr.textColorPrimary)
-            )
-        }
-
-        @CheckResult
-        @ColorInt
-        fun textColorPrimaryInverse(context: Context): Int {
-            return prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_TEXT_COLOR_PRIMARY_INVERSE,
-                resolveColor(context, android.R.attr.textColorPrimaryInverse)
-            )
-        }
-
-        @CheckResult
-        @ColorInt
-        fun textColorSecondary(context: Context): Int {
-            return prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_TEXT_COLOR_SECONDARY,
-                resolveColor(context, android.R.attr.textColorSecondary)
-            )
-        }
-
-        @CheckResult
-        @ColorInt
-        fun textColorSecondaryInverse(context: Context): Int {
-            return prefs(context).getInt(
-                ThemeStorePrefKeys.KEY_TEXT_COLOR_SECONDARY_INVERSE,
-                resolveColor(context, android.R.attr.textColorSecondaryInverse)
-            )
-        }
-
-        fun isConfigured(
-            context: Context, @IntRange(
-                from = 0,
-                to = Integer.MAX_VALUE.toLong()
-            ) version: Int
-        ): Boolean {
+        @SuppressLint("CommitPrefEdits")
+        fun isConfigured(context: Context, @IntRange(from = 0, to = Integer.MAX_VALUE.toLong()) version: Int): Boolean {
             val prefs = prefs(context)
             val lastVersion = prefs.getInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, -1)
             if (version > lastVersion) {
-                prefs.edit { putInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, version) }
+                prefs.edit().putInt(ThemeStorePrefKeys.IS_CONFIGURED_VERSION_KEY, version).commit()
                 return false
             }
             return true
         }
-
-        fun isMD3Enabled(context: Context): Boolean {
-            return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean(ThemeStorePrefKeys.KEY_MATERIAL_YOU, VersionUtils.hasS())
-        }
-
-        private fun isWallpaperAccentEnabled(context: Context): Boolean {
-            return PreferenceManager.getDefaultSharedPreferences(context)
-                .getBoolean("wallpaper_accent", false)
-        }
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.kt
index 7cc71a757..cbcb41f04 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStoreInterface.kt
@@ -1,6 +1,5 @@
 package code.name.monkey.appthemehelper
 
-import android.content.Context
 import androidx.annotation.AttrRes
 import androidx.annotation.ColorInt
 import androidx.annotation.ColorRes
@@ -35,8 +34,6 @@ internal interface ThemeStoreInterface {
 
     fun accentColor(@ColorInt color: Int): ThemeStore
 
-    fun wallpaperColor(context: Context, color: Int): ThemeStore
-
     fun accentColorRes(@ColorRes colorRes: Int): ThemeStore
 
     fun accentColorAttr(@AttrRes colorAttr: Int): ThemeStore
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
index 865a571bb..6dee82660 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ThemeStorePrefKeys.kt
@@ -8,28 +8,24 @@ internal interface ThemeStorePrefKeys {
 
         const val CONFIG_PREFS_KEY_DEFAULT = "[[kabouzeid_app-theme-helper]]"
         const val IS_CONFIGURED_KEY = "is_configured"
-        const val IS_CONFIGURED_VERSION_KEY = "is_configured_version"
+        const  val IS_CONFIGURED_VERSION_KEY = "is_configured_version"
         const val VALUES_CHANGED = "values_changed"
 
-        const val KEY_ACTIVITY_THEME = "activity_theme"
+        const  val KEY_ACTIVITY_THEME = "activity_theme"
 
-        const val KEY_PRIMARY_COLOR = "primary_color"
-        const val KEY_PRIMARY_COLOR_DARK = "primary_color_dark"
-        const val KEY_ACCENT_COLOR = "accent_color"
-        const val KEY_STATUS_BAR_COLOR = "status_bar_color"
-        const val KEY_NAVIGATION_BAR_COLOR = "navigation_bar_color"
+        const   val KEY_PRIMARY_COLOR = "primary_color"
+        const   val KEY_PRIMARY_COLOR_DARK = "primary_color_dark"
+        const   val KEY_ACCENT_COLOR = "accent_color"
+        const   val KEY_STATUS_BAR_COLOR = "status_bar_color"
+        const   val KEY_NAVIGATION_BAR_COLOR = "navigation_bar_color"
 
-        const val KEY_TEXT_COLOR_PRIMARY = "text_color_primary"
-        const val KEY_TEXT_COLOR_PRIMARY_INVERSE = "text_color_primary_inverse"
-        const val KEY_TEXT_COLOR_SECONDARY = "text_color_secondary"
-        const val KEY_TEXT_COLOR_SECONDARY_INVERSE = "text_color_secondary_inverse"
+        const   val KEY_TEXT_COLOR_PRIMARY = "text_color_primary"
+        const   val KEY_TEXT_COLOR_PRIMARY_INVERSE = "text_color_primary_inverse"
+        const   val KEY_TEXT_COLOR_SECONDARY = "text_color_secondary"
+        const   val KEY_TEXT_COLOR_SECONDARY_INVERSE = "text_color_secondary_inverse"
 
-        const val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
-        const val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
-        const val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
-
-        const val KEY_MATERIAL_YOU = "material_you"
-        const val KEY_WALLPAPER_COLOR_LIGHT = "wallpaper_color_light"
-        const val KEY_WALLPAPER_COLOR_DARK = "wallpaper_color_dark"
+        const   val KEY_APPLY_PRIMARYDARK_STATUSBAR = "apply_primarydark_statusbar"
+        const   val KEY_APPLY_PRIMARY_NAVBAR = "apply_primary_navbar"
+        const   val KEY_AUTO_GENERATE_PRIMARYDARK = "auto_generate_primarydark"
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
index 9c07c660f..0d581dff5 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/ATHToolbarActivity.java
@@ -2,20 +2,22 @@ package code.name.monkey.appthemehelper.common;
 
 import android.graphics.Color;
 import android.view.Menu;
+
 import androidx.annotation.Nullable;
 import androidx.appcompat.widget.Toolbar;
+
 import code.name.monkey.appthemehelper.ATHActivity;
+import code.name.monkey.appthemehelper.R;
 import code.name.monkey.appthemehelper.util.ATHUtil;
 import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
 
 
 public class ATHToolbarActivity extends ATHActivity {
-
     private Toolbar toolbar;
 
     public static int getToolbarBackgroundColor(@Nullable Toolbar toolbar) {
         if (toolbar != null) {
-            return ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), com.google.android.material.R.attr.colorSurface);
+            return ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), R.attr.colorSurface);
         }
         return Color.BLACK;
     }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt
index dcb990069..47850ee4c 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt
@@ -15,17 +15,16 @@
 package code.name.monkey.appthemehelper.common.prefs
 
 import android.content.Context
+import android.preference.Preference
 import android.util.AttributeSet
 import android.view.View
-import androidx.preference.Preference
-import androidx.preference.PreferenceViewHolder
 import code.name.monkey.appthemehelper.R
 
 class ATEColorPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+        defStyleRes: Int = 0
 ) : Preference(context, attrs, defStyleAttr, defStyleRes) {
 
     private var mView: View? = null
@@ -33,20 +32,15 @@ class ATEColorPreference @JvmOverloads constructor(
     private var border: Int = 0
 
     init {
+        layoutResource = R.layout.ate_preference_custom
         widgetLayoutResource = R.layout.ate_preference_color
         isPersistent = false
     }
 
-    /*override fun onBindView(view: View) {
+    override fun onBindView(view: View) {
         super.onBindView(view)
         mView = view
         invalidateColor()
-    }*/
-
-    override fun onBindViewHolder(holder: PreferenceViewHolder) {
-        super.onBindViewHolder(holder)
-        mView = holder.itemView
-        invalidateColor()
     }
 
     fun setColor(color: Int, border: Int) {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.kt
index b425e7ff9..9a86a12ce 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/BorderCircleView.kt
@@ -7,17 +7,14 @@ import android.graphics.Paint
 import android.graphics.PorterDuff
 import android.graphics.PorterDuffColorFilter
 import android.graphics.drawable.Drawable
-import android.util.AttributeSet
-import android.widget.FrameLayout
 import androidx.core.content.ContextCompat
-import code.name.monkey.appthemehelper.R
-import kotlin.math.min
+import android.util.AttributeSet
+import android.view.View
+import android.widget.FrameLayout
 
-class BorderCircleView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
+import code.name.monkey.appthemehelper.R
+
+class BorderCircleView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) : FrameLayout(context, attrs, defStyleAttr) {
 
     private val mCheck: Drawable? = ContextCompat.getDrawable(context, R.drawable.ate_check)
     private val paint: Paint = Paint()
@@ -52,14 +49,14 @@ class BorderCircleView @JvmOverloads constructor(
     }
 
     override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        val widthMode = MeasureSpec.getMode(widthMeasureSpec)
-        val heightMode = MeasureSpec.getMode(heightMeasureSpec)
-        if (widthMode == MeasureSpec.EXACTLY && heightMode != MeasureSpec.EXACTLY) {
-            val width = MeasureSpec.getSize(widthMeasureSpec)
+        val widthMode = View.MeasureSpec.getMode(widthMeasureSpec)
+        val heightMode = View.MeasureSpec.getMode(heightMeasureSpec)
+        if (widthMode == View.MeasureSpec.EXACTLY && heightMode != View.MeasureSpec.EXACTLY) {
+            val width = View.MeasureSpec.getSize(widthMeasureSpec)
 
             var height = width
-            if (heightMode == MeasureSpec.AT_MOST) {
-                height = min(height, MeasureSpec.getSize(heightMeasureSpec))
+            if (heightMode == View.MeasureSpec.AT_MOST) {
+                height = Math.min(height, View.MeasureSpec.getSize(heightMeasureSpec))
             }
             setMeasuredDimension(width, height)
         } else {
@@ -76,18 +73,8 @@ class BorderCircleView @JvmOverloads constructor(
         }
 
         val circleCenter = (canvasSize - borderWidth * 2) / 2
-        canvas.drawCircle(
-            (circleCenter + borderWidth).toFloat(),
-            (circleCenter + borderWidth).toFloat(),
-            (canvasSize - borderWidth * 2) / 2 + borderWidth - 4.0f,
-            paintBorder
-        )
-        canvas.drawCircle(
-            (circleCenter + borderWidth).toFloat(),
-            (circleCenter + borderWidth).toFloat(),
-            (canvasSize - borderWidth * 2) / 2 - 4.0f,
-            paint
-        )
+        canvas.drawCircle((circleCenter + borderWidth).toFloat(), (circleCenter + borderWidth).toFloat(), (canvasSize - borderWidth * 2) / 2 + borderWidth - 4.0f, paintBorder)
+        canvas.drawCircle((circleCenter + borderWidth).toFloat(), (circleCenter + borderWidth).toFloat(), (canvasSize - borderWidth * 2) / 2 - 4.0f, paint)
 
         if (isActivated) {
             val offset = canvasSize / 2 - mCheck!!.intrinsicWidth / 2
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.kt
index a17867499..492d5f7ca 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEColorPreference.kt
@@ -15,20 +15,19 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7
 
 import android.content.Context
+import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.view.View
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceViewHolder
 import code.name.monkey.appthemehelper.R
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.common.prefs.BorderCircleView
-import code.name.monkey.appthemehelper.util.ATHUtil
 
 class ATEColorPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
 ) : Preference(context, attrs, defStyleAttr) {
 
     private var mView: View? = null
@@ -36,15 +35,11 @@ class ATEColorPreference @JvmOverloads constructor(
     private var border: Int = 0
 
     init {
+        layoutResource = R.layout.ate_preference_custom_support
         widgetLayoutResource = R.layout.ate_preference_color
         isPersistent = false
 
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            ATHUtil.resolveColor(
-                context,
-                android.R.attr.colorControlNormal
-            ), BlendModeCompat.SRC_IN
-        )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.kt
index fb6967734..6ef22e0b3 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEDialogPreference.kt
@@ -19,7 +19,12 @@ import android.util.AttributeSet
 import androidx.preference.DialogPreference
 
 open class ATEDialogPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0, defStyleRes: Int = 0
-) : DialogPreference(context, attrs, defStyleAttr, defStyleRes)
\ No newline at end of file
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0, defStyleRes: Int = 0
+) : DialogPreference(context, attrs, defStyleAttr, defStyleRes) {
+
+    init {
+
+    }
+}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.kt
old mode 100644
new mode 100755
similarity index 64%
rename from appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.kt
rename to appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.kt
index 8ae99f58d..18767846a
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEEditTextPreference.kt
@@ -11,22 +11,22 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
+
 package code.name.monkey.appthemehelper.common.prefs.supportv7
 
 import android.content.Context
 import android.util.AttributeSet
-import androidx.preference.ListPreference
+import androidx.preference.EditTextPreference
+import code.name.monkey.appthemehelper.R
 
-class ATEListPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : ListPreference(context, attrs, defStyleAttr, defStyleRes) {
+class ATEEditTextPreference @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+        defStyleRes: Int = 0
+) : EditTextPreference(context, attrs, defStyleAttr, defStyleRes) {
 
     init {
-        if (summary == null || summary.toString().trim { it <= ' ' }.isEmpty()) {
-            summary = "%s"
-        }
+        layoutResource = R.layout.ate_preference_custom_support
     }
-}
\ No newline at end of file
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java
new file mode 100644
index 000000000..239eb72a0
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEListPreference.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.appthemehelper.common.prefs.supportv7;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.preference.ListPreference;
+
+import code.name.monkey.appthemehelper.R;
+
+public class ATEListPreference extends ListPreference {
+
+    public ATEListPreference(Context context) {
+        super(context);
+        init(context, null);
+    }
+
+    public ATEListPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public ATEListPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        init(context, attrs);
+    }
+
+    public ATEListPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context, attrs);
+    }
+
+    private void init(Context context, AttributeSet attrs) {
+        setLayoutResource(R.layout.ate_preference_custom_support);
+        if (getSummary() == null || getSummary().toString().trim().isEmpty())
+            setSummary("%s");
+    }
+}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.kt
index 53e3919bb..7dc47aa26 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreference.kt
@@ -15,25 +15,20 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7
 
 import android.content.Context
+import android.graphics.PorterDuff
 import android.util.AttributeSet
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
 import androidx.preference.Preference
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.ThemeStore
 
 class ATEPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0,
-    defStyleRes: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0,
+        defStyleRes: Int = 0
 ) : Preference(context, attrs, defStyleAttr, defStyleRes) {
 
     init {
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            ATHUtil.resolveColor(
-                context,
-                android.R.attr.colorControlNormal
-            ), BlendModeCompat.SRC_IN
-        )
+
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt
index 5fb2fc4aa..c683bf5d4 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceCategory.kt
@@ -22,17 +22,14 @@ import androidx.preference.PreferenceViewHolder
 import code.name.monkey.appthemehelper.ThemeStore
 
 class ATEPreferenceCategory @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet?,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
+        context: Context?,
+        attrs: AttributeSet?,
+        defStyleAttr: Int = -1,
+        defStyleRes: Int = -1
 ) : PreferenceCategory(context, attrs, defStyleAttr, defStyleRes) {
-
     override fun onBindViewHolder(holder: PreferenceViewHolder) {
         super.onBindViewHolder(holder)
         val title = holder.itemView.findViewById<TextView>(android.R.id.title)
-        title.setTextColor(
-           ThemeStore.accentColor(context)
-        )
+        title.setTextColor(ThemeStore.accentColor(context))
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
deleted file mode 100644
index 19b18b8f5..000000000
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package code.name.monkey.appthemehelper.common.prefs.supportv7;
-
-import androidx.annotation.Nullable;
-import androidx.fragment.app.DialogFragment;
-import androidx.preference.Preference;
-import androidx.preference.PreferenceFragmentCompat;
-
-import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEListPreferenceDialogFragmentCompat;
-import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEPreferenceDialogFragment;
-
-/**
- * @author Karim Abou Zeid (kabouzeid)
- */
-public abstract class ATEPreferenceFragmentCompat extends PreferenceFragmentCompat {
-    @Override
-    public void onDisplayPreferenceDialog(Preference preference) {
-        if (getCallbackFragment() instanceof OnPreferenceDisplayDialogCallback) {
-            ((OnPreferenceDisplayDialogCallback) getCallbackFragment()).onPreferenceDisplayDialog(this, preference);
-            return;
-        }
-
-        if (this.getActivity() instanceof OnPreferenceDisplayDialogCallback) {
-            ((OnPreferenceDisplayDialogCallback) this.getActivity()).onPreferenceDisplayDialog(this, preference);
-            return;
-        }
-
-        if (getFragmentManager().findFragmentByTag("androidx.preference.PreferenceFragment.DIALOG") == null) {
-            DialogFragment dialogFragment = onCreatePreferenceDialog(preference);
-
-            if (dialogFragment != null) {
-                dialogFragment.setTargetFragment(this, 0);
-                dialogFragment.show(this.getFragmentManager(), "androidx.preference.PreferenceFragment.DIALOG");
-                return;
-            }
-        }
-
-        super.onDisplayPreferenceDialog(preference);
-    }
-
-    @Nullable
-    public DialogFragment onCreatePreferenceDialog(Preference preference) {
-        if (preference instanceof ATEListPreference) {
-            return ATEListPreferenceDialogFragmentCompat.newInstance(preference.getKey());
-        } else if (preference instanceof ATEDialogPreference) {
-            return ATEPreferenceDialogFragment.newInstance(preference.getKey());
-        }
-        return null;
-    }
-}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.kt
new file mode 100644
index 000000000..e6c8ff621
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATEPreferenceFragmentCompat.kt
@@ -0,0 +1,61 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.appthemehelper.common.prefs.supportv7
+
+
+import androidx.fragment.app.DialogFragment
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEListPreferenceDialogFragmentCompat
+import code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs.ATEPreferenceDialogFragment
+
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+abstract class ATEPreferenceFragmentCompat : PreferenceFragmentCompat() {
+    override fun onDisplayPreferenceDialog(preference: Preference) {
+        if (callbackFragment is OnPreferenceDisplayDialogCallback) {
+            (callbackFragment as OnPreferenceDisplayDialogCallback).onPreferenceDisplayDialog(this, preference)
+            return
+        }
+
+        if (activity is OnPreferenceDisplayDialogCallback) {
+            (activity as OnPreferenceDisplayDialogCallback).onPreferenceDisplayDialog(this, preference)
+            return
+        }
+
+        if (fragmentManager?.findFragmentByTag("android.support.v7.preference.PreferenceFragment.DIALOG") == null) {
+            val dialogFragment = onCreatePreferenceDialog(preference)
+
+            if (dialogFragment != null) {
+                dialogFragment.setTargetFragment(this, 0)
+                dialogFragment.show(fragmentManager!!, "android.support.v7.preference.PreferenceFragment.DIALOG")
+                return
+            }
+        }
+
+        super.onDisplayPreferenceDialog(preference)
+    }
+
+    open fun onCreatePreferenceDialog(preference: Preference): DialogFragment? {
+        if (preference is ATEListPreference) {
+            return ATEListPreferenceDialogFragmentCompat.newInstance(preference.getKey())
+        } else if (preference is ATEDialogPreference) {
+            return ATEPreferenceDialogFragment.newInstance(preference.getKey())
+        }
+        return null
+    }
+}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
index 82e66817f..3cd3db72e 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESeekBarPreference.kt
@@ -1,63 +1,39 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7
 
 import android.content.Context
-import android.text.Editable
+import android.graphics.PorterDuff
 import android.util.AttributeSet
 import android.widget.SeekBar
-import android.widget.TextView
-import androidx.core.content.withStyledAttributes
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
-import androidx.core.widget.doAfterTextChanged
 import androidx.preference.PreferenceViewHolder
 import androidx.preference.SeekBarPreference
 import code.name.monkey.appthemehelper.R
 import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
 import code.name.monkey.appthemehelper.util.TintHelper
-import code.name.monkey.appthemehelper.util.VersionUtils
 
-class ATESeekBarPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) : SeekBarPreference(context, attrs, defStyleAttr, defStyleRes) {
+class ATESeekBarPreference : SeekBarPreference {
+    constructor(context: Context) : super(context) {
+        init()
+    }
 
-    var unit: String = ""
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init()
+    }
 
-    init {
-        context.withStyledAttributes(attrs, R.styleable.ATESeekBarPreference, 0, 0) {
-            getString(R.styleable.ATESeekBarPreference_ateKey_pref_unit)?.let {
-                unit = it
-            }
-        }
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            ATHUtil.resolveColor(
-                context,
-                android.R.attr.colorControlNormal
-            ), BlendModeCompat.SRC_IN
-        )
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init()
+    }
+
+    private fun init() {
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 
     override fun onBindViewHolder(view: PreferenceViewHolder) {
         super.onBindViewHolder(view)
-        val seekBar = view.findViewById(androidx.preference.R.id.seekbar) as SeekBar
-        TintHelper.setTintAuto(
-            seekBar, // Set MD3 accent if MD3 is enabled or in-app accent otherwise
-            ThemeStore.accentColor(context), false
-        )
-        (view.findViewById(androidx.preference.R.id.seekbar_value) as TextView).apply {
-            appendUnit(editableText)
-            doAfterTextChanged {
-                appendUnit(it)
-            }
-        }
-    }
-
-    private fun TextView.appendUnit(editable: Editable?) {
-        if (!editable.toString().endsWith(unit)) {
-            append(unit)
-        }
+        val seekBar = view.findViewById(R.id.seekbar) as SeekBar
+        TintHelper.setTintAuto(seekBar, ThemeStore.accentColor(context), false)
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
index 3f2869d34..eda097f14 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/ATESwitchPreference.kt
@@ -1,31 +1,38 @@
 package code.name.monkey.appthemehelper.common.prefs.supportv7
 
+import android.annotation.TargetApi
 import android.content.Context
+import android.graphics.PorterDuff
+import android.os.Build
 import android.util.AttributeSet
-import androidx.core.graphics.BlendModeColorFilterCompat
-import androidx.core.graphics.BlendModeCompat
 import androidx.preference.CheckBoxPreference
 import code.name.monkey.appthemehelper.R
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.ThemeStore
 
 /**
  * @author Aidan Follestad (afollestad)
  */
-class ATESwitchPreference @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-    defStyleRes: Int = -1
-) :
-    CheckBoxPreference(context, attrs, defStyleAttr, defStyleRes) {
+class ATESwitchPreference : CheckBoxPreference {
 
-    init {
+    constructor(context: Context) : super(context) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init()
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {
+        init()
+    }
+
+    private fun init() {
         widgetLayoutResource = R.layout.ate_preference_switch_support
-        icon?.colorFilter = BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
-            ATHUtil.resolveColor(
-                context,
-                android.R.attr.colorControlNormal
-            ), BlendModeCompat.SRC_IN
-        )
+        icon?.setColorFilter(ThemeStore.textColorSecondary(context), PorterDuff.Mode.SRC_IN)
     }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
index 68febf773..6e32c6fac 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEListPreferenceDialogFragmentCompat.java
@@ -14,10 +14,10 @@
 
 package code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs;
 
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.util.Log;
 
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
 import androidx.preference.ListPreference;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -25,13 +25,13 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import code.name.monkey.appthemehelper.common.prefs.supportv7.ATEListPreference;
 
 /**
- * @author Karim Abou Zeid (kabouzeid)
+ * Created by hemanths on 2019-09-03.
  */
 public class ATEListPreferenceDialogFragmentCompat extends ATEPreferenceDialogFragment {
-    private static final String TAG = "ATEPreferenceDialog";
     private int mClickedDialogEntryIndex;
 
-    public static ATEListPreferenceDialogFragmentCompat newInstance(String key) {
+    @NonNull
+    public static ATEListPreferenceDialogFragmentCompat newInstance(@NonNull String key) {
         final ATEListPreferenceDialogFragmentCompat fragment = new ATEListPreferenceDialogFragmentCompat();
         final Bundle b = new Bundle(1);
         b.putString(ARG_KEY, key);
@@ -44,7 +44,7 @@ public class ATEListPreferenceDialogFragmentCompat extends ATEPreferenceDialogFr
     }
 
     @Override
-    protected void onPrepareDialogBuilder(MaterialAlertDialogBuilder builder) {
+    protected void onPrepareDialogBuilder(@NonNull MaterialAlertDialogBuilder builder) {
         super.onPrepareDialogBuilder(builder);
 
         final ListPreference preference = getListPreference();
@@ -55,41 +55,32 @@ public class ATEListPreferenceDialogFragmentCompat extends ATEPreferenceDialogFr
         }
 
         mClickedDialogEntryIndex = preference.findIndexOfValue(preference.getValue());
-        builder.setSingleChoiceItems(preference.getEntries(), mClickedDialogEntryIndex, (dialog, which) -> {
-            mClickedDialogEntryIndex = which;
-            dismiss();
-            onClick(dialog, which);
+        builder.setSingleChoiceItems(preference.getEntries(), mClickedDialogEntryIndex, (dialogInterface, i) -> {
+            mClickedDialogEntryIndex = i;
         });
 
-        /*
-         * The typical interaction for list-based dialogs is to have
-         * click-on-an-item dismiss the dialog instead of the user having to
-         * press 'Ok'.
-         */
-        builder.setPositiveButton(null, null);
-        builder.setNegativeButton(null, null);
-        builder.setNeutralButton(null, null);
+        builder.setPositiveButton("Ok", null);
+        builder.setNegativeButton("", null);
+        builder.setNeutralButton("", null);
     }
 
     @Override
     public void onDialogClosed(boolean positiveResult) {
         final ListPreference preference = getListPreference();
-        Log.i(TAG, "onDialogClosed: " + positiveResult);
         if (positiveResult && mClickedDialogEntryIndex >= 0 &&
                 preference.getEntryValues() != null) {
             String value = preference.getEntryValues()[mClickedDialogEntryIndex].toString();
-            Log.i(TAG, "onDialogClosed: value " + value);
             if (preference.callChangeListener(value)) {
                 preference.setValue(value);
-                Log.i(TAG, "onDialogClosed: set value ");
             }
         }
     }
 
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        Log.i(TAG, "onClick: " + which);
+   /* @Override
+    public boolean onSelection(MaterialDialog dialog, View itemView, int which, CharSequence text) {
         mClickedDialogEntryIndex = which;
-        super.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
-    }
+        onClick(dialog, DialogAction.POSITIVE);
+        dismiss();
+        return true;
+    }*/
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
index 82a511e3b..cb8492fb8 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/supportv7/dialogs/ATEPreferenceDialogFragment.java
@@ -14,17 +14,16 @@
 
 package code.name.monkey.appthemehelper.common.prefs.supportv7.dialogs;
 
+
 import android.app.Dialog;
-import android.content.DialogInterface;
 import android.os.Bundle;
-import android.util.Log;
 import android.view.Window;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentActivity;
 import androidx.preference.DialogPreference;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
@@ -32,10 +31,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 /**
  * @author Karim Abou Zeid (kabouzeid)
  */
-public class ATEPreferenceDialogFragment extends DialogFragment implements DialogInterface.OnClickListener {
+public class ATEPreferenceDialogFragment extends DialogFragment {
     protected static final String ARG_KEY = "key";
-    private static final String TAG = "ATEPreferenceDialog";
-    private int mWhichButtonClicked;
+
     private DialogPreference mPreference;
 
     public static ATEPreferenceDialogFragment newInstance(String key) {
@@ -54,23 +52,25 @@ public class ATEPreferenceDialogFragment extends DialogFragment implements Dialo
         } else {
             DialogPreference.TargetFragment fragment = (DialogPreference.TargetFragment) rawFragment;
             String key = this.getArguments().getString(ARG_KEY);
-            this.mPreference = fragment.findPreference(key);
+            this.mPreference = (DialogPreference) fragment.findPreference(key);
         }
     }
 
     @NonNull
-    public Dialog onCreateDialog(Bundle savedInstanceState) {
-        FragmentActivity context = this.getActivity();
-        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context,
-                com.google.android.material.R.style.ThemeOverlay_MaterialComponents_Dialog_Alert)
-                .setTitle(this.mPreference.getDialogTitle())
-                .setIcon(this.mPreference.getDialogIcon())
-                .setMessage(this.mPreference.getDialogMessage())
-                .setPositiveButton(this.mPreference.getPositiveButtonText(), this)
-                .setNegativeButton(this.mPreference.getNegativeButtonText(), this);
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        MaterialAlertDialogBuilder materialDialog = new MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(mPreference.getTitle())
+                .setIcon(mPreference.getIcon())
+                .setMessage(mPreference.getDialogMessage())
+                .setPositiveButton(mPreference.getPositiveButtonText(), (dialogInterface, i) -> {
+                    onDialogClosed(true);
+                })
+                .setNegativeButton(mPreference.getNegativeButtonText(), (dialogInterface, i) -> {
+                    onDialogClosed(false);
+                });
 
-        this.onPrepareDialogBuilder(builder);
-        AlertDialog dialog = builder.create();
+        this.onPrepareDialogBuilder(materialDialog);
+        AlertDialog dialog = materialDialog.create();
         if (this.needInputMethod()) {
             this.requestInputMethod(dialog);
         }
@@ -93,21 +93,7 @@ public class ATEPreferenceDialogFragment extends DialogFragment implements Dialo
         window.setSoftInputMode(5);
     }
 
-    @Override
-    public void onDismiss(@NonNull DialogInterface dialog) {
-        super.onDismiss(dialog);
-        Log.i(TAG, "onDismiss: " + mWhichButtonClicked);
-        onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE);
-    }
-
     public void onDialogClosed(boolean positiveResult) {
 
     }
-
-    @Override
-    public void onClick(DialogInterface dialog, int which) {
-        Log.i(TAG, "onClick: " + which);
-        mWhichButtonClicked = which;
-        onDialogClosed(which == DialogInterface.BUTTON_POSITIVE);
-    }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
index 13359781b..1ac734ef1 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEAccentTextView.kt
@@ -16,13 +16,14 @@ package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
+
 import androidx.appcompat.widget.AppCompatTextView
 import code.name.monkey.appthemehelper.ThemeStore
 
 class ATEAccentTextView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
 ) : AppCompatTextView(context, attrs, defStyleAttr) {
 
     init {
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.kt
old mode 100644
new mode 100755
similarity index 58%
rename from app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt
rename to appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.kt
index d49092ee0..a95eddb23
--- a/app/src/main/java/code/name/monkey/retromusic/views/LollipopFixedWebView.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATECheckBox.kt
@@ -11,22 +11,22 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+
+package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
-import android.content.res.Configuration
 import android.util.AttributeSet
-import android.webkit.WebView
+import androidx.appcompat.widget.AppCompatCheckBox
+import code.name.monkey.appthemehelper.ATH
+import code.name.monkey.appthemehelper.ThemeStore
 
-class LollipopFixedWebView @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1
-) : WebView(getFixedContext(context), attrs, defStyleAttr){
+class ATECheckBox @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : AppCompatCheckBox(context, attrs, defStyleAttr) {
 
-    companion object {
-        fun getFixedContext(context: Context): Context {
-            return context.createConfigurationContext(Configuration())
-        }
+    init {
+        ATH.setTint(this, ThemeStore.accentColor(context))
     }
-}
\ No newline at end of file
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt
new file mode 100755
index 000000000..23d5ef5e6
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2019 Hemanth Savarala.
+ *
+ * Licensed under the GNU General Public License v3
+ *
+ * This is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by
+ *  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * See the GNU General Public License for more details.
+ */
+
+package code.name.monkey.appthemehelper.common.views
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.appcompat.widget.AppCompatTextView
+import code.name.monkey.appthemehelper.ThemeStore
+import com.google.android.material.textview.MaterialTextView
+
+class ATEPrimaryTextView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : MaterialTextView(context, attrs, defStyleAttr) {
+
+    init {
+        setTextColor(ThemeStore.textColorPrimary(context))
+    }
+}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
similarity index 60%
rename from app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt
rename to appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
index 01bd0da63..568d65e82 100755
--- a/app/src/main/java/code/name/monkey/retromusic/views/WidthFitSquareLayout.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt
@@ -11,18 +11,21 @@
  * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
  */
-package code.name.monkey.retromusic.views
+
+package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
-import android.widget.FrameLayout
+import code.name.monkey.appthemehelper.ThemeStore
+import com.google.android.material.textview.MaterialTextView
 
-class WidthFitSquareLayout @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1
-) : FrameLayout(context, attrs, defStyleAttr) {
-    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
-        super.onMeasure(widthMeasureSpec, widthMeasureSpec)
+class ATESecondaryTextView @JvmOverloads constructor(
+        context: Context,
+        attrs: AttributeSet? = null,
+        defStyleAttr: Int = 0
+) : MaterialTextView(context, attrs, defStyleAttr) {
+
+    init {
+        setTextColor(ThemeStore.textColorSecondary(context))
     }
-}
\ No newline at end of file
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
old mode 100644
new mode 100755
index 869f5db83..89284b9c6
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESwitch.kt
@@ -2,27 +2,34 @@ package code.name.monkey.appthemehelper.common.views
 
 import android.content.Context
 import android.util.AttributeSet
-import androidx.core.view.isVisible
+import android.view.View
+import androidx.appcompat.widget.SwitchCompat
 import code.name.monkey.appthemehelper.ATH
 import code.name.monkey.appthemehelper.ThemeStore
-import com.google.android.material.materialswitch.MaterialSwitch
+
 
 /**
  * @author Aidan Follestad (afollestad)
  */
-class ATESwitch @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = -1,
-) : MaterialSwitch(context, attrs, defStyleAttr) {
+class ATESwitch : SwitchCompat {
 
-    init {
-        if (!isInEditMode && !ThemeStore.isMD3Enabled(context)) {
-            ATH.setTint(this, ThemeStore.accentColor(context))
-        }
+    constructor(context: Context) : super(context) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        init(context)
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        init(context)
+    }
+
+    private fun init(context: Context) {
+        ATH.setTint(this, ThemeStore.accentColor(context))
     }
 
     override fun isShown(): Boolean {
-        return parent != null && isVisible
+        return parent != null && visibility == View.VISIBLE
     }
-}
\ No newline at end of file
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
index 4291efa94..2d9d301c0 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ATHUtil.kt
@@ -1,10 +1,7 @@
 package code.name.monkey.appthemehelper.util
 
 import android.content.Context
-import android.graphics.Color
 import androidx.annotation.AttrRes
-import androidx.core.content.res.use
-import java.lang.Exception
 
 /**
  * @author Aidan Follestad (afollestad)
@@ -16,13 +13,21 @@ object ATHUtil {
     }
 
     @JvmOverloads
-    fun resolveColor(context: Context, @AttrRes attr: Int, fallback: Int = 0): Int {
-        context.theme.obtainStyledAttributes(intArrayOf(attr)).use {
-            return try {
-                it.getColor(0, fallback);
-            } catch (e: Exception) {
-                Color.BLACK
-            }
+    fun resolveColor(context: Context?, @AttrRes attr: Int, fallback: Int = 0): Int {
+        val a = context!!.theme.obtainStyledAttributes(intArrayOf(attr))
+        try {
+            return a.getColor(0, fallback)
+        } finally {
+            a.recycle()
         }
     }
+
+    fun inClassPath(clsName: String): Class<*> {
+        try {
+            return Class.forName(clsName)
+        } catch (t: Throwable) {
+            throw IllegalStateException(String.format("%s is not in your class path! You must include the associated library.", clsName))
+        }
+
+    }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.kt
index b3de70bca..ae66d149f 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ColorUtil.kt
@@ -3,11 +3,7 @@ package code.name.monkey.appthemehelper.util
 import android.graphics.Color
 import androidx.annotation.ColorInt
 import androidx.annotation.FloatRange
-import androidx.core.graphics.ColorUtils
-import kotlin.math.abs
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.math.roundToInt
+
 
 object ColorUtil {
     fun desaturateColor(color: Int, ratio: Float): Int {
@@ -18,7 +14,6 @@ object ColorUtil {
 
         return Color.HSVToColor(hsv)
     }
-
     fun stripAlpha(@ColorInt color: Int): Int {
         return -0x1000000 or color
     }
@@ -38,63 +33,13 @@ object ColorUtil {
         return shiftColor(color, 0.9f)
     }
 
-    @ColorInt
-    fun darkenColorTheme(@ColorInt color: Int): Int {
-        return shiftColor(color, 0.8f)
-    }
-
     @ColorInt
     fun lightenColor(@ColorInt color: Int): Int {
         return shiftColor(color, 1.1f)
     }
 
-    @ColorInt
-    fun lightenColor(
-        @ColorInt color: Int,
-        value: Float
-    ): Int {
-        val hsl = FloatArray(3)
-        ColorUtils.colorToHSL(color, hsl)
-        hsl[2] += value
-        hsl[2] = hsl[2].coerceIn(0f, 1f)
-        return ColorUtils.HSLToColor(hsl)
-    }
-
-    @ColorInt
-    fun darkenColor(
-        @ColorInt color: Int,
-        value: Float
-    ): Int {
-        val hsl = FloatArray(3)
-        ColorUtils.colorToHSL(color, hsl)
-        hsl[2] -= value
-        hsl[2] = hsl[2].coerceIn(0f, 1f)
-        return ColorUtils.HSLToColor(hsl)
-    }
-
-    @ColorInt
-    fun getReadableColorLight(@ColorInt color: Int, @ColorInt bgColor: Int): Int {
-        var foregroundColor = color
-        while (ColorUtils.calculateContrast(foregroundColor, bgColor) <= 3.0
-        ) {
-            foregroundColor = darkenColor(foregroundColor, 0.1F)
-        }
-        return foregroundColor
-    }
-
-    @ColorInt
-    fun getReadableColorDark(@ColorInt color: Int, @ColorInt bgColor: Int): Int {
-        var foregroundColor = color
-        while (ColorUtils.calculateContrast(foregroundColor, bgColor) <= 3.0
-        ) {
-            foregroundColor = lightenColor(foregroundColor, 0.1F)
-        }
-        return foregroundColor
-    }
-
     fun isColorLight(@ColorInt color: Int): Boolean {
-        val darkness =
-            1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255
+        val darkness = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255
         return darkness < 0.4
     }
 
@@ -108,7 +53,7 @@ object ColorUtil {
 
     @ColorInt
     fun adjustAlpha(@ColorInt color: Int, @FloatRange(from = 0.0, to = 1.0) factor: Float): Int {
-        val alpha = (Color.alpha(color) * factor).roundToInt()
+        val alpha = Math.round(Color.alpha(color) * factor)
         val red = Color.red(color)
         val green = Color.green(color)
         val blue = Color.blue(color)
@@ -117,7 +62,7 @@ object ColorUtil {
 
     @ColorInt
     fun withAlpha(@ColorInt baseColor: Int, @FloatRange(from = 0.0, to = 1.0) alpha: Float): Int {
-        val a = min(255, max(0, (alpha * 255).toInt())) shl 24
+        val a = Math.min(255, Math.max(0, (alpha * 255).toInt())) shl 24
         val rgb = 0x00ffffff and baseColor
         return a + rgb
     }
@@ -134,6 +79,7 @@ object ColorUtil {
         return Color.argb(a.toInt(), r.toInt(), g.toInt(), b.toInt())
     }
 
+
     private fun getColorDarkness(@ColorInt color: Int): Double {
         return if (color == Color.BLACK)
             1.0
@@ -149,31 +95,25 @@ object ColorUtil {
     }
 
     fun isColorSaturated(@ColorInt color: Int): Boolean {
-        val max = max(
-            0.299 * Color.red(color),
-            max(0.587 * Color.green(color), 0.114 * Color.blue(color))
-        )
-        val min = min(
-            0.299 * Color.red(color),
-            min(0.587 * Color.green(color), 0.114 * Color.blue(color))
-        )
-        val diff = abs(max - min)
+        val max = Math.max(0.299 * Color.red(color), Math.max(0.587 * Color.green(color), 0.114 * Color.blue(color)))
+        val min = Math.min(0.299 * Color.red(color), Math.min(0.587 * Color.green(color), 0.114 * Color.blue(color)))
+        val diff = Math.abs(max - min)
         return diff > 20
     }
 
     @ColorInt
     fun getMixedColor(@ColorInt color1: Int, @ColorInt color2: Int): Int {
         return Color.rgb(
-            (Color.red(color1) + Color.red(color2)) / 2,
-            (Color.green(color1) + Color.green(color2)) / 2,
-            (Color.blue(color1) + Color.blue(color2)) / 2
+                (Color.red(color1) + Color.red(color2)) / 2,
+                (Color.green(color1) + Color.green(color2)) / 2,
+                (Color.blue(color1) + Color.blue(color2)) / 2
         )
     }
 
-    private fun getDifference(@ColorInt color1: Int, @ColorInt color2: Int): Double {
-        var diff = abs(0.299 * (Color.red(color1) - Color.red(color2)))
-        diff += abs(0.587 * (Color.green(color1) - Color.green(color2)))
-        diff += abs(0.114 * (Color.blue(color1) - Color.blue(color2)))
+    fun getDifference(@ColorInt color1: Int, @ColorInt color2: Int): Double {
+        var diff = Math.abs(0.299 * (Color.red(color1) - Color.red(color2)))
+        diff += Math.abs(0.587 * (Color.green(color1) - Color.green(color2)))
+        diff += Math.abs(0.114 * (Color.blue(color1) - Color.blue(color2)))
         return diff
     }
 
@@ -183,17 +123,12 @@ object ColorUtil {
     }
 
     @ColorInt
-    fun getReadableText(
-        @ColorInt textColor: Int,
-        @ColorInt backgroundColor: Int,
-        difference: Int
-    ): Int {
+    fun getReadableText(@ColorInt textColor: Int, @ColorInt backgroundColor: Int, difference: Int): Int {
         var textColorFinal = textColor
         val isLight = isColorLight(backgroundColor)
         var i = 0
         while (getDifference(textColorFinal, backgroundColor) < difference && i < 100) {
-            textColorFinal =
-                getMixedColor(textColorFinal, if (isLight) Color.BLACK else Color.WHITE)
+            textColorFinal = getMixedColor(textColorFinal, if (isLight) Color.BLACK else Color.WHITE)
             i++
         }
 
@@ -203,8 +138,7 @@ object ColorUtil {
     @ColorInt
     fun getContrastColor(@ColorInt color: Int): Int {
         // Counting the perceptive luminance - human eye favors green color...
-        val a =
-            1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255
+        val a = 1 - (0.299 * Color.red(color) + 0.587 * Color.green(color) + 0.114 * Color.blue(color)) / 255
         return if (a < 0.5) Color.BLACK else Color.WHITE
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.kt
new file mode 100755
index 000000000..1997533e8
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/DrawableUtil.kt
@@ -0,0 +1,23 @@
+package code.name.monkey.appthemehelper.util
+
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import android.graphics.drawable.TransitionDrawable
+import androidx.annotation.ColorInt
+
+
+object DrawableUtil {
+
+    fun createTransitionDrawable(@ColorInt startColor: Int, @ColorInt endColor: Int): TransitionDrawable {
+        return createTransitionDrawable(ColorDrawable(startColor), ColorDrawable(endColor))
+    }
+
+    fun createTransitionDrawable(start: Drawable, end: Drawable): TransitionDrawable {
+        val drawables = arrayOfNulls<Drawable>(2)
+
+        drawables[0] = start
+        drawables[1] = end
+
+        return TransitionDrawable(drawables)
+    }
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.kt
index dae1401b0..642343f0e 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialUtil.kt
@@ -1,30 +1,26 @@
 package code.name.monkey.appthemehelper.util
 
 import android.content.res.ColorStateList
-import android.graphics.Color
+import android.graphics.PorterDuff
+import android.widget.EditText
+import android.widget.TextView
+import androidx.annotation.ColorInt
+import androidx.core.content.ContextCompat
 import code.name.monkey.appthemehelper.ThemeStore
 import com.google.android.material.button.MaterialButton
 import com.google.android.material.textfield.TextInputLayout
 
+
 object MaterialUtil {
 
     @JvmOverloads
-    @JvmStatic
-    fun setTint(
-        button: MaterialButton, background: Boolean = true,
-        color: Int = ThemeStore.accentColor(button.context)
-    ) {
+    fun setTint(button: MaterialButton, background: Boolean = true,
+                color: Int = ThemeStore.accentColor(button.context)) {
 
         button.isAllCaps = false
         val context = button.context
         val colorState = ColorStateList.valueOf(color)
-        val textColor =
-            ColorStateList.valueOf(
-                MaterialValueHelper.getPrimaryTextColor(
-                    context,
-                    ColorUtil.isColorLight(color)
-                )
-            )
+        val textColor = ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(context, ColorUtil.isColorLight(color)))
 
 
         if (background) {
@@ -35,24 +31,9 @@ object MaterialUtil {
             button.setTextColor(colorState)
             button.iconTint = colorState
         }
+
     }
 
-    @JvmOverloads
-    @JvmStatic
-    fun tintColor(
-        button: MaterialButton,
-        textColor: Int = Color.WHITE,
-        backgroundColor: Int = Color.BLACK
-    ) {
-        val backgroundColorStateList = ColorStateList.valueOf(backgroundColor)
-        val textColorColorStateList = ColorStateList.valueOf(textColor)
-        button.backgroundTintList = backgroundColorStateList
-        button.setTextColor(textColorColorStateList)
-        button.iconTint = textColorColorStateList
-    }
-
-    @JvmOverloads
-    @JvmStatic
     fun setTint(textInputLayout: TextInputLayout, background: Boolean = true) {
         val context = textInputLayout.context
         val accentColor = ThemeStore.accentColor(context)
@@ -66,5 +47,6 @@ object MaterialUtil {
             textInputLayout.defaultHintTextColor = colorState
             textInputLayout.isHintAnimationEnabled = true
         }
+
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
index ace097c28..6a57e56b1 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/MaterialValueHelper.kt
@@ -7,41 +7,38 @@ import androidx.core.content.ContextCompat
 
 import code.name.monkey.appthemehelper.R
 
+
 object MaterialValueHelper {
 
     @SuppressLint("PrivateResource")
-    @JvmStatic
     @ColorInt
     fun getPrimaryTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_default_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_default_material_dark)
+            ContextCompat.getColor(context!!, R.color.primary_text_default_material_light)
+        } else ContextCompat.getColor(context!!, R.color.primary_text_default_material_dark)
     }
 
     @SuppressLint("PrivateResource")
-    @JvmStatic
     @ColorInt
     fun getSecondaryTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_default_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_default_material_dark)
+            ContextCompat.getColor(context!!, R.color.secondary_text_default_material_light)
+        } else ContextCompat.getColor(context!!, R.color.secondary_text_default_material_dark)
     }
 
     @SuppressLint("PrivateResource")
-    @JvmStatic
     @ColorInt
     fun getPrimaryDisabledTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_disabled_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.primary_text_disabled_material_dark)
+            ContextCompat.getColor(context!!, R.color.primary_text_disabled_material_light)
+        } else ContextCompat.getColor(context!!, R.color.primary_text_disabled_material_dark)
     }
 
     @SuppressLint("PrivateResource")
-    @JvmStatic
     @ColorInt
     fun getSecondaryDisabledTextColor(context: Context?, dark: Boolean): Int {
         return if (dark) {
-            ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_disabled_material_light)
-        } else ContextCompat.getColor(context!!, androidx.appcompat.R.color.secondary_text_disabled_material_dark)
+            ContextCompat.getColor(context!!, R.color.secondary_text_disabled_material_light)
+        } else ContextCompat.getColor(context!!, R.color.secondary_text_disabled_material_dark)
     }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
new file mode 100644
index 000000000..05782028d
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/NavigationViewUtil.kt
@@ -0,0 +1,41 @@
+package code.name.monkey.appthemehelper.util
+
+import android.content.res.ColorStateList
+import androidx.annotation.ColorInt
+import code.name.monkey.appthemehelper.ThemeStore
+import com.google.android.material.bottomnavigation.BottomNavigationView
+import com.google.android.material.navigation.NavigationView
+
+/**
+ * @author Karim Abou Zeid (kabouzeid)
+ */
+object NavigationViewUtil {
+
+    fun setItemIconColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val iconSl = ColorStateList(arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)), intArrayOf(normalColor, selectedColor))
+        navigationView.itemIconTintList = iconSl
+        val drawable = navigationView.itemBackground
+        navigationView.itemBackground = TintHelper.createTintedDrawable(drawable, ColorUtil.withAlpha(ThemeStore.accentColor(navigationView.context), 0.2f))
+    }
+
+    fun setItemTextColors(navigationView: NavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val textSl = ColorStateList(
+                arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+                intArrayOf(normalColor, selectedColor))
+        navigationView.itemTextColor = textSl
+    }
+
+    fun setItemIconColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val iconSl = ColorStateList(
+                arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+                intArrayOf(normalColor, selectedColor))
+        bottomNavigationView.itemIconTintList = iconSl
+    }
+
+    fun setItemTextColors(bottomNavigationView: BottomNavigationView, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        val textSl = ColorStateList(
+                arrayOf(intArrayOf(-android.R.attr.state_checked), intArrayOf(android.R.attr.state_checked)),
+                intArrayOf(normalColor, selectedColor))
+        bottomNavigationView.itemTextColor = textSl
+    }
+}
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.kt
new file mode 100755
index 000000000..06cbaba84
--- /dev/null
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TabLayoutUtil.kt
@@ -0,0 +1,23 @@
+package code.name.monkey.appthemehelper.util
+
+import android.content.res.ColorStateList
+import androidx.annotation.ColorInt
+import com.google.android.material.tabs.TabLayout
+
+
+object TabLayoutUtil {
+
+    fun setTabIconColors(tabLayout: TabLayout?, @ColorInt normalColor: Int, @ColorInt selectedColor: Int) {
+        if (tabLayout == null)
+            return
+
+        val sl = ColorStateList(arrayOf(intArrayOf(-android.R.attr.state_selected), intArrayOf(android.R.attr.state_selected)),
+                intArrayOf(normalColor, selectedColor))
+        for (i in 0 until tabLayout.tabCount) {
+            val tab = tabLayout.getTabAt(i)
+            if (tab != null && tab.icon != null) {
+                tab.icon = TintHelper.createTintedDrawable(tab.icon, sl)
+            }
+        }
+    }
+}
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.kt
index f037271e3..09d790709 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TextInputLayoutUtil.kt
@@ -4,6 +4,8 @@ import android.content.res.ColorStateList
 import androidx.annotation.ColorInt
 import com.google.android.material.textfield.TextInputLayout
 
+import java.lang.reflect.Field
+
 /**
  * @author Aidan Follestad (afollestad)
  */
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
index 06b14526c..037e2ca1b 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/TintHelper.java
@@ -3,10 +3,10 @@ package code.name.monkey.appthemehelper.util;
 import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.res.ColorStateList;
-import android.graphics.Color;
 import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.RippleDrawable;
+import android.os.Build;
 import android.view.View;
 import android.widget.Button;
 import android.widget.CheckBox;
@@ -15,6 +15,7 @@ import android.widget.ImageView;
 import android.widget.ProgressBar;
 import android.widget.RadioButton;
 import android.widget.SeekBar;
+import android.widget.Switch;
 import android.widget.TextView;
 
 import androidx.annotation.CheckResult;
@@ -28,7 +29,6 @@ import androidx.core.content.ContextCompat;
 import androidx.core.graphics.drawable.DrawableCompat;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
-import com.google.android.material.materialswitch.MaterialSwitch;
 
 import java.lang.reflect.Field;
 
@@ -39,6 +39,374 @@ import code.name.monkey.appthemehelper.R;
  */
 public final class TintHelper {
 
+    @SuppressLint("PrivateResource")
+    @ColorInt
+    private static int getDefaultRippleColor(@NonNull Context context, boolean useDarkRipple) {
+        // Light ripple is actually translucent black, and vice versa
+        return ContextCompat.getColor(context, useDarkRipple ?
+                R.color.ripple_material_light : R.color.ripple_material_dark);
+    }
+
+    @NonNull
+    private static ColorStateList getDisabledColorStateList(@ColorInt int normal, @ColorInt int disabled) {
+        return new ColorStateList(new int[][]{
+                new int[]{-android.R.attr.state_enabled},
+                new int[]{android.R.attr.state_enabled}
+        }, new int[]{
+                disabled,
+                normal
+        });
+    }
+
+    @SuppressWarnings("deprecation")
+    public static void setTintSelector(@NonNull View view, @ColorInt final int color, final boolean darker, final boolean useDarkTheme) {
+        final boolean isColorLight = ColorUtil.INSTANCE.isColorLight(color);
+        final int disabled = ContextCompat.getColor(view.getContext(), useDarkTheme ? R.color.ate_button_disabled_dark : R.color.ate_button_disabled_light);
+        final int pressed = ColorUtil.INSTANCE.shiftColor(color, darker ? 0.9f : 1.1f);
+        final int activated = ColorUtil.INSTANCE.shiftColor(color, darker ? 1.1f : 0.9f);
+        final int rippleColor = getDefaultRippleColor(view.getContext(), isColorLight);
+        final int textColor = ContextCompat.getColor(view.getContext(), isColorLight ? R.color.ate_primary_text_light : R.color.ate_primary_text_dark);
+
+        final ColorStateList sl;
+        if (view instanceof Button) {
+            sl = getDisabledColorStateList(color, disabled);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+                    view.getBackground() instanceof RippleDrawable) {
+                RippleDrawable rd = (RippleDrawable) view.getBackground();
+                rd.setColor(ColorStateList.valueOf(rippleColor));
+            }
+
+            // Disabled text color state for buttons, may get overridden later by ATE tags
+            final Button button = (Button) view;
+            button.setTextColor(getDisabledColorStateList(textColor, ContextCompat.getColor(view.getContext(), useDarkTheme ? R.color.ate_button_text_disabled_dark : R.color.ate_button_text_disabled_light)));
+        } else if (view instanceof FloatingActionButton) {
+            // FloatingActionButton doesn't support disabled state?
+            sl = new ColorStateList(new int[][]{
+                    new int[]{-android.R.attr.state_pressed},
+                    new int[]{android.R.attr.state_pressed}
+            }, new int[]{
+                    color,
+                    pressed
+            });
+
+            final FloatingActionButton fab = (FloatingActionButton) view;
+            fab.setRippleColor(rippleColor);
+            fab.setBackgroundTintList(sl);
+            if (fab.getDrawable() != null)
+                fab.setImageDrawable(createTintedDrawable(fab.getDrawable(), textColor));
+            return;
+        } else {
+            sl = new ColorStateList(
+                    new int[][]{
+                            new int[]{-android.R.attr.state_enabled},
+                            new int[]{android.R.attr.state_enabled},
+                            new int[]{android.R.attr.state_enabled, android.R.attr.state_pressed},
+                            new int[]{android.R.attr.state_enabled, android.R.attr.state_activated},
+                            new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
+                    },
+                    new int[]{
+                            disabled,
+                            color,
+                            pressed,
+                            activated,
+                            activated
+                    }
+            );
+        }
+
+        Drawable drawable = view.getBackground();
+        if (drawable != null) {
+            drawable = createTintedDrawable(drawable, sl);
+            ViewUtil.INSTANCE.setBackgroundCompat(view, drawable);
+        }
+
+        if (view instanceof TextView && !(view instanceof Button)) {
+            final TextView tv = (TextView) view;
+            tv.setTextColor(getDisabledColorStateList(textColor, ContextCompat.getColor(view.getContext(), isColorLight ? R.color.ate_text_disabled_light : R.color.ate_text_disabled_dark)));
+        }
+    }
+
+    public static void setTintAuto(final @NonNull View view, final @ColorInt int color,
+                                   boolean background) {
+        setTintAuto(view, color, background, ATHUtil.INSTANCE.isWindowBackgroundDark(view.getContext()));
+    }
+
+    @SuppressWarnings("deprecation")
+    public static void setTintAuto(final @NonNull View view, final @ColorInt int color,
+                                   boolean background, final boolean isDark) {
+        if (!background) {
+            if (view instanceof RadioButton)
+                setTint((RadioButton) view, color, isDark);
+            else if (view instanceof SeekBar)
+                setTint((SeekBar) view, color, isDark);
+            else if (view instanceof ProgressBar)
+                setTint((ProgressBar) view, color);
+            else if (view instanceof EditText)
+                setTint((EditText) view, color, isDark);
+            else if (view instanceof CheckBox)
+                setTint((CheckBox) view, color, isDark);
+            else if (view instanceof ImageView)
+                setTint((ImageView) view, color);
+            else if (view instanceof Switch)
+                setTint((Switch) view, color, isDark);
+            else if (view instanceof SwitchCompat)
+                setTint((SwitchCompat) view, color, isDark);
+            else background = true;
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP &&
+                    !background && view.getBackground() instanceof RippleDrawable) {
+                // Ripples for the above views (e.g. when you tap and hold a switch or checkbox)
+                RippleDrawable rd = (RippleDrawable) view.getBackground();
+                @SuppressLint("PrivateResource") final int unchecked = ContextCompat.getColor(view.getContext(),
+                        isDark ? R.color.ripple_material_dark : R.color.ripple_material_light);
+                final int checked = ColorUtil.INSTANCE.adjustAlpha(color, 0.4f);
+                final ColorStateList sl = new ColorStateList(
+                        new int[][]{
+                                new int[]{-android.R.attr.state_activated, -android.R.attr.state_checked},
+                                new int[]{android.R.attr.state_activated},
+                                new int[]{android.R.attr.state_checked}
+                        },
+                        new int[]{
+                                unchecked,
+                                checked,
+                                checked
+                        }
+                );
+                rd.setColor(sl);
+            }
+        }
+        if (background) {
+            // Need to tint the background of a view
+            if (view instanceof FloatingActionButton || view instanceof Button) {
+                setTintSelector(view, color, false, isDark);
+            } else if (view.getBackground() != null) {
+                Drawable drawable = view.getBackground();
+                if (drawable != null) {
+                    drawable = createTintedDrawable(drawable, color);
+                    ViewUtil.INSTANCE.setBackgroundCompat(view, drawable);
+                }
+            }
+        }
+    }
+
+
+    public static void setTint(@NonNull RadioButton radioButton, @ColorInt int color, boolean useDarker) {
+        ColorStateList sl = new ColorStateList(new int[][]{
+                new int[]{-android.R.attr.state_enabled},
+                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
+                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
+        }, new int[]{
+                // Rdio button includes own alpha for disabled state
+                ColorUtil.INSTANCE.stripAlpha(ContextCompat.getColor(radioButton.getContext(), useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light)),
+                ContextCompat.getColor(radioButton.getContext(), useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
+                color
+        });
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            radioButton.setButtonTintList(sl);
+        } else {
+            Drawable d = createTintedDrawable(ContextCompat.getDrawable(radioButton.getContext(), R.drawable.abc_btn_radio_material), sl);
+            radioButton.setButtonDrawable(d);
+        }
+    }
+
+    public static void setTint(@NonNull SeekBar seekBar, @ColorInt int color, boolean useDarker) {
+        final ColorStateList s1 = getDisabledColorStateList(color, ContextCompat.getColor(seekBar.getContext(), useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light));
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            seekBar.setThumbTintList(s1);
+            seekBar.setProgressTintList(s1);
+        } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.GINGERBREAD_MR1) {
+            Drawable progressDrawable = createTintedDrawable(seekBar.getProgressDrawable(), s1);
+            seekBar.setProgressDrawable(progressDrawable);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                Drawable thumbDrawable = createTintedDrawable(seekBar.getThumb(), s1);
+                seekBar.setThumb(thumbDrawable);
+            }
+        } else {
+            PorterDuff.Mode mode = PorterDuff.Mode.SRC_IN;
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+                mode = PorterDuff.Mode.MULTIPLY;
+            }
+            if (seekBar.getIndeterminateDrawable() != null)
+                seekBar.getIndeterminateDrawable().setColorFilter(color, mode);
+            if (seekBar.getProgressDrawable() != null)
+                seekBar.getProgressDrawable().setColorFilter(color, mode);
+        }
+    }
+
+    public static void setTint(@NonNull ProgressBar progressBar, @ColorInt int color) {
+        setTint(progressBar, color, false);
+    }
+
+    public static void setTint(@NonNull ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
+        ColorStateList sl = ColorStateList.valueOf(color);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            progressBar.setProgressTintList(sl);
+            progressBar.setSecondaryProgressTintList(sl);
+            if (!skipIndeterminate)
+                progressBar.setIndeterminateTintList(sl);
+        } else {
+            PorterDuff.Mode mode = PorterDuff.Mode.SRC_IN;
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.GINGERBREAD_MR1) {
+                mode = PorterDuff.Mode.MULTIPLY;
+            }
+            if (!skipIndeterminate && progressBar.getIndeterminateDrawable() != null)
+                progressBar.getIndeterminateDrawable().setColorFilter(color, mode);
+            if (progressBar.getProgressDrawable() != null)
+                progressBar.getProgressDrawable().setColorFilter(color, mode);
+        }
+    }
+
+    public static void setTint(@NonNull EditText editText, @ColorInt int color, boolean useDarker) {
+        final ColorStateList editTextColorStateList = new ColorStateList(new int[][]{
+                new int[]{-android.R.attr.state_enabled},
+                new int[]{android.R.attr.state_enabled, -android.R.attr.state_pressed, -android.R.attr.state_focused},
+                new int[]{}
+        }, new int[]{
+                ContextCompat.getColor(editText.getContext(), useDarker ? R.color.ate_text_disabled_dark : R.color.ate_text_disabled_light),
+                ContextCompat.getColor(editText.getContext(), useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
+                color
+        });
+        if (editText instanceof AppCompatEditText) {
+            ((AppCompatEditText) editText).setSupportBackgroundTintList(editTextColorStateList);
+        } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            editText.setBackgroundTintList(editTextColorStateList);
+        }
+        setCursorTint(editText, color);
+    }
+
+    public static void setTint(@NonNull CheckBox box, @ColorInt int color, boolean useDarker) {
+        ColorStateList sl = new ColorStateList(new int[][]{
+                new int[]{-android.R.attr.state_enabled},
+                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
+                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
+        }, new int[]{
+                ContextCompat.getColor(box.getContext(), useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light),
+                ContextCompat.getColor(box.getContext(), useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
+                color
+        });
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            box.setButtonTintList(sl);
+        } else {
+            Drawable drawable = createTintedDrawable(ContextCompat.getDrawable(box.getContext(), R.drawable.abc_btn_check_material), sl);
+            box.setButtonDrawable(drawable);
+        }
+    }
+
+    public static void setTint(@NonNull ImageView image, @ColorInt int color) {
+        image.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+    }
+
+    private static Drawable modifySwitchDrawable(@NonNull Context context, @NonNull Drawable from, @ColorInt int tint, boolean thumb, boolean compatSwitch, boolean useDarker) {
+        if (useDarker) {
+            tint = ColorUtil.INSTANCE.shiftColor(tint, 1.1f);
+        }
+        tint = ColorUtil.INSTANCE.adjustAlpha(tint, (compatSwitch && !thumb) ? 0.5f : 1.0f);
+        int disabled;
+        int normal;
+        if (thumb) {
+            disabled = ContextCompat.getColor(context, useDarker ? R.color.ate_switch_thumb_disabled_dark : R.color.ate_switch_thumb_disabled_light);
+            normal = ContextCompat.getColor(context, useDarker ? R.color.ate_switch_thumb_normal_dark : R.color.ate_switch_thumb_normal_light);
+        } else {
+            disabled = ContextCompat.getColor(context, useDarker ? R.color.ate_switch_track_disabled_dark : R.color.ate_switch_track_disabled_light);
+            normal = ContextCompat.getColor(context, useDarker ? R.color.ate_switch_track_normal_dark : R.color.ate_switch_track_normal_light);
+        }
+
+        // Stock switch includes its own alpha
+        if (!compatSwitch) {
+            normal = ColorUtil.INSTANCE.stripAlpha(normal);
+        }
+
+        final ColorStateList sl = new ColorStateList(
+                new int[][]{
+                        new int[]{-android.R.attr.state_enabled},
+                        new int[]{android.R.attr.state_enabled, -android.R.attr.state_activated, -android.R.attr.state_checked},
+                        new int[]{android.R.attr.state_enabled, android.R.attr.state_activated},
+                        new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
+                },
+                new int[]{
+                        disabled,
+                        normal,
+                        tint,
+                        tint
+                }
+        );
+        return createTintedDrawable(from, sl);
+    }
+
+    public static void setTint(@NonNull Switch switchView, @ColorInt int color, boolean useDarker) {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) return;
+        if (switchView.getTrackDrawable() != null) {
+            switchView.setTrackDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getTrackDrawable(), color, false, false, useDarker));
+        }
+        if (switchView.getThumbDrawable() != null) {
+            switchView.setThumbDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getThumbDrawable(), color, true, false, useDarker));
+        }
+    }
+
+    public static void setTint(@NonNull SwitchCompat switchView, @ColorInt int color, boolean useDarker) {
+        if (switchView.getTrackDrawable() != null) {
+            switchView.setTrackDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getTrackDrawable(), color, false, true, useDarker));
+        }
+        if (switchView.getThumbDrawable() != null) {
+            switchView.setThumbDrawable(modifySwitchDrawable(switchView.getContext(),
+                    switchView.getThumbDrawable(), color, true, true, useDarker));
+        }
+    }
+
+    @CheckResult
+    @Nullable
+    public static Drawable createTintedDrawable(Context context,
+                                                @DrawableRes int res, @ColorInt int color) {
+        Drawable drawable = ContextCompat.getDrawable(context, res);
+        return createTintedDrawable(drawable, color);
+    }
+
+
+    // This returns a NEW Drawable because of the mutate() call. The mutate() call is necessary because Drawables with the same resource have shared states otherwise.
+    @CheckResult
+    @Nullable
+    public static Drawable createTintedDrawable(@Nullable Drawable drawable, @ColorInt int color) {
+        if (drawable == null) return null;
+        drawable = DrawableCompat.wrap(drawable.mutate());
+        DrawableCompat.setTintMode(drawable, PorterDuff.Mode.SRC_IN);
+        DrawableCompat.setTint(drawable, color);
+        return drawable;
+    }
+
+    // This returns a NEW Drawable because of the mutate() call. The mutate() call is necessary because Drawables with the same resource have shared states otherwise.
+    @CheckResult
+    @Nullable
+    public static Drawable createTintedDrawable(@Nullable Drawable drawable, @NonNull ColorStateList sl) {
+        if (drawable == null) return null;
+        drawable = DrawableCompat.wrap(drawable.mutate());
+        DrawableCompat.setTintList(drawable, sl);
+        return drawable;
+    }
+
+    public static void setCursorTint(@NonNull EditText editText, @ColorInt int color) {
+        try {
+            Field fCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
+            fCursorDrawableRes.setAccessible(true);
+            int mCursorDrawableRes = fCursorDrawableRes.getInt(editText);
+            Field fEditor = TextView.class.getDeclaredField("mEditor");
+            fEditor.setAccessible(true);
+            Object editor = fEditor.get(editText);
+            Class<?> clazz = editor.getClass();
+            Field fCursorDrawable = clazz.getDeclaredField("mCursorDrawable");
+            fCursorDrawable.setAccessible(true);
+            Drawable[] drawables = new Drawable[2];
+            drawables[0] = ContextCompat.getDrawable(editText.getContext(), mCursorDrawableRes);
+            drawables[0] = createTintedDrawable(drawables[0], color);
+            drawables[1] = ContextCompat.getDrawable(editText.getContext(), mCursorDrawableRes);
+            drawables[1] = createTintedDrawable(drawables[1], color);
+            fCursorDrawable.set(editor, drawables);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
     @SuppressWarnings("JavaReflectionMemberAccess")
     public static void colorHandles(@NonNull TextView view, int color) {
         try {
@@ -80,366 +448,4 @@ public final class TintHelper {
             e.printStackTrace();
         }
     }
-
-    @CheckResult
-    @NonNull
-    public static Drawable createTintedDrawable(Context context,
-                                                @DrawableRes int res, @ColorInt int color) {
-        Drawable drawable = ContextCompat.getDrawable(context, res);
-        return createTintedDrawable(drawable, color);
-    }
-
-    // This returns a NEW Drawable because of the mutate() call. The mutate() call is necessary because Drawables with the same resource have shared states otherwise.
-    @CheckResult
-    @NonNull
-    public static Drawable createTintedDrawable(@Nullable Drawable drawable, @ColorInt int color) {
-        if (drawable == null) {
-            return null;
-        }
-        drawable = DrawableCompat.wrap(drawable.mutate());
-        drawable.setTintMode(PorterDuff.Mode.SRC_IN);
-        drawable.setTint(color);
-        return drawable;
-    }
-
-    // This returns a NEW Drawable because of the mutate() call. The mutate() call is necessary because Drawables with the same resource have shared states otherwise.
-    @CheckResult
-    @Nullable
-    public static Drawable createTintedDrawable(@Nullable Drawable drawable, @NonNull ColorStateList sl) {
-        if (drawable == null) {
-            return null;
-        }
-        Drawable temp = DrawableCompat.wrap(drawable.mutate());
-        temp.setTintList(sl);
-        return temp;
-    }
-
-    public static void setCursorTint(@NonNull EditText editText, @ColorInt int color) {
-        try {
-            Field fCursorDrawableRes = TextView.class.getDeclaredField("mCursorDrawableRes");
-            fCursorDrawableRes.setAccessible(true);
-            int mCursorDrawableRes = fCursorDrawableRes.getInt(editText);
-            Field fEditor = TextView.class.getDeclaredField("mEditor");
-            fEditor.setAccessible(true);
-            Object editor = fEditor.get(editText);
-            Class<?> clazz = editor.getClass();
-            Field fCursorDrawable = clazz.getDeclaredField("mCursorDrawable");
-            fCursorDrawable.setAccessible(true);
-            Drawable[] drawables = new Drawable[2];
-            drawables[0] = ContextCompat.getDrawable(editText.getContext(), mCursorDrawableRes);
-            drawables[0] = createTintedDrawable(drawables[0], color);
-            drawables[1] = ContextCompat.getDrawable(editText.getContext(), mCursorDrawableRes);
-            drawables[1] = createTintedDrawable(drawables[1], color);
-            fCursorDrawable.set(editor, drawables);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void setTint(@NonNull RadioButton radioButton, @ColorInt int color, boolean useDarker) {
-        ColorStateList sl = new ColorStateList(new int[][]{
-                new int[]{-android.R.attr.state_enabled},
-                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
-                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
-        }, new int[]{
-                // Rdio button includes own alpha for disabled state
-                ColorUtil.INSTANCE.stripAlpha(ContextCompat.getColor(radioButton.getContext(),
-                        useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light)),
-                ContextCompat.getColor(radioButton.getContext(),
-                        useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
-                color
-        });
-        radioButton.setButtonTintList(sl);
-    }
-
-    public static void setTint(@NonNull SeekBar seekBar, @ColorInt int color, boolean useDarker) {
-        final ColorStateList s1 = getDisabledColorStateList(color, ContextCompat.getColor(seekBar.getContext(),
-                useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light));
-        seekBar.setThumbTintList(s1);
-        seekBar.setProgressTintList(s1);
-    }
-
-    public static void setTint(@NonNull ProgressBar progressBar, @ColorInt int color) {
-        setTint(progressBar, color, false);
-    }
-
-    public static void setTint(@NonNull ProgressBar progressBar, @ColorInt int color, boolean skipIndeterminate) {
-        ColorStateList sl = ColorStateList.valueOf(color);
-        progressBar.setProgressTintList(sl);
-        progressBar.setSecondaryProgressTintList(sl);
-        if (!skipIndeterminate) {
-            progressBar.setIndeterminateTintList(sl);
-        }
-    }
-
-    public static void setTint(@NonNull EditText editText, @ColorInt int color, boolean useDarker) {
-        final ColorStateList editTextColorStateList = new ColorStateList(new int[][]{
-                new int[]{-android.R.attr.state_enabled},
-                new int[]{android.R.attr.state_enabled, -android.R.attr.state_pressed, -android.R.attr.state_focused},
-                new int[]{}
-        }, new int[]{
-                ContextCompat.getColor(editText.getContext(),
-                        useDarker ? R.color.ate_text_disabled_dark : R.color.ate_text_disabled_light),
-                ContextCompat.getColor(editText.getContext(),
-                        useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
-                color
-        });
-        if (editText instanceof AppCompatEditText) {
-            ((AppCompatEditText) editText).setSupportBackgroundTintList(editTextColorStateList);
-        } else {
-            editText.setBackgroundTintList(editTextColorStateList);
-        }
-        setCursorTint(editText, color);
-    }
-
-    public static void setTint(@NonNull CheckBox box, @ColorInt int color, boolean useDarker) {
-        ColorStateList sl = new ColorStateList(new int[][]{
-                new int[]{-android.R.attr.state_enabled},
-                new int[]{android.R.attr.state_enabled, -android.R.attr.state_checked},
-                new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
-        }, new int[]{
-                ContextCompat.getColor(box.getContext(),
-                        useDarker ? R.color.ate_control_disabled_dark : R.color.ate_control_disabled_light),
-                ContextCompat.getColor(box.getContext(),
-                        useDarker ? R.color.ate_control_normal_dark : R.color.ate_control_normal_light),
-                color
-        });
-        box.setButtonTintList(sl);
-    }
-
-    public static void setTint(@NonNull ImageView image, @ColorInt int color) {
-        image.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
-    }
-
-    public static void setTint(@NonNull SwitchCompat switchView, @ColorInt int color, boolean useDarker) {
-        if (switchView.getTrackDrawable() != null) {
-            switchView.setTrackDrawable(modifySwitchDrawable(switchView.getContext(),
-                    switchView.getTrackDrawable(), color, false, true, useDarker));
-        }
-        if (switchView.getThumbDrawable() != null) {
-            switchView.setThumbDrawable(modifySwitchDrawable(switchView.getContext(),
-                    switchView.getThumbDrawable(), color, true, true, useDarker));
-        }
-    }
-
-    public static void setTint(@NonNull MaterialSwitch switchView, @ColorInt int color, boolean useDarker) {
-        if (switchView.getTrackDrawable() != null) {
-            switchView.setTrackTintList(createSwitchDrawableTintList(switchView.getContext(), color, false, true, useDarker));
-        }
-        if (switchView.getThumbDrawable() != null) {
-            switchView.setThumbTintList(createSwitchDrawableTintList(switchView.getContext(), color, true, true, useDarker));
-        }
-    }
-
-    public static void setTintAuto(final @NonNull View view, final @ColorInt int color,
-                                   boolean background) {
-        setTintAuto(view, color, background, ATHUtil.INSTANCE.isWindowBackgroundDark(view.getContext()));
-    }
-
-    public static void setTintAuto(final @NonNull View view, final @ColorInt int color,
-                                   boolean background, final boolean isDark) {
-        if (!background) {
-            if (view instanceof FloatingActionButton) {
-                setTint((FloatingActionButton) view, color, isDark);
-            } else if (view instanceof RadioButton) {
-                setTint((RadioButton) view, color, isDark);
-            } else if (view instanceof SeekBar) {
-                setTint((SeekBar) view, color, isDark);
-            } else if (view instanceof ProgressBar) {
-                setTint((ProgressBar) view, color);
-            } else if (view instanceof EditText) {
-                setTint((EditText) view, color, isDark);
-            } else if (view instanceof CheckBox) {
-                setTint((CheckBox) view, color, isDark);
-            } else if (view instanceof ImageView) {
-                setTint((ImageView) view, color);
-            } else if (view instanceof MaterialSwitch) {
-                setTint((MaterialSwitch) view, color, isDark);
-            } else if (view instanceof SwitchCompat) {
-                setTint((SwitchCompat) view, color, isDark);
-            } else {
-                background = true;
-            }
-
-            if (!background && view.getBackground() instanceof RippleDrawable) {
-                // Ripples for the above views (e.g. when you tap and hold a switch or checkbox)
-                RippleDrawable rd = (RippleDrawable) view.getBackground();
-                @SuppressLint("PrivateResource") final int unchecked = ContextCompat.getColor(view.getContext(),
-                        isDark ? androidx.appcompat.R.color.ripple_material_dark : androidx.appcompat.R.color.ripple_material_light);
-                final int checked = ColorUtil.INSTANCE.adjustAlpha(color, 0.4f);
-                final ColorStateList sl = new ColorStateList(
-                        new int[][]{
-                                new int[]{-android.R.attr.state_activated, -android.R.attr.state_checked},
-                                new int[]{android.R.attr.state_activated},
-                                new int[]{android.R.attr.state_checked}
-                        },
-                        new int[]{
-                                unchecked,
-                                checked,
-                                checked
-                        }
-                );
-                rd.setColor(sl);
-            }
-        }
-        if (background) {
-            // Need to tint the background of a view
-            if (view instanceof FloatingActionButton || view instanceof Button) {
-                setTintSelector(view, color, false, isDark);
-            } else if (view.getBackground() != null) {
-                Drawable drawable = view.getBackground();
-                if (drawable != null) {
-                    drawable = createTintedDrawable(drawable, color);
-                    ViewUtil.INSTANCE.setBackgroundCompat(view, drawable);
-                }
-            }
-        }
-    }
-
-    public static void setTintSelector(@NonNull View view, @ColorInt final int color, final boolean darker,
-                                       final boolean useDarkTheme) {
-        final boolean isColorLight = ColorUtil.INSTANCE.isColorLight(color);
-        final int disabled = ContextCompat.getColor(view.getContext(),
-                useDarkTheme ? R.color.ate_button_disabled_dark : R.color.ate_button_disabled_light);
-        final int pressed = ColorUtil.INSTANCE.shiftColor(color, darker ? 0.9f : 1.1f);
-        final int activated = ColorUtil.INSTANCE.shiftColor(color, darker ? 1.1f : 0.9f);
-        final int rippleColor = getDefaultRippleColor(view.getContext(), isColorLight);
-        final int textColor = ContextCompat.getColor(view.getContext(),
-                isColorLight ? R.color.ate_primary_text_light : R.color.ate_primary_text_dark);
-
-        final ColorStateList sl;
-        if (view instanceof Button) {
-            sl = getDisabledColorStateList(color, disabled);
-            if (view.getBackground() instanceof RippleDrawable) {
-                RippleDrawable rd = (RippleDrawable) view.getBackground();
-                rd.setColor(ColorStateList.valueOf(rippleColor));
-            }
-
-            // Disabled text color state for buttons, may get overridden later by ATE tags
-            final Button button = (Button) view;
-            button.setTextColor(getDisabledColorStateList(textColor, ContextCompat.getColor(view.getContext(),
-                    useDarkTheme ? R.color.ate_button_text_disabled_dark : R.color.ate_button_text_disabled_light)));
-        } else if (view instanceof FloatingActionButton) {
-            // FloatingActionButton doesn't support disabled state?
-            sl = new ColorStateList(new int[][]{
-                    new int[]{-android.R.attr.state_pressed},
-                    new int[]{android.R.attr.state_pressed}
-            }, new int[]{
-                    color,
-                    pressed
-            });
-
-            final FloatingActionButton fab = (FloatingActionButton) view;
-            fab.setRippleColor(rippleColor);
-            fab.setBackgroundTintList(sl);
-            if (fab.getDrawable() != null) {
-                fab.setImageDrawable(createTintedDrawable(fab.getDrawable(), textColor));
-            }
-            return;
-        } else {
-            sl = new ColorStateList(
-                    new int[][]{
-                            new int[]{-android.R.attr.state_enabled},
-                            new int[]{android.R.attr.state_enabled},
-                            new int[]{android.R.attr.state_enabled, android.R.attr.state_pressed},
-                            new int[]{android.R.attr.state_enabled, android.R.attr.state_activated},
-                            new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
-                    },
-                    new int[]{
-                            disabled,
-                            color,
-                            pressed,
-                            activated,
-                            activated
-                    }
-            );
-        }
-
-        Drawable drawable = view.getBackground();
-        if (drawable != null) {
-            drawable = createTintedDrawable(drawable, sl);
-            ViewUtil.INSTANCE.setBackgroundCompat(view, drawable);
-        }
-
-        if (view instanceof TextView && !(view instanceof Button)) {
-            final TextView tv = (TextView) view;
-            tv.setTextColor(getDisabledColorStateList(textColor, ContextCompat.getColor(view.getContext(),
-                    isColorLight ? R.color.ate_text_disabled_light : R.color.ate_text_disabled_dark)));
-        }
-    }
-
-    @SuppressLint("PrivateResource")
-    @ColorInt
-    private static int getDefaultRippleColor(@NonNull Context context, boolean useDarkRipple) {
-        // Light ripple is actually translucent black, and vice versa
-        return ContextCompat.getColor(context, useDarkRipple ?
-                androidx.appcompat.R.color.ripple_material_light : androidx.appcompat.R.color.ripple_material_dark);
-    }
-
-    @NonNull
-    private static ColorStateList getDisabledColorStateList(@ColorInt int normal, @ColorInt int disabled) {
-        return new ColorStateList(new int[][]{
-                new int[]{-android.R.attr.state_enabled},
-                new int[]{android.R.attr.state_enabled}
-        }, new int[]{
-                disabled,
-                normal
-        });
-    }
-
-    private static ColorStateList createSwitchDrawableTintList(@NonNull Context context, @ColorInt int tint,
-                                                               boolean thumb, boolean compatSwitch, boolean useDarker) {
-        int lighterTint = ColorUtil.INSTANCE.blendColors(tint, Color.WHITE, 0.4f);
-        int darkerTint = ColorUtil.INSTANCE.shiftColor(tint, 0.8f);
-        if (useDarker) {
-            tint = (compatSwitch && !thumb) ? lighterTint : darkerTint;
-        } else {
-            tint = (compatSwitch && !thumb) ? darkerTint : Color.WHITE;
-        }
-        int disabled;
-        int normal;
-        if (thumb) {
-            disabled = ContextCompat.getColor(context,
-                    useDarker ? R.color.ate_switch_thumb_disabled_dark : R.color.ate_switch_thumb_disabled_light);
-            normal = ContextCompat.getColor(context,
-                    useDarker ? R.color.ate_switch_thumb_normal_dark : R.color.ate_switch_thumb_normal_light);
-        } else {
-            disabled = ContextCompat.getColor(context,
-                    useDarker ? R.color.ate_switch_track_disabled_dark : R.color.ate_switch_track_disabled_light);
-            normal = ContextCompat.getColor(context,
-                    useDarker ? R.color.ate_switch_track_normal_dark : R.color.ate_switch_track_normal_light);
-        }
-
-        // Stock switch includes its own alpha
-        if (!compatSwitch) {
-            normal = ColorUtil.INSTANCE.stripAlpha(normal);
-        }
-
-        return new ColorStateList(
-                new int[][]{
-                        new int[]{-android.R.attr.state_enabled},
-                        new int[]{android.R.attr.state_enabled, -android.R.attr.state_activated,
-                                -android.R.attr.state_checked},
-                        new int[]{android.R.attr.state_enabled, android.R.attr.state_activated},
-                        new int[]{android.R.attr.state_enabled, android.R.attr.state_checked}
-                },
-                new int[]{
-                        disabled,
-                        normal,
-                        tint,
-                        tint
-                }
-        );
-    }
-
-    private static Drawable modifySwitchDrawable(@NonNull Context context, @NonNull Drawable from, @ColorInt int tint,
-                                                 boolean thumb, boolean compatSwitch, boolean useDarker) {
-
-        ColorStateList sl = createSwitchDrawableTintList(context, tint, thumb, compatSwitch, useDarker);
-        return createTintedDrawable(from, sl);
-    }
-
-    private static void setTint(final FloatingActionButton view, final int color, final boolean isDark) {
-        view.setImageTintList(ColorStateList.valueOf(color));
-    }
 }
\ No newline at end of file
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
index 23179ffbd..5fb476c99 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ToolbarContentTintHelper.java
@@ -5,6 +5,7 @@ import android.content.Context;
 import android.graphics.PorterDuff;
 import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
+import android.os.Build;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -39,250 +40,51 @@ import androidx.core.graphics.drawable.DrawableCompat;
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 
+import code.name.monkey.appthemehelper.R;
 import code.name.monkey.appthemehelper.ThemeStore;
 
 public final class ToolbarContentTintHelper {
 
-    public static class InternalToolbarContentTintUtil {
+    private ToolbarContentTintHelper() {
+    }
 
-        public static final class SearchViewTintUtil {
-
-            public static void setSearchViewContentColor(View searchView, final @ColorInt int color) {
-                if (searchView == null) {
-                    return;
-                }
-                final Class<?> cls = searchView.getClass();
-                try {
-                    final Field mSearchSrcTextViewField = cls.getDeclaredField("mSearchSrcTextView");
-                    mSearchSrcTextViewField.setAccessible(true);
-                    final EditText mSearchSrcTextView = (EditText) mSearchSrcTextViewField.get(searchView);
-                    mSearchSrcTextView.setTextColor(color);
-                    mSearchSrcTextView.setHintTextColor(ColorUtil.INSTANCE.adjustAlpha(color, 0.5f));
-                    TintHelper.setCursorTint(mSearchSrcTextView, color);
-
-                    Field field = cls.getDeclaredField("mSearchButton");
-                    tintImageView(searchView, field, color);
-                    field = cls.getDeclaredField("mGoButton");
-                    tintImageView(searchView, field, color);
-                    field = cls.getDeclaredField("mCloseButton");
-                    tintImageView(searchView, field, color);
-                    field = cls.getDeclaredField("mVoiceButton");
-                    tintImageView(searchView, field, color);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-
-            private SearchViewTintUtil() {
-            }
-
-            private static void tintImageView(Object target, Field field, final @ColorInt int color)
-                    throws Exception {
-                field.setAccessible(true);
-                final ImageView imageView = (ImageView) field.get(target);
-                if (imageView.getDrawable() != null) {
-                    imageView
-                            .setImageDrawable(
-                                    TintHelper.createTintedDrawable(imageView.getDrawable(), color));
-                }
-            }
-        }
-
-        public static void applyOverflowMenuTint(final @NonNull Context context, final Toolbar toolbar,
-                final @ColorInt int color) {
-            if (toolbar == null) {
-                return;
-            }
-            toolbar.post(() -> {
-                try {
-                    Field f1 = Toolbar.class.getDeclaredField("mMenuView");
-                    f1.setAccessible(true);
-                    ActionMenuView actionMenuView = (ActionMenuView) f1.get(toolbar);
-                    Field f2 = ActionMenuView.class.getDeclaredField("mPresenter");
-                    f2.setAccessible(true);
-
-                    // Actually ActionMenuPresenter
-                    BaseMenuPresenter presenter = (BaseMenuPresenter) f2.get(actionMenuView);
-                    Field f3 = presenter.getClass().getDeclaredField("mOverflowPopup");
-                    f3.setAccessible(true);
-                    MenuPopupHelper overflowMenuPopupHelper = (MenuPopupHelper) f3.get(presenter);
-                    setTintForMenuPopupHelper(context, overflowMenuPopupHelper, color);
-
-                    Field f4 = presenter.getClass().getDeclaredField("mActionButtonPopup");
-                    f4.setAccessible(true);
-                    MenuPopupHelper subMenuPopupHelper = (MenuPopupHelper) f4.get(presenter);
-                    setTintForMenuPopupHelper(context, subMenuPopupHelper, color);
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            });
-        }
-
-        public static void setOverflowButtonColor(@NonNull Activity activity,
-                final @ColorInt int color) {
-            final String overflowDescription = activity
-                    .getString(androidx.appcompat.R.string.abc_action_menu_overflow_description);
-            final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
-            final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
-            viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                @Override
-                public void onGlobalLayout() {
-                    final ArrayList<View> outViews = new ArrayList<>();
-                    decorView.findViewsWithText(outViews, overflowDescription,
-                            View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
-                    if (outViews.isEmpty()) {
-                        return;
-                    }
-                    final AppCompatImageView overflow = (AppCompatImageView) outViews.get(0);
-                    overflow.setImageDrawable(TintHelper.createTintedDrawable(overflow.getDrawable(), color));
-                    ViewUtil.INSTANCE.removeOnGlobalLayoutListener(decorView, this);
-                }
-            });
-        }
-
-        public static void setTintForMenuPopupHelper(final @NonNull Context context,
-                @Nullable MenuPopupHelper menuPopupHelper, final @ColorInt int color) {
-            try {
-                if (menuPopupHelper != null) {
-                    final ListView listView = ((ShowableListMenu) menuPopupHelper.getPopup()).getListView();
-                    listView.getViewTreeObserver()
-                            .addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-                                @Override
-                                public void onGlobalLayout() {
-                                    try {
-                                        Field checkboxField = ListMenuItemView.class.getDeclaredField("mCheckBox");
-                                        checkboxField.setAccessible(true);
-                                        Field radioButtonField = ListMenuItemView.class
-                                                .getDeclaredField("mRadioButton");
-                                        radioButtonField.setAccessible(true);
-
-                                        final boolean isDark = !ColorUtil.INSTANCE.isColorLight(
-                                                ATHUtil.INSTANCE
-                                                        .resolveColor(context, android.R.attr.windowBackground));
-
-                                        for (int i = 0; i < listView.getChildCount(); i++) {
-                                            View v = listView.getChildAt(i);
-                                            if (!(v instanceof ListMenuItemView)) {
-                                                continue;
-                                            }
-                                            ListMenuItemView iv = (ListMenuItemView) v;
-
-                                            CheckBox check = (CheckBox) checkboxField.get(iv);
-                                            if (check != null) {
-                                                TintHelper.setTint(check, color, isDark);
-                                                check.setBackground(null);
-                                            }
-
-                                            RadioButton radioButton = (RadioButton) radioButtonField.get(iv);
-                                            if (radioButton != null) {
-                                                TintHelper.setTint(radioButton, color, isDark);
-                                                radioButton.setBackground(null);
-                                            }
-                                        }
-                                    } catch (Exception e) {
-                                        e.printStackTrace();
-                                    }
-                                    listView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
-                                }
-                            });
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-        }
-
-        public static void tintMenu(@NonNull Toolbar toolbar, @Nullable Menu menu,
-                final @ColorInt int color) {
-            try {
-                final Field field = Toolbar.class.getDeclaredField("mCollapseIcon");
-                field.setAccessible(true);
-                Drawable collapseIcon = (Drawable) field.get(toolbar);
-                if (collapseIcon != null) {
-                    field.set(toolbar, TintHelper.createTintedDrawable(collapseIcon, color));
-                }
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-
-            if (menu != null && menu.size() > 0) {
-                for (int i = 0; i < menu.size(); i++) {
-                    final MenuItem item = menu.getItem(i);
-                    if (item.getIcon() != null) {
-                        item.setIcon(TintHelper.createTintedDrawable(item.getIcon(), color));
-                    }
-                    // Search view theming
-                    if (item.getActionView() != null && (
-                            item.getActionView() instanceof android.widget.SearchView || item
-                                    .getActionView() instanceof androidx.appcompat.widget.SearchView)) {
-                        SearchViewTintUtil.setSearchViewContentColor(item.getActionView(), color);
-                    }
-                }
-            }
-        }
-
-        private InternalToolbarContentTintUtil() {
+    public static void tintAllIcons(Menu menu, final int color) {
+        for (int i = 0; i < menu.size(); ++i) {
+            final MenuItem item = menu.getItem(i);
+            tintMenuItemIcon(color, item);
+            tintShareIconIfPresent(color, item);
         }
     }
 
-    private static class ATHMenuPresenterCallback implements MenuPresenter.Callback {
-
-        private final int mColor;
-
-        private final Context mContext;
-
-        private final MenuPresenter.Callback mParentCb;
-
-        private final Toolbar mToolbar;
-
-        public ATHMenuPresenterCallback(Context context, final @ColorInt int color,
-                MenuPresenter.Callback parentCb, Toolbar toolbar) {
-            mContext = context;
-            mColor = color;
-            mParentCb = parentCb;
-            mToolbar = toolbar;
-        }
-
-        @Override
-        public void onCloseMenu(@NonNull MenuBuilder menu, boolean allMenusAreClosing) {
-            if (mParentCb != null) {
-                mParentCb.onCloseMenu(menu, allMenusAreClosing);
-            }
-        }
-
-        @Override
-        public boolean onOpenSubMenu(@NonNull MenuBuilder subMenu) {
-            InternalToolbarContentTintUtil.applyOverflowMenuTint(mContext, mToolbar, mColor);
-            return mParentCb != null && mParentCb.onOpenSubMenu(subMenu);
+    private static void tintMenuItemIcon(int color, MenuItem item) {
+        final Drawable drawable = item.getIcon();
+        if (drawable != null) {
+            final Drawable wrapped = DrawableCompat.wrap(drawable);
+            drawable.mutate();
+            DrawableCompat.setTint(wrapped, color);
+            item.setIcon(drawable);
         }
     }
 
-    private static class ATHOnMenuItemClickListener implements Toolbar.OnMenuItemClickListener {
-
-        private final int mColor;
-
-        private final Context mContext;
-
-        private final Toolbar.OnMenuItemClickListener mParentListener;
-
-        private final Toolbar mToolbar;
-
-        public ATHOnMenuItemClickListener(Context context, final @ColorInt int color,
-                Toolbar.OnMenuItemClickListener parentCb, Toolbar toolbar) {
-            mContext = context;
-            mColor = color;
-            mParentListener = parentCb;
-            mToolbar = toolbar;
-        }
-
-        @Override
-        public boolean onMenuItemClick(MenuItem item) {
-            InternalToolbarContentTintUtil.applyOverflowMenuTint(mContext, mToolbar, mColor);
-            return mParentListener != null && mParentListener.onMenuItemClick(item);
+    private static void tintShareIconIfPresent(int color, MenuItem item) {
+        if (item.getActionView() != null) {
+            final View actionView = item.getActionView();
+            final View expandActivitiesButton = actionView.findViewById(R.id.expand_activities_button);
+            if (expandActivitiesButton != null) {
+                final ImageView image = (ImageView) expandActivitiesButton.findViewById(R.id.image);
+                if (image != null) {
+                    final Drawable drawable = image.getDrawable();
+                    final Drawable wrapped = DrawableCompat.wrap(drawable);
+                    drawable.mutate();
+                    DrawableCompat.setTint(wrapped, color);
+                    image.setImageDrawable(drawable);
+                }
+            }
         }
     }
 
     public static void colorBackButton(@NonNull Toolbar toolbar) {
-        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(), androidx.appcompat.R.attr.colorControlNormal);
+        int color = ATHUtil.INSTANCE.resolveColor(toolbar.getContext(),  R.attr.colorControlNormal);
         final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(color, PorterDuff.Mode.MULTIPLY);
         for (int i = 0; i < toolbar.getChildCount(); i++) {
             final View backButton = toolbar.getChildAt(i);
@@ -300,7 +102,7 @@ public final class ToolbarContentTintHelper {
      * @param activity          reference to activity needed to register observers
      */
     public static void colorizeToolbar(Toolbar toolbarView, int toolbarIconsColor,
-            Activity activity) {
+                                       Activity activity) {
         final PorterDuffColorFilter colorFilter = new PorterDuffColorFilter(toolbarIconsColor,
                 PorterDuff.Mode.MULTIPLY);
 
@@ -326,8 +128,13 @@ public final class ToolbarContentTintHelper {
 
                                 //Important to set the color filter in seperate thread, by adding it to the message queue
                                 //Won't work otherwise.
-                                innerView.post(() -> ((ActionMenuItemView) innerView).getCompoundDrawables()[finalK]
-                                        .setColorFilter(colorFilter));
+                                innerView.post(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        ((ActionMenuItemView) innerView).getCompoundDrawables()[finalK]
+                                                .setColorFilter(colorFilter);
+                                    }
+                                });
                             }
                         }
                     }
@@ -335,72 +142,101 @@ public final class ToolbarContentTintHelper {
             }
 
             //Step 3: Changing the color of title and subtitle.
-            toolbarView.setTitleTextColor(ATHUtil.INSTANCE.resolveColor(activity, android.R.attr.textColorPrimary));
-            toolbarView
-                    .setSubtitleTextColor(ATHUtil.INSTANCE.resolveColor(activity, android.R.attr.textColorSecondary));
+            toolbarView.setTitleTextColor(ThemeStore.Companion.textColorPrimary(activity));
+            toolbarView.setSubtitleTextColor(ThemeStore.Companion.textColorSecondary(activity));
 
             //Step 4: Changing the color of the Overflow Menu icon.
-            setOverflowButtonColor(toolbarView, toolbarIconsColor);
+            setOverflowButtonColor(activity, toolbarView, toolbarIconsColor);
         }
     }
 
-    @Nullable
-    public static Toolbar getSupportActionBarView(@Nullable ActionBar ab) {
-        if (!(ab instanceof WindowDecorActionBar)) {
-            return null;
-        }
-        try {
-            WindowDecorActionBar decorAb = (WindowDecorActionBar) ab;
-            Field field = WindowDecorActionBar.class.getDeclaredField("mDecorToolbar");
-            field.setAccessible(true);
-            ToolbarWidgetWrapper wrapper = (ToolbarWidgetWrapper) field.get(decorAb);
-            field = ToolbarWidgetWrapper.class.getDeclaredField("mToolbar");
-            field.setAccessible(true);
-            return (Toolbar) field.get(wrapper);
-        } catch (Throwable t) {
-            throw new RuntimeException(
-                    "Failed to retrieve Toolbar from AppCompat support ActionBar: " + t.getMessage(), t);
-        }
+    /**
+     * It's important to set overflowDescription atribute in styles, so we can grab the reference to
+     * the overflow icon. Check: res/values/styles.xml
+     */
+    private static void setOverflowButtonColor(final Activity activity,
+                                               final PorterDuffColorFilter colorFilter) {
+        final String overflowDescription = activity
+                .getString(R.string.abc_action_menu_overflow_description);
+        final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
+        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+                final ArrayList<View> outViews = new ArrayList<View>();
+                decorView.findViewsWithText(outViews, overflowDescription,
+                        View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
+                if (outViews.isEmpty()) {
+                    return;
+                }
+                final ActionMenuView overflowViewParent = (ActionMenuView) outViews.get(0).getParent();
+                overflowViewParent.getOverflowIcon().setColorFilter(colorFilter);
+                removeOnGlobalLayoutListener(decorView, this);
+            }
+        });
     }
 
-    public static void handleOnCreateOptionsMenu(
-            @NonNull Context context,
-            @NonNull Toolbar toolbar,
-            @NonNull Menu menu,
-            int toolbarColor) {
-        setToolbarContentColorBasedOnToolbarColor(context, toolbar, menu, toolbarColor);
+    private static void setOverflowButtonColor(final Activity activity, final Toolbar toolbar,
+                                               final int toolbarIconsColor) {
+        final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+        final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
+        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+            @Override
+            public void onGlobalLayout() {
+
+                if (toolbar != null && toolbar.getOverflowIcon() != null) {
+                    Drawable bg = DrawableCompat.wrap(toolbar.getOverflowIcon());
+                    DrawableCompat.setTint(bg, toolbarIconsColor);
+                }
+                removeOnGlobalLayoutListener(decorView, this);
+            }
+        });
     }
 
-    public static void handleOnCreateOptionsMenu(Context context, Toolbar toolbar, Menu menu,
-            @ColorInt int toolbarContentColor, @ColorInt int titleTextColor,
-            @ColorInt int subtitleTextColor, @ColorInt int menuWidgetColor) {
-        setToolbarContentColor(context, toolbar, menu, toolbarContentColor, titleTextColor,
-                subtitleTextColor, menuWidgetColor);
+    private static void removeOnGlobalLayoutListener(View v,
+                                                     ViewTreeObserver.OnGlobalLayoutListener listener) {
+        v.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
     }
 
-    public static void handleOnPrepareOptionsMenu(Activity activity, Toolbar toolbar) {
-        handleOnPrepareOptionsMenu(activity, toolbar, ThemeStore.Companion.accentColor(activity));
+    public static void setToolbarContentColorBasedOnToolbarColor(@NonNull Context context,
+                                                                 Toolbar toolbar,
+                                                                 int toolbarColor) {
+        setToolbarContentColorBasedOnToolbarColor(context, toolbar, null, toolbarColor);
     }
 
-    public static void handleOnPrepareOptionsMenu(Activity activity, Toolbar toolbar,
-            int widgetColor) {
-        InternalToolbarContentTintUtil.applyOverflowMenuTint(activity, toolbar, widgetColor);
+    public static void setToolbarContentColorBasedOnToolbarColor(@NonNull Context context,
+                                                                 Toolbar toolbar,
+                                                                 @Nullable Menu menu,
+                                                                 int toolbarColor) {
+        setToolbarContentColorBasedOnToolbarColor(context, toolbar, menu, toolbarColor,
+                ThemeStore.Companion.accentColor(context));
+    }
+
+    public static void setToolbarContentColorBasedOnToolbarColor(@NonNull Context context,
+                                                                 Toolbar toolbar,
+                                                                 @Nullable Menu menu,
+                                                                 int toolbarColor,
+                                                                 final @ColorInt int menuWidgetColor) {
+        setToolbarContentColor(context, toolbar, menu, toolbarContentColor(context, toolbarColor),
+                toolbarTitleColor(context, toolbarColor), toolbarSubtitleColor(context, toolbarColor),
+                menuWidgetColor);
     }
 
     public static void setToolbarContentColor(@NonNull Context context, Toolbar toolbar,
-            final @ColorInt int toolbarContentColor, final @ColorInt int primaryTextColor,
-            final @ColorInt int secondaryTextColor, final @ColorInt int menuWidgetColor) {
+                                              final @ColorInt int toolbarContentColor, final @ColorInt int primaryTextColor,
+                                              final @ColorInt int secondaryTextColor, final @ColorInt int menuWidgetColor) {
         setToolbarContentColor(context, toolbar, null, toolbarContentColor, primaryTextColor,
                 secondaryTextColor, menuWidgetColor);
     }
 
+    @SuppressWarnings("unchecked")
     public static void setToolbarContentColor(@NonNull Context context,
-            Toolbar toolbar,
-            @Nullable Menu menu,
-            final @ColorInt int toolbarContentColor,
-            final @ColorInt int titleTextColor,
-            final @ColorInt int subtitleTextColor,
-            final @ColorInt int menuWidgetColor) {
+                                              Toolbar toolbar,
+                                              @Nullable Menu menu,
+                                              final @ColorInt int toolbarContentColor,
+                                              final @ColorInt int titleTextColor,
+                                              final @ColorInt int subtitleTextColor,
+                                              final @ColorInt int menuWidgetColor) {
         if (toolbar == null) {
             return;
         }
@@ -422,7 +258,8 @@ public final class ToolbarContentTintHelper {
         InternalToolbarContentTintUtil.applyOverflowMenuTint(context, toolbar, menuWidgetColor);
 
         if (context instanceof Activity) {
-            InternalToolbarContentTintUtil.setOverflowButtonColor((Activity) context, toolbarContentColor);
+            InternalToolbarContentTintUtil
+                    .setOverflowButtonColor((Activity) context, toolbarContentColor);
         }
 
         try {
@@ -451,8 +288,7 @@ public final class ToolbarContentTintHelper {
             final Field menuItemClickListener = Toolbar.class
                     .getDeclaredField("mOnMenuItemClickListener");
             menuItemClickListener.setAccessible(true);
-            Toolbar.OnMenuItemClickListener currentClickListener
-                    = (Toolbar.OnMenuItemClickListener) menuItemClickListener
+            Toolbar.OnMenuItemClickListener currentClickListener = (Toolbar.OnMenuItemClickListener) menuItemClickListener
                     .get(toolbar);
             if (!(currentClickListener instanceof ATHOnMenuItemClickListener)) {
                 final ATHOnMenuItemClickListener newClickListener = new ATHOnMenuItemClickListener(context,
@@ -464,38 +300,44 @@ public final class ToolbarContentTintHelper {
         }
     }
 
-    public static void setToolbarContentColorBasedOnToolbarColor(@NonNull Context context,
-            Toolbar toolbar,
-            int toolbarColor) {
-        setToolbarContentColorBasedOnToolbarColor(context, toolbar, null, toolbarColor);
-    }
-
-    public static void setToolbarContentColorBasedOnToolbarColor(
-            @NonNull Context context,
-            @NonNull Toolbar toolbar,
-            @Nullable Menu menu,
-            int toolbarColor) {
-        setToolbarContentColorBasedOnToolbarColor(context, toolbar, menu, toolbarColor,
-                ThemeStore.Companion.accentColor(context));
-    }
-
-    public static void setToolbarContentColorBasedOnToolbarColor(
-            @NonNull Context context,
-            @NonNull Toolbar toolbar,
-            @Nullable Menu menu,
-            int toolbarColor,
-            final @ColorInt int menuWidgetColor) {
-        setToolbarContentColor(context, toolbar, menu, toolbarContentColor(context, toolbarColor),
-                toolbarTitleColor(context, toolbarColor), toolbarSubtitleColor(context, toolbarColor),
-                menuWidgetColor);
-    }
-
-    public static void tintAllIcons(Menu menu, final int color) {
-        for (int i = 0; i < menu.size(); ++i) {
-            final MenuItem item = menu.getItem(i);
-            tintMenuItemIcon(color, item);
-            tintShareIconIfPresent(color, item);
+    @Nullable
+    public static Toolbar getSupportActionBarView(@Nullable ActionBar ab) {
+        if (ab == null || !(ab instanceof WindowDecorActionBar)) {
+            return null;
         }
+        try {
+            WindowDecorActionBar decorAb = (WindowDecorActionBar) ab;
+            Field field = WindowDecorActionBar.class.getDeclaredField("mDecorToolbar");
+            field.setAccessible(true);
+            ToolbarWidgetWrapper wrapper = (ToolbarWidgetWrapper) field.get(decorAb);
+            field = ToolbarWidgetWrapper.class.getDeclaredField("mToolbar");
+            field.setAccessible(true);
+            return (Toolbar) field.get(wrapper);
+        } catch (Throwable t) {
+            throw new RuntimeException(
+                    "Failed to retrieve Toolbar from AppCompat support ActionBar: " + t.getMessage(), t);
+        }
+    }
+
+    public static void handleOnPrepareOptionsMenu(Activity activity, Toolbar toolbar) {
+        handleOnPrepareOptionsMenu(activity, toolbar, ThemeStore.Companion.accentColor(activity));
+    }
+
+    public static void handleOnPrepareOptionsMenu(Activity activity, Toolbar toolbar,
+                                                  int widgetColor) {
+        InternalToolbarContentTintUtil.applyOverflowMenuTint(activity, toolbar, widgetColor);
+    }
+
+    public static void handleOnCreateOptionsMenu(Context context, Toolbar toolbar, Menu menu,
+                                                 int toolbarColor) {
+        setToolbarContentColorBasedOnToolbarColor(context, toolbar, menu, toolbarColor);
+    }
+
+    public static void handleOnCreateOptionsMenu(Context context, Toolbar toolbar, Menu menu,
+                                                 @ColorInt int toolbarContentColor, @ColorInt int titleTextColor,
+                                                 @ColorInt int subtitleTextColor, @ColorInt int menuWidgetColor) {
+        setToolbarContentColor(context, toolbar, menu, toolbarContentColor, titleTextColor,
+                subtitleTextColor, menuWidgetColor);
     }
 
     @CheckResult
@@ -510,100 +352,254 @@ public final class ToolbarContentTintHelper {
     @CheckResult
     @ColorInt
     public static int toolbarSubtitleColor(@NonNull Context context, @ColorInt int toolbarColor) {
-        return MaterialValueHelper
-                .getSecondaryTextColor(context, ColorUtil.INSTANCE.isColorLight(toolbarColor));
+        return MaterialValueHelper.INSTANCE.getSecondaryTextColor(context, ColorUtil.INSTANCE.isColorLight(toolbarColor));
     }
 
     @CheckResult
     @ColorInt
     public static int toolbarTitleColor(@NonNull Context context, @ColorInt int toolbarColor) {
-        return MaterialValueHelper
-                .getPrimaryTextColor(context, ColorUtil.INSTANCE.isColorLight(toolbarColor));
+        return MaterialValueHelper.INSTANCE.getPrimaryTextColor(context, ColorUtil.INSTANCE.isColorLight(toolbarColor));
     }
 
-    private ToolbarContentTintHelper() {
-    }
+    private static class ATHMenuPresenterCallback implements MenuPresenter.Callback {
 
-    private static void removeOnGlobalLayoutListener(View v,
-            ViewTreeObserver.OnGlobalLayoutListener listener) {
-        v.getViewTreeObserver().removeOnGlobalLayoutListener(listener);
-    }
+        private Context mContext;
+        private int mColor;
+        private MenuPresenter.Callback mParentCb;
+        private Toolbar mToolbar;
 
-    private static void setOverflowButtonColor(final Toolbar toolbar, final int color) {
-            Drawable drawable = toolbar.getOverflowIcon();
-            if (drawable != null) {
-                // If we don't mutate the drawable, then all drawables with this id will have the ColorFilter
-                drawable.mutate();
-                drawable.setColorFilter(color, PorterDuff.Mode.SRC_ATOP);
+        public ATHMenuPresenterCallback(Context context, final @ColorInt int color,
+                                        MenuPresenter.Callback parentCb, Toolbar toolbar) {
+            mContext = context;
+            mColor = color;
+            mParentCb = parentCb;
+            mToolbar = toolbar;
         }
 
-    }
-
-    private static void setOverflowButtonColor(final Activity activity, final Toolbar toolbar,
-            final int toolbarIconsColor) {
-        final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
-        final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
-        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-
-                if (toolbar != null && toolbar.getOverflowIcon() != null) {
-                    Drawable bg = DrawableCompat.wrap(toolbar.getOverflowIcon());
-                    bg.setTint(toolbarIconsColor);
-                }
-                removeOnGlobalLayoutListener(decorView, this);
+        @Override
+        public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
+            if (mParentCb != null) {
+                mParentCb.onCloseMenu(menu, allMenusAreClosing);
             }
-        });
+        }
+
+        @Override
+        public boolean onOpenSubMenu(MenuBuilder subMenu) {
+            InternalToolbarContentTintUtil.applyOverflowMenuTint(mContext, mToolbar, mColor);
+            return mParentCb != null && mParentCb.onOpenSubMenu(subMenu);
+        }
     }
 
-    /**
-     * It's important to set overflowDescription atribute in styles, so we can grab the reference to
-     * the overflow icon. Check: res/values/styles.xml
-     */
-    private static void setOverflowButtonColor(final Activity activity,
-            final PorterDuffColorFilter colorFilter) {
-        final String overflowDescription = activity
-                .getString(androidx.appcompat.R.string.abc_action_menu_overflow_description);
-        final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
-        final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
-        viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
-            @Override
-            public void onGlobalLayout() {
-                final ArrayList<View> outViews = new ArrayList<>();
-                decorView.findViewsWithText(outViews, overflowDescription,
-                        View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
-                if (outViews.isEmpty()) {
+    private static class ATHOnMenuItemClickListener implements Toolbar.OnMenuItemClickListener {
+
+        private Context mContext;
+        private int mColor;
+        private Toolbar.OnMenuItemClickListener mParentListener;
+        private Toolbar mToolbar;
+
+        public ATHOnMenuItemClickListener(Context context, final @ColorInt int color,
+                                          Toolbar.OnMenuItemClickListener parentCb, Toolbar toolbar) {
+            mContext = context;
+            mColor = color;
+            mParentListener = parentCb;
+            mToolbar = toolbar;
+        }
+
+        @Override
+        public boolean onMenuItemClick(MenuItem item) {
+            InternalToolbarContentTintUtil.applyOverflowMenuTint(mContext, mToolbar, mColor);
+            return mParentListener != null && mParentListener.onMenuItemClick(item);
+        }
+    }
+
+    public static class InternalToolbarContentTintUtil {
+
+        private InternalToolbarContentTintUtil() {
+        }
+
+        @SuppressWarnings("unchecked")
+        public static void tintMenu(@NonNull Toolbar toolbar, @Nullable Menu menu,
+                                    final @ColorInt int color) {
+            try {
+                final Field field = Toolbar.class.getDeclaredField("mCollapseIcon");
+                field.setAccessible(true);
+                Drawable collapseIcon = (Drawable) field.get(toolbar);
+                if (collapseIcon != null) {
+                    field.set(toolbar, TintHelper.createTintedDrawable(collapseIcon, color));
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+
+            if (menu != null && menu.size() > 0) {
+                for (int i = 0; i < menu.size(); i++) {
+                    final MenuItem item = menu.getItem(i);
+                    if (item.getIcon() != null) {
+                        item.setIcon(TintHelper.createTintedDrawable(item.getIcon(), color));
+                    }
+                    // Search view theming
+                    if (item.getActionView() != null && (
+                            item.getActionView() instanceof android.widget.SearchView || item
+                                    .getActionView() instanceof androidx.appcompat.widget.SearchView)) {
+                        SearchViewTintUtil.setSearchViewContentColor(item.getActionView(), color);
+                    }
+                }
+            }
+        }
+
+        public static void applyOverflowMenuTint(final @NonNull Context context, final Toolbar toolbar,
+                                                 final @ColorInt int color) {
+            if (toolbar == null) {
+                return;
+            }
+            toolbar.post(new Runnable() {
+                @Override
+                public void run() {
+                    try {
+                        Field f1 = Toolbar.class.getDeclaredField("mMenuView");
+                        f1.setAccessible(true);
+                        ActionMenuView actionMenuView = (ActionMenuView) f1.get(toolbar);
+                        Field f2 = ActionMenuView.class.getDeclaredField("mPresenter");
+                        f2.setAccessible(true);
+
+                        // Actually ActionMenuPresenter
+                        BaseMenuPresenter presenter = (BaseMenuPresenter) f2.get(actionMenuView);
+                        Field f3 = presenter.getClass().getDeclaredField("mOverflowPopup");
+                        f3.setAccessible(true);
+                        MenuPopupHelper overflowMenuPopupHelper = (MenuPopupHelper) f3.get(presenter);
+                        setTintForMenuPopupHelper(context, overflowMenuPopupHelper, color);
+
+                        Field f4 = presenter.getClass().getDeclaredField("mActionButtonPopup");
+                        f4.setAccessible(true);
+                        MenuPopupHelper subMenuPopupHelper = (MenuPopupHelper) f4.get(presenter);
+                        setTintForMenuPopupHelper(context, subMenuPopupHelper, color);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                }
+            });
+        }
+
+        public static void setTintForMenuPopupHelper(final @NonNull Context context,
+                                                     @Nullable MenuPopupHelper menuPopupHelper, final @ColorInt int color) {
+            try {
+                if (menuPopupHelper != null) {
+                    final ListView listView = ((ShowableListMenu) menuPopupHelper.getPopup()).getListView();
+                    listView.getViewTreeObserver()
+                            .addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                                @Override
+                                public void onGlobalLayout() {
+                                    try {
+                                        Field checkboxField = ListMenuItemView.class.getDeclaredField("mCheckBox");
+                                        checkboxField.setAccessible(true);
+                                        Field radioButtonField = ListMenuItemView.class
+                                                .getDeclaredField("mRadioButton");
+                                        radioButtonField.setAccessible(true);
+
+                                        final boolean isDark = !ColorUtil.INSTANCE.isColorLight(
+                                                ATHUtil.INSTANCE.resolveColor(context, android.R.attr.windowBackground));
+
+                                        for (int i = 0; i < listView.getChildCount(); i++) {
+                                            View v = listView.getChildAt(i);
+                                            if (!(v instanceof ListMenuItemView)) {
+                                                continue;
+                                            }
+                                            ListMenuItemView iv = (ListMenuItemView) v;
+
+                                            CheckBox check = (CheckBox) checkboxField.get(iv);
+                                            if (check != null) {
+                                                TintHelper.setTint(check, color, isDark);
+                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                                    check.setBackground(null);
+                                                }
+                                            }
+
+                                            RadioButton radioButton = (RadioButton) radioButtonField.get(iv);
+                                            if (radioButton != null) {
+                                                TintHelper.setTint(radioButton, color, isDark);
+                                                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+                                                    radioButton.setBackground(null);
+                                                }
+                                            }
+                                        }
+                                    } catch (Exception e) {
+                                        e.printStackTrace();
+                                    }
+                                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
+                                        listView.getViewTreeObserver().removeOnGlobalLayoutListener(this);
+                                    } else {
+                                        //noinspection deprecation
+                                        listView.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+                                    }
+                                }
+                            });
+                }
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+        public static void setOverflowButtonColor(@NonNull Activity activity,
+                                                  final @ColorInt int color) {
+            final String overflowDescription = activity
+                    .getString(R.string.abc_action_menu_overflow_description);
+            final ViewGroup decorView = (ViewGroup) activity.getWindow().getDecorView();
+            final ViewTreeObserver viewTreeObserver = decorView.getViewTreeObserver();
+            viewTreeObserver.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+                @Override
+                public void onGlobalLayout() {
+                    final ArrayList<View> outViews = new ArrayList<>();
+                    decorView.findViewsWithText(outViews, overflowDescription,
+                            View.FIND_VIEWS_WITH_CONTENT_DESCRIPTION);
+                    if (outViews.isEmpty()) {
+                        return;
+                    }
+                    final AppCompatImageView overflow = (AppCompatImageView) outViews.get(0);
+                    overflow.setImageDrawable(TintHelper.createTintedDrawable(overflow.getDrawable(), color));
+                    ViewUtil.INSTANCE.removeOnGlobalLayoutListener(decorView, this);
+                }
+            });
+        }
+
+        public static final class SearchViewTintUtil {
+
+            private SearchViewTintUtil() {
+            }
+
+            private static void tintImageView(Object target, Field field, final @ColorInt int color)
+                    throws Exception {
+                field.setAccessible(true);
+                final ImageView imageView = (ImageView) field.get(target);
+                if (imageView.getDrawable() != null) {
+                    imageView
+                            .setImageDrawable(
+                                    TintHelper.createTintedDrawable(imageView.getDrawable(), color));
+                }
+            }
+
+            public static void setSearchViewContentColor(View searchView, final @ColorInt int color) {
+                if (searchView == null) {
                     return;
                 }
-                final ActionMenuView overflowViewParent = (ActionMenuView) outViews.get(0).getParent();
-                overflowViewParent.getOverflowIcon().setColorFilter(colorFilter);
-                removeOnGlobalLayoutListener(decorView, this);
-            }
-        });
-    }
+                final Class<?> cls = searchView.getClass();
+                try {
+                    final Field mSearchSrcTextViewField = cls.getDeclaredField("mSearchSrcTextView");
+                    mSearchSrcTextViewField.setAccessible(true);
+                    final EditText mSearchSrcTextView = (EditText) mSearchSrcTextViewField.get(searchView);
+                    mSearchSrcTextView.setTextColor(color);
+                    mSearchSrcTextView.setHintTextColor(ColorUtil.INSTANCE.adjustAlpha(color, 0.5f));
+                    TintHelper.setCursorTint(mSearchSrcTextView, color);
 
-    private static void tintMenuItemIcon(int color, MenuItem item) {
-        final Drawable drawable = item.getIcon();
-        if (drawable != null) {
-            final Drawable wrapped = DrawableCompat.wrap(drawable);
-            drawable.mutate();
-            wrapped.setTint(color);
-            item.setIcon(drawable);
-        }
-    }
-
-    private static void tintShareIconIfPresent(int color, MenuItem item) {
-        if (item.getActionView() != null) {
-            final View actionView = item.getActionView();
-            final View expandActivitiesButton = actionView.findViewById(com.google.android.material.R.id.expand_activities_button);
-            if (expandActivitiesButton != null) {
-                final ImageView image = expandActivitiesButton.findViewById(com.google.android.material.R.id.image);
-                if (image != null) {
-                    final Drawable drawable = image.getDrawable();
-                    final Drawable wrapped = DrawableCompat.wrap(drawable);
-                    drawable.mutate();
-                    wrapped.setTint(color);
-                    image.setImageDrawable(drawable);
+                    Field field = cls.getDeclaredField("mSearchButton");
+                    tintImageView(searchView, field, color);
+                    field = cls.getDeclaredField("mGoButton");
+                    tintImageView(searchView, field, color);
+                    field = cls.getDeclaredField("mCloseButton");
+                    tintImageView(searchView, field, color);
+                    field = cls.getDeclaredField("mVoiceButton");
+                    tintImageView(searchView, field, color);
+                } catch (Exception e) {
+                    e.printStackTrace();
                 }
             }
         }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
index 269c2c698..92cbbf417 100644
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/VersionUtils.kt
@@ -1,33 +1,37 @@
 package code.name.monkey.appthemehelper.util
 
 import android.os.Build
-import androidx.annotation.ChecksSdkIntAtLeast
 
 /**
  * @author Hemanth S (h4h13).
  */
 
 object VersionUtils {
+
+    /**
+     * @return true if device is running API >= 21
+     */
+    fun hasLollipop(): Boolean {
+        return Build.VERSION.SDK_INT >= 21
+    }
+
     /**
      * @return true if device is running API >= 23
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.M)
     fun hasMarshmallow(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.M
+        return Build.VERSION.SDK_INT >= 23
     }
 
     /**
      * @return true if device is running API >= 24
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.N)
     fun hasNougat(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
     }
 
     /**
-     * @return true if device is running API >= 25
+     * @return true if device is running API >= 24
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.N_MR1)
     fun hasNougatMR(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1
     }
@@ -35,60 +39,7 @@ object VersionUtils {
     /**
      * @return true if device is running API >= 26
      */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O)
     fun hasOreo(): Boolean {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O
     }
-
-    /**
-     * @return true if device is running API >= 27
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.O_MR1)
-    fun hasOreoMR1(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O_MR1
-    }
-
-    /**
-     * @return true if device is running API >= 28
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.P)
-    fun hasP(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.P
-    }
-
-    /**
-     * @return true if device is running API >= 29
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.Q)
-    @JvmStatic
-    fun hasQ(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
-    }
-
-    /**
-     * @return true if device is running API >= 30
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.R)
-    @JvmStatic
-    fun hasR(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.R
-    }
-
-    /**
-     * @return true if device is running API >= 31
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.S)
-    @JvmStatic
-    fun hasS(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.S
-    }
-
-    /**
-     * @return true if device is running API >= 33
-     */
-    @ChecksSdkIntAtLeast(api = Build.VERSION_CODES.TIRAMISU)
-    @JvmStatic
-    fun hasT(): Boolean {
-        return Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU
-    }
 }
diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.kt
index 7620f31cf..40ca8ebfe 100755
--- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.kt
+++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/util/ViewUtil.kt
@@ -4,6 +4,7 @@ import android.graphics.drawable.Drawable
 import android.view.View
 import android.view.ViewTreeObserver
 
+
 object ViewUtil {
     fun removeOnGlobalLayoutListener(v: View, listener: ViewTreeObserver.OnGlobalLayoutListener) {
         v.viewTreeObserver.removeOnGlobalLayoutListener(listener)
diff --git a/appthemehelper/src/main/res/drawable/ate_switch.xml b/appthemehelper/src/main/res/drawable/ate_switch.xml
new file mode 100644
index 000000000..186e54ef7
--- /dev/null
+++ b/appthemehelper/src/main/res/drawable/ate_switch.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/ic_toggle_switch_off" android:state_checked="false" />
+    <item android:drawable="@drawable/ic_toggle_switch" android:state_checked="true" />
+</selector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
new file mode 100644
index 000000000..2df3a07ad
--- /dev/null
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zm0-7c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+</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
new file mode 100644
index 000000000..24315a7da
--- /dev/null
+++ b/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<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="M17 6H7c-3.31 0-6 2.69-6 6s2.69 6 6 6h10c3.31 0 6-2.69 6-6s-2.69-6-6-6zm0 10H7c-2.21 0-4-1.79-4-4s1.79-4 4-4h10c2.21 0 4 1.79 4 4s-1.79 4-4 4zM7 9c-1.66 0-3 1.34-3 3s1.34 3 3 3 3-1.34 3-3-1.34-3-3-3z" />
+</vector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom.xml b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
new file mode 100755
index 000000000..08ddf2d04
--- /dev/null
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom.xml
@@ -0,0 +1,69 @@
+<?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="wrap_content"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    tools:ignore="RtlSymmetry,UnusedAttribute">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/ate_preference_inset"
+        android:layout_marginLeft="@dimen/ate_preference_inset"
+        tools:ignore="ContentDescription" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_marginStart="@dimen/ate_preference_inset"
+        android:layout_marginLeft="@dimen/ate_preference_inset"
+        android:layout_marginTop="12dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginBottom="12dip"
+        android:layout_weight="1">
+
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:id="@android:id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            tools:text="Title" />
+
+        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:layout_marginTop="2dp"
+            android:maxLines="4"
+            tools:text="Summary" />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <code.name.monkey.appthemehelper.common.views.ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/switchWidget"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@null"
+        android:button="@drawable/ate_switch"
+        android:clickable="false"
+        android:focusable="false" />
+
+</LinearLayout><!-- From: file:/home/jitpack/build/commons/src/main/res/layout/md_preference_custom.xml -->
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
new file mode 100755
index 000000000..108a6e289
--- /dev/null
+++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
@@ -0,0 +1,70 @@
+<?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="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingRight="?android:attr/scrollbarSize"
+    tools:ignore="RtlSymmetry,UnusedAttribute">
+
+    <ImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginStart="@dimen/ate_preference_inset"
+        android:layout_marginLeft="@dimen/ate_preference_inset"
+        tools:ignore="ContentDescription" />
+
+    <RelativeLayout
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_gravity="start|center_vertical"
+        android:layout_marginStart="32dp"
+        android:layout_marginLeft="@dimen/ate_preference_inset"
+        android:layout_marginTop="12dip"
+        android:layout_marginEnd="6dip"
+        android:layout_marginRight="6dip"
+        android:layout_marginBottom="12dip"
+        android:layout_weight="1">
+
+        <code.name.monkey.appthemehelper.common.views.ATEPrimaryTextView
+            android:id="@android:id/title"
+            style="@style/TextAppearance.MaterialComponents.Subtitle1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentLeft="true"
+            android:ellipsize="marquee"
+            android:fadingEdge="horizontal"
+            android:singleLine="true"
+            tools:text="Title" />
+
+        <code.name.monkey.appthemehelper.common.views.ATESecondaryTextView
+            android:id="@android:id/summary"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@android:id/title"
+            android:layout_alignStart="@android:id/title"
+            android:layout_alignLeft="@android:id/title"
+            android:layout_marginTop="2dp"
+            android:maxLines="4"
+            tools:text="I have one solution for you.you can change font size for specific preference by managing layout file." />
+
+    </RelativeLayout>
+
+    <!-- Preference should place its actual preference widget here. -->
+    <LinearLayout
+        android:id="@android:id/widget_frame"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="end|center_vertical"
+        android:gravity="center_vertical"
+        android:orientation="vertical" />
+
+</LinearLayout><!-- From: file:/home/jitpack/build/commons/src/main/res/layout/md_preference_custom.xml -->
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/layout/ate_preference_list.xml b/appthemehelper/src/main/res/layout/ate_preference_list.xml
new file mode 100644
index 000000000..56447c6a9
--- /dev/null
+++ b/appthemehelper/src/main/res/layout/ate_preference_list.xml
@@ -0,0 +1,23 @@
+<?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="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/dialogTitle"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="2dp" />
+
+    <ListView
+        android:id="@android:id/list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
index 96e84ab06..50d68fcec 100755
--- a/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
+++ b/appthemehelper/src/main/res/layout/ate_preference_switch_support.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <code.name.monkey.appthemehelper.common.views.ATESwitch xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/checkbox"
-    style="@style/Widget.Material3.CompoundButton.MaterialSwitch"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:clickable="false"
diff --git a/appthemehelper/src/main/res/values-large/dimens.xml b/appthemehelper/src/main/res/values-large/dimens.xml
index 0d2c4cc40..e34d3bb87 100755
--- a/appthemehelper/src/main/res/values-large/dimens.xml
+++ b/appthemehelper/src/main/res/values-large/dimens.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <dimen name="ate_preference_inset">28dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/values-night-v31/colors.xml b/appthemehelper/src/main/res/values-night-v31/colors.xml
deleted file mode 100644
index e4ce232d1..000000000
--- a/appthemehelper/src/main/res/values-night-v31/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="m3_accent_color">@android:color/system_accent1_200</color>
-    <color name="m3_selection_color">@android:color/system_accent1_500</color>
-</resources>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/values-v31/colors.xml b/appthemehelper/src/main/res/values-v31/colors.xml
deleted file mode 100755
index bd0a13625..000000000
--- a/appthemehelper/src/main/res/values-v31/colors.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="m3_accent_color">@android:color/system_accent1_600</color>
-    <color name="m3_selection_color">@android:color/system_accent1_50</color>
-</resources>
diff --git a/appthemehelper/src/main/res/values/attrs.xml b/appthemehelper/src/main/res/values/attrs.xml
old mode 100644
new mode 100755
index 2288b702c..bce101f29
--- a/appthemehelper/src/main/res/values/attrs.xml
+++ b/appthemehelper/src/main/res/values/attrs.xml
@@ -16,10 +16,6 @@
         <attr name="ateKey_pref_color" format="string" />
     </declare-styleable>
 
-    <declare-styleable name="ATESeekBarPreference">
-        <attr name="ateKey_pref_unit" format="string" />
-    </declare-styleable>
-
     <declare-styleable name="ATEDialogPreference">
         <attr name="ateKey_pref_dialog" format="string" />
     </declare-styleable>
diff --git a/appthemehelper/src/main/res/values/colors_material_design.xml b/appthemehelper/src/main/res/values/colors_material_design.xml
index d4ba521e1..0b2311477 100755
--- a/appthemehelper/src/main/res/values/colors_material_design.xml
+++ b/appthemehelper/src/main/res/values/colors_material_design.xml
@@ -7,10 +7,15 @@
     <color name="md_red_500">#F44336</color>
     <color name="md_red_A400">#FF1744</color>
 
+    <!-- Pink -->
+
+    <!-- Yellow -->
     <color name="md_yellow_A400">#FFD600</color>
 
-    <color name="md_deep_purple_A400">#651FFF</color>
 
+    <!-- Deep Purple -->
+
+    <color name="md_deep_purple_A400">#651FFF</color>
     <color name="md_deep_purple_300">#9575CD</color>
     <color name="md_deep_purple_400">#7E57C2</color>
     <color name="md_deep_purple_600">#5E35B1</color>
@@ -19,12 +24,16 @@
     <color name="md_deep_purple_500">#673AB7</color>
     <color name="md_deep_purple_A200">#7C4DFF</color>
 
+    <!-- Indigo -->
 
+
+    <!-- Blue -->
     <color name="md_blue_500">#2196F3</color>
+    <color name="md_blue_A200">#448AFF</color>
     <color name="md_blue_A400">#2979FF</color>
 
-    <color name="md_cyan_400">#26c6da</color>
 
+    <color name="md_green_A200">#69F0AE</color>
     <color name="md_green_A700">#00C853</color>
     <color name="md_green_500">#4CAF50</color>
 
@@ -32,13 +41,14 @@
     <color name="md_grey_200">#EEEEEE</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_900">#212121</color>
+
 
     <color name="md_black_1000">#000000</color>
     <color name="md_white_1000">#FFFFFF</color>
 
+
     <color name="md_teal_A400">#1DE9B6</color>
     <color name="md_deep_orange_A400">#FF3D00</color>
     <color name="md_light_green_A400">#76FF03</color>
diff --git a/appthemehelper/src/main/res/values/dimens.xml b/appthemehelper/src/main/res/values/dimens.xml
index 6de3840c1..740cb41e5 100755
--- a/appthemehelper/src/main/res/values/dimens.xml
+++ b/appthemehelper/src/main/res/values/dimens.xml
@@ -3,4 +3,6 @@
 
     <dimen name="ate_circleview_border">1dp</dimen>
 
+    <dimen name="ate_preference_inset">16dp</dimen>
+
 </resources>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/values/ids.xml b/appthemehelper/src/main/res/values/ids.xml
new file mode 100644
index 000000000..14602804e
--- /dev/null
+++ b/appthemehelper/src/main/res/values/ids.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="statusbarutil_fake_status_bar_view" type="id" />
+    <item name="statusbarutil_translucent_view" type="id" />
+</resources>
\ No newline at end of file
diff --git a/appthemehelper/src/test/java/code/name/monkey/appthemehelper/ExampleUnitTest.java b/appthemehelper/src/test/java/code/name/monkey/appthemehelper/ExampleUnitTest.java
new file mode 100644
index 000000000..b73306367
--- /dev/null
+++ b/appthemehelper/src/test/java/code/name/monkey/appthemehelper/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package code.name.monkey.appthemehelper;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() throws Exception {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 33029c4f9..e4eb1d0f9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,30 +1,26 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext {
-        lifecycle_version = '2.6.1'
-        navigation_version = '2.5.3'
-        mdc_version = '1.9.0-beta01'
-        preference_version = '1.2.0'
-        appcompat_version = '1.6.1'
-        core_version = '1.10.0-rc01'
-    }
-
+    ext.kotlin_version = '1.3.41'
     repositories {
-        mavenCentral()
+        jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.0'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$navigation_version"
+        classpath 'com.android.tools.build:gradle:3.5.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:bundletool:0.9.0'
     }
 }
-plugins {
-    id "com.github.ben-manes.versions" version "0.46.0"
-    id 'com.google.devtools.ksp' version '1.8.10-1.0.9' apply false
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        maven { url "https://jitpack.io" }
+    }
 }
 
-tasks.register('clean', Delete) {
+task clean(type: Delete) {
     delete rootProject.buildDir
-}
\ No newline at end of file
+}
diff --git a/crowdin.yml b/crowdin.yml
deleted file mode 100644
index 1c85b3e89..000000000
--- a/crowdin.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-files:
-  - source: /app/src/main/res/values/strings.xml
-    translation: /app/src/main/res/values-%android_code%/strings.xml
-    content_segmentation: 0
diff --git a/fastlane/metadata/android/en-US/changelogs/10443.txt b/fastlane/metadata/android/en-US/changelogs/10443.txt
deleted file mode 100644
index f1bce70ce..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10443.txt
+++ /dev/null
@@ -1 +0,0 @@
-Added music suggestions with various internal changes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10445.txt b/fastlane/metadata/android/en-US/changelogs/10445.txt
deleted file mode 100644
index 12ef46d40..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10445.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed songs not loading from SD card
-- Changed default grid size for libraries
-- Fixed crash on rotating the device
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10503.txt b/fastlane/metadata/android/en-US/changelogs/10503.txt
deleted file mode 100644
index 73a6b3e28..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10503.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Fixed crash on clicking app shortcuts
-- Re-added multiple selection
-- Removed billing activity
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10579.txt b/fastlane/metadata/android/en-US/changelogs/10579.txt
deleted file mode 100644
index df9ed6528..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10579.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-- Migrate to Material 3
-- Support for Storage Access Framework
-- Bump SDK to 32 (Android 12L)
-- Minor fixes
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10580.txt b/fastlane/metadata/android/en-US/changelogs/10580.txt
deleted file mode 100644
index 0c5df9436..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10580.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-- Display song images along in the artist and album details pages
-- Removed the Internet permissions and all the associated features
-- Fixed crashing occurs during changing screen orientation
diff --git a/fastlane/metadata/android/en-US/changelogs/10597.txt b/fastlane/metadata/android/en-US/changelogs/10597.txt
deleted file mode 100644
index d2297558d..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10597.txt
+++ /dev/null
@@ -1 +0,0 @@
-Added lyrics downloading
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10600.txt b/fastlane/metadata/android/en-US/changelogs/10600.txt
deleted file mode 100644
index cefa1c1ae..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10600.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Synced with Retro Music Player.
-
-See in-app changelog for more information.
-
-NOTE: Metro is a fully offline music player, and intends to remain so. So, any features such as scribbling, fetching lyrics, album arts, etc. will never be available.
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/changelogs/10603.txt b/fastlane/metadata/android/en-US/changelogs/10603.txt
deleted file mode 100644
index 3fcfb2d52..000000000
--- a/fastlane/metadata/android/en-US/changelogs/10603.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-- Remove startup warnings
-- Target Android 13
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt
deleted file mode 100644
index 5b31c0da9..000000000
--- a/fastlane/metadata/android/en-US/full_description.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-<i>Metro</i> is a fork of <a href="https://apt.izzysoft.de/fdroid/index/apk/code.name.monkey.retromusic">Retro Music</a> with Google Play API removed and all pro features unlocked.
-
-<b>Features:</b>
-<ul>
-    <li>Local playback only (based on the MediaStore)</li>
-    <li>Sleep timer</li>
-    <li>Folder browser</li>
-    <li>Home screen widgets</li>
-    <li>Themes (Just Black, Kinda Dark, Clearly White)</li>
-    <li>Now playing themes</li>
-    <li>Volume controls</li>
-    <li>Blacklist</li>
-    <li>Album artist support</li>
-    <li>Auto-download artist images from Last.fm</li>
-</ul>
diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png
deleted file mode 100644
index c632d3782..000000000
Binary files a/fastlane/metadata/android/en-US/images/icon.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/logo.png b/fastlane/metadata/android/en-US/images/logo.png
deleted file mode 100644
index 11a780e31..000000000
Binary files a/fastlane/metadata/android/en-US/images/logo.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg
deleted file mode 100644
index 6892ae9d0..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png
deleted file mode 100644
index ef4ea34c2..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg
deleted file mode 100644
index 8e3ab9669..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png
deleted file mode 100644
index 6387f7e35..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg
deleted file mode 100644
index e5d163ac3..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png
deleted file mode 100644
index a9f412b4b..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg
deleted file mode 100644
index caa3f629f..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png
deleted file mode 100644
index adb404107..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg
deleted file mode 100644
index b3707f128..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png
deleted file mode 100644
index 9263842f8..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/5.png and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg
deleted file mode 100644
index 84e58df14..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/6.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg
deleted file mode 100644
index d587ec6c1..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/7.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg b/fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg
deleted file mode 100644
index b58c633e6..000000000
Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/8.jpg and /dev/null differ
diff --git a/fastlane/metadata/android/en-US/short_description.txt b/fastlane/metadata/android/en-US/short_description.txt
deleted file mode 100644
index e2b97ca22..000000000
--- a/fastlane/metadata/android/en-US/short_description.txt
+++ /dev/null
@@ -1 +0,0 @@
-Best material design music player for Android
\ No newline at end of file
diff --git a/fastlane/metadata/android/en-US/title.txt b/fastlane/metadata/android/en-US/title.txt
deleted file mode 100644
index 25a159430..000000000
--- a/fastlane/metadata/android/en-US/title.txt
+++ /dev/null
@@ -1 +0,0 @@
-Metro - A music player for Android
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 5a5b46413..c9729751a 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,11 @@
-android.injected.testOnly=false
-android.useAndroidX=true
-kotlin.code.style=official
-org.gradle.caching=true
-org.gradle.configureondemand=true
-org.gradle.jvmargs=-Xmx4g -XX:+UseParallelGC -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx2048M
+org.gradle.daemon=true
 org.gradle.parallel=true
-
-# https://developer.android.com/studio/build/optimize-your-build#use-non-transitive-r-classes
-android.nonTransitiveRClass=true
-# https://blog.jetbrains.com/kotlin/2022/07/a-new-approach-to-incremental-compilation-in-kotlin/
-kotlin.incremental.useClasspathSnapshot=true
-# https://docs.gradle.org/7.5/userguide/configuration_cache.html
-org.gradle.unsafe.configuration-cache=true
\ No newline at end of file
+jvmArgs='-Xmx2048m'
+android.useAndroidX=true
+android.enabelR8=true
+android.enableR8.fullMode=false
+android.enableJetifier=true
+android.debug.obsoleteApi=true
+android.enableBuildCache=true
+android.jetifier.blacklist = butterknife.*\\.jar
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 943f0cbfa..7a3265ee9 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f398c33c4..751631787 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
+#Fri Sep 20 00:21:23 IST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
-networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.1-all.zip
diff --git a/gradlew b/gradlew
index 65dcd68d6..cccdd3d51 100755
--- a/gradlew
+++ b/gradlew
@@ -1,129 +1,78 @@
-#!/bin/sh
-
-#
-# Copyright © 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
+#!/usr/bin/env sh
 
 ##############################################################################
-#
-#   Gradle start up script for POSIX generated by Gradle.
-#
-#   Important for running:
-#
-#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-#       noncompliant, but you have some other compliant shell such as ksh or
-#       bash, then to run this script, type that shell name before the whole
-#       command line, like:
-#
-#           ksh Gradle
-#
-#       Busybox and similar reduced shells will NOT work, because this script
-#       requires all of these POSIX shell features:
-#         * functions;
-#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including «command», «set», and «ulimit».
-#
-#   Important for patching:
-#
-#   (2) This script targets any POSIX shell, so it avoids extensions provided
-#       by Bash, Ksh, etc; in particular arrays are avoided.
-#
-#       The "traditional" practice of packing multiple parameters into a
-#       space-separated string is a well documented source of bugs and security
-#       problems, so this is (mostly) avoided, by progressively accumulating
-#       options in "$@", and eventually passing that to Java.
-#
-#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-#       see the in-line comments for details.
-#
-#       There are tweaks for specific operating systems such as AIX, CygWin,
-#       Darwin, MinGW, and NonStop.
-#
-#   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-#       within the Gradle project.
-#
-#       You can find Gradle at https://github.com/gradle/gradle/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
-
-# Need this for daisy-chained symlinks.
-while
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    [ -h "$app_path" ]
-do
-    ls=$( ls -ld "$app_path" )
-    link=${ls#*' -> '}
-    case $link in             #(
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
 done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
-# This is normally unused
-# shellcheck disable=SC2034
-APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
-  CYGWIN* )         cygwin=true  ;; #(
-  Darwin* )         darwin=true  ;; #(
-  MSYS* | MINGW* )  msys=true    ;; #(
-  NONSTOP* )        nonstop=true ;;
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +81,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD=java
+    JAVACMD="java"
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -140,105 +89,84 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
-        # shellcheck disable=SC3045 
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-fi
-
-# Collect all arguments for the java command, stacking in reverse order:
-#   * args from the command line
-#   * the main class name
-#   * -classpath
-#   * -D...appname settings
-#   * --module-path (only if needed)
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
         fi
-        # Roll the args list around exactly as many times as the number of
-        # args, so each arg winds up back in the position where it started, but
-        # possibly modified.
-        #
-        # NB: a `for` loop captures its iteration list before it begins, so
-        # changing the positional parameters here affects neither the number of
-        # iterations, nor the values presented in `arg`.
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
     done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# Stop when "xargs" is not available.
-if ! command -v xargs >/dev/null 2>&1
-then
-    die "xargs is not available"
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
 fi
 
-# Use "xargs" to parse quoted args.
-#
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
-#
-# In Bash we could simply go:
-#
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
-#   set -- "${ARGS[@]}" "$@"
-#
-# but POSIX shell has neither arrays nor command substitution, so instead we
-# post-process each arg (as a line of input to sed) to backslash-escape any
-# character that might be a shell metacharacter, then use eval to reverse
-# that process (while maintaining the separation between arguments), and wrap
-# the whole thing up as a single "set" statement.
-#
-# This will of course break if any of these variables contains a newline or
-# an unmatched quote.
-#
-
-eval "set -- $(
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
-        xargs -n1 |
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
-        tr '\n' ' '
-    )" '"$@"'
-
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 93e3f59f1..f9553162f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,20 +1,4 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
-@if "%DEBUG%"=="" @echo off
+@if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,23 +9,19 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%"=="" set DIRNAME=.
-@rem This is normally unused
+if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if %ERRORLEVEL% equ 0 goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -55,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -65,26 +45,38 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell
-if %ERRORLEVEL% equ 0 goto mainEnd
+if "%ERRORLEVEL%"=="0" goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-set EXIT_CODE=%ERRORLEVEL%
-if %EXIT_CODE% equ 0 set EXIT_CODE=1
-if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
-exit /b %EXIT_CODE%
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/screenshots/adaptive.jpg b/screenshots/adaptive.jpg
deleted file mode 100644
index 8a63520ac..000000000
Binary files a/screenshots/adaptive.jpg and /dev/null differ
diff --git a/screenshots/blur.jpg b/screenshots/blur.jpg
deleted file mode 100644
index 20370542e..000000000
Binary files a/screenshots/blur.jpg and /dev/null differ
diff --git a/screenshots/classic.jpg b/screenshots/classic.jpg
deleted file mode 100644
index 28fe0796f..000000000
Binary files a/screenshots/classic.jpg and /dev/null differ
diff --git a/screenshots/color.jpg b/screenshots/color.jpg
deleted file mode 100644
index fdfa4dc3b..000000000
Binary files a/screenshots/color.jpg and /dev/null differ
diff --git a/screenshots/fit.jpg b/screenshots/fit.jpg
deleted file mode 100644
index 565304c90..000000000
Binary files a/screenshots/fit.jpg and /dev/null differ
diff --git a/screenshots/flat.jpg b/screenshots/flat.jpg
deleted file mode 100644
index 08c48ffbe..000000000
Binary files a/screenshots/flat.jpg and /dev/null differ
diff --git a/screenshots/material.jpg b/screenshots/material.jpg
deleted file mode 100644
index 23d13c30b..000000000
Binary files a/screenshots/material.jpg and /dev/null differ
diff --git a/screenshots/peak.jpg b/screenshots/peak.jpg
deleted file mode 100644
index 1ea64fcca..000000000
Binary files a/screenshots/peak.jpg and /dev/null differ
diff --git a/screenshots/peek.jpg b/screenshots/peek.jpg
deleted file mode 100644
index 1ea64fcca..000000000
Binary files a/screenshots/peek.jpg and /dev/null differ
diff --git a/screenshots/playlists.jpg b/screenshots/playlists.jpg
deleted file mode 100644
index b04e25d3f..000000000
Binary files a/screenshots/playlists.jpg and /dev/null differ
diff --git a/screenshots/synced_over_black.jpg b/screenshots/synced_over_black.jpg
deleted file mode 100644
index 6c094e389..000000000
Binary files a/screenshots/synced_over_black.jpg and /dev/null differ
diff --git a/screenshots/synced_over_dark.jpg b/screenshots/synced_over_dark.jpg
deleted file mode 100644
index 35494eb7c..000000000
Binary files a/screenshots/synced_over_dark.jpg and /dev/null differ
diff --git a/screenshots/synced_over_light.jpg b/screenshots/synced_over_light.jpg
deleted file mode 100644
index ac7c06e56..000000000
Binary files a/screenshots/synced_over_light.jpg and /dev/null differ
diff --git a/screenshots/synced_replace_black.jpg b/screenshots/synced_replace_black.jpg
deleted file mode 100644
index 550a77698..000000000
Binary files a/screenshots/synced_replace_black.jpg and /dev/null differ
diff --git a/screenshots/synced_replace_dark.jpg b/screenshots/synced_replace_dark.jpg
deleted file mode 100644
index ef45ffcb2..000000000
Binary files a/screenshots/synced_replace_dark.jpg and /dev/null differ
diff --git a/screenshots/synced_replace_light.jpg b/screenshots/synced_replace_light.jpg
deleted file mode 100644
index 6bdc5e56a..000000000
Binary files a/screenshots/synced_replace_light.jpg and /dev/null differ
diff --git a/screenshots/tiny.jpg b/screenshots/tiny.jpg
deleted file mode 100644
index fa6c2c5bd..000000000
Binary files a/screenshots/tiny.jpg and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 08e2f668d..d170d34cd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,22 +1 @@
-// https://docs.gradle.com/enterprise/gradle-plugin/
-plugins {
-    id "com.gradle.enterprise" version "3.10.3"
-}
-
-gradleEnterprise {
-    buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
-    }
-}
-
-dependencyResolutionManagement {
-    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
-    repositories {
-        google()
-        mavenCentral()
-        maven { url "https://jitpack.io" }
-    }
-}
-
-include ':app', ':appthemehelper'
\ No newline at end of file
+include ':app', ':appthemehelper', ':core'
\ No newline at end of file
diff --git a/spotless.license.kt b/spotless.license.kt
deleted file mode 100644
index 16e9c7a19..000000000
--- a/spotless.license.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2020 Hemanth Savarla.
- *
- * Licensed under the GNU General Public License v3
- *
- * This is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
- * See the GNU General Public License for more details.
- *
- */
\ No newline at end of file