diff --git a/Patches/LineageOS-14.1/android_vendor_cm/config.xml b/Patches/LineageOS-14.1/android_vendor_cm/config.xml
new file mode 100644
index 00000000..75891994
--- /dev/null
+++ b/Patches/LineageOS-14.1/android_vendor_cm/config.xml
@@ -0,0 +1,196 @@
+
+
+
+
+
+
+
+ - acr.browser.lightning.*,1
+ - at.bitfire.davdroid.*,0
+ - be.uhasselt.privacypolice.*,0
+ - br.usp.ime.retrobreaker.*,3
+ - ch.blinkenlights.android.vanilla.*,3
+ - ch.logixisland.anuto.*,3
+ - com.a5corp.weather.*,0
+ - com.aaronjwood.portauthority.*,1
+ - com.anddevw.getchromium.*,4
+ - com.android.calculator2.*,0
+ - com.android.calendar.*,0
+ - com.android.contacts.*,3
+ - com.android.deskclock.*,0
+ - com.android.dialer.*,1
+ - com.android.documentsui.*,3
+ - com.android.gallery3d.*,3
+ - com.android.keepass.*,3
+ - com.android.settings.*,3
+ - com.catchingnow.tinyclipboardmanager.*,0
+ - com.commit451.gitlab.*,1
+ - com.cyanogenmod.eleven.*,3
+ - com.darshancomputing.BatteryIndicatorPro.*,3
+ - com.dosse.chromiumautoupdater.*,4
+ - com.dozingcatsoftware.bouncy.*,3
+ - com.fsck.k9.*,1
+ - com.github.pires.obd.reader.*,3
+ - com.github.yeriomin.yalpstore.*,1
+ - com.google.android.gms.*,3
+ - com.google.zxing.client.android.*,3
+ - com.grarak.kerneladiutor.*,3
+ - com.jbirdvegas.mgerrit.*,3
+ - com.jefftharris.passwdsafe.*,3
+ - com.mitzuli.*,1
+ - com.morlunk.mumbleclient.*,3
+ - com.nextcloud.android.beta.*,3
+ - com.nononsenseapps.feeder.*,3
+ - com.nutomic.syncthingandroid.*,1
+ - com.orgzly.*,3
+ - com.pandoroid.*,3
+ - com.physphil.android.unitconverterultimate.*,0
+ - com.reddyetwo.hashmypass.app.*,3
+ - com.saibotd.bitbeaker.*,1
+ - com.shatteredpixel.shatteredpixeldungeon.*,3
+ - com.simplemobiletools.gallery.*,3
+ - com.stoutner.privacybrowser.standard.*,1
+ - com.termux.*,3
+ - com.twistedplane.sealnote.*,3
+ - com.vonglasow.michael.satstat.*,3
+ - com.xargsgrep.portknocker.*,0
+ - com.yassirh.digitalocean.*,3
+ - com.yubico.yubioath.*,3
+ - com.zeapo.pwdstore.*,3
+ - cz.martykan.forecastie.*,0
+ - de.danoeh,antennapod.*,3
+ - de.baumann.sieben.*,0
+ - de.blinkt.openvpn.*,3
+ - de.schildbach.wallet.*,1
+ - de.srlabs.snoopsnitch.*,3
+ - de.tobiasbielefeld.solitaire.*,0
+ - dev.ukanth.ufirewall.*,3
+ - dk.jens.backup.*,4
+ - eu.faircode.netguard.*,1
+ - eu.siacs.conversations.*,3
+ - fly.speedmeter.grub.*,3
+ - free.rm.skytube.oss.*,1
+ - im.vector.alpha.*,1
+ - info.guardianproject.orfox.*,1
+ - info.guardianproject.pixelknot.*,4
+ - io.github.benoitduffez.cupsprint.*,3
+ - io.github.hidroh.materialistic.*,3
+ - jp.forkhub.*,1
+ - me.ccrama.redditslide.*,1
+ - me.johnmh.boogdroid.*,3
+ - me.zeeroooo.materialfb.*,1
+ - net.i2p.android.router.*,1
+ - net.minetest.minetest.*,4
+ - net.nightwhistler.pageturner.*,0
+ - net.nullsum.audinaut.*,3
+ - net.osmand.plus.*,4
+ - org.adaway.*,4
+ - org.asdtm.goodweather.*,0
+ - org.billthefarmer.diary.*,0
+ - org.blockinger.game.*,3
+ - org.bottiger.podcast.*,3
+ - org.cipherdyne.fwknop2.*,0
+ - org.connectbot.*,3
+ - org.csploit.android.*,4
+ - org.cyanogenmod.audiofx.*,3
+ - org.cyanogenmod.snap.*,1
+ - org.documentfoundation.libreoffice.*,1
+ - org.eehouse.android.xw4.*,3
+ - org.fdroid.fdroid.*,1
+ - org.fedorahosted.freeotp.*,0
+ - org.fitchfamily.android.gsmlocation.*,4
+ - org.fitchfamily.android.wifi_backend.*,3
+ - org.floens.chan.*,3
+ - org.gateshipone.malp.*,3
+ - org.gnu.icecat.*,1
+ - org.indywidualni.fblite.*,3
+ - org.isoron.uhabits.*,3
+ - org.jak_linux.dns66.*,1
+ - org.kiwix.kiwixmobile.*,1
+ - org.ligi.survivalmanual.*,0
+ - org.lineageos.jelly.*,1
+ - org.lineageos.recorder.*,1
+ - org.linphone.*,1
+ - org.lumicall.android.*,1
+ - org.mariotaku.twidere.*,1
+ - org.microg.nlp.backend.ichnaea.*,3
+ - org.microg.nlp.backend.nominatim.*,0
+ - org.mozilla.fennec_fdroid.*,1
+ - org.ppsspp.ppsspp.*,4
+ - org.primftpd.*,3
+ - org.proninyaroslav.libretorrent.*,1
+ - org.quantumbadger.redreader.*,3
+ - org.schabi.etherwake.*,0
+ - org.schabi.newpipe.*,1
+ - org.secuso.privacyfriendlyactivitytracker.*,3
+ - org.secuso.privacyfriendlynetmonitor.*,3
+ - org.secuso.privacyfriendlynotes.*,0
+ - org.secuso.privacyfriendlysudoku.*,0
+ - org.smssecure.smssecure.*,3
+ - org.sufficientlysecure.keychain.*,1
+ - org.sufficientlysecure.localcalendar.*,0
+ - org.sufficientlysecure.viewer.*,3
+ - org.tasks.*,3
+ - org.telegram.messenger.*,1
+ - org.thoughtcrime.securesms.*,1
+ - org.torproject.android.*,3
+ - org.totschnig.myexpenses.*,3
+ - org.transdroid.full.*,0
+ - org.videolan.vlc.*,1
+ - org.wikipedia.*,3
+ - org.xbmc.kodi.*,1
+ - org.xbmc.kore.*,3
+ - protect.card_locker.*,0
+ - tk.jordynsmediagroup.simpleirc.fdroid.*,0
+
+ - com.a1dev.sdbench.*,2
+ - com.amazon.kindle.*,3
+ - com.amazon.mp3.*,3
+ - com.antutu.ABenchMark.*,2
+ - com.antutu.benchmark.full.*,2
+ - com.apple.android.music.*,3
+ - com.aurorasoftworks.quadrant.ui.standard.*,2
+ - com.authy.authy.*,3
+ - com.facebook.mlite.*,3
+ - com.facebook.orca.*,1
+ - com.futuremark.dmandroid.application.*,2
+ - com.futuremark.pcmark.android.benchmark.*,2
+ - com.google.android.apps.fireball.*,1
+ - com.google.android.apps.googlevoice.*,3
+ - com.google.android.apps.maps.*,1
+ - com.google.android.apps.photos.*,1
+ - com.google.android.apps.tachyon.*,1
+ - com.google.android.apps.translate.*,1
+ - com.google.android.apps.youtube.music.*,1
+ - com.google.android.music.*,3
+ - com.google.android.talk.*,1
+ - com.google.android.youtube.*,1
+ - com.netflix.mediaclient.*,1
+ - com.pandora.android.*,3
+ - com.passmark.pt_mobile.*,2
+ - com.primatelabs.geekbench.*,2
+ - com.rightware.BasemarkOSII.*,2
+ - com.snapchat.android.*,1
+ - com.soundcloud.android.*,3
+ - com.spotify.music.*,3
+ - com.squareup.*,1
+ - com.whatsapp.*,3
+ - eu.chainfire.cfbench.*,2
+
+
diff --git a/Patches/LineageOS-14.1/cm_platform_sdk/0001-PAPP.patch b/Patches/LineageOS-14.1/cm_platform_sdk/0001-PAPP.patch
deleted file mode 100644
index 86a29e7f..00000000
--- a/Patches/LineageOS-14.1/cm_platform_sdk/0001-PAPP.patch
+++ /dev/null
@@ -1,212 +0,0 @@
-From bf751ddb83109faeeffebe85363ce8edd00fc6f6 Mon Sep 17 00:00:00 2001
-From: Tad
-Date: Sun, 2 Jul 2017 23:28:25 -0400
-Subject: [PATCH] Per App Performance Profiles
-
-Change-Id: Ifcfa1738bcd823973db317f7d34eb57a1fd31856
----
- .../internal/PerformanceManagerService.java | 2 +-
- cm/res/res/values/config.xml | 173 +++++++++++++++++++++
- 2 files changed, 174 insertions(+), 1 deletion(-)
-
-diff --git a/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
-index 378050e..fd9db05 100644
---- a/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
-+++ b/cm/lib/main/java/org/cyanogenmod/platform/internal/PerformanceManagerService.java
-@@ -218,7 +218,7 @@ public class PerformanceManagerService extends CMSystemService {
- }
- float weight = Float.valueOf(profileWeights[i]);
- mProfiles.put(profileIds[i], new PerformanceProfile(profileIds[i],
-- weight, profileNames[i], profileDescs[i], shouldUseOptimizations(weight)));
-+ weight, profileNames[i], profileDescs[i], true));
- }
- }
-
-diff --git a/cm/res/res/values/config.xml b/cm/res/res/values/config.xml
-index a85365f..d517ea7 100644
---- a/cm/res/res/values/config.xml
-+++ b/cm/res/res/values/config.xml
-@@ -43,7 +43,180 @@
-
-+
-
-+
-+ - acr.browser.lightning.*,1
-+ - at.bitfire.davdroid.*,0
-+ - be.uhasselt.privacypolice.*,0
-+ - br.usp.ime.retrobreaker.*,3
-+ - ch.blinkenlights.android.vanilla.*,3
-+ - ch.logixisland.anuto.*,3
-+ - com.a5corp.weather.*,0
-+ - com.aaronjwood.portauthority.*,1
-+ - com.anddevw.getchromium.*,4
-+ - com.android.calculator2.*,0
-+ - com.android.calendar.*,0
-+ - com.android.contacts.*,3
-+ - com.android.deskclock.*,0
-+ - com.android.dialer.*,1
-+ - com.android.documentsui.*,3
-+ - com.android.gallery3d.*,3
-+ - com.android.keepass.*,3
-+ - com.android.settings.*,3
-+ - com.catchingnow.tinyclipboardmanager.*,0
-+ - com.commit451.gitlab.*,1
-+ - com.cyanogenmod.eleven.*,3
-+ - com.darshancomputing.BatteryIndicatorPro.*,3
-+ - com.dosse.chromiumautoupdater.*,4
-+ - com.dozingcatsoftware.bouncy.*,3
-+ - com.fsck.k9.*,1
-+ - com.github.pires.obd.reader.*,3
-+ - com.github.yeriomin.yalpstore.*,1
-+ - com.google.android.gms.*,3
-+ - com.google.zxing.client.android.*,3
-+ - com.grarak.kerneladiutor.*,3
-+ - com.jbirdvegas.mgerrit.*,3
-+ - com.jefftharris.passwdsafe.*,3
-+ - com.mitzuli.*,1
-+ - com.morlunk.mumbleclient.*,3
-+ - com.nextcloud.android.beta.*,3
-+ - com.nononsenseapps.feeder.*,3
-+ - com.nutomic.syncthingandroid.*,1
-+ - com.orgzly.*,3
-+ - com.pandoroid.*,3
-+ - com.physphil.android.unitconverterultimate.*,0
-+ - com.reddyetwo.hashmypass.app.*,3
-+ - com.saibotd.bitbeaker.*,1
-+ - com.shatteredpixel.shatteredpixeldungeon.*,3
-+ - com.simplemobiletools.gallery.*,3
-+ - com.stoutner.privacybrowser.standard.*,1
-+ - com.termux.*,3
-+ - com.twistedplane.sealnote.*,3
-+ - com.vonglasow.michael.satstat.*,3
-+ - com.xargsgrep.portknocker.*,0
-+ - com.yassirh.digitalocean.*,3
-+ - com.yubico.yubioath.*,3
-+ - com.zeapo.pwdstore.*,3
-+ - cz.martykan.forecastie.*,0
-+ - de.danoeh,antennapod.*,3
-+ - de.baumann.sieben.*,0
-+ - de.blinkt.openvpn.*,3
-+ - de.schildbach.wallet.*,1
-+ - de.srlabs.snoopsnitch.*,3
-+ - de.tobiasbielefeld.solitaire.*,0
-+ - dev.ukanth.ufirewall.*,3
-+ - dk.jens.backup.*,4
-+ - eu.faircode.netguard.*,1
-+ - eu.siacs.conversations.*,3
-+ - fly.speedmeter.grub.*,3
-+ - free.rm.skytube.oss.*,1
-+ - im.vector.alpha.*,1
-+ - info.guardianproject.orfox.*,1
-+ - info.guardianproject.pixelknot.*,4
-+ - io.github.benoitduffez.cupsprint.*,3
-+ - io.github.hidroh.materialistic.*,3
-+ - jp.forkhub.*,1
-+ - me.ccrama.redditslide.*,1
-+ - me.johnmh.boogdroid.*,3
-+ - me.zeeroooo.materialfb.*,1
-+ - net.i2p.android.router.*,1
-+ - net.minetest.minetest.*,4
-+ - net.nightwhistler.pageturner.*,0
-+ - net.nullsum.audinaut.*,3
-+ - net.osmand.plus.*,4
-+ - org.adaway.*,4
-+ - org.asdtm.goodweather.*,0
-+ - org.billthefarmer.diary.*,0
-+ - org.blockinger.game.*,3
-+ - org.bottiger.podcast.*,3
-+ - org.cipherdyne.fwknop2.*,0
-+ - org.connectbot.*,3
-+ - org.csploit.android.*,4
-+ - org.cyanogenmod.audiofx.*,3
-+ - org.cyanogenmod.snap.*,1
-+ - org.documentfoundation.libreoffice.*,1
-+ - org.eehouse.android.xw4.*,3
-+ - org.fdroid.fdroid.*,1
-+ - org.fedorahosted.freeotp.*,0
-+ - org.fitchfamily.android.gsmlocation.*,4
-+ - org.fitchfamily.android.wifi_backend.*,3
-+ - org.floens.chan.*,3
-+ - org.gateshipone.malp.*,3
-+ - org.gnu.icecat.*,1
-+ - org.indywidualni.fblite.*,3
-+ - org.isoron.uhabits.*,3
-+ - org.jak_linux.dns66.*,1
-+ - org.kiwix.kiwixmobile.*,1
-+ - org.ligi.survivalmanual.*,0
-+ - org.lineageos.jelly.*,1
-+ - org.lineageos.recorder.*,1
-+ - org.linphone.*,1
-+ - org.lumicall.android.*,1
-+ - org.mariotaku.twidere.*,1
-+ - org.microg.nlp.backend.ichnaea.*,3
-+ - org.microg.nlp.backend.nominatim.*,0
-+ - org.mozilla.fennec_fdroid.*,1
-+ - org.ppsspp.ppsspp.*,4
-+ - org.primftpd.*,3
-+ - org.proninyaroslav.libretorrent.*,1
-+ - org.quantumbadger.redreader.*,3
-+ - org.schabi.etherwake.*,0
-+ - org.schabi.newpipe.*,1
-+ - org.secuso.privacyfriendlyactivitytracker.*,3
-+ - org.secuso.privacyfriendlynetmonitor.*,3
-+ - org.secuso.privacyfriendlynotes.*,0
-+ - org.secuso.privacyfriendlysudoku.*,0
-+ - org.smssecure.smssecure.*,3
-+ - org.sufficientlysecure.keychain.*,1
-+ - org.sufficientlysecure.localcalendar.*,0
-+ - org.sufficientlysecure.viewer.*,3
-+ - org.tasks.*,3
-+ - org.telegram.messenger.*,1
-+ - org.thoughtcrime.securesms.*,1
-+ - org.torproject.android.*,3
-+ - org.totschnig.myexpenses.*,3
-+ - org.transdroid.full.*,0
-+ - org.videolan.vlc.*,1
-+ - org.wikipedia.*,3
-+ - org.xbmc.kodi.*,1
-+ - org.xbmc.kore.*,3
-+ - protect.card_locker.*,0
-+ - tk.jordynsmediagroup.simpleirc.fdroid.*,0
-+
-+ - com.a1dev.sdbench.*,2
-+ - com.amazon.kindle.*,3
-+ - com.amazon.mp3.*,3
-+ - com.antutu.ABenchMark.*,2
-+ - com.antutu.benchmark.full.*,2
-+ - com.apple.android.music.*,3
-+ - com.aurorasoftworks.quadrant.ui.standard.*,2
-+ - com.authy.authy.*,3
-+ - com.facebook.mlite.*,3
-+ - com.facebook.orca.*,1
-+ - com.futuremark.dmandroid.application.*,2
-+ - com.futuremark.pcmark.android.benchmark.*,2
-+ - com.google.android.apps.fireball.*,1
-+ - com.google.android.apps.googlevoice.*,3
-+ - com.google.android.apps.maps.*,1
-+ - com.google.android.apps.photos.*,1
-+ - com.google.android.apps.tachyon.*,1
-+ - com.google.android.apps.translate.*,1
-+ - com.google.android.apps.youtube.music.*,1
-+ - com.google.android.music.*,3
-+ - com.google.android.talk.*,1
-+ - com.google.android.youtube.*,1
-+ - com.netflix.mediaclient.*,1
-+ - com.pandora.android.*,3
-+ - com.passmark.pt_mobile.*,2
-+ - com.primatelabs.geekbench.*,2
-+ - com.rightware.BasemarkOSII.*,2
-+ - com.snapchat.android.*,1
-+ - com.soundcloud.android.*,3
-+ - com.spotify.music.*,3
-+ - com.squareup.*,1
-+ - com.whatsapp.*,3
-+ - eu.chainfire.cfbench.*,2
-
-
-