diff --git a/Android.bp b/Android.bp
index ea7f89c46eab3a7de7e8b0e4b2d4efb9feadc25b..c460223620b3ea3cb7c982ac3e5f71606f9c6ef0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -15,6 +15,8 @@ android_app {
 
     product_specific: true,
 
+    certificate: "platform",
+
     static_libs: [
         "android-common",
         "android-opt-timezonepicker",
diff --git a/app/build.gradle b/app/build.gradle
index 0e216db1ad1aaf6599100fa7a7699b13c64efc75..7dbd5d2ef2d2dc9ba4539f1394ef89ebd711e807 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -88,6 +88,7 @@ android {
 }
 
 dependencies {
+    implementation 'foundation.e:elib:0.0.1-alpha11'
 
     // Core
     implementation 'androidx.core:core-ktx:1.10.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03c336a0f3820df05dff10b44ab1df37955fe094..b20f00b2e784b1a0fa94442581aed821940ab205 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,7 @@
     package="ws.xsoh.etar"
     android:installLocation="auto">
 
+    <uses-permission android:name="android.permission.BROADCAST_CLOSE_SYSTEM_DIALOGS" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.GET_ACCOUNTS" />
     <uses-permission android:name="android.permission.VIBRATE"/>
@@ -87,7 +88,7 @@
             <meta-data android:name="android.app.shortcuts"
                 android:resource="@xml/shortcuts" />
 
-            <meta-data android:name="org.lineageos.etar.dynamic_icons"
+            <meta-data android:name="foundation.e.calendar.dynamic_icons"
                 android:resource="@array/calendar_icons_dynamic" />
 
         </activity>
@@ -218,7 +219,7 @@
 
         <provider
             android:name="androidx.startup.InitializationProvider"
-            android:authorities="org.lineageos.etar.androidx-startup"
+            android:authorities="foundation.e.calendar.androidx-startup"
             android:exported="false"
             tools:replace="android:authorities" />
 
diff --git a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
index e469cbfb50dab856f4ddf9c2907449c8774bbc12..efc09ec0f3cad347439fbe016ae0fa85995a6ef4 100644
--- a/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
+++ b/app/src/main/java/com/android/calendar/alerts/AlertReceiver.java
@@ -22,6 +22,7 @@ import static com.android.calendar.alerts.AlertService.ALERT_CHANNEL_ID;
 import android.app.Notification;
 import android.app.PendingIntent;
 import android.app.Service;
+import android.app.TaskStackBuilder;
 import android.content.ActivityNotFoundException;
 import android.content.BroadcastReceiver;
 import android.content.ContentUris;
@@ -676,6 +677,15 @@ public class AlertReceiver extends BroadcastReceiver {
                 geoIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 // If this intent cannot be handled, do not create the map action
                 if (isResolveIntent(context, geoIntent)) {
+                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+                        TaskStackBuilder taskStackBuilder = TaskStackBuilder.create(context);
+                        geoIntent = createMapActivityIntent(context, urlSpans);
+                        if (geoIntent != null) {
+                            taskStackBuilder.addNextIntentWithParentStack(geoIntent);
+                            return taskStackBuilder.getPendingIntent(0,
+                                    PendingIntent.FLAG_UPDATE_CURRENT | Utils.PI_FLAG_IMMUTABLE);
+                        }
+                    }
                     Intent broadcastIntent = new Intent(MAP_ACTION);
                     broadcastIntent.setClass(context, AlertReceiver.class);
                     broadcastIntent.putExtra(EXTRA_EVENT_ID, eventId);
diff --git a/settings.gradle b/settings.gradle
index b2b9aba9073e6211abfb0caf20ff2b263e674d13..877dc98db78a0270f9402d0d08e6c83cfa2e9116 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -13,6 +13,7 @@ dependencyResolutionManagement {
         google()
         mavenCentral()
         maven { url "https://jitpack.io" }
+        maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven' }
     }
 }
 rootProject.name = "Etar-Calendar"