diff --git a/README.MD b/README.MD
index 83d542432..2a5be0cb5 100644
--- a/README.MD
+++ b/README.MD
@@ -33,7 +33,6 @@ Furthermore, Magisk provides a **Systemless Interface** to alter the system (or
 Default string resources for Magisk Manager are scattered throughout
 
 - `app/src/main/res/values/strings.xml`
-- `stub/src/main/res/values/strings.xml`
 - `shared/src/main/res/values/strings.xml`
 
 Translate each and place them in the respective locations (`<module>/src/main/res/values-<lang>/strings.xml`).
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 163ef7469..4d76d7753 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    ** Special Requirements **
+
+    This AndroidManifest.xml will be copied into the stub
+    APK to allow APK delegation. This is why these special
+    requirements exist.
+
+    * Class names *
+    Class names a.a, a.c, a.e should not be changed as they are used
+    externally. All other class names can be changed.
+
+    * Resource IDs *
+    All resource IDs referred in AndroidManifest.xml is required to be
+    included into the "shared" module to make the ID match with stub.
+
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
@@ -11,32 +29,37 @@
 
     <application
         android:name="a.e"
+        android:appComponentFactory="a.a"
         android:allowBackup="true"
-        android:theme="@style/MagiskTheme"
         android:usesCleartextTraffic="true"
-        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning"
+        tools:replace="android:appComponentFactory">
 
-        <!-- Activities -->
+        <!-- Splash -->
 
-        <activity
-            android:name="a.b"
-            android:configChanges="orientation|screenSize"
-            android:exported="true" />
         <activity
             android:name="a.c"
             android:configChanges="orientation|screenSize"
-            android:exported="true"
             android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <!-- Main -->
+
+        <activity
+            android:name="a.b"
+            android:configChanges="orientation|screenSize"
+            android:exported="true" />
+
+        <!-- Flashing  -->
+
         <activity
             android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:screenOrientation="nosensor"
-            android:theme="@style/MagiskTheme.Flashing" />
+            android:screenOrientation="nosensor" />
 
         <!-- Superuser -->
 
@@ -44,8 +67,7 @@
             android:name="a.m"
             android:directBootAware="true"
             android:excludeFromRecents="true"
-            android:exported="false"
-            android:theme="@style/MagiskTheme.SU" />
+            android:exported="false" />
 
         <!-- Receiver -->
 
@@ -64,9 +86,10 @@
             </intent-filter>
         </receiver>
 
-        <!-- Service -->
+        <!-- DownloadService -->
 
-        <service android:name="a.j"
+        <service
+            android:name="a.j"
             android:exported="false" />
 
         <!-- Hardcode GMS version -->
diff --git a/app/src/main/java/a/a.java b/app/src/main/java/a/a.java
index ec5a4e698..5ccb6738b 100644
--- a/app/src/main/java/a/a.java
+++ b/app/src/main/java/a/a.java
@@ -1,13 +1,19 @@
 package a;
 
+import androidx.annotation.Keep;
+import androidx.core.app.AppComponentFactory;
+
 import com.topjohnwu.magisk.utils.PatchAPK;
 import com.topjohnwu.signing.BootSigner;
 
-import androidx.annotation.Keep;
-
 @Keep
-public class a extends BootSigner {
+public class a extends AppComponentFactory {
+
     public static boolean patchAPK(String in, String out, String pkg) {
         return PatchAPK.patch(in, out, pkg);
     }
+
+    public static void main(String[] args) throws Exception {
+        BootSigner.main(args);
+    }
 }
diff --git a/app/src/main/java/a/w.java b/app/src/main/java/a/w.java
index f852a8968..6fa3e50f6 100644
--- a/app/src/main/java/a/w.java
+++ b/app/src/main/java/a/w.java
@@ -7,6 +7,7 @@ import androidx.work.Worker;
 import androidx.work.WorkerParameters;
 
 import com.topjohnwu.magisk.base.DelegateWorker;
+import com.topjohnwu.magisk.utils.ResourceMgrKt;
 
 import java.lang.reflect.ParameterizedType;
 
@@ -18,7 +19,7 @@ public abstract class w<T extends DelegateWorker> extends Worker {
 
     @SuppressWarnings("unchecked")
     w(@NonNull Context context, @NonNull WorkerParameters workerParams) {
-        super(context, workerParams);
+        super(ResourceMgrKt.wrap(context, false), workerParams);
         try {
             base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
                     .getActualTypeArguments()[0]).newInstance();
diff --git a/app/src/main/java/com/topjohnwu/magisk/App.kt b/app/src/main/java/com/topjohnwu/magisk/App.kt
index b742d5175..3a3f6961c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/App.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/App.kt
@@ -13,8 +13,11 @@ import com.topjohnwu.magisk.data.database.RepoDatabase_Impl
 import com.topjohnwu.magisk.di.ActivityTracker
 import com.topjohnwu.magisk.di.koinModules
 import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.utils.LocaleManager
-import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.magisk.extensions.unwrap
+import com.topjohnwu.magisk.utils.ResourceMgr
+import com.topjohnwu.magisk.utils.RootInit
+import com.topjohnwu.magisk.utils.isRunningAsStub
+import com.topjohnwu.magisk.utils.wrap
 import com.topjohnwu.superuser.Shell
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
@@ -26,7 +29,7 @@ open class App : Application() {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
         Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER or Shell.FLAG_USE_MAGISK_BUSYBOX)
         Shell.Config.verboseLogging(BuildConfig.DEBUG)
-        Shell.Config.addInitializers(RootUtils::class.java)
+        Shell.Config.addInitializers(RootInit::class.java)
         Shell.Config.setTimeout(2)
         Room.setFactory {
             when (it) {
@@ -38,22 +41,42 @@ open class App : Application() {
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(base)
+        // Basic setup
         if (BuildConfig.DEBUG)
             MultiDex.install(base)
         Timber.plant(Timber.DebugTree())
 
+        // Some context magic
+        val app: Application
+        val impl: Context
+        if (base is Application) {
+            isRunningAsStub = true
+            app = base
+            impl = base.baseContext
+        } else {
+            app = this
+            impl = base
+        }
+        ResourceMgr.init(impl)
+        super.attachBaseContext(impl.wrap())
+
+        // Normal startup
         startKoin {
-            androidContext(this@App)
+            androidContext(baseContext)
             modules(koinModules)
         }
+        ResourceMgr.reload()
+        app.registerActivityLifecycleCallbacks(get<ActivityTracker>())
+    }
 
-        registerActivityLifecycleCallbacks(get<ActivityTracker>())
-        LocaleManager.setLocale(this)
+    // This is required as some platforms expect ContextImpl
+    override fun getBaseContext(): Context {
+        return super.getBaseContext().unwrap()
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
-        super.onConfigurationChanged(newConfig)
-        LocaleManager.setLocale(this)
+        ResourceMgr.reload(newConfig)
+        if (!isRunningAsStub)
+            super.onConfigurationChanged(newConfig)
     }
 }
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
index 04dad084f..0b8fed26f 100644
--- a/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseActivity.kt
@@ -15,12 +15,13 @@ import androidx.databinding.DataBindingUtil
 import androidx.databinding.ViewDataBinding
 import com.topjohnwu.magisk.BR
 import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.R
 import com.topjohnwu.magisk.base.viewmodel.BaseViewModel
 import com.topjohnwu.magisk.extensions.set
 import com.topjohnwu.magisk.model.events.EventHandler
 import com.topjohnwu.magisk.model.permissions.PermissionRequestBuilder
-import com.topjohnwu.magisk.utils.LocaleManager
 import com.topjohnwu.magisk.utils.currentLocale
+import com.topjohnwu.magisk.utils.wrap
 import kotlin.random.Random
 
 typealias RequestCallback = BaseActivity<*, *>.(Int, Intent?) -> Unit
@@ -31,9 +32,8 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
     protected lateinit var binding: Binding
     protected abstract val layoutRes: Int
     protected abstract val viewModel: ViewModel
+    protected open val themeRes: Int = R.style.MagiskTheme
     protected open val snackbarView get() = binding.root
-    protected open val navHostId: Int = 0
-    protected open val defaultPosition: Int = 0
 
     private val resultCallbacks by lazy { SparseArrayCompat<RequestCallback>() }
 
@@ -53,10 +53,11 @@ abstract class BaseActivity<ViewModel : BaseViewModel, Binding : ViewDataBinding
     }
 
     override fun attachBaseContext(base: Context) {
-        super.attachBaseContext(LocaleManager.getLocaleContext(base))
+        super.attachBaseContext(base.wrap(false))
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
+        setTheme(themeRes)
         super.onCreate(savedInstanceState)
 
         viewModel.viewEvents.observe(this, viewEventObserver)
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/BaseReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseReceiver.kt
new file mode 100644
index 000000000..2e96a6b11
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseReceiver.kt
@@ -0,0 +1,17 @@
+package com.topjohnwu.magisk.base
+
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
+import com.topjohnwu.magisk.utils.wrap
+import org.koin.core.KoinComponent
+
+abstract class BaseReceiver : BroadcastReceiver(), KoinComponent {
+
+    final override fun onReceive(context: Context, intent: Intent?) {
+        onReceive(context.wrap() as ContextWrapper, intent)
+    }
+
+    abstract fun onReceive(context: ContextWrapper, intent: Intent?)
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/base/BaseService.kt b/app/src/main/java/com/topjohnwu/magisk/base/BaseService.kt
new file mode 100644
index 000000000..dc7801664
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/base/BaseService.kt
@@ -0,0 +1,12 @@
+package com.topjohnwu.magisk.base
+
+import android.app.Service
+import android.content.Context
+import com.topjohnwu.magisk.utils.wrap
+import org.koin.core.KoinComponent
+
+abstract class BaseService : Service(), KoinComponent {
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt b/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
index d8d5802f3..4a893ab8b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/extensions/XAndroid.kt
@@ -1,6 +1,8 @@
 package com.topjohnwu.magisk.extensions
 
+import android.content.ComponentName
 import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
 import android.content.pm.ApplicationInfo
 import android.content.pm.ComponentInfo
@@ -18,11 +20,13 @@ import androidx.annotation.ColorRes
 import androidx.annotation.DrawableRes
 import androidx.core.content.ContextCompat
 import androidx.core.net.toUri
+import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.FileProvider
 import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.magisk.utils.currentLocale
 import java.io.File
 import java.io.FileNotFoundException
+import java.util.*
 
 val packageName: String get() = get<Context>().packageName
 
@@ -93,6 +97,105 @@ fun Context.readUri(uri: Uri) =
 
 fun Intent.startActivity(context: Context) = context.startActivity(this)
 
+fun Intent.toCommand(args: MutableList<String>) {
+    if (action != null) {
+        args.add("-a")
+        args.add(action!!)
+    }
+    if (component != null) {
+        args.add("-n")
+        args.add(component!!.flattenToString())
+    }
+    if (data != null) {
+        args.add("-d")
+        args.add(dataString!!)
+    }
+    if (categories != null) {
+        for (cat in categories) {
+            args.add("-c")
+            args.add(cat)
+        }
+    }
+    if (type != null) {
+        args.add("-t")
+        args.add(type!!)
+    }
+    val extras = extras
+    if (extras != null) {
+        loop@ for (key in extras.keySet()) {
+            val v = extras.get(key) ?: continue
+            var value: Any = v
+            val arg: String
+            when {
+                v is String -> arg = "--es"
+                v is Boolean -> arg = "--ez"
+                v is Int -> arg = "--ei"
+                v is Long -> arg = "--el"
+                v is Float -> arg = "--ef"
+                v is Uri -> arg = "--eu"
+                v is ComponentName -> {
+                    arg = "--ecn"
+                    value = v.flattenToString()
+                }
+                v is ArrayList<*> -> {
+                    if (v.size <= 0)
+                    /* Impossible to know the type due to type erasure */
+                        continue@loop
+
+                    arg = if (v[0] is Int)
+                        "--eial"
+                    else if (v[0] is Long)
+                        "--elal"
+                    else if (v[0] is Float)
+                        "--efal"
+                    else if (v[0] is String)
+                        "--esal"
+                    else
+                        continue@loop  /* Unsupported */
+
+                    val sb = StringBuilder()
+                    for (o in v) {
+                        sb.append(o.toString().replace(",", "\\,"))
+                        sb.append(',')
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length - 1)
+                    value = sb
+                }
+                v.javaClass.isArray -> {
+                    arg = if (v is IntArray)
+                        "--eia"
+                    else if (v is LongArray)
+                        "--ela"
+                    else if (v is FloatArray)
+                        "--efa"
+                    else if (v is Array<*> && v.isArrayOf<String>())
+                        "--esa"
+                    else
+                        continue@loop  /* Unsupported */
+
+                    val sb = StringBuilder()
+                    val len = java.lang.reflect.Array.getLength(v)
+                    for (i in 0 until len) {
+                        sb.append(java.lang.reflect.Array.get(v, i)!!.toString().replace(",", "\\,"))
+                        sb.append(',')
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length - 1)
+                    value = sb
+                }
+                else -> continue@loop
+            }  /* Unsupported */
+
+            args.add(arg)
+            args.add(key)
+            args.add(value.toString())
+        }
+    }
+    args.add("-f")
+    args.add(flags.toString())
+}
+
 fun File.provide(context: Context = get()): Uri {
     return FileProvider.getUriForFile(context, context.packageName + ".provider", this)
 }
@@ -157,3 +260,18 @@ fun Context.startEndToLeftRight(start: Int, end: Int): Pair<Int, Int> {
 }
 
 fun Context.openUrl(url: String) = Utils.openLink(this, url.toUri())
+
+@Suppress("FunctionName")
+inline fun <reified T> T.DynamicClassLoader(apk: File)
+        = DynamicClassLoader(apk, T::class.java.classLoader)
+
+fun Context.unwrap() : Context {
+    var context = this
+    while (true) {
+        if (context is ContextWrapper)
+            context = context.baseContext
+        else
+            break
+    }
+    return context
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
index 4fdf3b9fe..278edafb0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/download/ManagerUpgrade.kt
@@ -5,13 +5,13 @@ import com.topjohnwu.magisk.BuildConfig
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.extensions.DynamicClassLoader
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Restore
 import com.topjohnwu.magisk.model.entity.internal.Configuration.APK.Upgrade
 import com.topjohnwu.magisk.model.entity.internal.DownloadSubject
 import com.topjohnwu.magisk.ui.SplashActivity
-import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.PatchAPK
-import com.topjohnwu.magisk.utils.RootUtils
+import com.topjohnwu.magisk.utils.Utils
 import com.topjohnwu.superuser.Shell
 import timber.log.Timber
 import java.io.File
@@ -54,7 +54,7 @@ private fun RemoteFileService.restore(apk: File, id: Int) {
     if (Shell.su("pm install $apk").exec().isSuccess) {
         val component = ComponentName(BuildConfig.APPLICATION_ID,
                 ClassMap.get<Class<*>>(SplashActivity::class.java).name)
-        RootUtils.rmAndLaunch(packageName, component)
+        Utils.rmAndLaunch(packageName, component)
     }
 }
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/download/NotificationService.kt b/app/src/main/java/com/topjohnwu/magisk/model/download/NotificationService.kt
index 716869fc3..f558265e3 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/download/NotificationService.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/download/NotificationService.kt
@@ -1,16 +1,16 @@
 package com.topjohnwu.magisk.model.download
 
 import android.app.Notification
-import android.app.Service
 import android.content.Intent
 import android.os.IBinder
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
+import com.topjohnwu.magisk.base.BaseService
 import org.koin.core.KoinComponent
 import java.util.*
 import kotlin.random.Random.Default.nextInt
 
-abstract class NotificationService : Service(), KoinComponent {
+abstract class NotificationService : BaseService(), KoinComponent {
 
     abstract val defaultNotification: NotificationCompat.Builder
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
index 93e277780..587712370 100644
--- a/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.kt
@@ -1,15 +1,14 @@
 package com.topjohnwu.magisk.model.receiver
 
-import android.content.BroadcastReceiver
-import android.content.Context
+import android.content.ContextWrapper
 import android.content.Intent
 import com.topjohnwu.magisk.ClassMap
 import com.topjohnwu.magisk.Config
 import com.topjohnwu.magisk.Const
 import com.topjohnwu.magisk.Info
+import com.topjohnwu.magisk.base.BaseReceiver
 import com.topjohnwu.magisk.data.database.PolicyDao
 import com.topjohnwu.magisk.data.database.base.su
-import com.topjohnwu.magisk.extensions.inject
 import com.topjohnwu.magisk.extensions.reboot
 import com.topjohnwu.magisk.model.download.DownloadService
 import com.topjohnwu.magisk.model.entity.ManagerJson
@@ -20,8 +19,9 @@ import com.topjohnwu.magisk.utils.SuLogger
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
+import org.koin.core.inject
 
-open class GeneralReceiver : BroadcastReceiver() {
+open class GeneralReceiver : BaseReceiver() {
 
     private val policyDB: PolicyDao by inject()
 
@@ -36,7 +36,7 @@ open class GeneralReceiver : BroadcastReceiver() {
         return intent.data?.encodedSchemeSpecificPart.orEmpty()
     }
 
-    override fun onReceive(context: Context, intent: Intent?) {
+    override fun onReceive(context: ContextWrapper, intent: Intent?) {
         intent ?: return
         when (intent.action ?: return) {
             Intent.ACTION_REBOOT, Intent.ACTION_BOOT_COMPLETED -> {
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
index 8810447af..848192ca6 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.kt
@@ -40,8 +40,8 @@ open class MainActivity : BaseActivity<MainViewModel, ActivityMainBinding>(), Na
 
     override val layoutRes: Int = R.layout.activity_main
     override val viewModel: MainViewModel by viewModel()
-    override val navHostId: Int = R.id.main_nav_host
-    override val defaultPosition: Int = 0
+    private val navHostId: Int = R.id.main_nav_host
+    private val defaultPosition: Int = 0
 
     private val navigationController by lazy {
         FragNavController(supportFragmentManager, navHostId)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
index 7021b62ba..728720b1b 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.kt
@@ -1,17 +1,23 @@
 package com.topjohnwu.magisk.ui
 
+import android.app.Activity
+import android.content.Context
 import android.content.Intent
 import android.os.Bundle
 import android.text.TextUtils
 import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.app.AppCompatActivity
 import com.topjohnwu.magisk.*
 import com.topjohnwu.magisk.utils.Utils
+import com.topjohnwu.magisk.utils.wrap
 import com.topjohnwu.magisk.view.Notifications
 import com.topjohnwu.magisk.view.Shortcuts
 import com.topjohnwu.superuser.Shell
 
-open class SplashActivity : AppCompatActivity() {
+open class SplashActivity : Activity() {
+
+    override fun attachBaseContext(base: Context) {
+        super.attachBaseContext(base.wrap())
+    }
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
index 2f46401a4..143db2a3e 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.kt
@@ -23,6 +23,7 @@ import java.io.File
 open class FlashActivity : BaseActivity<FlashViewModel, ActivityFlashBinding>() {
 
     override val layoutRes: Int = R.layout.activity_flash
+    override val themeRes: Int = R.style.MagiskTheme_Flashing
     override val viewModel: FlashViewModel by viewModel {
         val uri = intent.data ?: let { finish(); Uri.EMPTY }
         val additionalUri = intent.getParcelableExtra(Const.Key.FLASH_DATA) ?: uri
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
index 2cee4cbd8..2d2b2161c 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/home/HomeFragment.kt
@@ -9,11 +9,11 @@ import com.topjohnwu.magisk.base.BaseActivity
 import com.topjohnwu.magisk.base.BaseFragment
 import com.topjohnwu.magisk.data.repository.MagiskRepository
 import com.topjohnwu.magisk.databinding.FragmentMagiskBinding
+import com.topjohnwu.magisk.extensions.DynamicClassLoader
 import com.topjohnwu.magisk.extensions.openUrl
 import com.topjohnwu.magisk.extensions.subscribeK
 import com.topjohnwu.magisk.extensions.writeTo
 import com.topjohnwu.magisk.model.events.*
-import com.topjohnwu.magisk.utils.DynamicClassLoader
 import com.topjohnwu.magisk.utils.SafetyNetHelper
 import com.topjohnwu.magisk.view.MarkDownWindow
 import com.topjohnwu.magisk.view.dialogs.*
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
index 8f4d2fced..a3457ddd0 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.kt
@@ -201,7 +201,7 @@ class SettingsFragment : BasePreferenceFragment() {
                 Shell.su("magiskhide --disable").submit()
             }
             Config.Key.LOCALE -> {
-                LocaleManager.setLocale(activity.application)
+                ResourceMgr.reload()
                 activity.recreate()
             }
             Config.Key.CHECK_UPDATES -> Utils.scheduleUpdateCheck(activity)
@@ -230,7 +230,7 @@ class SettingsFragment : BasePreferenceFragment() {
                 val values = mutableListOf<String>()
 
                 names.add(
-                    LocaleManager.getString(defaultLocale, R.string.system_default)
+                    ResourceMgr.getString(defaultLocale, R.string.system_default)
                 )
                 values.add("")
 
diff --git a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
index 2fb93eeea..b55e108c2 100644
--- a/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.kt
@@ -18,6 +18,7 @@ import org.koin.androidx.viewmodel.ext.android.viewModel
 open class SuRequestActivity : BaseActivity<SuRequestViewModel, ActivityRequestBinding>() {
 
     override val layoutRes: Int = R.layout.activity_request
+    override val themeRes: Int = R.style.MagiskTheme_SU
     override val viewModel: SuRequestViewModel by viewModel()
 
     override fun onBackPressed() {
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.kt b/app/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.kt
deleted file mode 100644
index 9810c91bd..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.kt
+++ /dev/null
@@ -1,61 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import dalvik.system.DexClassLoader
-import java.io.File
-import java.io.IOException
-import java.net.URL
-import java.util.*
-
-@Suppress("FunctionName")
-inline fun <reified T> T.DynamicClassLoader(apk: File) = DynamicClassLoader(apk, T::class.java.classLoader)
-
-class DynamicClassLoader(apk: File, parent: ClassLoader?)
-    : DexClassLoader(apk.path, apk.parent, null, parent) {
-
-    private val base by lazy { Any::class.java.classLoader!! }
-
-    @Throws(ClassNotFoundException::class)
-    override fun loadClass(name: String, resolve: Boolean) : Class<*>
-        = findLoadedClass(name) ?: runCatching {
-            base.loadClass(name)
-        }.getOrElse {
-            runCatching {
-                findClass(name)
-            }.getOrElse { err ->
-                runCatching {
-                    parent.loadClass(name)
-                }.getOrElse { throw err }
-            }
-        }
-
-    override fun getResource(name: String) = base.getResource(name)
-            ?: findResource(name)
-            ?: parent?.getResource(name)
-
-    @Throws(IOException::class)
-    override fun getResources(name: String): Enumeration<URL> {
-        val resources = mutableListOf(
-                base.getResources(name),
-                findResources(name), parent.getResources(name))
-        return object : Enumeration<URL> {
-            override fun hasMoreElements(): Boolean {
-                while (true) {
-                    if (resources.isEmpty())
-                        return false
-                    if (!resources[0].hasMoreElements()) {
-                        resources.removeAt(0)
-                    } else {
-                        return true
-                    }
-                }
-            }
-
-            override fun nextElement(): URL {
-                if (!hasMoreElements())
-                    throw NoSuchElementException()
-                return resources[0].nextElement()
-            }
-        }
-    }
-
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt b/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt
deleted file mode 100644
index e89241b0d..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/utils/LocaleManager.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.content.Context
-import android.content.ContextWrapper
-import android.content.res.Configuration
-import android.content.res.Resources
-import androidx.annotation.StringRes
-import com.topjohnwu.magisk.Config
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.extensions.get
-import com.topjohnwu.magisk.extensions.inject
-import com.topjohnwu.magisk.extensions.langTagToLocale
-import com.topjohnwu.superuser.internal.InternalUtils
-import io.reactivex.Single
-import java.util.*
-
-var currentLocale = Locale.getDefault()!!
-    private set
-
-val defaultLocale = Locale.getDefault()!!
-
-val availableLocales = Single.fromCallable {
-    val compareId = R.string.app_changelog
-    val res: Resources by inject()
-    mutableListOf<Locale>().apply {
-        // Add default locale
-        add(Locale.ENGLISH)
-
-        // Add some special locales
-        add(Locale.TAIWAN)
-        add(Locale("pt", "BR"))
-
-        // Other locales
-        val otherLocales = res.assets.locales
-                .map { it.langTagToLocale() }
-                .distinctBy { LocaleManager.getString(it, compareId) }
-
-        listOf("", "").toTypedArray()
-
-        addAll(otherLocales)
-    }.sortedWith(Comparator { a, b ->
-        a.getDisplayName(a).toLowerCase(a)
-                .compareTo(b.getDisplayName(b).toLowerCase(b))
-    })
-}.cache()!!
-
-object LocaleManager {
-
-    fun setLocale(wrapper: ContextWrapper) {
-        val localeConfig = Config.locale
-        currentLocale = when {
-            localeConfig.isEmpty() -> defaultLocale
-            else -> localeConfig.langTagToLocale()
-        }
-        Locale.setDefault(currentLocale)
-        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(wrapper, currentLocale))
-    }
-
-    fun getLocaleContext(context: Context, locale: Locale = currentLocale): Context {
-        val config = Configuration(context.resources.configuration)
-        config.setLocale(locale)
-        return context.createConfigurationContext(config)
-    }
-
-    fun getString(locale: Locale, @StringRes id: Int): String {
-        return getLocaleContext(get(), locale).getString(id)
-    }
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt b/app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
index 5f45dc8a7..1ed022ead 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.kt
@@ -102,7 +102,7 @@ object PatchAPK {
 
         Config.suManager = pkg
         Config.export()
-        RootUtils.rmAndLaunch(BuildConfig.APPLICATION_ID,
+        Utils.rmAndLaunch(BuildConfig.APPLICATION_ID,
                 ComponentName(pkg, ClassMap.get<Class<*>>(SplashActivity::class.java).name))
 
         return true
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/ResourceMgr.kt b/app/src/main/java/com/topjohnwu/magisk/utils/ResourceMgr.kt
new file mode 100644
index 000000000..fb3d7d503
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/ResourceMgr.kt
@@ -0,0 +1,126 @@
+@file:Suppress("DEPRECATION")
+
+package com.topjohnwu.magisk.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.res.AssetManager
+import android.content.res.Configuration
+import android.content.res.Resources
+import androidx.annotation.StringRes
+import com.topjohnwu.magisk.Config
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.extensions.langTagToLocale
+import io.reactivex.Single
+import java.util.*
+
+var isRunningAsStub = false
+
+var currentLocale: Locale = Locale.getDefault()
+    private set
+
+@SuppressLint("ConstantLocale")
+val defaultLocale: Locale = Locale.getDefault()
+
+val availableLocales = Single.fromCallable {
+    val compareId = R.string.app_changelog
+    mutableListOf<Locale>().apply {
+        // Add default locale
+        add(Locale.ENGLISH)
+
+        // Add some special locales
+        add(Locale.TAIWAN)
+        add(Locale("pt", "BR"))
+
+        val config = Configuration()
+        val metrics = ResourceMgr.resource.displayMetrics
+        val res = Resources(ResourceMgr.resource.assets, metrics, config)
+
+        // Other locales
+        val otherLocales = ResourceMgr.resource.assets.locales
+                .map { it.langTagToLocale() }
+                .distinctBy {
+                    config.setLocale(it)
+                    res.updateConfiguration(config, metrics)
+                    res.getString(compareId)
+                }
+
+        listOf("", "").toTypedArray()
+
+        addAll(otherLocales)
+    }.sortedWith(Comparator { a, b ->
+        a.getDisplayName(a).toLowerCase(a)
+                .compareTo(b.getDisplayName(b).toLowerCase(b))
+    })
+}.cache()!!
+
+private val addAssetPath by lazy {
+    AssetManager::class.java.getMethod("addAssetPath", String::class.java)
+}
+
+fun AssetManager.addAssetPath(path: String) {
+    addAssetPath.invoke(this, path)
+}
+
+fun Context.wrap(global: Boolean = true): Context
+        = if (!global) ResourceMgr.ResContext(this) else ResourceMgr.GlobalResContext(this)
+
+object ResourceMgr {
+
+    lateinit var resource: Resources
+    private lateinit var resApk: String
+
+    fun init(context: Context) {
+        resource = context.resources
+        if (isRunningAsStub)
+            resApk = DynAPK.current(context).path
+    }
+
+    // Override locale and inject resources from dynamic APK
+    private fun Resources.patch(config: Configuration = Configuration(configuration)): Resources {
+        config.setLocale(currentLocale)
+        updateConfiguration(config, displayMetrics)
+        if (isRunningAsStub)
+            assets.addAssetPath(resApk)
+        return this
+    }
+
+    fun reload(config: Configuration = Configuration(resource.configuration)) {
+        val localeConfig = Config.locale
+        currentLocale = when {
+            localeConfig.isEmpty() -> defaultLocale
+            else -> localeConfig.langTagToLocale()
+        }
+        Locale.setDefault(currentLocale)
+        resource.patch(config)
+    }
+
+    fun getString(locale: Locale, @StringRes id: Int): String {
+        val config = Configuration()
+        config.setLocale(locale)
+        return Resources(resource.assets, resource.displayMetrics, config).getString(id)
+    }
+
+    open class GlobalResContext(base: Context) : ContextWrapper(base) {
+        open val mRes: Resources get() = resource
+        private val loader by lazy { javaClass.classLoader!! }
+
+        override fun getResources(): Resources {
+            return mRes
+        }
+
+        override fun getClassLoader(): ClassLoader {
+            return loader
+        }
+
+        override fun createConfigurationContext(config: Configuration): Context {
+            return ResContext(super.createConfigurationContext(config))
+        }
+    }
+
+    class ResContext(base: Context) : GlobalResContext(base) {
+        override val mRes by lazy { base.resources.patch() }
+    }
+
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/RootInit.kt b/app/src/main/java/com/topjohnwu/magisk/utils/RootInit.kt
new file mode 100644
index 000000000..c4bbfde4e
--- /dev/null
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/RootInit.kt
@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.utils
+
+import android.content.Context
+import com.topjohnwu.magisk.Const
+import com.topjohnwu.magisk.Info
+import com.topjohnwu.magisk.R
+import com.topjohnwu.magisk.extensions.rawResource
+import com.topjohnwu.superuser.Shell
+import com.topjohnwu.superuser.ShellUtils
+import com.topjohnwu.superuser.io.SuFile
+
+class RootInit : Shell.Initializer() {
+
+    override fun onInit(context: Context, shell: Shell): Boolean {
+        return init(context.wrap(), shell)
+    }
+
+    fun init(context: Context, shell: Shell): Boolean {
+        val job = shell.newJob()
+        if (shell.isRoot) {
+            job.add(context.rawResource(R.raw.util_functions))
+                    .add(context.rawResource(R.raw.utils))
+            Const.MAGISK_DISABLE_FILE = SuFile("/cache/.disable_magisk")
+            Info.loadMagiskInfo()
+        } else {
+            job.add(context.rawResource(R.raw.nonroot_utils))
+        }
+
+        job.add("mount_partitions",
+                "get_flags",
+                "run_migrations",
+                "export BOOTMODE=true")
+                .exec()
+
+        Info.keepVerity = ShellUtils.fastCmd("echo \$KEEPVERITY").toBoolean()
+        Info.keepEnc = ShellUtils.fastCmd("echo \$KEEPFORCEENCRYPT").toBoolean()
+        Info.recovery = ShellUtils.fastCmd("echo \$RECOVERYMODE").toBoolean()
+        return true
+    }
+}
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt b/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt
deleted file mode 100644
index 11bd46695..000000000
--- a/app/src/main/java/com/topjohnwu/magisk/utils/RootUtils.kt
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.topjohnwu.magisk.utils
-
-import android.content.ComponentName
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import com.topjohnwu.magisk.Const
-import com.topjohnwu.magisk.Info
-import com.topjohnwu.magisk.R
-import com.topjohnwu.magisk.extensions.rawResource
-import com.topjohnwu.magisk.extensions.toShellCmd
-import com.topjohnwu.superuser.Shell
-import com.topjohnwu.superuser.ShellUtils
-import com.topjohnwu.superuser.io.SuFile
-import java.util.*
-import java.lang.reflect.Array as RArray
-
-fun Intent.toCommand(args: MutableList<String>) {
-    if (action != null) {
-        args.add("-a")
-        args.add(action!!)
-    }
-    if (component != null) {
-        args.add("-n")
-        args.add(component!!.flattenToString())
-    }
-    if (data != null) {
-        args.add("-d")
-        args.add(dataString!!)
-    }
-    if (categories != null) {
-        for (cat in categories) {
-            args.add("-c")
-            args.add(cat)
-        }
-    }
-    if (type != null) {
-        args.add("-t")
-        args.add(type!!)
-    }
-    val extras = extras
-    if (extras != null) {
-        loop@ for (key in extras.keySet()) {
-            val v = extras.get(key) ?: continue
-            var value: Any = v
-            val arg: String
-            when {
-                v is String -> arg = "--es"
-                v is Boolean -> arg = "--ez"
-                v is Int -> arg = "--ei"
-                v is Long -> arg = "--el"
-                v is Float -> arg = "--ef"
-                v is Uri -> arg = "--eu"
-                v is ComponentName -> {
-                    arg = "--ecn"
-                    value = v.flattenToString()
-                }
-                v is ArrayList<*> -> {
-                    if (v.size <= 0)
-                    /* Impossible to know the type due to type erasure */
-                        continue@loop
-
-                    arg = if (v[0] is Int)
-                        "--eial"
-                    else if (v[0] is Long)
-                        "--elal"
-                    else if (v[0] is Float)
-                        "--efal"
-                    else if (v[0] is String)
-                        "--esal"
-                    else
-                        continue@loop  /* Unsupported */
-
-                    val sb = StringBuilder()
-                    for (o in v) {
-                        sb.append(o.toString().replace(",", "\\,"))
-                        sb.append(',')
-                    }
-                    // Remove trailing comma
-                    sb.deleteCharAt(sb.length - 1)
-                    value = sb
-                }
-                v.javaClass.isArray -> {
-                    arg = if (v is IntArray)
-                        "--eia"
-                    else if (v is LongArray)
-                        "--ela"
-                    else if (v is FloatArray)
-                        "--efa"
-                    else if (v is Array<*> && v.isArrayOf<String>())
-                        "--esa"
-                    else
-                        continue@loop  /* Unsupported */
-
-                    val sb = StringBuilder()
-                    val len = RArray.getLength(v)
-                    for (i in 0 until len) {
-                        sb.append(RArray.get(v, i)!!.toString().replace(",", "\\,"))
-                        sb.append(',')
-                    }
-                    // Remove trailing comma
-                    sb.deleteCharAt(sb.length - 1)
-                    value = sb
-                }
-                else -> continue@loop
-            }  /* Unsupported */
-
-            args.add(arg)
-            args.add(key)
-            args.add(value.toString())
-        }
-    }
-    args.add("-f")
-    args.add(flags.toString())
-}
-
-fun startActivity(intent: Intent) {
-    if (intent.component == null)
-        return
-    val args = ArrayList<String>()
-    args.add("am")
-    args.add("start")
-    intent.toCommand(args)
-    Shell.su(args.toShellCmd()).exec()
-}
-
-class RootUtils : Shell.Initializer() {
-
-    override fun onInit(context: Context, shell: Shell): Boolean {
-        val job = shell.newJob()
-        if (shell.isRoot) {
-            job.add(context.rawResource(R.raw.util_functions))
-                    .add(context.rawResource(R.raw.utils))
-            Const.MAGISK_DISABLE_FILE = SuFile("/cache/.disable_magisk")
-            Info.loadMagiskInfo()
-        } else {
-            job.add(context.rawResource(R.raw.nonroot_utils))
-        }
-
-        job.add("mount_partitions",
-                "get_flags",
-                "run_migrations",
-                "export BOOTMODE=true")
-                .exec()
-
-        Info.keepVerity = ShellUtils.fastCmd("echo \$KEEPVERITY").toBoolean()
-        Info.keepEnc = ShellUtils.fastCmd("echo \$KEEPFORCEENCRYPT").toBoolean()
-        Info.recovery = ShellUtils.fastCmd("echo \$RECOVERYMODE").toBoolean()
-        return true
-    }
-
-    companion object {
-
-        fun rmAndLaunch(rm: String, component: ComponentName) {
-            Shell.su("(rm_launch $rm ${component.flattenToString()})").exec()
-        }
-    }
-}
diff --git a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
index bf3758fe6..4e873aa8a 100644
--- a/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/utils/Utils.kt
@@ -1,5 +1,6 @@
 package com.topjohnwu.magisk.utils
 
+import android.content.ComponentName
 import android.content.Context
 import android.content.Intent
 import android.content.res.Resources
@@ -72,4 +73,8 @@ object Utils {
             if ((exists() && isDirectory) || mkdirs()) this else null
         }
 
+    fun rmAndLaunch(rm: String, component: ComponentName) {
+        Shell.su("(rm_launch $rm ${component.flattenToString()})").exec()
+    }
+
 }
diff --git a/app/src/main/res/values-v19/styles.xml b/app/src/main/res/values-v19/styles.xml
index 785a6291e..2a7f9b3e4 100644
--- a/app/src/main/res/values-v19/styles.xml
+++ b/app/src/main/res/values-v19/styles.xml
@@ -1,9 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
-        <item name="android:windowTranslucentStatus">true</item>
-        <item name="android:windowTranslucentNavigation">true</item>
-    </style>
+    <style name="SplashTheme" parent="SplashThemeBase.V19"/>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 51e244abd..8b7a31746 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -32,10 +32,6 @@
     <color name="dark_secondary_text">#dedede</color>
     <color name="su_request_background">#e0e0e0</color>
 
-    <!-- Flashing colors -->
-
-    <color name="ic_launcher_background">#00AF9C</color>
-
     <!-- Card colors -->
     <color name="card_background_color_dark">#ff424242</color>
     <color name="card_background_color_light">#ffffffff</color>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 88d6d4759..a66eac8a4 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,8 +60,6 @@
         <item name="cardBackgroundColor">@color/card_background_color_light</item>
     </style>
 
-    <style name="SplashTheme" parent="Theme.AppCompat.NoActionBar">
-        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
-    </style>
+    <style name="SplashTheme" parent="SplashThemeBase"/>
 
 </resources>
diff --git a/build.gradle b/build.gradle
index d80324468..52c34561a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -38,7 +38,7 @@ subprojects {
         maven { url "https://jitpack.io" }
         maven { url "http://oss.sonatype.org/content/repositories/snapshots" }
     }
-    afterEvaluate {
+    afterEvaluate { module ->
         if (getPlugins().hasPlugin('com.android.library') ||
             getPlugins().hasPlugin('com.android.application')) {
             android {
@@ -58,7 +58,7 @@ subprojects {
             }
         }
 
-        if (it.name == 'app' || it.name == 'stub') {
+        if (module.name == 'app' || module.name == 'stub') {
             android {
                 signingConfigs {
                     config {
@@ -76,8 +76,6 @@ subprojects {
                             signingConfig signingConfigs.config
                     }
                     release {
-                        minifyEnabled true
-                        shrinkResources true
                         signingConfig signingConfigs.config
                     }
                 }
@@ -85,6 +83,16 @@ subprojects {
                 lintOptions {
                     disable 'MissingTranslation'
                 }
+
+                aaptOptions {
+                    // Preserve stub resource IDs
+                    File publicTxt = rootProject.file('stub-public.txt')
+                    if (publicTxt.exists()) {
+                        additionalParameters "--stable-ids", "${publicTxt.absolutePath}"
+                    } else if (module.name == 'stub') {
+                        additionalParameters "--emit-ids", "${publicTxt.absolutePath}"
+                    }
+                }
             }
         }
     }
diff --git a/shared/src/main/AndroidManifest.xml b/shared/src/main/AndroidManifest.xml
index 82038fd93..73a5f831e 100644
--- a/shared/src/main/AndroidManifest.xml
+++ b/shared/src/main/AndroidManifest.xml
@@ -10,6 +10,12 @@
         android:installLocation="internalOnly"
         android:label="@string/app_name"
         android:supportsRtl="true">
+
+        <activity
+            android:name="a.r"
+            android:theme="@android:style/Theme.Translucent.NoTitleBar"
+            android:process=":remote" />
+
         <provider
             android:name="a.p"
             android:authorities="${applicationId}.provider"
diff --git a/shared/src/main/java/a/r.java b/shared/src/main/java/a/r.java
new file mode 100644
index 000000000..3863eccb3
--- /dev/null
+++ b/shared/src/main/java/a/r.java
@@ -0,0 +1,6 @@
+package a;
+
+import com.topjohnwu.magisk.ProcessPhoenix;
+
+public class r extends ProcessPhoenix {
+}
diff --git a/shared/src/main/java/com/topjohnwu/magisk/ProcessPhoenix.java b/shared/src/main/java/com/topjohnwu/magisk/ProcessPhoenix.java
new file mode 100644
index 000000000..4bc113f0a
--- /dev/null
+++ b/shared/src/main/java/com/topjohnwu/magisk/ProcessPhoenix.java
@@ -0,0 +1,90 @@
+/*
+ * Copyright (C) 2014 Jake Wharton
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.topjohnwu.magisk;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
+import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
+
+/**
+ * Modified from JakeWharton/ProcessPhoenix
+ *
+ * Process Phoenix facilitates restarting your application process. This should only be used for
+ * things like fundamental state changes in your debug builds (e.g., changing from staging to
+ * production).
+ * <p>
+ * Trigger process recreation by calling {@link #triggerRebirth} with a {@link Context} instance.
+ */
+public class ProcessPhoenix extends Activity {
+    private static final String KEY_RESTART_INTENTS = "phoenix_restart_intents";
+
+    /**
+     * Call to restart the application process using the {@linkplain Intent#CATEGORY_DEFAULT default}
+     * activity as an intent.
+     * <p>
+     * Behavior of the current process after invoking this method is undefined.
+     */
+    public static void triggerRebirth(Context context) {
+        triggerRebirth(context, getRestartIntent(context));
+    }
+
+    /**
+     * Call to restart the application process using the specified intents.
+     * <p>
+     * Behavior of the current process after invoking this method is undefined.
+     */
+    public static void triggerRebirth(Context context, Intent... nextIntents) {
+        Intent intent = new Intent(context, a.r.class);
+        intent.addFlags(FLAG_ACTIVITY_NEW_TASK); // In case we are called with non-Activity context.
+        intent.putParcelableArrayListExtra(KEY_RESTART_INTENTS, new ArrayList<>(Arrays.asList(nextIntents)));
+        context.startActivity(intent);
+        if (context instanceof Activity) {
+            ((Activity) context).finish();
+        }
+        Runtime.getRuntime().exit(0);
+    }
+
+    private static Intent getRestartIntent(Context context) {
+        String packageName = context.getPackageName();
+        Intent defaultIntent = context.getPackageManager().getLaunchIntentForPackage(packageName);
+        if (defaultIntent != null) {
+            defaultIntent.addFlags(FLAG_ACTIVITY_NEW_TASK | FLAG_ACTIVITY_CLEAR_TASK);
+            return defaultIntent;
+        }
+
+        throw new IllegalStateException("Unable to determine default activity for "
+                + packageName
+                + ". Does an activity specify the DEFAULT category in its intent filter?");
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        ArrayList<Intent> intents = getIntent().getParcelableArrayListExtra(KEY_RESTART_INTENTS);
+        startActivities(intents.toArray(new Intent[0]));
+        finish();
+        Runtime.getRuntime().exit(0);
+    }
+}
diff --git a/shared/src/main/java/com/topjohnwu/magisk/utils/CompoundEnumeration.java b/shared/src/main/java/com/topjohnwu/magisk/utils/CompoundEnumeration.java
new file mode 100644
index 000000000..8d7790958
--- /dev/null
+++ b/shared/src/main/java/com/topjohnwu/magisk/utils/CompoundEnumeration.java
@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.utils;
+
+import java.util.Enumeration;
+import java.util.NoSuchElementException;
+
+public class CompoundEnumeration<E> implements Enumeration<E> {
+    private Enumeration<E>[] enums;
+    private int index = 0;
+
+    @SafeVarargs
+    public CompoundEnumeration(Enumeration<E> ...enums) {
+        this.enums = enums;
+    }
+
+    private boolean next() {
+        while (index < enums.length) {
+            if (enums[index] != null && enums[index].hasMoreElements()) {
+                return true;
+            }
+            index++;
+        }
+        return false;
+    }
+
+    public boolean hasMoreElements() {
+        return next();
+    }
+
+    public E nextElement() {
+        if (!next()) {
+            throw new NoSuchElementException();
+        }
+        return enums[index].nextElement();
+    }
+}
diff --git a/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java b/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java
new file mode 100644
index 000000000..4c1d170c5
--- /dev/null
+++ b/shared/src/main/java/com/topjohnwu/magisk/utils/DynAPK.java
@@ -0,0 +1,16 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+
+import java.io.File;
+
+public class DynAPK {
+
+    private static File dynDir;
+
+    public static File current(Context context) {
+        if (dynDir == null)
+            dynDir = new File(context.getFilesDir().getParent(), "dyn");
+        return new File(dynDir, "current.apk");
+    }
+}
diff --git a/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java b/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
new file mode 100644
index 000000000..14134fc38
--- /dev/null
+++ b/shared/src/main/java/com/topjohnwu/magisk/utils/DynamicClassLoader.java
@@ -0,0 +1,60 @@
+package com.topjohnwu.magisk.utils;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+import java.util.Enumeration;
+
+import dalvik.system.DexClassLoader;
+
+public class DynamicClassLoader extends DexClassLoader {
+
+    private ClassLoader base = Object.class.getClassLoader();
+
+    public DynamicClassLoader(File apk, ClassLoader parent) {
+        super(apk.getPath(), apk.getParent(), null, parent);
+    }
+
+    @Override
+    protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException {
+        // First check if already loaded
+        Class cls = findLoadedClass(name);
+        if (cls != null)
+            return cls;
+
+        try {
+            // Then check boot classpath
+            return base.loadClass(name);
+        } catch (ClassNotFoundException ignored) {
+            try {
+                // Next try current dex
+                return findClass(name);
+            } catch (ClassNotFoundException fromSuper) {
+                try {
+                    // Finally try parent
+                    return getParent().loadClass(name);
+                } catch (ClassNotFoundException e) {
+                    throw fromSuper;
+                }
+            }
+        }
+    }
+
+    @Override
+    public URL getResource(String name) {
+        URL resource = base.getResource(name);
+        if (resource != null)
+            return resource;
+        resource = findResource(name);
+        if (resource != null)
+            return resource;
+        resource = getParent().getResource(name);
+        return resource;
+    }
+
+    @Override
+    public Enumeration<URL> getResources(String name) throws IOException {
+        return new CompoundEnumeration<>(base.getResources(name),
+                findResources(name), getParent().getResources(name));
+    }
+}
diff --git a/shared/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml b/shared/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml
new file mode 100644
index 000000000..dffe01567
--- /dev/null
+++ b/shared/src/main/res/drawable-anydpi-v23/ic_splash_activity.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/ic_launcher_background" />
+    <item
+        android:width="250dp"
+        android:height="250dp"
+        android:gravity="center"
+        android:drawable="@drawable/ic_magisk" />
+
+</layer-list>
\ No newline at end of file
diff --git a/shared/src/main/res/values-az/strings.xml b/shared/src/main/res/values-az/strings.xml
index 0aa292c50..b0d32921f 100644
--- a/shared/src/main/res/values-az/strings.xml
+++ b/shared/src/main/res/values-az/strings.xml
@@ -1,12 +1,6 @@
 <resources>
-    <!--Not translatable-->
-    <string name="app_name" translatable="false">Magisk Manager</string>
-    <string name="re_app_name" translatable="false">Manager</string>
-    <string name="magisk" translatable="false">Magisk</string>
-    <string name="magiskhide" translatable="false">Magisk Hide</string>
-    <string name="empty" translatable="false"/>
-
-    <!--Used in both stub and full app-->
+    <string name="upgrade_msg">Qurmanı sonlandırmaq üçün full Magisk Manager`ə yüksəldin. Yüklənib qurulsun?</string>
+    <string name="no_internet_msg">Lütfən internetə qoşulun! Full Magisk Manager\'ə yüksəltmə lazımidir.</string>
     <string name="no_thanks">Yox, sağolun</string>
     <string name="yes">Bəli</string>
     <string name="ok">OK</string>
diff --git a/shared/src/main/res/values-bg/strings.xml b/shared/src/main/res/values-bg/strings.xml
index 67672c83a..1421eb6b0 100644
--- a/shared/src/main/res/values-bg/strings.xml
+++ b/shared/src/main/res/values-bg/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Не, благодаря.</string>
     <string name="yes">Да</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Надградете до пълната версия на Magisk Manager, за да довършите първоначалната настройка. Изтегляне и инсталиране сега?</string>
+    <string name="no_internet_msg">Моля да се свържете към работеща интернет мрежа, защото надграждането до пълната версия на Magisk Manager е задължително.</string>
 </resources>
diff --git a/shared/src/main/res/values-ca/strings.xml b/shared/src/main/res/values-ca/strings.xml
index 2586bea2f..04cb79758 100644
--- a/shared/src/main/res/values-ca/strings.xml
+++ b/shared/src/main/res/values-ca/strings.xml
@@ -3,5 +3,7 @@
     <string name="no_thanks">No, gràcies</string>     
     <string name="yes">Sí</string>     
     <string name="ok">Ok</string>  
+    <string name="upgrade_msg">Fes una actualització total de Magisk Manager  per finalitzar l\'instalació. Descarregar i instalar?</string>
+    <string name="no_internet_msg">Si us plau, connecta\'t a internet! Es necessari fer una actualització total de Magisk Manager.</string>
     
 </resources>
diff --git a/shared/src/main/res/values-de/strings.xml b/shared/src/main/res/values-de/strings.xml
index 45d2649df..426a03351 100644
--- a/shared/src/main/res/values-de/strings.xml
+++ b/shared/src/main/res/values-de/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Nein danke</string>
     <string name="yes">Ja</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Upgrade zum vollständigen Magisk Manager, um das Setup abzuschließen. Herunterladen und installieren?</string>
+    <string name="no_internet_msg">Bitte eine Verbindung mit dem Internet herstellen! Upgrade zum vollständigen Magisk Manager ist erforderlich.</string>
 </resources>
diff --git a/shared/src/main/res/values-es/strings.xml b/shared/src/main/res/values-es/strings.xml
index 59e347308..8904fdf32 100644
--- a/shared/src/main/res/values-es/strings.xml
+++ b/shared/src/main/res/values-es/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">No gracias</string>
     <string name="yes">Sí</string>
     <string name="ok">Aceptar</string>
+    <string name="upgrade_msg">Actualizar a la Ver. Completa de Magisk Manager para finalizar la instalación. Descargar e instalar?</string>
+    <string name="no_internet_msg">¡Por favor conectarse a Internet! Se requiere actualizar a la Ver. Completa de Magisk Manager </string>
 </resources>
diff --git a/shared/src/main/res/values-et/strings.xml b/shared/src/main/res/values-et/strings.xml
index a8dd7ca3d..50288c12a 100644
--- a/shared/src/main/res/values-et/strings.xml
+++ b/shared/src/main/res/values-et/strings.xml
@@ -3,4 +3,6 @@
     <string name="no_thanks">Tänan ei</string>
     <string name="yes">Jah</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Täienda seadistuse lõpetamiseks Magisk Manager\'i täisversioonile. Kas laadid alla ja installid?</string>
+    <string name="no_internet_msg">Palun ühendu Internetti! Nõutud on Magisk Manager\'i täisversioonile täiendamine.</string>
 </resources>
\ No newline at end of file
diff --git a/shared/src/main/res/values-fr/strings.xml b/shared/src/main/res/values-fr/strings.xml
index f153b4e9f..d44357e3e 100644
--- a/shared/src/main/res/values-fr/strings.xml
+++ b/shared/src/main/res/values-fr/strings.xml
@@ -4,4 +4,6 @@
     <string name="no_thanks">Non merci</string>
     <string name="yes">Oui</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Mettre à jour vers la version complête de Magisk Manager pour finir l\'installation. Télécharger et installer?</string>
+    <string name="no_internet_msg">Veuillez vous connecter à Internet! Une mise à niveau complête vers le Gestionnaire Magisk est requise.</string>
 </resources>
diff --git a/shared/src/main/res/values-in/strings.xml b/shared/src/main/res/values-in/strings.xml
index 9083d1990..6bc1ef7f8 100644
--- a/shared/src/main/res/values-in/strings.xml
+++ b/shared/src/main/res/values-in/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Tidak, terima kasih</string>
     <string name="yes">Ya</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Tingkatkan ke Magisk Manager versi penuh untuk menyelesaikan penyiapan. Unduh dan pasang?</string>
+    <string name="no_internet_msg">Harap menyambungkan ke Internet! Peningkatan ke Magisk Manager versi penuh diperlukan.</string>
 </resources>
diff --git a/shared/src/main/res/values-it/strings.xml b/shared/src/main/res/values-it/strings.xml
index 9513ee6b8..0c8c96c0e 100644
--- a/shared/src/main/res/values-it/strings.xml
+++ b/shared/src/main/res/values-it/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">No, grazie</string>
     <string name="yes">Sì</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Aggiorna alla versione completa di Magisk Manager per completare l\'installazione. Vuoi procedere al download e all\'installazione?</string>
+    <string name="no_internet_msg">Controlla la connessione a Internet! È necessaria per l\'aggiornamento di Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-ko/strings.xml b/shared/src/main/res/values-ko/strings.xml
index ff0b4b4f8..a47c15d35 100644
--- a/shared/src/main/res/values-ko/strings.xml
+++ b/shared/src/main/res/values-ko/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">아니오, 괜찮습니다</string>
     <string name="yes">예</string>
     <string name="ok">확인</string>
+    <string name="upgrade_msg">완전한 Magisk Manager로 업데이트하여 설치를 마치십시오. 다운로드하고 설치하시겠습니까?</string>
+    <string name="no_internet_msg">인터넷에 연결해 주시기 바랍니다! 완전한 Magisk Manager로 업데이트 해야 합니다.</string>
 </resources>
diff --git a/shared/src/main/res/values-lt/strings.xml b/shared/src/main/res/values-lt/strings.xml
index b07a56dad..2c5179804 100644
--- a/shared/src/main/res/values-lt/strings.xml
+++ b/shared/src/main/res/values-lt/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Ačiū, nereikia</string>
     <string name="yes">Taip</string>
     <string name="ok">Gerai</string>
+    <string name="upgrade_msg">Atsinaujinkite į pilną Magisk Manager versiją, kad baigtumėte pasiruošimą. Atsisiųsti ir instaliuoti?</string>
+    <string name="no_internet_msg">Prašome prisijungti prie interneto! Atsinaujinimas į pilną Magisk Manager versiją yra privalomas.</string>
 </resources>
diff --git a/shared/src/main/res/values-mk/strings.xml b/shared/src/main/res/values-mk/strings.xml
index 26b898170..ad7bece43 100644
--- a/shared/src/main/res/values-mk/strings.xml
+++ b/shared/src/main/res/values-mk/strings.xml
@@ -1,13 +1,8 @@
 <resources>
-    <!--Not translatable-->
-    <string name="app_name" translatable="false">Magisk Manager</string>
-    <string name="re_app_name" translatable="false">Manager</string>
-    <string name="magisk" translatable="false">Magisk</string>
-    <string name="magiskhide" translatable="false">Magisk Hide</string>
-    <string name="empty" translatable="false"/>
-
     <!--Used in both stub and full app-->
     <string name="no_thanks">Не, благодарам</string>
     <string name="yes">Да</string>
     <string name="ok">ОК</string>
+    <string name="upgrade_msg">Надградете до целосната верзија на Magisk Manager за да го завршите поставувањето. Преземете и инсталирајте?</string>
+    <string name="no_internet_msg">Ве молиме поврзете се на интернет бидејќи е потребна надградба на целосната верзија на Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-nb/strings.xml b/shared/src/main/res/values-nb/strings.xml
index 7191e0a8e..322190c48 100644
--- a/shared/src/main/res/values-nb/strings.xml
+++ b/shared/src/main/res/values-nb/strings.xml
@@ -4,4 +4,6 @@
     <string name="no_thanks">Nei takk</string>
     <string name="yes">Ja</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Oppgrader til den komplette versjonen av Magisk Manager for å fullføre oppsettet. Vil du laste ned og installere?</string>
+    <string name="no_internet_msg">Vennligst koble deg på internettet! Å oppgradere til den komplette versjonen av Magisk Manager er påkrevd.</string>
  </resources>
diff --git a/shared/src/main/res/values-pl/strings.xml b/shared/src/main/res/values-pl/strings.xml
index 6ee825e88..d38b3c55a 100644
--- a/shared/src/main/res/values-pl/strings.xml
+++ b/shared/src/main/res/values-pl/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Nie dziękuję</string>
     <string name="yes">Tak</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Przejdź na pełną wersję programu Magisk Manager, aby ukończyć konfigurację. Ściągnąć i zainstalować?</string>
+    <string name="no_internet_msg">Połącz się z Internetem! Wymagana jest aktualizacja do pełnego programu Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-ro/strings.xml b/shared/src/main/res/values-ro/strings.xml
index 0a0a68366..0e70bed77 100644
--- a/shared/src/main/res/values-ro/strings.xml
+++ b/shared/src/main/res/values-ro/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Nu, mulțumesc</string>
     <string name="yes">Da</string>
     <string name="ok">Ok</string>
+    <string name="upgrade_msg">Treci la versiunea completă Magisk Manager pentru a finaliza configurarea. Descarci și instalezi?</string>
+    <string name="no_internet_msg">Te rugăm să te conectezi la internet! Este necesară actualizarea la versiunea completă Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-ru/strings.xml b/shared/src/main/res/values-ru/strings.xml
index c890d9852..4bb584099 100644
--- a/shared/src/main/res/values-ru/strings.xml
+++ b/shared/src/main/res/values-ru/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Нет</string>
     <string name="yes">Да</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Обновите Magisk Manager для завершения установки. Загрузить и установить?</string>
+    <string name="no_internet_msg">Пожалуйста, подключитесь к интернету! Требуется обновление Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-sk/strings.xml b/shared/src/main/res/values-sk/strings.xml
index 525594569..d93b29bde 100644
--- a/shared/src/main/res/values-sk/strings.xml
+++ b/shared/src/main/res/values-sk/strings.xml
@@ -3,4 +3,6 @@
     <string name="no_thanks">Nie, ďakujem</string>
     <string name="yes">Áno</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Pre dokončenie inštalácie sa vyžaduje upgrade Magisk Managera. Stiahnuť a nainštalovať?</string>
+    <string name="no_internet_msg">Pripojte sa na internet! Upgrade Magisk Managera je potrebný.</string>
 </resources>
diff --git a/shared/src/main/res/values-tr/strings.xml b/shared/src/main/res/values-tr/strings.xml
index b12c91cfb..24ae0185a 100644
--- a/shared/src/main/res/values-tr/strings.xml
+++ b/shared/src/main/res/values-tr/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Hayır, teşekkürler</string>
     <string name="yes">Evet</string>
     <string name="ok">Tamam</string>
+    <string name="upgrade_msg">Kurulumu tamamlamak için tam Magisk Manager\'a yükseltin. İndirip yüklensin mi?</string>
+    <string name="no_internet_msg">Lütfen internete bağlanın! Tam Magisk Manager\'a yükseltmek gerekiyor.</string>
 </resources>
diff --git a/shared/src/main/res/values-uk/strings.xml b/shared/src/main/res/values-uk/strings.xml
index 798125257..3d6f7ed57 100644
--- a/shared/src/main/res/values-uk/strings.xml
+++ b/shared/src/main/res/values-uk/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">Ні, дякую</string>
     <string name="yes">Так</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Оновіть Magisk Manager для завершення встановлення. Завантажити і встановити?</string>
+    <string name="no_internet_msg">Будь ласка, підключіться до Інтернету! Потрібно оновити Magisk Manager.</string>
 </resources>
diff --git a/shared/src/main/res/values-v23/values.xml b/shared/src/main/res/values-v23/values.xml
new file mode 100644
index 000000000..0a0a96685
--- /dev/null
+++ b/shared/src/main/res/values-v23/values.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="enable_system_alarm_service_default">false</bool>
+    <bool name="enable_system_job_service_default">true</bool>
+</resources>
diff --git a/shared/src/main/res/values-zh-rCN/strings.xml b/shared/src/main/res/values-zh-rCN/strings.xml
index dfe109c8e..6a7ca6dd2 100644
--- a/shared/src/main/res/values-zh-rCN/strings.xml
+++ b/shared/src/main/res/values-zh-rCN/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">不，谢谢</string>
     <string name="yes">是</string>
     <string name="ok">好</string>
+    <string name="upgrade_msg">需要升级到完整的 Magisk Manager 来完成安装。 现在下载？</string>
+    <string name="no_internet_msg">请连接到互联网！ 这是升级到完整 Magisk Manager 所必需的。</string>
 </resources>
diff --git a/shared/src/main/res/values-zh-rTW/strings.xml b/shared/src/main/res/values-zh-rTW/strings.xml
index de1ddf06f..c330fec82 100644
--- a/shared/src/main/res/values-zh-rTW/strings.xml
+++ b/shared/src/main/res/values-zh-rTW/strings.xml
@@ -2,4 +2,6 @@
     <string name="no_thanks">不，謝謝</string>
     <string name="yes">是</string>
     <string name="ok">好</string>
+    <string name="upgrade_msg">需要升級到完整版 Magisk Manager。是否下載並安裝？</string>
+    <string name="no_internet_msg">請連上網路！升級到完整版 Magisk Manager 是必須的。</string>
 </resources>
diff --git a/shared/src/main/res/values/colors.xml b/shared/src/main/res/values/colors.xml
new file mode 100644
index 000000000..f307cc63e
--- /dev/null
+++ b/shared/src/main/res/values/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#00AF9C</color>
+</resources>
\ No newline at end of file
diff --git a/shared/src/main/res/values/strings.xml b/shared/src/main/res/values/strings.xml
index cdbc67780..891efcd11 100644
--- a/shared/src/main/res/values/strings.xml
+++ b/shared/src/main/res/values/strings.xml
@@ -6,8 +6,9 @@
     <string name="magiskhide" translatable="false">Magisk Hide</string>
     <string name="empty" translatable="false"/>
 
-    <!--Used in both stub and full app-->
     <string name="no_thanks">No thanks</string>
     <string name="yes">Yes</string>
     <string name="ok">OK</string>
+    <string name="upgrade_msg">Upgrade to full Magisk Manager to finish the setup. Download and install?</string>
+    <string name="no_internet_msg">Please connect to the Internet! Upgrading to full Magisk Manager is required.</string>
 </resources>
diff --git a/shared/src/main/res/values/styles.xml b/shared/src/main/res/values/styles.xml
new file mode 100644
index 000000000..fd5837779
--- /dev/null
+++ b/shared/src/main/res/values/styles.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools">
+
+    <style name="SplashThemeBase" parent="android:Theme.DeviceDefault.NoActionBar">
+        <item name="android:windowBackground">@drawable/ic_splash_activity</item>
+    </style>
+
+    <style name="SplashThemeBase.V19" parent="SplashThemeBase">
+        <item name="android:windowTranslucentStatus" tools:targetApi="19">true</item>
+        <item name="android:windowTranslucentNavigation" tools:targetApi="19">true</item>
+    </style>
+
+    <style name="SplashTheme" parent="android:Theme.Translucent.NoTitleBar" />
+</resources>
diff --git a/shared/src/main/res/values/values.xml b/shared/src/main/res/values/values.xml
new file mode 100644
index 000000000..285dd6910
--- /dev/null
+++ b/shared/src/main/res/values/values.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="enable_system_alarm_service_default">true</bool>
+    <bool name="enable_system_job_service_default">false</bool>
+    <bool name="workmanager_test_configuration">false</bool>
+</resources>
diff --git a/stub/build.gradle b/stub/build.gradle
index 17540f5df..b9e76ddae 100644
--- a/stub/build.gradle
+++ b/stub/build.gradle
@@ -9,7 +9,10 @@ android {
 
     buildTypes {
         release {
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            minifyEnabled true
+            shrinkResources false /* Do NOT allow resource shrinking */
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'),
+                    'proguard-rules.pro'
         }
     }
 }
diff --git a/stub/src/main/AndroidManifest.xml b/stub/src/main/AndroidManifest.xml
index 6a0bfc6d1..16dfc8081 100644
--- a/stub/src/main/AndroidManifest.xml
+++ b/stub/src/main/AndroidManifest.xml
@@ -1,21 +1,182 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+    Try to recreate the main app's AndroidManifest.xml
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.topjohnwu.magisk">
 
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.VIBRATE" />
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
-    <application tools:ignore="GoogleAppIndexingWarning"
-        android:allowBackup="true">
+    <application
+        android:name="a.e"
+        android:appComponentFactory="a.a"
+        android:allowBackup="true"
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning" >
+
+        <!-- Download Activity -->
 
         <activity
-            android:name=".MainActivity"
-            android:theme="@android:style/Theme.Translucent.NoTitleBar">
+            android:name="a.c"
+            android:configChanges="orientation|screenSize"
+            android:theme="@style/SplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <!-- Magisk Manager Components -->
+
+        <activity
+            android:name="a.b"
+            android:configChanges="orientation|screenSize"
+            android:exported="true" />
+
+        <activity
+            android:name="a.f"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="nosensor" />
+
+        <activity
+            android:name="a.m"
+            android:directBootAware="true"
+            android:excludeFromRecents="true"
+            android:exported="false" />
+
+        <receiver
+            android:name="a.h"
+            android:directBootAware="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
+            </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.PACKAGE_REPLACED" />
+                <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
+
+                <data android:scheme="package" />
+            </intent-filter>
+        </receiver>
+
+        <service
+            android:name="a.j"
+            android:exported="false" />
+
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="12451000" />
+
+        <!-- WorkManager -->
+
+        <provider
+            android:name="androidx.work.impl.WorkManagerInitializer"
+            android:authorities="${applicationId}.workmanager-init"
+            android:directBootAware="false"
+            android:exported="false"
+            android:multiprocess="true"
+            tools:targetApi="n" />
+
+        <service
+            android:name="androidx.work.impl.background.systemalarm.SystemAlarmService"
+            android:directBootAware="false"
+            android:enabled="@bool/enable_system_alarm_service_default"
+            android:exported="false"
+            tools:targetApi="n" />
+        <service
+            android:name="androidx.work.impl.background.systemjob.SystemJobService"
+            android:directBootAware="false"
+            android:enabled="@bool/enable_system_job_service_default"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE"
+            tools:targetApi="n" />
+
+        <receiver
+            android:name="androidx.work.impl.utils.ForceStopRunnable$BroadcastReceiver"
+            android:directBootAware="false"
+            android:enabled="true"
+            android:exported="false"
+            tools:targetApi="n" />
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryChargingProxy"
+            android:directBootAware="false"
+            android:enabled="false"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="android.intent.action.ACTION_POWER_CONNECTED" />
+                <action android:name="android.intent.action.ACTION_POWER_DISCONNECTED" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$BatteryNotLowProxy"
+            android:directBootAware="false"
+            android:enabled="false"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="android.intent.action.BATTERY_OKAY" />
+                <action android:name="android.intent.action.BATTERY_LOW" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$StorageNotLowProxy"
+            android:directBootAware="false"
+            android:enabled="false"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="android.intent.action.DEVICE_STORAGE_LOW" />
+                <action android:name="android.intent.action.DEVICE_STORAGE_OK" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.ConstraintProxy$NetworkStateProxy"
+            android:directBootAware="false"
+            android:enabled="false"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.RescheduleReceiver"
+            android:directBootAware="false"
+            android:enabled="false"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.TIME_SET" />
+                <action android:name="android.intent.action.TIMEZONE_CHANGED" />
+            </intent-filter>
+        </receiver>
+        <receiver
+            android:name="androidx.work.impl.background.systemalarm.ConstraintProxyUpdateReceiver"
+            android:directBootAware="false"
+            android:enabled="@bool/enable_system_alarm_service_default"
+            android:exported="false"
+            tools:targetApi="n" >
+            <intent-filter>
+                <action android:name="androidx.work.impl.background.systemalarm.UpdateProxies" />
+            </intent-filter>
+        </receiver>
+
+        <!-- Room -->
+
+        <service
+            android:name="androidx.room.MultiInstanceInvalidationService"
+            android:exported="false" />
+
     </application>
+
 </manifest>
diff --git a/stub/src/main/java/a/a.java b/stub/src/main/java/a/a.java
new file mode 100644
index 000000000..3510c9096
--- /dev/null
+++ b/stub/src/main/java/a/a.java
@@ -0,0 +1,6 @@
+package a;
+
+import com.topjohnwu.magisk.DelegateComponentFactory;
+
+public class a extends DelegateComponentFactory {
+}
diff --git a/stub/src/main/java/a/c.java b/stub/src/main/java/a/c.java
new file mode 100644
index 000000000..44b3521e1
--- /dev/null
+++ b/stub/src/main/java/a/c.java
@@ -0,0 +1,6 @@
+package a;
+
+import com.topjohnwu.magisk.DownloadActivity;
+
+public class c extends DownloadActivity {
+}
diff --git a/stub/src/main/java/a/e.java b/stub/src/main/java/a/e.java
new file mode 100644
index 000000000..cd2e45a4c
--- /dev/null
+++ b/stub/src/main/java/a/e.java
@@ -0,0 +1,6 @@
+package a;
+
+import com.topjohnwu.magisk.DelegateApplication;
+
+public class e extends DelegateApplication {
+}
diff --git a/stub/src/main/java/androidx/work/impl/WorkManagerInitializer.java b/stub/src/main/java/androidx/work/impl/WorkManagerInitializer.java
new file mode 100644
index 000000000..706a63085
--- /dev/null
+++ b/stub/src/main/java/androidx/work/impl/WorkManagerInitializer.java
@@ -0,0 +1,12 @@
+package androidx.work.impl;
+
+import com.topjohnwu.magisk.dummy.DummyProvider;
+
+public class WorkManagerInitializer extends DummyProvider {
+    /* This class have to exist, or else pre 9.0 devices
+     * will experience ClassNotFoundException crashes when
+     * launching the stub, as ContentProviders are constructed
+     * when an app starts up. Pre 9.0 devices do not have
+     * our custom DelegateComponentFactory to help creating
+     * dummies. */
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java b/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
new file mode 100644
index 000000000..e56d66ae8
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/DelegateApplication.java
@@ -0,0 +1,72 @@
+package com.topjohnwu.magisk;
+
+import android.app.AppComponentFactory;
+import android.app.Application;
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.os.Build;
+import android.util.Log;
+
+import com.topjohnwu.magisk.utils.DynAPK;
+import com.topjohnwu.magisk.utils.DynamicClassLoader;
+
+import java.io.File;
+import java.lang.reflect.Method;
+
+import static com.topjohnwu.magisk.DownloadActivity.TAG;
+
+public class DelegateApplication extends Application {
+
+    static File MANAGER_APK;
+
+    private Object factory;
+    private Application delegate;
+
+    public DelegateApplication() {}
+
+    public DelegateApplication(Object o) {
+        factory = o;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        if (Build.VERSION.SDK_INT >= 28) {
+            // If 9.0+, try to dynamically load the APK
+            DelegateComponentFactory factory = (DelegateComponentFactory) this.factory;
+            MANAGER_APK = DynAPK.current(this);
+            MANAGER_APK.getParentFile().mkdir();
+            if (MANAGER_APK.exists()) {
+                ClassLoader cl = new DynamicClassLoader(MANAGER_APK, factory.loader);
+                try {
+                    // Create the delegate AppComponentFactory
+                    Object df = cl.loadClass("a.a").newInstance();
+
+                    // Create the delegate Application
+                    delegate = (Application) cl.loadClass("a.e").newInstance();
+
+                    // Call attachBaseContext without ContextImpl to show it is being wrapped
+                    Method m = ContextWrapper.class.getDeclaredMethod("attachBaseContext", Context.class);
+                    m.setAccessible(true);
+                    m.invoke(delegate, this);
+
+                    // If everything went well, set our loader and delegate
+                    factory.delegate = (AppComponentFactory) df;
+                    factory.loader = cl;
+                } catch (Exception e) {
+                    Log.e(TAG, "dyn load", e);
+                    MANAGER_APK.delete();
+                }
+            }
+        } else {
+            MANAGER_APK = new File(base.getCacheDir(), "manager.apk");
+        }
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        delegate.onConfigurationChanged(newConfig);
+    }
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java b/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java
new file mode 100644
index 000000000..4a60ee911
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/DelegateComponentFactory.java
@@ -0,0 +1,72 @@
+package com.topjohnwu.magisk;
+
+import android.annotation.SuppressLint;
+import android.app.Activity;
+import android.app.AppComponentFactory;
+import android.app.Application;
+import android.app.Service;
+import android.content.BroadcastReceiver;
+import android.content.ContentProvider;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.dummy.DummyActivity;
+import com.topjohnwu.magisk.dummy.DummyProvider;
+import com.topjohnwu.magisk.dummy.DummyReceiver;
+import com.topjohnwu.magisk.dummy.DummyService;
+
+@SuppressLint("NewApi")
+public class DelegateComponentFactory extends AppComponentFactory {
+
+    ClassLoader loader;
+    AppComponentFactory delegate;
+
+    @Override
+    public Application instantiateApplication(ClassLoader cl, String className) {
+        loader = cl;
+        return new DelegateApplication(this);
+    }
+
+    @Override
+    public Activity instantiateActivity(ClassLoader cl, String className, Intent intent)
+            throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        if (delegate != null)
+            return delegate.instantiateActivity(loader, className, intent);
+        return create(className, DummyActivity.class);
+    }
+
+    @Override
+    public BroadcastReceiver instantiateReceiver(ClassLoader cl, String className, Intent intent)
+            throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        if (delegate != null)
+            return delegate.instantiateReceiver(loader, className, intent);
+        return create(className, DummyReceiver.class);
+    }
+
+    @Override
+    public Service instantiateService(ClassLoader cl, String className, Intent intent)
+            throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        if (delegate != null)
+            return delegate.instantiateService(loader, className, intent);
+        return create(className, DummyService.class);
+    }
+
+    @Override
+    public ContentProvider instantiateProvider(ClassLoader cl, String className)
+            throws ClassNotFoundException, IllegalAccessException, InstantiationException {
+        if (delegate != null)
+            return delegate.instantiateProvider(loader, className);
+        return create(className, DummyProvider.class);
+    }
+
+    /**
+     * Create the class or dummy implementation if creation failed
+     */
+    private <T> T create(String name, Class<? extends T> dummy)
+            throws InstantiationException, IllegalAccessException {
+        try {
+            return (T) loader.loadClass(name).newInstance();
+        } catch (IllegalAccessException | InstantiationException | ClassNotFoundException ignored) {
+            return dummy.newInstance();
+        }
+    }
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
similarity index 63%
rename from stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
rename to stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
index 2d6e8b325..f020a2b0f 100644
--- a/stub/src/main/java/com/topjohnwu/magisk/MainActivity.java
+++ b/stub/src/main/java/com/topjohnwu/magisk/DownloadActivity.java
@@ -3,34 +3,55 @@ package com.topjohnwu.magisk;
 import android.app.Activity;
 import android.app.AlertDialog;
 import android.app.Application;
+import android.app.ProgressDialog;
+import android.os.Build;
 import android.os.Bundle;
 import android.util.Log;
 
-import com.topjohnwu.magisk.utils.APKInstall;
+import com.topjohnwu.magisk.net.ErrorHandler;
 import com.topjohnwu.magisk.net.Networking;
 import com.topjohnwu.magisk.net.ResponseListener;
+import com.topjohnwu.magisk.utils.APKInstall;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.File;
+import static com.topjohnwu.magisk.DelegateApplication.MANAGER_APK;
 
-public class MainActivity extends Activity {
+public class DownloadActivity extends Activity {
 
-    private static final String TAG = "MMStub";
+    static final String TAG = "MMStub";
     private static final boolean IS_CANARY = BuildConfig.VERSION_NAME.contains("-");
     private static final String URL =
             "https://raw.githubusercontent.com/topjohnwu/magisk_files/" +
                     (IS_CANARY ? "canary/release.json" : "master/stable.json");
 
     private String apkLink;
+    private ErrorHandler err = (conn, e) -> {
+        Log.e(TAG, "network error", e);
+        finish();
+    };
+
+    private void showDialog() {
+        ProgressDialog.show(this,
+                "Downloading...",
+                "Downloading Magisk Manager", true);
+    }
 
     private void dlAPK() {
-        Application app = getApplication();
-        Networking.get(apkLink)
-                .getAsFile(new File(getFilesDir(), "manager.apk"),
-                        apk -> APKInstall.install(app, apk));
-        finish();
+        showDialog();
+        if (Build.VERSION.SDK_INT >= 28) {
+            // Download and relaunch the app
+            Networking.get(apkLink)
+                    .setErrorHandler(err)
+                    .getAsFile(MANAGER_APK, f -> ProcessPhoenix.triggerRebirth(this));
+        } else {
+            // Download and upgrade the app
+            Application app = getApplication();
+            Networking.get(apkLink)
+                    .setErrorHandler(err)
+                    .getAsFile(MANAGER_APK, apk -> APKInstall.install(app, apk));
+        }
     }
 
     @Override
@@ -39,10 +60,7 @@ public class MainActivity extends Activity {
         Networking.init(this);
         if (Networking.checkNetworkStatus(this)) {
             Networking.get(URL)
-                    .setErrorHandler(((conn, e) -> {
-                        Log.d(TAG, "network error", e);
-                        finish();
-                    }))
+                    .setErrorHandler(err)
                     .getAsJSONObject(new JSONLoader());
         } else {
             new AlertDialog.Builder(this)
@@ -61,7 +79,7 @@ public class MainActivity extends Activity {
             try {
                 JSONObject manager = json.getJSONObject("app");
                 apkLink = manager.getString("link");
-                new AlertDialog.Builder(MainActivity.this)
+                new AlertDialog.Builder(DownloadActivity.this)
                         .setCancelable(false)
                         .setTitle(R.string.app_name)
                         .setMessage(R.string.upgrade_msg)
diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyActivity.java b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyActivity.java
new file mode 100644
index 000000000..7a279ba55
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyActivity.java
@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.dummy;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class DummyActivity extends Activity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        finish();
+    }
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java
new file mode 100644
index 000000000..0c407ff8c
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyProvider.java
@@ -0,0 +1,38 @@
+package com.topjohnwu.magisk.dummy;
+
+import android.content.ContentProvider;
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.net.Uri;
+
+public class DummyProvider extends ContentProvider {
+    @Override
+    public boolean onCreate() {
+        return false;
+    }
+
+    @Override
+    public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs, String sortOrder) {
+        return null;
+    }
+
+    @Override
+    public String getType(Uri uri) {
+        return null;
+    }
+
+    @Override
+    public Uri insert(Uri uri, ContentValues values) {
+        return null;
+    }
+
+    @Override
+    public int delete(Uri uri, String selection, String[] selectionArgs) {
+        return 0;
+    }
+
+    @Override
+    public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
+        return 0;
+    }
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java
new file mode 100644
index 000000000..f4e57e7a7
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyReceiver.java
@@ -0,0 +1,10 @@
+package com.topjohnwu.magisk.dummy;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+public class DummyReceiver extends BroadcastReceiver {
+    @Override
+    public void onReceive(Context context, Intent intent) {}
+}
diff --git a/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java
new file mode 100644
index 000000000..6bce30183
--- /dev/null
+++ b/stub/src/main/java/com/topjohnwu/magisk/dummy/DummyService.java
@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk.dummy;
+
+import android.app.Service;
+import android.content.Intent;
+import android.os.IBinder;
+
+public class DummyService extends Service {
+    @Override
+    public IBinder onBind(Intent intent) {
+        stopSelf();
+        return null;
+    }
+}
diff --git a/stub/src/main/res/values-az/strings.xml b/stub/src/main/res/values-az/strings.xml
deleted file mode 100644
index f8d446377..000000000
--- a/stub/src/main/res/values-az/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Qurmanı sonlandırmaq üçün full Magisk Manager`ə yüksəldin. Yüklənib qurulsun?</string>
-    <string name="no_internet_msg">Lütfən internetə qoşulun! Full Magisk Manager\'ə yüksəltmə lazımidir.</string>
-</resources>
diff --git a/stub/src/main/res/values-bg/strings.xml b/stub/src/main/res/values-bg/strings.xml
deleted file mode 100644
index 2b3e84751..000000000
--- a/stub/src/main/res/values-bg/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Надградете до пълната версия на Magisk Manager, за да довършите първоначалната настройка. Изтегляне и инсталиране сега?</string>
-    <string name="no_internet_msg">Моля да се свържете към работеща интернет мрежа, защото надграждането до пълната версия на Magisk Manager е задължително.</string>
-</resources>
diff --git a/stub/src/main/res/values-ca/strings.xml b/stub/src/main/res/values-ca/strings.xml
deleted file mode 100644
index 80b7c163a..000000000
--- a/stub/src/main/res/values-ca/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Fes una actualització total de Magisk Manager  per finalitzar l\'instalació. Descarregar i instalar?</string>
-    <string name="no_internet_msg">Si us plau, connecta\'t a internet! Es necessari fer una actualització total de Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-de/strings.xml b/stub/src/main/res/values-de/strings.xml
deleted file mode 100644
index faaca3e75..000000000
--- a/stub/src/main/res/values-de/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Upgrade zum vollständigen Magisk Manager, um das Setup abzuschließen. Herunterladen und installieren?</string>
-    <string name="no_internet_msg">Bitte eine Verbindung mit dem Internet herstellen! Upgrade zum vollständigen Magisk Manager ist erforderlich.</string>
-</resources>
diff --git a/stub/src/main/res/values-es/strings.xml b/stub/src/main/res/values-es/strings.xml
deleted file mode 100644
index acd1b12f1..000000000
--- a/stub/src/main/res/values-es/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Actualizar a la Ver. Completa de Magisk Manager para finalizar la instalación. Descargar e instalar?</string>
-    <string name="no_internet_msg">¡Por favor conectarse a Internet! Se requiere actualizar a la Ver. Completa de Magisk Manager </string>
-</resources>
diff --git a/stub/src/main/res/values-et/strings.xml b/stub/src/main/res/values-et/strings.xml
deleted file mode 100644
index ec72c8a82..000000000
--- a/stub/src/main/res/values-et/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Täienda seadistuse lõpetamiseks Magisk Manager\'i täisversioonile. Kas laadid alla ja installid?</string>
-    <string name="no_internet_msg">Palun ühendu Internetti! Nõutud on Magisk Manager\'i täisversioonile täiendamine.</string>
-</resources>
diff --git a/stub/src/main/res/values-fr/strings.xml b/stub/src/main/res/values-fr/strings.xml
deleted file mode 100644
index dc928c8e9..000000000
--- a/stub/src/main/res/values-fr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Mettre à jour vers la version complête de Magisk Manager pour finir l\'installation. Télécharger et installer?</string>
-    <string name="no_internet_msg">Veuillez vous connecter à Internet! Une mise à niveau complête vers le Gestionnaire Magisk est requise.</string>
-</resources>
diff --git a/stub/src/main/res/values-in/strings.xml b/stub/src/main/res/values-in/strings.xml
deleted file mode 100644
index 0cec7e72a..000000000
--- a/stub/src/main/res/values-in/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Tingkatkan ke Magisk Manager versi penuh untuk menyelesaikan penyiapan. Unduh dan pasang?</string>
-    <string name="no_internet_msg">Harap menyambungkan ke Internet! Peningkatan ke Magisk Manager versi penuh diperlukan.</string>
-</resources>
diff --git a/stub/src/main/res/values-it/strings.xml b/stub/src/main/res/values-it/strings.xml
deleted file mode 100644
index 2c1db9f3e..000000000
--- a/stub/src/main/res/values-it/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Aggiorna alla versione completa di Magisk Manager per completare l\'installazione. Vuoi procedere al download e all\'installazione?</string>
-    <string name="no_internet_msg">Controlla la connessione a Internet! È necessaria per l\'aggiornamento di Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-ko/strings.xml b/stub/src/main/res/values-ko/strings.xml
deleted file mode 100644
index 5b79aa155..000000000
--- a/stub/src/main/res/values-ko/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">완전한 Magisk Manager로 업데이트하여 설치를 마치십시오. 다운로드하고 설치하시겠습니까?</string>
-    <string name="no_internet_msg">인터넷에 연결해 주시기 바랍니다! 완전한 Magisk Manager로 업데이트 해야 합니다.</string>
-</resources>
diff --git a/stub/src/main/res/values-lt/strings.xml b/stub/src/main/res/values-lt/strings.xml
deleted file mode 100644
index a0df2e8ea..000000000
--- a/stub/src/main/res/values-lt/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-	<string name="upgrade_msg">Atsinaujinkite į pilną Magisk Manager versiją, kad baigtumėte pasiruošimą. Atsisiųsti ir instaliuoti?</string>
-	<string name="no_internet_msg">Prašome prisijungti prie interneto! Atsinaujinimas į pilną Magisk Manager versiją yra privalomas.</string>
-</resources>
\ No newline at end of file
diff --git a/stub/src/main/res/values-mk/strings.xml b/stub/src/main/res/values-mk/strings.xml
deleted file mode 100644
index 32664f06e..000000000
--- a/stub/src/main/res/values-mk/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Надградете до целосната верзија на Magisk Manager за да го завршите поставувањето. Преземете и инсталирајте?</string>
-    <string name="no_internet_msg">Ве молиме поврзете се на интернет бидејќи е потребна надградба на целосната верзија на Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-nb/strings.xml b/stub/src/main/res/values-nb/strings.xml
deleted file mode 100644
index 2738cc8e3..000000000
--- a/stub/src/main/res/values-nb/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Oppgrader til den komplette versjonen av Magisk Manager for å fullføre oppsettet. Vil du laste ned og installere?</string>
-    <string name="no_internet_msg">Vennligst koble deg på internettet! Å oppgradere til den komplette versjonen av Magisk Manager er påkrevd.</string>
-</resources>
diff --git a/stub/src/main/res/values-pl/strings.xml b/stub/src/main/res/values-pl/strings.xml
deleted file mode 100644
index e4f02e80f..000000000
--- a/stub/src/main/res/values-pl/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Przejdź na pełną wersję programu Magisk Manager, aby ukończyć konfigurację. Ściągnąć i zainstalować?</string>
-    <string name="no_internet_msg">Połącz się z Internetem! Wymagana jest aktualizacja do pełnego programu Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-ro/strings.xml b/stub/src/main/res/values-ro/strings.xml
deleted file mode 100644
index 57162183e..000000000
--- a/stub/src/main/res/values-ro/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Treci la versiunea completă Magisk Manager pentru a finaliza configurarea. Descarci și instalezi?</string>
-    <string name="no_internet_msg">Te rugăm să te conectezi la internet! Este necesară actualizarea la versiunea completă Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-ru/strings.xml b/stub/src/main/res/values-ru/strings.xml
deleted file mode 100644
index 4e288d2c7..000000000
--- a/stub/src/main/res/values-ru/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Обновите Magisk Manager для завершения установки. Загрузить и установить?</string>
-    <string name="no_internet_msg">Пожалуйста, подключитесь к интернету! Требуется обновление Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-sk/strings.xml b/stub/src/main/res/values-sk/strings.xml
deleted file mode 100644
index d123d58b7..000000000
--- a/stub/src/main/res/values-sk/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Pre dokončenie inštalácie sa vyžaduje upgrade Magisk Managera. Stiahnuť a nainštalovať?</string>
-    <string name="no_internet_msg">Pripojte sa na internet! Upgrade Magisk Managera je potrebný.</string>
-</resources>
diff --git a/stub/src/main/res/values-tr/strings.xml b/stub/src/main/res/values-tr/strings.xml
deleted file mode 100644
index a7af6d6fe..000000000
--- a/stub/src/main/res/values-tr/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">Kurulumu tamamlamak için tam Magisk Manager\'a yükseltin. İndirip yüklensin mi?</string>
-    <string name="no_internet_msg">Lütfen internete bağlanın! Tam Magisk Manager\'a yükseltmek gerekiyor.</string>
-</resources>
diff --git a/stub/src/main/res/values-uk/strings.xml b/stub/src/main/res/values-uk/strings.xml
deleted file mode 100644
index 63d4f1519..000000000
--- a/stub/src/main/res/values-uk/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Оновіть Magisk Manager для завершення встановлення. Завантажити і встановити?</string>
-    <string name="no_internet_msg">Будь ласка, підключіться до Інтернету! Потрібно оновити Magisk Manager.</string>
-</resources>
diff --git a/stub/src/main/res/values-v28/styles.xml b/stub/src/main/res/values-v28/styles.xml
new file mode 100644
index 000000000..2c3e644c9
--- /dev/null
+++ b/stub/src/main/res/values-v28/styles.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="SplashTheme" parent="SplashThemeBase.V19" />
+</resources>
diff --git a/stub/src/main/res/values-zh-rCN/strings.xml b/stub/src/main/res/values-zh-rCN/strings.xml
deleted file mode 100644
index c4045136a..000000000
--- a/stub/src/main/res/values-zh-rCN/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">需要升级到完整的 Magisk Manager 来完成安装。 现在下载？</string>
-    <string name="no_internet_msg">请连接到互联网！ 这是升级到完整 Magisk Manager 所必需的。</string>
-</resources>
diff --git a/stub/src/main/res/values-zh-rTW/strings.xml b/stub/src/main/res/values-zh-rTW/strings.xml
deleted file mode 100644
index 73d202e02..000000000
--- a/stub/src/main/res/values-zh-rTW/strings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="upgrade_msg">需要升級到完整版 Magisk Manager。是否下載並安裝？</string>
-    <string name="no_internet_msg">請連上網路！升級到完整版 Magisk Manager 是必須的。</string>
-</resources>
diff --git a/stub/src/main/res/values/strings.xml b/stub/src/main/res/values/strings.xml
deleted file mode 100644
index 4a66afb3d..000000000
--- a/stub/src/main/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<resources>
-    <string name="upgrade_msg">Upgrade to full Magisk Manager to finish the setup. Download and install?</string>
-    <string name="no_internet_msg">Please connect to the Internet! Upgrading to full Magisk Manager is required.</string>
-</resources>