diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index d5d35ec..d27ac8f 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,6 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/activity_add_server.xml" value="0.19999999999999998" />
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/layout/activity_settings.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/layout/content_main.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/layout/custom_menu.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/layout/fragment_album.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/menu/track_menu.xml" value="0.19398148148148148" />
+        <entry key="app/src/main/res/menu/track_menu2.xml" value="0.1" />
+      </map>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle b/app/build.gradle
index a37515f..b6fc004 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,15 +2,15 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.android.gms.oss-licenses-plugin'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId 'com.kangtech.tauonremote'
         minSdkVersion 22
-        targetSdkVersion 30
-        versionCode 5
-        versionName "1.0 beta3"
+        targetSdkVersion 31
+        versionCode 6
+        versionName "1.0 beta4"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -37,18 +37,18 @@ android {
 
 dependencies {
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'androidx.appcompat:appcompat:1.3.1'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     //implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
     //implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'androidx.multidex:multidex:2.0.1'
-    implementation 'androidx.navigation:navigation-fragment:2.3.2'
-    implementation 'androidx.navigation:navigation-ui:2.3.2'
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    implementation 'androidx.navigation:navigation-fragment:2.3.5'
+    implementation 'androidx.navigation:navigation-ui:2.3.5'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 
     // Retrofit
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
diff --git a/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java b/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java
index f43b357..cdc046c 100644
--- a/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java
+++ b/app/src/main/java/com/kangtech/tauonremote/view/AddServer.java
@@ -69,12 +69,12 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_add_server);
 
-        //set default NIGHT/Dark theme
+/*        //set default NIGHT/Dark theme
         if (SharedPreferencesUtils.getBoolean("light_enable", false)) {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
         } else {
             AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
-        }
+        }*/
 
         if (SharedPreferencesUtils.getBoolean("set_server", false)) {
             Intent intent = new Intent(this, MainActivity.class);
@@ -133,7 +133,7 @@ public boolean onMenuItemClick(MenuItem item) {
                             public void run() {
                                 refreshLayout.setRefreshing(true);
                             }
-                        },delay);
+                        }, delay);
                     }
                 }
 
@@ -208,7 +208,7 @@ protected Void doInBackground(Void... voids) {
                                 new Handler(Looper.getMainLooper()).post(new Runnable() {
                                     @Override
                                     public void run() {
-                                       adapter.notifyDataSetChanged();
+                                        adapter.notifyDataSetChanged();
                                     }
                                 });
 
@@ -250,7 +250,7 @@ private String getJSON(String url) {
                         StringBuilder sb = new StringBuilder();
                         String line;
                         while ((line = br.readLine()) != null) {
-                            sb.append(line+"\n");
+                            sb.append(line + "\n");
                         }
                         br.close();
                         return sb.toString();
diff --git a/app/src/main/java/com/kangtech/tauonremote/view/SettingsActivity.java b/app/src/main/java/com/kangtech/tauonremote/view/SettingsActivity.java
index 9a2ed38..849268b 100644
--- a/app/src/main/java/com/kangtech/tauonremote/view/SettingsActivity.java
+++ b/app/src/main/java/com/kangtech/tauonremote/view/SettingsActivity.java
@@ -65,7 +65,7 @@ public void onClick(View v) {
             }
         });
 
-        SwitchMaterial switchMaterial = findViewById(R.id.sm_setting_light);
+/*        SwitchMaterial switchMaterial = findViewById(R.id.sm_setting_light);
         if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_YES) {
             switchMaterial.setChecked(false);
         } else {
@@ -88,7 +88,7 @@ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                     AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
                 }
             }
-        });
+        });*/
 
         SwitchMaterial smNotif = findViewById(R.id.sm_setting_notif);
         TextView tvInfoNotif = findViewById(R.id.tv_info_notif_enable);
diff --git a/app/src/main/java/com/kangtech/tauonremote/view/fragment/album/AlbumFragment.java b/app/src/main/java/com/kangtech/tauonremote/view/fragment/album/AlbumFragment.java
index 4b42149..88f8dd8 100644
--- a/app/src/main/java/com/kangtech/tauonremote/view/fragment/album/AlbumFragment.java
+++ b/app/src/main/java/com/kangtech/tauonremote/view/fragment/album/AlbumFragment.java
@@ -2,15 +2,6 @@
 
 import android.content.Context;
 import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.GridLayoutManager;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.os.Handler;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -19,21 +10,26 @@
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.GridLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.kangtech.tauonremote.R;
 import com.kangtech.tauonremote.adapter.AlbumListAdapter;
-import com.kangtech.tauonremote.adapter.TrackListAdapter;
 import com.kangtech.tauonremote.api.ApiServiceInterface;
 import com.kangtech.tauonremote.model.album.AlbumListModel;
 import com.kangtech.tauonremote.util.Server;
 import com.kangtech.tauonremote.util.SharedPreferencesUtils;
 
+import java.util.Objects;
+
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-import io.reactivex.annotations.NonNull;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
@@ -52,7 +48,7 @@ public class AlbumFragment extends Fragment {
     private static AlbumFragment frag;
 
     public AlbumFragment() {
-        setHasOptionsMenu(true);
+        //setHasOptionsMenu(true);
     }
 
     public static AlbumFragment newInstance(String param1, String param2) {
@@ -65,10 +61,12 @@ public static AlbumFragment newInstance(String param1, String param2) {
     }
 
     public static void hideSearch() {
-        if (!searchView.isIconified()) {
-            searchView.clearFocus();
-            searchView.setQuery("", false);
-            searchItem.setVisible(false);
+        if (searchView != null) {
+            if (!searchView.isIconified()) {
+                searchView.clearFocus();
+                searchView.setQuery("", false);
+                searchItem.setVisible(false);
+            }
         }
     }
 
@@ -80,7 +78,7 @@ public static void reload() {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        setHasOptionsMenu(true);
+        //setHasOptionsMenu(true);
 
         apiServiceInterface = Server.getApiServiceInterface();
 
@@ -161,17 +159,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         mFab.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                searchItem.setVisible(true);
+                Objects.requireNonNull(searchItem).setVisible(true);
                 searchView.setIconified(false);
+
             }
         });
 
-
         return v;
     }
 
     @Override
-    public void onCreateOptionsMenu(@androidx.annotation.NonNull Menu menu, @androidx.annotation.NonNull MenuInflater inflater) {
+    public void onCreateOptionsMenu(@NonNull Menu menu, @NonNull MenuInflater inflater) {
         inflater.inflate(R.menu.track_menu, menu);
 
         searchItem = menu.findItem(R.id.menu_search_track);
diff --git a/app/src/main/java/com/kangtech/tauonremote/view/fragment/track/TrackFragment.java b/app/src/main/java/com/kangtech/tauonremote/view/fragment/track/TrackFragment.java
index cabf0aa..a3d901d 100644
--- a/app/src/main/java/com/kangtech/tauonremote/view/fragment/track/TrackFragment.java
+++ b/app/src/main/java/com/kangtech/tauonremote/view/fragment/track/TrackFragment.java
@@ -1,21 +1,12 @@
 package com.kangtech.tauonremote.view.fragment.track;
 
+import static android.content.Context.MODE_PRIVATE;
+
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.RequiresApi;
-import androidx.appcompat.widget.SearchView;
-import androidx.appcompat.widget.Toolbar;
-import androidx.fragment.app.Fragment;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-
 import android.os.Handler;
-import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -25,32 +16,29 @@
 import android.view.ViewGroup;
 import android.widget.Toast;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
+import androidx.appcompat.widget.SearchView;
+import androidx.appcompat.widget.Toolbar;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.kangtech.tauonremote.R;
 import com.kangtech.tauonremote.adapter.TrackListAdapter;
 import com.kangtech.tauonremote.api.ApiServiceInterface;
-import com.kangtech.tauonremote.model.playlist.PlaylistModel;
 import com.kangtech.tauonremote.model.track.TrackListModel;
-import com.kangtech.tauonremote.model.track.TrackModel;
 import com.kangtech.tauonremote.util.Server;
 import com.kangtech.tauonremote.util.SharedPreferencesUtils;
 import com.kangtech.tauonremote.view.MainActivity;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Objects;
-
 import io.reactivex.Observer;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 
-import static android.content.Context.MODE_PRIVATE;
-
 
 public class TrackFragment extends Fragment {
 
diff --git a/app/src/main/res/layout/activity_add_server.xml b/app/src/main/res/layout/activity_add_server.xml
index 47281a9..a088723 100644
--- a/app/src/main/res/layout/activity_add_server.xml
+++ b/app/src/main/res/layout/activity_add_server.xml
@@ -49,7 +49,7 @@
     <LinearLayout
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
-        android:layout_height="120dp"
+        android:layout_height="wrap_content"
         android:padding="5dp"
         android:orientation="vertical"
         android:background="@color/rose_bg_seekbar1"
@@ -64,11 +64,12 @@
             android:paddingStart="4dp"
             android:paddingEnd="4dp"
             android:textColor="@color/rose_text_artist"
-            android:text="or enter IP address manually (for example: 192.168.1.2) and click \"Remote\". Make sure the device is on the same local network (and port 7814/TCP is open)"/>
+            android:text="or enter IP address manually (for example: 192.168.1.2) and click Remote. \nMake sure the device is on the same local network (and port 7814/TCP is open)"/>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="6dp"
             android:orientation="horizontal">
 
             <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index 78f74fa..e1ae965 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -84,7 +84,7 @@
 
             </LinearLayout>
 
-            <LinearLayout
+<!--            <LinearLayout
                 android:id="@+id/ll_setting_theme"
                 android:layout_width="match_parent"
                 android:layout_height="65dp"
@@ -126,7 +126,7 @@
 
                 </LinearLayout>
 
-            </LinearLayout>
+            </LinearLayout>-->
 
             <LinearLayout
                 android:id="@+id/ll_setting_notif"
@@ -138,7 +138,7 @@
                 android:paddingBottom="8dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/ll_setting_theme">
+                app:layout_constraintTop_toBottomOf="@+id/ll_setting_changeserver_utama">
 
                 <ImageView
                     android:layout_width="40dp"
diff --git a/app/src/main/res/layout/fragment_album.xml b/app/src/main/res/layout/fragment_album.xml
index b51a402..4fbb317 100644
--- a/app/src/main/res/layout/fragment_album.xml
+++ b/app/src/main/res/layout/fragment_album.xml
@@ -58,6 +58,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="118dp"
         android:clickable="true"
+        android:visibility="invisible"
         android:backgroundTint="@color/rose_text_artist"
         app:borderWidth="0dp"
         app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior"
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 583e95a..0000000
--- a/app/src/main/res/values-night/colors.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-
-    <!--Rose color Dark-->
-    <color name="rose_bg_nowplaying">#0F0F0F</color>
-    <color name="rose_bg_nowplaying_cover">#1A1A1A</color>
-    <color name="rose_text_artist">#1D8680</color>
-    <color name="rose_text_title">#DD3D63</color>
-    <color name="rose_text_album">#09EC7F</color>
-    <color name="rose_bg_list">#141414</color>
-    <color name="rose_bg_seekbar1">#3C3C3C</color>
-    <color name="rose_bg_seekbar2">#1E1E1E</color>
-    <color name="rose_icon_true">#D2D2D2</color>
-    <color name="rose_icon_false">#373737</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
deleted file mode 100644
index 9f68d61..0000000
--- a/app/src/main/res/values-night/themes.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Theme.TauonMusicRemote" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/rose_bg_nowplaying</item>
-        <item name="colorPrimaryVariant">@color/rose_bg_nowplaying</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/rose_text_artist</item>
-        <item name="colorSecondaryVariant">@color/rose_text_title</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-        <item name="android:colorControlHighlight">@color/rose_icon_true</item>
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <!--StatusBar Icon Tint-->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-    </style>
-
-    <!-- Base application theme with ActionBar. -->
-    <style name="Theme.TauonMusicRemote.ActionBar" parent="Theme.MaterialComponents">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/rose_bg_nowplaying</item>
-        <item name="colorPrimaryVariant">@color/rose_bg_nowplaying</item>
-        <item name="colorOnPrimary">@color/white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/rose_text_artist</item>
-        <item name="colorSecondaryVariant">@color/rose_text_title</item>
-        <item name="colorOnSecondary">@color/black</item>
-        <!-- Status bar color. -->
-        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
-        <!-- Customize your theme here. -->
-        <item name="android:colorControlHighlight">@color/rose_icon_true</item>
-        <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
-        <!--StatusBar Icon Tint-->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
-    </style>
-
-    <style name="NowPlayingSheet">
-        <item name="paddingBottomSystemWindowInsets">true</item>
-        <item name="paddingLeftSystemWindowInsets">true</item>
-        <item name="paddingRightSystemWindowInsets">true</item>
-    </style>
-
-    <style name="Theme.TauonMusicRemote.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="Theme.TauonMusicRemote.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="Theme.TauonMusicRemote.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
-    <style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
-        <item name="spinBars">true</item>
-        <item name="color">@color/white</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index dc77750..583e95a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -6,17 +6,17 @@
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
 
-    <!--Rose color Light-->
-    <color name="rose_bg_nowplaying">#FFFFFF</color>
-    <color name="rose_bg_nowplaying_cover">#D9D9D9</color>
+    <!--Rose color Dark-->
+    <color name="rose_bg_nowplaying">#0F0F0F</color>
+    <color name="rose_bg_nowplaying_cover">#1A1A1A</color>
     <color name="rose_text_artist">#1D8680</color>
     <color name="rose_text_title">#DD3D63</color>
     <color name="rose_text_album">#09EC7F</color>
-    <color name="rose_bg_list">#E7E7E7</color>
-    <color name="rose_bg_seekbar1">#909090</color>
-    <color name="rose_bg_seekbar2">#EAEAEA</color>
-    <color name="rose_icon_true">#131313</color>
-    <color name="rose_icon_false">#747474</color>
-    <color name="black">#FFFFFF</color>
-    <color name="white">#000000</color>
+    <color name="rose_bg_list">#141414</color>
+    <color name="rose_bg_seekbar1">#3C3C3C</color>
+    <color name="rose_bg_seekbar2">#1E1E1E</color>
+    <color name="rose_icon_true">#D2D2D2</color>
+    <color name="rose_icon_false">#373737</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index db8295b..5318295 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,6 +1,6 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
-    <style name="Theme.TauonMusicRemote" parent="Theme.MaterialComponents.Light.NoActionBar">
+    <style name="Theme.TauonMusicRemote" parent="Theme.MaterialComponents.NoActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/rose_bg_nowplaying</item>
         <item name="colorPrimaryVariant">@color/rose_bg_nowplaying</item>
@@ -15,11 +15,11 @@
         <item name="android:colorControlHighlight">@color/rose_icon_true</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <!--StatusBar Icon Tint-->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 
     <!-- Base application theme with ActionBar. -->
-    <style name="Theme.TauonMusicRemote.ActionBar" parent="Theme.MaterialComponents.Light">
+    <style name="Theme.TauonMusicRemote.ActionBar" parent="Theme.MaterialComponents">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/rose_bg_nowplaying</item>
         <item name="colorPrimaryVariant">@color/rose_bg_nowplaying</item>
@@ -34,7 +34,7 @@
         <item name="android:colorControlHighlight">@color/rose_icon_true</item>
         <item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
         <!--StatusBar Icon Tint-->
-        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
     </style>
 
     <style name="NowPlayingSheet">
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 6cfd3b8..8731608 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sat Dec 19 11:07:15 WIB 2020
+#Fri Aug 27 20:49:06 WIB 2021
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/hxaudio-custom/build.gradle b/hxaudio-custom/build.gradle
index 162f9c5..2eee177 100644
--- a/hxaudio-custom/build.gradle
+++ b/hxaudio-custom/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 30
+    compileSdkVersion 31
     buildToolsVersion '30.0.3'
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 31
         versionCode 23
         versionName "3.3.1.01"
     }