diff --git a/MiNote/app/build.gradle.kts b/MiNote/app/build.gradle.kts
index 35ebd33..0c131fd 100644
--- a/MiNote/app/build.gradle.kts
+++ b/MiNote/app/build.gradle.kts
@@ -50,10 +50,16 @@ dependencies {
 //        "include" to listOf("*.aar", "*.jar"),
 //        "exclude" to listOf()
 //    )))
+//    "E:\AndroidProjects\MiNote_Rewrite\MiNote\httpcomponents-client-4.5.14-bin"
     //noinspection GradlePath
-    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-osgi-4.5.14.jar"))
-    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpclient-win-4.5.14.jar"))
-    implementation(files("D:/MiNotes-Rewrite/MiNote_Rewrite/MiNote/httpcomponents-client-4.5.14-bin/lib/httpcore-4.4.16.jar"))
+    implementation(files("E:\\AndroidProjects\\MiNote_Rewrite\\MiNote\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-osgi-4.5.14.jar"))
+    implementation(files("E:\\AndroidProjects\\MiNote_Rewrite\\MiNote\\httpcomponents-client-4.5.14-bin\\lib\\httpclient-win-4.5.14.jar"))
+    implementation(files("E:\\AndroidProjects\\MiNote_Rewrite\\MiNote\\httpcomponents-client-4.5.14-bin\\lib\\httpcore-4.4.16.jar"))
+//    implementation(fileTree(mapOf(
+//        "dir" to "E:\\AndroidProjects\\MiNote_Rewrite\\MiNote\\httpcomponents-client-4.5.14-bin\\lib",
+//        "include" to listOf("*.aar", "*.jar"),
+//        "exclude" to listOf()
+//    )))
 
     testImplementation(libs.junit)
     androidTestImplementation(libs.ext.junit)
diff --git a/MiNote/app/src/main/AndroidManifest.xml b/MiNote/app/src/main/AndroidManifest.xml
index 5a89a7e..0407c61 100644
--- a/MiNote/app/src/main/AndroidManifest.xml
+++ b/MiNote/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:label="@string/app_name"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:uiOptions="splitActionBarWhenNarrow"
             android:windowSoftInputMode="adjustPan"
             android:exported="true">
@@ -44,7 +44,7 @@
             android:name=".ui.NoteEditActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTop"
-            android:theme="@style/NoteTheme"
+            android:theme="@style/Theme.AppCompat.Light.DarkActionBar"
             android:exported="true">
 
             <intent-filter tools:ignore="AppLinkUrlError">
diff --git a/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
index 96a9ff8..8a23906 100644
--- a/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
+++ b/MiNote/app/src/main/java/net/micode/notes/ui/NoteEditActivity.java
@@ -52,6 +52,8 @@ import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.TextNote;
@@ -72,7 +74,7 @@ import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 
-public class NoteEditActivity extends Activity implements OnClickListener,
+public class NoteEditActivity extends AppCompatActivity implements OnClickListener,
         NoteSettingChangedListener, OnTextViewChangeListener {
     private class HeadViewHolder {
         public TextView tvModified;
@@ -429,8 +431,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         int id = v.getId();
         if (id == R.id.btn_set_bg_color) {
             mNoteBgColorSelector.setVisibility(View.VISIBLE);
-            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
-                    -                    View.VISIBLE);
+            findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(View.VISIBLE);
         } else if (sBgSelectorBtnsMap.containsKey(id)) {
             findViewById(sBgSelectorSelectionMap.get(mWorkingNote.getBgColorId())).setVisibility(
                     View.GONE);
@@ -623,7 +624,7 @@ public class NoteEditActivity extends Activity implements OnClickListener,
         if (mWorkingNote.getNoteId() > 0) {
             Intent intent = new Intent(this, AlarmReceiver.class);
             intent.setData(ContentUris.withAppendedId(Notes.CONTENT_NOTE_URI, mWorkingNote.getNoteId()));
-            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, 0);
+            PendingIntent pendingIntent = PendingIntent.getBroadcast(this, 0, intent, PendingIntent.FLAG_IMMUTABLE);
             AlarmManager alarmManager = ((AlarmManager) getSystemService(ALARM_SERVICE));
             showAlertHeader();
             if(!set) {
diff --git a/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
index e843aec..77a30b8 100644
--- a/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
+++ b/MiNote/app/src/main/java/net/micode/notes/ui/NotesListActivity.java
@@ -60,6 +60,8 @@ import android.widget.PopupMenu;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 import net.micode.notes.R;
 import net.micode.notes.data.Notes;
 import net.micode.notes.data.Notes.NoteColumns;
@@ -78,7 +80,7 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.util.HashSet;
 
-public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener {
+public class NotesListActivity extends AppCompatActivity implements OnClickListener, OnItemLongClickListener {
     private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0;
 
     private static final int FOLDER_LIST_QUERY_TOKEN      = 1;
diff --git a/MiNote/app/src/main/res/values/styles.xml b/MiNote/app/src/main/res/values/styles.xml
index 486abc0..d750e65 100644
--- a/MiNote/app/src/main/res/values/styles.xml
+++ b/MiNote/app/src/main/res/values/styles.xml
@@ -63,7 +63,7 @@
     </style>
 
     <style name="NoteActionBarStyle" parent="@android:style/Widget.Holo.Light.ActionBar.Solid">
-<!--        <item name="android:displayOptions" />-->
-        <item name="android:visibility">visible</item>
+        <item name="android:displayOptions" />
+        <item name="android:visibility">gone</item>
     </style>
 </resources>
\ No newline at end of file