diff --git a/README.md b/README.md
index 8454d22..f115b25 100644
--- a/README.md
+++ b/README.md
@@ -38,8 +38,6 @@ everything on a ROM flash in a system installation.
| Google Play Store | x | | | x |
| Aurora Store | | x | | |
| Aurora Droid | x | x | | |
-| Swype libs | x | | | |
-| Google DRM jars | x | | | x |
| Google Sync adapters | x | | | |
#### List of MinAddon variants
@@ -53,8 +51,6 @@ They just consist of singular components, just what they say on their label.
- Google Play Store modded from the Pixel Experience Gitlab
- Fake Store from MicroG FDroid repo
- Aurora Store and Aurora Droid from Whyorean's GitLab
-- Swype libs for AOSP keyboard from OpenGApps GitHub repo
-- Some Google DRM jars from OpenGApps GitHub repo
- Google Sync adapters for KK-R from OpenGApps GitLab repo, and for S-T from MindTheGApps GitLab repo
### Uninstallation and notes
diff --git a/conf/defconf-minimal.txt b/conf/defconf-minimal.txt
index 05e5fbd..01aa3a8 100644
--- a/conf/defconf-minimal.txt
+++ b/conf/defconf-minimal.txt
@@ -56,14 +56,6 @@ stuff_other="
/system/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
/system/etc/default-permissions/gsync.xml
/system/etc/permissions/com.google.android.backuptransport.xml
- /system/etc/permissions/com.google.android.media.effects.xml
- /system/etc/permissions/com.google.widevine.software.drm.xml
- /system/framework/com.google.android.media.effects.jar
- /system/framework/com.google.widevine.software.drm.jar
- /system/lib/libjni_keyboarddecoder.so
- /system/lib/libjni_latinimegoogle.so
- /system/lib64/libjni_keyboarddecoder.so
- /system/lib64/libjni_latinimegoogle.so
/system/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
/system/priv-app/Phonesky/Phonesky.apk
";
@@ -80,9 +72,17 @@ stuff_old="
/system/app/RadioCellsNLPBackend/RadioCellsNLPBackend.apk
/system/etc/default-permissions/microg-permissions-unlp.xml
/system/etc/permissions/com.aurora.services.xml
+ /system/etc/permissions/com.google.android.media.effects.xml
+ /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/permissions/gsync.xml
/system/etc/permissions/org.fdroid.fdroid.privileged.xml
/system/etc/sysconfig/nogoolag-unlp.xml
+ /system/framework/com.google.android.media.effects.jar
+ /system/framework/com.google.widevine.software.drm.jar
+ /system/lib/libjni_keyboarddecoder.so
+ /system/lib/libjni_latinimegoogle.so
+ /system/lib64/libjni_keyboarddecoder.so
+ /system/lib64/libjni_latinimegoogle.so
/system/priv-app/AuroraServices/AuroraServices.apk
/system/priv-app/AuroraStore/AuroraStore.apk
/system/priv-app/DejaVuLocationService/DejaVuLocationService.apk
diff --git a/conf/defconf-minimaliap.txt b/conf/defconf-minimaliap.txt
index 9f7ddee..09fb662 100644
--- a/conf/defconf-minimaliap.txt
+++ b/conf/defconf-minimaliap.txt
@@ -26,13 +26,9 @@ stuff="
/system/etc/permissions/com.android.vending.xml
/system/etc/permissions/com.google.android.gms.xml
/system/etc/permissions/com.google.android.maps.xml
- /system/etc/permissions/com.google.android.media.effects.xml
- /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/sysconfig/nogoolag.xml
/system/framework/com.google.android.maps.jar
- /system/framework/com.google.android.media.effects.jar
- /system/framework/com.google.widevine.software.drm.jar
/system/priv-app/Phonesky/Phonesky.apk
/system/priv-app/MicroGGMSCore/MicroGGMSCore.apk
@@ -60,10 +56,6 @@ stuff_other="
/system/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
/system/etc/default-permissions/gsync.xml
/system/etc/permissions/com.google.android.backuptransport.xml
- /system/lib/libjni_keyboarddecoder.so
- /system/lib/libjni_latinimegoogle.so
- /system/lib64/libjni_keyboarddecoder.so
- /system/lib64/libjni_latinimegoogle.so
/system/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
/system/priv-app/FakeStore/FakeStore.apk
";
@@ -80,9 +72,17 @@ stuff_old="
/system/app/RadioCellsNLPBackend/RadioCellsNLPBackend.apk
/system/etc/default-permissions/microg-permissions-unlp.xml
/system/etc/permissions/com.aurora.services.xml
+ /system/etc/permissions/com.google.android.media.effects.xml
+ /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/permissions/gsync.xml
/system/etc/permissions/org.fdroid.fdroid.privileged.xml
/system/etc/sysconfig/nogoolag-unlp.xml
+ /system/framework/com.google.android.media.effects.jar
+ /system/framework/com.google.widevine.software.drm.jar
+ /system/lib/libjni_keyboarddecoder.so
+ /system/lib/libjni_latinimegoogle.so
+ /system/lib64/libjni_keyboarddecoder.so
+ /system/lib64/libjni_latinimegoogle.so
/system/priv-app/AuroraServices/AuroraServices.apk
/system/priv-app/AuroraStore/AuroraStore.apk
/system/priv-app/DejaVuLocationService/DejaVuLocationService.apk
diff --git a/conf/defconf-nogoolag.txt b/conf/defconf-nogoolag.txt
index 9358834..752fa51 100644
--- a/conf/defconf-nogoolag.txt
+++ b/conf/defconf-nogoolag.txt
@@ -56,14 +56,6 @@ stuff_other="
/system/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
/system/etc/default-permissions/gsync.xml
/system/etc/permissions/com.google.android.backuptransport.xml
- /system/etc/permissions/com.google.android.media.effects.xml
- /system/etc/permissions/com.google.widevine.software.drm.xml
- /system/framework/com.google.android.media.effects.jar
- /system/framework/com.google.widevine.software.drm.jar
- /system/lib/libjni_keyboarddecoder.so
- /system/lib/libjni_latinimegoogle.so
- /system/lib64/libjni_keyboarddecoder.so
- /system/lib64/libjni_latinimegoogle.so
/system/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk
/system/priv-app/Phonesky/Phonesky.apk
";
@@ -80,9 +72,17 @@ stuff_old="
/system/app/RadioCellsNLPBackend/RadioCellsNLPBackend.apk
/system/etc/default-permissions/microg-permissions-unlp.xml
/system/etc/permissions/com.aurora.services.xml
+ /system/etc/permissions/com.google.android.media.effects.xml
+ /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/permissions/gsync.xml
/system/etc/permissions/org.fdroid.fdroid.privileged.xml
/system/etc/sysconfig/nogoolag-unlp.xml
+ /system/framework/com.google.android.media.effects.jar
+ /system/framework/com.google.widevine.software.drm.jar
+ /system/lib/libjni_keyboarddecoder.so
+ /system/lib/libjni_latinimegoogle.so
+ /system/lib64/libjni_keyboarddecoder.so
+ /system/lib64/libjni_latinimegoogle.so
/system/priv-app/AuroraServices/AuroraServices.apk
/system/priv-app/AuroraStore/AuroraStore.apk
/system/priv-app/DejaVuLocationService/DejaVuLocationService.apk
diff --git a/conf/defconf-standard.txt b/conf/defconf-standard.txt
index 222ef6f..63e5108 100644
--- a/conf/defconf-standard.txt
+++ b/conf/defconf-standard.txt
@@ -28,13 +28,9 @@ stuff="
/system/etc/permissions/com.google.android.backuptransport.xml
/system/etc/permissions/com.google.android.gms.xml
/system/etc/permissions/com.google.android.maps.xml
- /system/etc/permissions/com.google.android.media.effects.xml
- /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/sysconfig/nogoolag.xml
/system/framework/com.google.android.maps.jar
- /system/framework/com.google.android.media.effects.jar
- /system/framework/com.google.widevine.software.drm.jar
/system/priv-app/MicroGGMSCore/MicroGGMSCore.apk
/system/priv-app/Phonesky/Phonesky.apk
@@ -51,10 +47,6 @@ stuff_sdk="
";
stuff_arch_sdk="
- /system/lib/libjni_keyboarddecoder.so
- /system/lib/libjni_latinimegoogle.so
- /system/lib64/libjni_keyboarddecoder.so
- /system/lib64/libjni_latinimegoogle.so
";
stuff_util="
@@ -80,9 +72,17 @@ stuff_old="
/system/app/RadioCellsNLPBackend/RadioCellsNLPBackend.apk
/system/etc/default-permissions/microg-permissions-unlp.xml
/system/etc/permissions/com.aurora.services.xml
+ /system/etc/permissions/com.google.android.media.effects.xml
+ /system/etc/permissions/com.google.widevine.software.drm.xml
/system/etc/permissions/gsync.xml
/system/etc/permissions/org.fdroid.fdroid.privileged.xml
/system/etc/sysconfig/nogoolag-unlp.xml
+ /system/framework/com.google.android.media.effects.jar
+ /system/framework/com.google.widevine.software.drm.jar
+ /system/lib/libjni_keyboarddecoder.so
+ /system/lib/libjni_latinimegoogle.so
+ /system/lib64/libjni_keyboarddecoder.so
+ /system/lib64/libjni_latinimegoogle.so
/system/priv-app/AuroraServices/AuroraServices.apk
/system/priv-app/AuroraStore/AuroraStore.apk
/system/priv-app/DejaVuLocationService/DejaVuLocationService.apk
@@ -152,10 +152,6 @@ stuff_perm="
/system/app/GoogleCalendarSyncAdapter
/system/app/GoogleContactsSyncAdapter
/system/priv-app/GoogleBackupTransport
- /system/lib/libjni_keyboarddecoder.so
- /system/lib/libjni_latinimegoogle.so
- /system/lib64/libjni_keyboarddecoder.so
- /system/lib64/libjni_latinimegoogle.so
";
pre_build_actions() {
diff --git a/conf/resdl-download.txt b/conf/resdl-download.txt
index 635556b..910ab0f 100644
--- a/conf/resdl-download.txt
+++ b/conf/resdl-download.txt
@@ -25,25 +25,6 @@ stuff_download="
/system/app/GoogleContactsSyncAdapter/-29-/GoogleContactsSyncAdapter.apk direct https://gitlab.opengapps.org/opengapps/all/raw/master/app/com.google.android.syncadapters.contacts/29/nodpi/29.apk
/system/app/GoogleContactsSyncAdapter/-30-/GoogleContactsSyncAdapter.apk direct https://gitlab.opengapps.org/opengapps/all/raw/master/app/com.google.android.syncadapters.contacts/30/nodpi/30.apk
/system/app/GoogleContactsSyncAdapter/-31-32-33-/GoogleContactsSyncAdapter.apk direct https://gitlab.com/MindTheGapps/vendor_gapps/raw/sigma/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk
- /system/framework/com.google.android.media.effects.jar direct https://gitlab.opengapps.org/opengapps/all/raw/master/framework/19/com.google.android.media.effects.jar
- /system/framework/com.google.widevine.software.drm.jar direct https://gitlab.opengapps.org/opengapps/all/raw/master/framework/19/com.google.widevine.software.drm.jar
- /system/lib/-arm--19-21-22-23-24-25-26-27-28-29-30-/libjni_keyboarddecoder.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/23/libjni_keyboarddecoder.so
- /system/lib/-x86--19-21-22-23-24-25-26-27-28-29-30-/libjni_keyboarddecoder.so direct https://gitlab.opengapps.org/opengapps/x86/raw/master/lib/23/libjni_keyboarddecoder.so
- /system/lib/-arm--19-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/19/libjni_latinimegoogle.so
- /system/lib/-arm--21-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/21/libjni_latinimegoogle.so
- /system/lib/-arm--22-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/22/libjni_latinimegoogle.so
- /system/lib/-arm--23-24-25-26-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/23/libjni_latinimegoogle.so
- /system/lib/-arm--27-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/27/libjni_latinimegoogle.so
- /system/lib/-arm--28-29-30-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm/raw/master/lib/28/libjni_latinimegoogle.so
- /system/lib/-x86--19-21-22-23-24-25-26-27-28-29-30-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/x86/raw/master/lib/23/libjni_latinimegoogle.so
- /system/lib64/-arm64--19-21-22-23-24-25-26-27-28-29-30-/libjni_keyboarddecoder.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/23/libjni_keyboarddecoder.so
- /system/lib64/-x86_64--19-21-22-23-24-25-26-27-28-29-30-/libjni_keyboarddecoder.so direct https://gitlab.opengapps.org/opengapps/x86_64/raw/master/lib64/23/libjni_keyboarddecoder.so
- /system/lib64/-arm64--19-21-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/21/libjni_latinimegoogle.so
- /system/lib64/-arm64--22-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/22/libjni_latinimegoogle.so
- /system/lib64/-arm64--23-24-25-26-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/23/libjni_latinimegoogle.so
- /system/lib64/-arm64--27-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/27/libjni_latinimegoogle.so
- /system/lib64/-arm64--28-29-30-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/arm64/raw/master/lib64/28/libjni_latinimegoogle.so
- /system/lib64/-x86_64--19-21-22-23-24-25-26-27-28-29-30-/libjni_latinimegoogle.so direct https://gitlab.opengapps.org/opengapps/x86_64/raw/master/lib64/23/libjni_latinimegoogle.so
/system/priv-app/GoogleBackupTransport/-19-/GoogleBackupTransport.apk direct https://gitlab.opengapps.org/opengapps/all/raw/master/priv-app/com.google.android.backuptransport/19/nodpi/19.apk
/system/priv-app/GoogleBackupTransport/-21-22-/GoogleBackupTransport.apk direct https://gitlab.opengapps.org/opengapps/all/raw/master/priv-app/com.google.android.backuptransport/21/nodpi/21.apk
/system/priv-app/GoogleBackupTransport/-23-/GoogleBackupTransport.apk direct https://gitlab.opengapps.org/opengapps/all/raw/master/priv-app/com.google.android.backuptransport/23/nodpi/23.apk
diff --git a/res/system/etc/permissions/com.google.android.media.effects.xml b/res/system/etc/permissions/com.google.android.media.effects.xml
deleted file mode 100644
index 6a69c91..0000000
--- a/res/system/etc/permissions/com.google.android.media.effects.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
diff --git a/res/system/etc/permissions/com.google.widevine.software.drm.xml b/res/system/etc/permissions/com.google.widevine.software.drm.xml
deleted file mode 100644
index f75abf9..0000000
--- a/res/system/etc/permissions/com.google.widevine.software.drm.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-