diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index 06dd1a17..9cb0ca8d 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: #{link-color};        }        a:active {        color: #{link-color-active};        }        ul {        list-style-position: outside;        padding-left: 0;        padding-right: 0;        margin-left: 1rem;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.2.200</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>Custom UserImageView for loading user profile image</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><h4>v3.1.240</h4><ul>    <li>Fix Search not showing from home screen</li>    <li>Fix Volume controls color issue</li>    <li>Fix Seek bar alignment</li>    <li>Added tiny theme</li>    <li>Improved full theme appearances</li>    <li>Now playing theme preview updated</li>    <li>Fix composer error</li>    <li>Bottom Options improved(internal)</li></ul><h4>v3.1.200</h4><ul>    <li>Added composer sort and editing</li>    <li>Fix Crash in Album tag editor while selecting options</li>    <li>Added Filter song length</li>    <li>Added Favourites playlist icon will be accent color</li>    <li>Added Colorful settings icons</li>    <li>Added Corners for dialog</li></ul><h4>v3.0.570</h4><ul>    <li>Fix Album/Artist square image</li>    <li>Fix Delete dialog text format</li>    <li>Fix Profile picture not showing after coming back from folders</li>    <li>Fix Play button color i Simple and Plain themes</li>    <li>Fix Sleep timer dialog crashing</li>    <li>Fix Share song dialog title and text</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
+<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: #{link-color};        }        a:active {        color: #{link-color-active};        }        ul {        list-style-position: outside;        padding-left: 0;        padding-right: 0;        margin-left: 1rem;        }        li {        padding-top: 8px;        }    </style></head><body><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>Custom UserImageView for loading user profile image</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><h4>v3.1.240</h4><ul>    <li>Fix Search not showing from home screen</li>    <li>Fix Volume controls color issue</li>    <li>Fix Seek bar alignment</li>    <li>Added tiny theme</li>    <li>Improved full theme appearances</li>    <li>Now playing theme preview updated</li>    <li>Fix composer error</li>    <li>Bottom Options improved(internal)</li></ul><h4>v3.1.200</h4><ul>    <li>Added composer sort and editing</li>    <li>Fix Crash in Album tag editor while selecting options</li>    <li>Added Filter song length</li>    <li>Added Favourites playlist icon will be accent color</li>    <li>Added Colorful settings icons</li>    <li>Added Corners for dialog</li></ul><h4>v3.0.570</h4><ul>    <li>Fix Album/Artist square image</li>    <li>Fix Delete dialog text format</li>    <li>Fix Profile picture not showing after coming back from folders</li>    <li>Fix Play button color i Simple and Plain themes</li>    <li>Fix Sleep timer dialog crashing</li>    <li>Fix Share song dialog title and text</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/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
index 2310f613..fc995f9f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
+++ b/app/src/main/java/code/name/monkey/retromusic/adapter/CategoryInfoAdapter.java
@@ -15,11 +15,11 @@
 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.CheckBox;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -27,8 +27,11 @@ 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;
@@ -113,13 +116,14 @@ public class CategoryInfoAdapter extends RecyclerView.Adapter<CategoryInfoAdapte
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
-        CheckBox checkBox;
+        MaterialCheckBox checkBox;
         TextView title;
         View dragView;
 
         ViewHolder(View view) {
             super(view);
             checkBox = view.findViewById(R.id.checkbox);
+            checkBox.setBackgroundTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(checkBox.getContext())));
             title = view.findViewById(R.id.title);
             dragView = view.findViewById(R.id.drag_view);
         }
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 2e2c6c57..86384166 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
@@ -35,13 +35,13 @@ import java.util.*
 
 
 class LibraryPreference : ATEDialogPreference {
-    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)
 
-    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes) {}
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attrs, defStyleAttr, defStyleRes)
 
     init {
         icon?.setColorFilter(ThemeStore.accentColor(context), PorterDuff.Mode.SRC_IN)
@@ -63,7 +63,7 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
         if (savedInstanceState != null) {
             categoryInfos = savedInstanceState.getParcelableArrayList(PreferenceUtil.LIBRARY_CATEGORIES)
         } else {
-            categoryInfos = PreferenceUtil.getInstance().getLibraryCategoryInfos()
+            categoryInfos = PreferenceUtil.getInstance().libraryCategoryInfos
         }
         adapter = CategoryInfoAdapter(categoryInfos)
 
@@ -73,7 +73,6 @@ class LibraryPreferenceDialog : PreferenceDialogFragmentCompat() {
 
         adapter.attachToRecyclerView(recyclerView)
 
-
         return MaterialDialog(context!!, BottomSheet())
                 .title(code.name.monkey.retromusic.R.string.library_categories)
                 .customView(view = view)
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
index 8155bf1c..90d2dd9f 100644
--- a/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
+++ b/app/src/main/java/code/name/monkey/retromusic/service/MusicService.java
@@ -355,6 +355,7 @@ public class MusicService extends Service implements SharedPreferences.OnSharedP
                 mediaButtonReceiverComponentName,
                 mediaButtonReceiverPendingIntent);
         mediaSession.setCallback(new MediaSessionCompat.Callback() {
+
             @Override
             public void onPlay() {
                 play();
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 fee28556..3f01a793 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
@@ -28,7 +28,7 @@
     android:paddingRight="16dp"
     tools:gravity="start|center_vertical">
 
-    <code.name.monkey.appthemehelper.common.views.ATECheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/checkbox"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
@@ -37,7 +37,7 @@
         android:focusable="false"
         android:gravity="center_vertical" />
 
-    <TextView
+    <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/title"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
