diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e061ed5..ecae1dd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,7 +20,7 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Notesmaster"
+        android:theme="@style/NoteActionBarStyle"
         tools:targetApi="31">
 
         <activity
diff --git a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
index b3b61e7..719f867 100644
--- a/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
+++ b/app/src/main/java/net/micode/notes/gtask/remote/GTaskASyncTask.java
@@ -63,22 +63,42 @@ public class GTaskASyncTask extends AsyncTask<Void, String, Integer> {
         });
     }
 
+//    private void showNotification(int tickerId, String content) {
+//        Notification notification = new Notification(R.drawable.notification, mContext
+//                .getString(tickerId), System.currentTimeMillis());
+//        notification.defaults = Notification.DEFAULT_LIGHTS;
+//        notification.flags = Notification.FLAG_AUTO_CANCEL;
+//        PendingIntent pendingIntent;
+//        if (tickerId != R.string.ticker_success) {
+//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+//                    NotesPreferenceActivity.class), 0);
+//
+//        } else {
+//            pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
+//                    NotesListActivity.class), 0);
+//        }
+//        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
+//                pendingIntent);
+//        mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
+//    }
+
     private void showNotification(int tickerId, String content) {
-        Notification notification = new Notification(R.drawable.notification, mContext
-                .getString(tickerId), System.currentTimeMillis());
-        notification.defaults = Notification.DEFAULT_LIGHTS;
-        notification.flags = Notification.FLAG_AUTO_CANCEL;
         PendingIntent pendingIntent;
         if (tickerId != R.string.ticker_success) {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesPreferenceActivity.class), 0);
-
+                    NotesPreferenceActivity.class), PendingIntent.FLAG_IMMUTABLE);
         } else {
             pendingIntent = PendingIntent.getActivity(mContext, 0, new Intent(mContext,
-                    NotesListActivity.class), 0);
+                    NotesListActivity.class), PendingIntent.FLAG_IMMUTABLE);
         }
-        notification.setLatestEventInfo(mContext, mContext.getString(R.string.app_name), content,
-                pendingIntent);
+        Notification.Builder builder = new Notification.Builder(mContext)
+                .setAutoCancel(true)
+                .setContentTitle(mContext.getString(R.string.app_name))
+                .setContentText(content)
+                .setContentIntent(pendingIntent)
+                .setWhen(System.currentTimeMillis())
+                .setOngoing(true);
+        Notification notification=builder.getNotification();
         mNotifiManager.notify(GTASK_SYNC_NOTIFICATION_ID, notification);
     }