diff --git a/app/app.iml b/app/app.iml
index fe5700de..b59cc9eb 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -31,7 +31,7 @@
         </compilerSettings>
         <compilerArguments>
           <option name="destination" value="$MODULE_DIR$/build/tmp/kotlin-classes/debug" />
-          <option name="classpath" value="$MODULE_DIR$/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f32d60b81aeecdf3da9abe96d592507a/databinding-adapters-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4d531d31d4c10bfb285e39b7f25438c3/databinding-runtime-3.6.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/3.6.3/555fa9bb14c6214e7ebbce7a0a2016d3c9a365f1/databinding-common-3.6.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/96015a6d72839a604724ad89694dc122/jetified-viewbinding-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd188d1126f5f2bed7a9a9adc8f750f8/navigation-ui-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/16bde5a268b31dee284da06156d7e8f1/navigation-ui-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5789cb7cf3093379d5437a597e0e07f5/material-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a6699c041cef944e735712c58bd6f044/jetified-GetJSON-1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a154d268cc84e7f53f8debf8ce2ca06f/jetified-preference-ktx-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b2352c283e32d4bbbb6cf34046325d27/preference-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8113fa49becebbb1ecc5f8807aa8334/appcompat-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/146c5a1a964c8d83c490a11a460cb4ee/navigation-fragment-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/43d7efdc16c5e46f1ead8d10b1c8daf6/jetified-fragment-ktx-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/272276ff8aa8e7e04a07c4b88f8c9278/navigation-runtime-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/db8c908aeb7f3b9a90bd9677474beb19/jetified-activity-ktx-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1ce640bfddabb731d0b5ab1fb8c84a66/jetified-core-ktx-1.3.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78bcd5b132c38bd8ffac1a14da5f3f1d/browser-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/60970d11be80926fb94d914ebe7afacc/jetified-reactivenetwork-rx2-3.0.8-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3cee6e0d381942f8d40bcfb8b134acf9/jetified-core-2.5.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/768d4bbc3387b0280c4ff7d3b50467a4/lifecycle-extensions-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/fbc754069f19d249d4f917b2d14d3d77/legacy-support-v4-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cb5e74637f3f97c7e6f191acb4518af0/navigation-fragment-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78f4fede34ea2122a3fc58a18743e6a6/jetified-viewpager2-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b26735bb6d57259fb859bde8bd7815b3/fragment-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a9a09bc4780fc9a6870cc8cea0a41469/jetified-appcompat-resources-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/c47fd7d7dc02ea3dddd5829307ed47b4/legacy-support-core-ui-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f60d503848a7312f41ea0c690e81db3c/drawerlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0ad299a691af749d1bc74c1893243812/media-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0597bc315b8daa2a39db6f912dd7fef9/legacy-support-core-utils-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/611023dc8deabb10cf01784b0ce3c2b1/coordinatorlayout-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/acd17aa3febd2134521e12e179059987/recyclerview-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4234cbe6ed77ba2a1483e5f4c50c33c/transition-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e744c5901f92b0666b997a02e1d28444/vectordrawable-animated-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/27e73a641a26feb6756196f3406306a8/vectordrawable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/8261cc7dc801583621ae1686e77b20ba/viewpager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/51995cd66ee66f63d9e1fa81d31aba40/loader-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6a014c1d44512b853b1698219329f7d3/navigation-runtime-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9a4ba0d5b932e0a0696080e13d82c3d2/jetified-activity-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78dab6ef604983c68e9fa7da625a4c99/slidingpanelayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/df2f814cba6709de2245fe751785df12/customview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f6b087e5c3383f2243d985d144af9ece/swiperefreshlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ab18de97c4fa444df769be83004a8958/asynclayoutinflater-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1894225b4728add4cfba2fa747a8e0fb/navigation-common-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ca51898072c807d3dbc72aeebd79a9e4/navigation-common-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e4f3cf1691918b5c4af03d02f7003cfd/core-1.3.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59e8220cdf34f50df57c0337210c3819/jetified-lifecycle-process-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/746d4b93be16ffef6291f07b7ede794c/jetified-lifecycle-service-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ac014d61322e1e528d7ce6d04bdedb28/jetified-lifecycle-runtime-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/285999a7a12a158a95139a860fc16422/lifecycle-runtime-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dd663f7056f5f52d05d169f62f187f9f/jetified-collection-ktx-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6cff49c67a55c9d846caac6db4f029c/versionedparcelable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f380750b489f5a279ada37357a1586b3/cursoradapter-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cab6ee3d69ce5cce8eca8a6e7b6ad670/lifecycle-livedata-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a5172f1d39eeb86754423f81dc7d0e8/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a568eea44a0a3df6c436037f1ee9006a/jetified-lifecycle-viewmodel-savedstate-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/911e6161aa5bf847a03136bb7401d5e5/lifecycle-livedata-core-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5b8bd47d9c48717ee1e76d5cfaae05dc/core-runtime-2.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/53ad1c090e0e4ac03c45120888929877/jetified-savedstate-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.2.0/4ef09a745007778eef83b92f8f23987a8ea59496/lifecycle-common-2.2.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/261e9a74c7845ca029579ab94bb1efc7/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8e63f91f0dce5cc9e854c3743b1b453/lifecycle-viewmodel-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6acc4f28cd4ba5ae90580c5ac476db7a/cardview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/02682a11fd5ebaa8e055575838fb83a1/documentfile-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/954ab66de19329692601713f1041e30a/localbroadcastmanager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/62dbd37bbe25623b96220010fba40082/print-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a74caff008b00f69ea01931ee62716e/interpolator-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2007790f728a1209fc7f4c998ef37192/jetified-kotlin-android-extensions-runtime-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/252e2a61fd070ba3f0443757e204c8b9/jetified-rxdownload4-1.0.9-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/04a3f47a61e66bdc148e7c91fa0eb96d/jetified-kotlin-stdlib-jdk7-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/af128bec281493d28e77d7acd3951223/jetified-converter-gson-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ae29c4bd992ef6b798933c4866da6676/jetified-adapter-rxjava2-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dc45a1f8246042c9b56a9cdb39289092/jetified-retrofit-2.6.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/36529dd66722df7ba976f1b15e22b5d9/jetified-okhttp-3.12.6.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4b3b60a0a87cdc1bb9b88642240afa43/jetified-okio-jvm-2.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/081c2f986beda55569727e660dffc06e/jetified-kotlinx-coroutines-android-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59de657b77e62115a66ce379115c343c/jetified-kotlinx-coroutines-core-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/88fdafa44c425dc99960dc38fd21e606/jetified-kotlin-stdlib-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3fc56f9567b3362c5e198a251df74ff8/jetified-kotlin-stdlib-common-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e6b13d476c07d97a8633c2e07ebe8ba6/jetified-annotations-13.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a272c0ad4d8566b092489648ecceb025/constraintlayout-1.1.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/790d8a1c00f5fd4fd93d824f673d5157/jetified-listenablefuture-1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/15c0731e39cb1a39fa0d4e4c5bd804b4/jetified-gson-2.8.5.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6b9ef3d3b503e285483facbbd76aa52/jetified-rxandroid-2.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd376cf77c119767e67660833f585cfd/jetified-rxkotlin-2.4.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/73359d9a978bcf036eda9b6206274a9c/jetified-rxjava-2.2.19.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/47099c4e3c84f1ee1e2c6b4498111f34/jetified-reactive-streams-1.0.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9620339831bbcec8d9cfe2795bbd776e/jetified-ClarityPotion-1.0.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9151763858ee7c6447bc7538f7512b3b/multidex-2.0.0-api.jar:/Users/Xinto/Library/Android/sdk/platforms/android-29/android.jar:/Users/Xinto/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
+          <option name="classpath" value="$MODULE_DIR$/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f32d60b81aeecdf3da9abe96d592507a/databinding-adapters-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4d531d31d4c10bfb285e39b7f25438c3/databinding-runtime-3.6.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.databinding/databinding-common/3.6.3/555fa9bb14c6214e7ebbce7a0a2016d3c9a365f1/databinding-common-3.6.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/96015a6d72839a604724ad89694dc122/jetified-viewbinding-3.6.3-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd188d1126f5f2bed7a9a9adc8f750f8/navigation-ui-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/16bde5a268b31dee284da06156d7e8f1/navigation-ui-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5789cb7cf3093379d5437a597e0e07f5/material-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a6699c041cef944e735712c58bd6f044/jetified-GetJSON-1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a154d268cc84e7f53f8debf8ce2ca06f/jetified-preference-ktx-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b2352c283e32d4bbbb6cf34046325d27/preference-1.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8113fa49becebbb1ecc5f8807aa8334/appcompat-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/146c5a1a964c8d83c490a11a460cb4ee/navigation-fragment-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/43d7efdc16c5e46f1ead8d10b1c8daf6/jetified-fragment-ktx-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/272276ff8aa8e7e04a07c4b88f8c9278/navigation-runtime-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/db8c908aeb7f3b9a90bd9677474beb19/jetified-activity-ktx-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1ce640bfddabb731d0b5ab1fb8c84a66/jetified-core-ktx-1.3.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78bcd5b132c38bd8ffac1a14da5f3f1d/browser-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/60970d11be80926fb94d914ebe7afacc/jetified-reactivenetwork-rx2-3.0.8-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3cee6e0d381942f8d40bcfb8b134acf9/jetified-core-2.5.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/768d4bbc3387b0280c4ff7d3b50467a4/lifecycle-extensions-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/fbc754069f19d249d4f917b2d14d3d77/legacy-support-v4-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cb5e74637f3f97c7e6f191acb4518af0/navigation-fragment-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78f4fede34ea2122a3fc58a18743e6a6/jetified-viewpager2-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/b26735bb6d57259fb859bde8bd7815b3/fragment-1.2.4-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a9a09bc4780fc9a6870cc8cea0a41469/jetified-appcompat-resources-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/c47fd7d7dc02ea3dddd5829307ed47b4/legacy-support-core-ui-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f60d503848a7312f41ea0c690e81db3c/drawerlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0ad299a691af749d1bc74c1893243812/media-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/0597bc315b8daa2a39db6f912dd7fef9/legacy-support-core-utils-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/611023dc8deabb10cf01784b0ce3c2b1/coordinatorlayout-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/acd17aa3febd2134521e12e179059987/recyclerview-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f4234cbe6ed77ba2a1483e5f4c50c33c/transition-1.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e744c5901f92b0666b997a02e1d28444/vectordrawable-animated-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/27e73a641a26feb6756196f3406306a8/vectordrawable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/8261cc7dc801583621ae1686e77b20ba/viewpager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/51995cd66ee66f63d9e1fa81d31aba40/loader-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6a014c1d44512b853b1698219329f7d3/navigation-runtime-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9a4ba0d5b932e0a0696080e13d82c3d2/jetified-activity-1.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/78dab6ef604983c68e9fa7da625a4c99/slidingpanelayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/df2f814cba6709de2245fe751785df12/customview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f6b087e5c3383f2243d985d144af9ece/swiperefreshlayout-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ab18de97c4fa444df769be83004a8958/asynclayoutinflater-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/1894225b4728add4cfba2fa747a8e0fb/navigation-common-ktx-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ca51898072c807d3dbc72aeebd79a9e4/navigation-common-2.2.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e4f3cf1691918b5c4af03d02f7003cfd/core-1.3.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59e8220cdf34f50df57c0337210c3819/jetified-lifecycle-process-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/746d4b93be16ffef6291f07b7ede794c/jetified-lifecycle-service-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ac014d61322e1e528d7ce6d04bdedb28/jetified-lifecycle-runtime-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/285999a7a12a158a95139a860fc16422/lifecycle-runtime-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dd663f7056f5f52d05d169f62f187f9f/jetified-collection-ktx-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6cff49c67a55c9d846caac6db4f029c/versionedparcelable-1.1.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.collection/collection/1.1.0/1f27220b47669781457de0d600849a5de0e89909/collection-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f380750b489f5a279ada37357a1586b3/cursoradapter-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cab6ee3d69ce5cce8eca8a6e7b6ad670/lifecycle-livedata-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a5172f1d39eeb86754423f81dc7d0e8/jetified-lifecycle-livedata-core-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a568eea44a0a3df6c436037f1ee9006a/jetified-lifecycle-viewmodel-savedstate-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/911e6161aa5bf847a03136bb7401d5e5/lifecycle-livedata-core-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/5b8bd47d9c48717ee1e76d5cfaae05dc/core-runtime-2.1.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/53ad1c090e0e4ac03c45120888929877/jetified-savedstate-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.arch.core/core-common/2.1.0/b3152fc64428c9354344bd89848ecddc09b6f07e/core-common-2.1.0.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.lifecycle/lifecycle-common/2.2.0/4ef09a745007778eef83b92f8f23987a8ea59496/lifecycle-common-2.2.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/261e9a74c7845ca029579ab94bb1efc7/jetified-lifecycle-viewmodel-ktx-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d8e63f91f0dce5cc9e854c3743b1b453/lifecycle-viewmodel-2.2.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/6acc4f28cd4ba5ae90580c5ac476db7a/cardview-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/02682a11fd5ebaa8e055575838fb83a1/documentfile-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/954ab66de19329692601713f1041e30a/localbroadcastmanager-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/62dbd37bbe25623b96220010fba40082/print-1.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/7a74caff008b00f69ea01931ee62716e/interpolator-1.0.0-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.annotation/annotation/1.1.0/e3a6fb2f40e3a3842e6b7472628ba4ce416ea4c8/annotation-1.1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/2007790f728a1209fc7f4c998ef37192/jetified-kotlin-android-extensions-runtime-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/252e2a61fd070ba3f0443757e204c8b9/jetified-rxdownload4-1.0.9-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/04a3f47a61e66bdc148e7c91fa0eb96d/jetified-kotlin-stdlib-jdk7-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/af128bec281493d28e77d7acd3951223/jetified-converter-gson-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/ae29c4bd992ef6b798933c4866da6676/jetified-adapter-rxjava2-2.6.1.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/dc45a1f8246042c9b56a9cdb39289092/jetified-retrofit-2.6.2.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/36529dd66722df7ba976f1b15e22b5d9/jetified-okhttp-3.12.6.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/4b3b60a0a87cdc1bb9b88642240afa43/jetified-okio-jvm-2.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/081c2f986beda55569727e660dffc06e/jetified-kotlinx-coroutines-android-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/59de657b77e62115a66ce379115c343c/jetified-kotlinx-coroutines-core-1.3.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/88fdafa44c425dc99960dc38fd21e606/jetified-kotlin-stdlib-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/3fc56f9567b3362c5e198a251df74ff8/jetified-kotlin-stdlib-common-1.3.72.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/e6b13d476c07d97a8633c2e07ebe8ba6/jetified-annotations-13.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/a272c0ad4d8566b092489648ecceb025/constraintlayout-1.1.3-api.jar:/Users/Xinto/.gradle/caches/modules-2/files-2.1/androidx.constraintlayout/constraintlayout-solver/1.1.3/54abe9ffb22cc9019b0b6fcc10f185cc4e67b34e/constraintlayout-solver-1.1.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/790d8a1c00f5fd4fd93d824f673d5157/jetified-listenablefuture-1.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/15c0731e39cb1a39fa0d4e4c5bd804b4/jetified-gson-2.8.5.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/d6b9ef3d3b503e285483facbbd76aa52/jetified-rxandroid-2.1.1-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/cd376cf77c119767e67660833f585cfd/jetified-rxkotlin-2.4.0.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/73359d9a978bcf036eda9b6206274a9c/jetified-rxjava-2.2.19.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/47099c4e3c84f1ee1e2c6b4498111f34/jetified-reactive-streams-1.0.3.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9620339831bbcec8d9cfe2795bbd776e/jetified-ClarityPotion-1.0.2-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/9151763858ee7c6447bc7538f7512b3b/multidex-2.0.0-api.jar:/Users/Xinto/.gradle/caches/transforms-2/files-2.1/f2d71888716edb5478ba750b4fdc6577/jetified-prdownloader-0.6.0-api.jar:/Users/Xinto/Library/Android/sdk/platforms/android-29/android.jar:/Users/Xinto/Library/Android/sdk/build-tools/29.0.3/core-lambda-stubs.jar" />
           <option name="noStdlib" value="true" />
           <option name="noReflect" value="true" />
           <option name="moduleName" value="app_debug" />
@@ -72,15 +72,15 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kaptKotlin/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/out" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugAndroidTest" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/out" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/kapt/debugUnitTest" isTestSource="true" generated="true" />
@@ -236,5 +236,6 @@
     <orderEntry type="library" name="Gradle: io.reactivex.rxjava2:rxandroid:2.1.1@aar" level="project" />
     <orderEntry type="library" name="Gradle: com.github.ssseasonnn:ClarityPotion:1.0.2@aar" level="project" />
     <orderEntry type="library" name="Gradle: androidx.multidex:multidex:2.0.0@aar" level="project" />
+    <orderEntry type="library" name="Gradle: com.mindorks.android:prdownloader:0.6.0@aar" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index bdc788a3..f912d00b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,7 +58,7 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.fragment:fragment-ktx:1.2.4'
+    implementation 'androidx.fragment:fragment-ktx:1.2.5'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
     implementation 'androidx.browser:browser:1.2.0'
@@ -67,8 +67,8 @@ dependencies {
     implementation 'androidx.navigation:navigation-ui-ktx:2.2.2'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.github.ssseasonnn.RxDownload:rxdownload4:1.0.9'
     implementation 'com.github.100rabhkr:GetJSON:1.0'
     implementation 'com.github.pwittchen:reactivenetwork-rx2:3.0.8'
     implementation 'com.github.topjohnwu.libsu:core:2.5.1'
+    implementation 'com.mindorks.android:prdownloader:0.6.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb54c255..0d6096b1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,6 +10,7 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
+        android:name=".core.App"
         android:allowBackup="false"
         android:fullBackupContent="false"
         android:icon="@mipmap/ic_launcher"
@@ -59,6 +60,7 @@
         <service android:name=".core.installer.RootSplitInstallerService" />
         <service android:name=".core.installer.StubInstaller" />
         <service android:name=".core.installer.RootAppUninstaller" />
+        <service android:name=".core.installer.AppUninstallerService" />
         <service android:name=".core.downloader.VancedDownloadService" />
         <service android:name=".core.downloader.MicrogDownloadService" />
 
diff --git a/app/src/main/java/com/vanced/manager/core/App.kt b/app/src/main/java/com/vanced/manager/core/App.kt
new file mode 100644
index 00000000..3092f69d
--- /dev/null
+++ b/app/src/main/java/com/vanced/manager/core/App.kt
@@ -0,0 +1,13 @@
+package com.vanced.manager.core
+
+import android.app.Application
+import com.downloader.PRDownloader
+
+class App: Application() {
+
+    override fun onCreate() {
+        super.onCreate()
+        PRDownloader.initialize(applicationContext)
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/core/base/DummyJava.java b/app/src/main/java/com/vanced/manager/core/base/DummyJava.java
index ea6aa920..b3069e72 100644
--- a/app/src/main/java/com/vanced/manager/core/base/DummyJava.java
+++ b/app/src/main/java/com/vanced/manager/core/base/DummyJava.java
@@ -1,19 +1,6 @@
 package com.vanced.manager.core.base;
 
-import android.app.Activity;
-import android.app.Application;
-import android.content.Context;
-import android.content.SharedPreferences;
-
 public class DummyJava {
 
-    private final Activity activity;
 
-    public DummyJava(Activity activity) {
-        this.activity = activity;
-    }
-
-    private void SomeVoid() {
-        SharedPreferences bullshit = activity.getSharedPreferences("installPrefs", Context.MODE_PRIVATE);
-    }
 }
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
index d58577b3..853a706c 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/MicrogDownloadService.kt
@@ -6,22 +6,17 @@ import android.content.Intent
 import android.os.IBinder
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import com.dezlum.codelabs.getjson.GetJson
-import com.vanced.manager.core.installer.MicrogInstaller.installMicrog
+import com.downloader.Error
+import com.downloader.OnDownloadListener
+import com.downloader.PRDownloader
 import com.vanced.manager.ui.fragments.HomeFragment
-import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.subscribeBy
-import io.reactivex.schedulers.Schedulers
-import zlc.season.rxdownload4.download
-import zlc.season.rxdownload4.file
-import zlc.season.rxdownload4.task.Task
-import zlc.season.rxdownload4.utils.getFileNameFromUrl
+import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
 
 class MicrogDownloadService: Service() {
 
-    private var disposable: Disposable? = null
-
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         downloadMicrog()
+        stopSelf()
         return START_NOT_STICKY
     }
 
@@ -31,41 +26,30 @@ class MicrogDownloadService: Service() {
 
         val apkUrl = GetJson().AsJSONObject("https://x1nto.github.io/VancedFiles/microg.json")
         val dwnldUrl = apkUrl.get("url").asString
-        val task = filesDir?.path?.let {
-            Task(
-                url = dwnldUrl,
-                saveName = getFileNameFromUrl(dwnldUrl),
-                savePath = it
-            )
-        }
-
-        if (task?.file()?.exists()!!)
-            task.file().delete()
-
-        disposable = task
-            .download()
-            .observeOn(Schedulers.newThread())
-            .subscribeBy(
-                onNext = { progress ->
-                    val intent = Intent(HomeFragment.MICROG_DOWNLOADING)
-                    intent.action = HomeFragment.MICROG_DOWNLOADING
-                    intent.putExtra("microgProgress", progress.percent().toInt())
-                    intent.putExtra("fileName", "Downloading ${getFileNameFromUrl(dwnldUrl)}...")
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
-                },
-                onComplete = {
+        PRDownloader.download(dwnldUrl, filesDir.path, "microg.apk")
+            .build()
+            .setOnProgressListener { progress ->
+                val intent = Intent(HomeFragment.MICROG_DOWNLOADING)
+                val mProgress = progress.currentBytes * 100 / progress.totalBytes
+                intent.action = HomeFragment.MICROG_DOWNLOADING
+                intent.putExtra("microgProgress", mProgress.toInt())
+                intent.putExtra("fileName", "Downloading ${getFileNameFromUrl(dwnldUrl)}...")
+                LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+            }
+            .start(object : OnDownloadListener {
+                override fun onDownloadComplete() {
                     val intent = Intent(HomeFragment.MICROG_DOWNLOADED)
                     intent.action = HomeFragment.MICROG_DOWNLOADED
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+                    LocalBroadcastManager.getInstance(this@MicrogDownloadService).sendBroadcast(intent)
                     prefs?.edit()?.putBoolean("isMicrogDownloading", false)?.apply()
-                },
-                onError = { throwable ->
+                }
+                override fun onError(error: Error) {
                     val intent = Intent(HomeFragment.DOWNLOAD_ERROR)
                     intent.action = HomeFragment.DOWNLOAD_ERROR
-                    intent.putExtra("DownloadError", throwable.toString())
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+                    intent.putExtra("DownloadError", error.toString())
+                    LocalBroadcastManager.getInstance(this@MicrogDownloadService).sendBroadcast(intent)
                 }
-            )
+            })
     }
 
     override fun onBind(intent: Intent?): IBinder? {
diff --git a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
index 4b7e439a..771472e7 100644
--- a/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
+++ b/app/src/main/java/com/vanced/manager/core/downloader/VancedDownloadService.kt
@@ -7,24 +7,19 @@ import android.os.Build
 import android.os.IBinder
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
 import androidx.preference.PreferenceManager
+import com.downloader.Error
+import com.downloader.OnDownloadListener
+import com.downloader.PRDownloader
 import com.vanced.manager.core.installer.RootSplitInstallerService
 import com.vanced.manager.core.installer.SplitInstaller
 import com.vanced.manager.ui.fragments.HomeFragment
-import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.subscribeBy
-import io.reactivex.schedulers.Schedulers
-import zlc.season.rxdownload4.delete
-import zlc.season.rxdownload4.download
-import zlc.season.rxdownload4.file
-import zlc.season.rxdownload4.task.Task
-import zlc.season.rxdownload4.utils.getFileNameFromUrl
+import com.vanced.manager.utils.InternetTools.getFileNameFromUrl
 
 class VancedDownloadService: Service() {
 
-    private var disposable: Disposable? = null
-
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         downloadSplits()
+        stopSelf()
         return START_NOT_STICKY
     }
 
@@ -33,7 +28,8 @@ class VancedDownloadService: Service() {
     ) {
         val prefs = getSharedPreferences("installPrefs", Context.MODE_PRIVATE)
         prefs?.edit()?.putBoolean("isVancedDownloading", true)?.apply()
-        val variant = PreferenceManager.getDefaultSharedPreferences(this).getString("vanced_variant", "nonroot")
+        val variant = PreferenceManager.getDefaultSharedPreferences(this)
+            .getString("vanced_variant", "nonroot")
         val lang = prefs?.getString("lang", "en")
         val theme = prefs?.getString("theme", "dark")
         val arch =
@@ -51,28 +47,21 @@ class VancedDownloadService: Service() {
                 else -> throw NotImplementedError("This type of APK is NOT valid. What the hell did you even do?")
             }
 
-        val task = cacheDir?.path?.let {
-            Task(
-                url = url,
-                saveName = getFileNameFromUrl(url),
-                savePath = it
-            )
-        }
-
-        if (task?.file()?.exists()!!)
-            task.delete()
-
-        disposable = task.download()
-            .observeOn(Schedulers.newThread())
-            .subscribeBy(
-                onNext = { progress ->
-                    val intent = Intent(HomeFragment.VANCED_DOWNLOADING)
-                    intent.action = HomeFragment.VANCED_DOWNLOADING
-                    intent.putExtra("vancedProgress", progress.percent().toInt())
-                    intent.putExtra("fileName", "Downloading ${getFileNameFromUrl(url)}...")
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
-                },
-                onComplete = {
+        PRDownloader.download(url, filesDir.path, getFileNameFromUrl(url))
+            .build()
+            .setOnProgressListener { progress ->
+                val intent = Intent(HomeFragment.VANCED_DOWNLOADING)
+                val mProgress = progress.currentBytes * 100 / progress.totalBytes
+                intent.action = HomeFragment.VANCED_DOWNLOADING
+                intent.putExtra("vancedProgress", mProgress.toInt())
+                intent.putExtra(
+                    "fileName",
+                    "Downloading ${getFileNameFromUrl(url)}..."
+                )
+                LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+            }
+            .start(object : OnDownloadListener {
+                override fun onDownloadComplete() {
                     when (type) {
                         "arch" -> downloadSplits("theme")
                         "theme" -> downloadSplits("lang")
@@ -80,25 +69,26 @@ class VancedDownloadService: Service() {
                             if (lang == "en" || type == "enlang") {
                                 val intent = Intent(HomeFragment.VANCED_DOWNLOADED)
                                 intent.action = HomeFragment.VANCED_DOWNLOADED
-                                LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+                                LocalBroadcastManager.getInstance(this@VancedDownloadService).sendBroadcast(intent)
                                 if (variant == "root")
                                     launchRootInstaller()
                                 else
                                     launchInstaller()
-                                stopSelf()
                             } else {
                                 downloadSplits("enlang")
                             }
                         }
                     }
-                },
-                onError = { throwable ->
+                }
+
+                override fun onError(error: Error) {
                     val intent = Intent(HomeFragment.DOWNLOAD_ERROR)
                     intent.action = HomeFragment.DOWNLOAD_ERROR
-                    intent.putExtra("DownloadError", throwable.toString())
-                    LocalBroadcastManager.getInstance(this).sendBroadcast(intent)
+                    intent.putExtra("DownloadError", error.toString())
+                    LocalBroadcastManager.getInstance(this@VancedDownloadService)
+                        .sendBroadcast(intent)
                 }
-            )
+            })
     }
     private fun launchInstaller() {
         SplitInstaller.installSplitApk(this)
diff --git a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
index e44362cb..9435161d 100644
--- a/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
+++ b/app/src/main/java/com/vanced/manager/core/fragments/Home.kt
@@ -17,7 +17,7 @@ import com.vanced.manager.core.installer.StubInstaller
 import com.vanced.manager.ui.dialogs.DialogContainer.rootModeDetected
 import com.vanced.manager.ui.dialogs.DialogContainer.secondMiuiDialog
 import com.vanced.manager.utils.MiuiHelper
-import com.vanced.manager.utils.PackageHelper.uninstallApp
+import com.vanced.manager.utils.PackageHelper.uninstallApk
 
 open class Home : BaseFragment(), View.OnClickListener {
 
@@ -53,9 +53,9 @@ open class Home : BaseFragment(), View.OnClickListener {
         val isVancedDownloading: Boolean? = prefs?.getBoolean("isVancedDownloading", false)
         val isMicrogDownloading: Boolean? = prefs?.getBoolean("isMicrogDownloading", false)
         val variant = getDefaultSharedPreferences(activity)
-            .getString("vanced_variant", "Nonroot")
+            .getString("vanced_variant", "nonroot")
         val vancedPkgName =
-            if (variant == "Root") {
+            if (variant == "root") {
                 "com.google.android.youtube"
             } else {
                 "com.vanced.android.youtube"
@@ -64,7 +64,7 @@ open class Home : BaseFragment(), View.OnClickListener {
         when (v?.id) {
             R.id.vanced_installbtn -> {
                 if (!isVancedDownloading!!) {
-                    if (variant == "Root") {
+                    if (variant == "root") {
                         if (MiuiHelper.isMiui()) {
                             activity?.let { secondMiuiDialog(it) }
                         } else
@@ -106,9 +106,9 @@ open class Home : BaseFragment(), View.OnClickListener {
                 val intent = Intent(activity, StubInstaller::class.java)
                 activity?.startService(intent)
             }
-            R.id.microg_uninstallbtn -> activity?.let { uninstallApp("com.mgoogle.android.gms", it)
+            R.id.microg_uninstallbtn -> activity?.let { uninstallApk("com.mgoogle.android.gms", it)
             }
-            R.id.vanced_uninstallbtn -> activity?.let { uninstallApp(vancedPkgName, it) }
+            R.id.vanced_uninstallbtn -> activity?.let { uninstallApk(vancedPkgName, it) }
         }
     }
 
diff --git a/app/src/main/java/com/vanced/manager/core/installer/AppUninstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/AppUninstallerService.kt
new file mode 100644
index 00000000..a8a03189
--- /dev/null
+++ b/app/src/main/java/com/vanced/manager/core/installer/AppUninstallerService.kt
@@ -0,0 +1,36 @@
+package com.vanced.manager.core.installer
+
+import android.app.Service
+import android.content.Intent
+import android.content.pm.PackageInstaller
+import android.os.IBinder
+import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.vanced.manager.ui.fragments.HomeFragment
+
+class AppUninstallerService: Service() {
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        when (intent?.getIntExtra(PackageInstaller.EXTRA_STATUS, -999)) {
+            PackageInstaller.STATUS_SUCCESS -> {
+                sendBroadCast(HomeFragment.APP_UNINSTALLED)
+
+            }
+            PackageInstaller.STATUS_FAILURE -> {
+                sendBroadCast(HomeFragment.APP_NOT_UNINSTALLED)
+            }
+        }
+        return START_NOT_STICKY
+    }
+
+    private fun sendBroadCast(status: String) {
+        val mIntent = Intent(status)
+        mIntent.action = status
+        mIntent.putExtra("pkgName", PackageInstaller.EXTRA_PACKAGE_NAME)
+        LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
+    }
+
+    override fun onBind(intent: Intent?): IBinder? {
+        return null
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
index 21d29f1a..2fc2dd34 100644
--- a/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
+++ b/app/src/main/java/com/vanced/manager/core/installer/SplitInstallerService.kt
@@ -9,6 +9,7 @@ import android.util.Log
 import android.widget.Toast
 import androidx.annotation.Nullable
 import androidx.localbroadcastmanager.content.LocalBroadcastManager
+import com.vanced.manager.R
 import com.vanced.manager.ui.MainActivity
 
 class SplitInstallerService: Service() {
@@ -33,48 +34,29 @@ class SplitInstallerService: Service() {
                 mIntent.action = MainActivity.INSTALL_COMPLETED
                 LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
             }
-            PackageInstaller.STATUS_FAILURE_ABORTED -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                val mIntent = Intent(MainActivity.INSTALL_ABORTED)
-                mIntent.action = MainActivity.INSTALL_ABORTED
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
-            PackageInstaller.STATUS_FAILURE_INVALID -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                val mIntent = Intent(MainActivity.INSTALL_INVALID)
-                mIntent.action = MainActivity.INSTALL_INVALID
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
-            PackageInstaller.STATUS_FAILURE_CONFLICT -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                val mIntent = Intent(MainActivity.INSTALL_CONFLICT)
-                mIntent.action = MainActivity.INSTALL_CONFLICT
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
-            PackageInstaller.STATUS_FAILURE_STORAGE -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                val mIntent = Intent(MainActivity.INSTALL_STORAGE)
-                mIntent.action = MainActivity.INSTALL_STORAGE
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
-            PackageInstaller.STATUS_FAILURE_BLOCKED -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                val mIntent = Intent(MainActivity.INSTALL_BLOCKED)
-                mIntent.action = MainActivity.INSTALL_BLOCKED
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
-            else -> {
-                getSharedPreferences("installPrefs", Context.MODE_PRIVATE).edit().putBoolean("isInstalling", false).apply()
-                Log.d(TAG, "Installation failed")
-                val mIntent = Intent(MainActivity.INSTALL_FAILED)
-                mIntent.action = MainActivity.INSTALL_FAILED
-                LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
-            }
+            else -> sendFailure(intent.getIntExtra(PackageInstaller.EXTRA_STATUS, -999))
         }
         stopSelf()
         return START_NOT_STICKY
     }
 
+    private fun sendFailure(status: Int) {
+        val msg = when (status) {
+            PackageInstaller.STATUS_FAILURE_ABORTED -> getString(R.string.installation_aborted)
+            PackageInstaller.STATUS_FAILURE_BLOCKED -> getString(R.string.installation_blocked)
+            PackageInstaller.STATUS_FAILURE_STORAGE -> getString(R.string.installation_storage)
+            PackageInstaller.STATUS_FAILURE_INVALID -> getString(R.string.installation_invalid)
+            PackageInstaller.STATUS_FAILURE_INCOMPATIBLE -> getString(R.string.installation_incompatible)
+            PackageInstaller.STATUS_FAILURE_CONFLICT -> getString(R.string.installation_conflict)
+            else -> getString(R.string.installation_failed)
+        }
+
+        val mIntent = Intent(MainActivity.INSTALL_FAILED)
+        mIntent.action = MainActivity.INSTALL_FAILED
+        mIntent.putExtra("errorMsg", msg)
+        LocalBroadcastManager.getInstance(this).sendBroadcast(mIntent)
+    }
+
     @Nullable
     override fun onBind(intent: Intent?): IBinder? {
         return null
diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
index 49d916b2..1fb0bc10 100644
--- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
+++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt
@@ -55,13 +55,9 @@ class MainActivity : Main() {
         override fun onReceive(context: Context, intent: Intent) {
             when (intent.action) {
                 INSTALL_COMPLETED -> launchVanced(this@MainActivity)
-                INSTALL_BLOCKED -> installAlertBuilder(getString(R.string.installation_blocked), this@MainActivity)
-                INSTALL_FAILED -> installAlertBuilder(getString(R.string.installation_failed), this@MainActivity)
-                INSTALL_ABORTED -> installAlertBuilder(getString(R.string.installation_aborted), this@MainActivity)
-                INSTALL_STORAGE -> installAlertBuilder(getString(R.string.installation_storage), this@MainActivity)
-                INSTALL_CONFLICT -> installAlertBuilder(getString(R.string.installation_conflict), this@MainActivity)
-                INSTALL_INVALID -> installAlertBuilder(getString(R.string.installation_invalid), this@MainActivity)
-
+                INSTALL_FAILED -> {
+                    installAlertBuilder(intent.getStringExtra("errorMsg") as String, this@MainActivity)
+                }
             }
         }
     }
@@ -127,34 +123,14 @@ class MainActivity : Main() {
         LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
             INSTALL_COMPLETED
         ))
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
-            INSTALL_ABORTED
-        ))
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
-            INSTALL_BLOCKED
-        ))
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
-            INSTALL_STORAGE
-        ))
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
-            INSTALL_CONFLICT
-        ))
         LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
             INSTALL_FAILED
         ))
-        LocalBroadcastManager.getInstance(this).registerReceiver(broadcastReceiver, IntentFilter(
-            INSTALL_INVALID
-        ))
 
     }
 
     companion object {
         const val INSTALL_COMPLETED = "Installation completed"
-        const val INSTALL_ABORTED = "user aborted installation"
-        const val INSTALL_BLOCKED = "user blocked installation"
-        const val INSTALL_STORAGE = "there was an error with storage.\n Hold up how is that even possible?"
-        const val INSTALL_CONFLICT = "app conflicts with already installed app"
         const val INSTALL_FAILED = "it just failed idk"
-        const val INSTALL_INVALID = "apk files are invalid"
     }
 }
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
index b5eccc01..5cb12435 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/HomeFragment.kt
@@ -184,7 +184,12 @@ class HomeFragment : Home() {
                         }
 
                         if (variant == "root" && viewModel.signatureStatusTxt.value != getString(R.string.signature_disabled)) {
-                            disableVancedButton(getString(R.string.signature_not_checked))
+                            when (viewModel.signatureStatusTxt.value) {
+                                getString(R.string.unavailable) -> disableVancedButton(getString(R.string.signature_not_checked))
+                                getString(R.string.signature_enabled) -> disableVancedButton(getString(R.string.signature_disable))
+                                else -> throw NotImplementedError("Error handling status")
+                            }
+
                         }
 
                         val oa2 = ObjectAnimator.ofFloat(networkErrorLayout, "yFraction", 0f, 0.3f)
@@ -291,6 +296,15 @@ class HomeFragment : Home() {
                     Toast.makeText(activity, error, Toast.LENGTH_SHORT).show()
                     Log.d("VMDwnld", error)
                 }
+                APP_UNINSTALLED -> {
+                    val pkgName = intent.getStringExtra("pkgName")
+                    restartActivity()
+                    Log.d(tag, "successfully uninstalled $pkgName")
+                }
+                APP_NOT_UNINSTALLED -> {
+                    val pkgName = intent.getStringExtra("pkgName")
+                    Log.d(tag, "Failed to uninstall $pkgName")
+                }
             }
         }
     }
@@ -337,6 +351,18 @@ class HomeFragment : Home() {
             )
             )
         }
+        activity?.let {
+            LocalBroadcastManager.getInstance(it).registerReceiver(broadcastReceiver, IntentFilter(
+                APP_UNINSTALLED
+            )
+            )
+        }
+        activity?.let {
+            LocalBroadcastManager.getInstance(it).registerReceiver(broadcastReceiver, IntentFilter(
+                APP_NOT_UNINSTALLED
+            )
+            )
+        }
 
     }
 
@@ -396,6 +422,9 @@ class HomeFragment : Home() {
         const val VANCED_DOWNLOADED = "Vanced downloaded"
         const val MICROG_DOWNLOADED = "MicroG downloaded"
         const val DOWNLOAD_ERROR = "Error occurred"
+        const val APP_UNINSTALLED = "App uninstalled"
+        const val APP_NOT_UNINSTALLED = "App not uninstalled"
+
     }
 
 }
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
index ccf1b0c2..707e48f0 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/SettingsFragment.kt
@@ -8,9 +8,11 @@ import androidx.preference.*
 import com.topjohnwu.superuser.Shell
 import com.vanced.manager.R
 import com.vanced.manager.ui.MainActivity
+import java.util.*
 
 class SettingsFragment : PreferenceFragmentCompat() {
 
+    @ExperimentalStdlibApi
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.preferences, rootKey)
 
@@ -40,7 +42,9 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         val installMode: DropDownPreference? = findPreference("vanced_variant")
-        installMode?.summary = preferenceScreen.sharedPreferences.getString("vanced_variant", "nonroot")
+        installMode?.summary = preferenceScreen.sharedPreferences.getString("vanced_variant",
+            "nonroot"
+        )?.capitalize(Locale.ROOT)
         installMode?.setOnPreferenceChangeListener{ _, _ ->
             when (installMode.value) {
                 "nonroot" -> {
diff --git a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
index 436bf9b9..149cdefe 100644
--- a/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
+++ b/app/src/main/java/com/vanced/manager/ui/fragments/UpdateCheckFragment.kt
@@ -1,6 +1,5 @@
 package com.vanced.manager.ui.fragments
 
-import android.annotation.SuppressLint
 import android.content.Intent
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
@@ -19,21 +18,17 @@ import androidx.fragment.app.DialogFragment
 import com.dezlum.codelabs.getjson.GetJson
 import androidx.core.content.FileProvider
 import androidx.preference.PreferenceManager
+import com.downloader.Error
+import com.downloader.OnDownloadListener
+import com.downloader.PRDownloader
 import com.vanced.manager.BuildConfig
 
 import com.vanced.manager.R
-import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.Disposable
-import io.reactivex.rxkotlin.subscribeBy
-import zlc.season.rxdownload4.download
-import zlc.season.rxdownload4.file
-import zlc.season.rxdownload4.task.Task
-import zlc.season.rxdownload4.utils.getFileNameFromUrl
+import java.io.File
 
 class UpdateCheckFragment : DialogFragment() {
 
-    private var disposable: Disposable? = null
-
     override fun onCreateView(
         inflater: LayoutInflater, container: ViewGroup?,
         savedInstanceState: Bundle?
@@ -44,7 +39,6 @@ class UpdateCheckFragment : DialogFragment() {
         return inflater.inflate(R.layout.fragment_update_check, container, false)
     }
 
-    @SuppressLint("SetTextI18n")
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -63,18 +57,18 @@ class UpdateCheckFragment : DialogFragment() {
             if (remoteVersion > BuildConfig.VERSION_CODE) {
 
                 recheckbtn.visibility = View.GONE
-                checkingTxt.text = "Update Found!"
+                checkingTxt.text = getString(R.string.update_found)
 
                 updatebtn.setOnClickListener {
                         upgradeManager(loadBar)
                 }
 
             } else {
-                checkingTxt.text = "No updates found"
+                checkingTxt.text = getString(R.string.update_notfound)
             }
 
         } else {
-            checkingTxt.text = "No connection"
+            checkingTxt.text = getString(R.string.network_error)
         }
 
     }
@@ -83,32 +77,22 @@ class UpdateCheckFragment : DialogFragment() {
         val apkUrl = GetJson().AsJSONObject("https://vanced.app/api/v1/manager.json")
         val dwnldUrl = apkUrl.get("url").asString
 
-        val task = activity?.filesDir?.path?.let {
-            Task(
-                url = dwnldUrl,
-                saveName = getFileNameFromUrl(dwnldUrl),
-                savePath = it
-            )
-        }
+        PRDownloader.download(dwnldUrl, activity?.filesDir?.path, "manager.apk")
+            .build()
+            .setOnProgressListener { progress ->
+                val mProgress = progress.currentBytes * 100 / progress.totalBytes
+                loadBar.visibility = View.VISIBLE
+                loadBar.progress = mProgress.toInt()
 
-        if (task?.file()?.exists()!!)
-            task.file().delete()
-
-        disposable = task
-            .download()
-            .observeOn(AndroidSchedulers.mainThread())
-            .subscribeBy(
-                onNext = { progress ->
-                    loadBar.visibility = View.VISIBLE
-                    loadBar.progress = progress.percent().toInt()
-                },
-                onComplete = {
+            }
+            .start(object : OnDownloadListener{
+                override fun onDownloadComplete() {
                     val prefs = PreferenceManager.getDefaultSharedPreferences(requireContext())
                     prefs.getBoolean("isUpgrading", false)
                     prefs.edit().putBoolean("isUpgrading", true).apply()
 
                     val pn = activity?.packageName
-                    val apk = task.file()
+                    val apk = File(activity?.filesDir?.path, "manager.apk")
                     val uri =
                         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                             FileProvider.getUriForFile(requireContext(), "$pn.provider", apk)
@@ -119,12 +103,14 @@ class UpdateCheckFragment : DialogFragment() {
                     intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
                     intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
                     startActivity(intent)
-                },
-                onError = { throwable ->
-                    Toast.makeText(activity, throwable.toString(), Toast.LENGTH_SHORT).show()
-                    Log.e("VMUpgrade", throwable.toString())
                 }
-            )
+
+                override fun onError(error: Error?) {
+                    Toast.makeText(activity, error.toString(), Toast.LENGTH_SHORT).show()
+                    Log.e("VMUpgrade", error.toString())
+                }
+            })
+
     }
 
 
diff --git a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
index e9d95de6..99ea5461 100644
--- a/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
+++ b/app/src/main/java/com/vanced/manager/ui/viewmodels/HomeViewModel.kt
@@ -26,7 +26,6 @@ open class HomeViewModel(application: Application): AndroidViewModel(application
         } else {
             "com.vanced.android.youtube"
         }
-    //private val signaturePref = getDefaultSharedPreferences(application).getString("signature_status", "unavailable")
 
     val microgInstalled: Boolean = isPackageInstalled("com.mgoogle.android.gms", application.packageManager)
     val vancedInstalled: Boolean = isPackageInstalled(vancedPkgName, application.packageManager)
diff --git a/app/src/main/java/com/vanced/manager/utils/FileInfo.kt b/app/src/main/java/com/vanced/manager/utils/FileInfo.kt
index fed73179..0f11232b 100644
--- a/app/src/main/java/com/vanced/manager/utils/FileInfo.kt
+++ b/app/src/main/java/com/vanced/manager/utils/FileInfo.kt
@@ -5,6 +5,7 @@ import java.io.FileInputStream
 import java.io.InputStream
 
 open class FileInfo(val name: String, val fileSize: Long, val file: File? = null) {
+
     open fun getInputStream(): InputStream =
         if (file!= null)
             FileInputStream(file)
diff --git a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
index 1a121bf7..6c7e98af 100644
--- a/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
+++ b/app/src/main/java/com/vanced/manager/utils/InternetTools.kt
@@ -14,5 +14,7 @@ object InternetTools {
         customTabsIntent.launchUrl(context, Uri.parse(Url))
     }
 
+    fun getFileNameFromUrl(url: String) = url.substring(url.lastIndexOf('/')+1, url.length)
+
 }
 
diff --git a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
index f0b0a46c..3ea9fdc2 100644
--- a/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
+++ b/app/src/main/java/com/vanced/manager/utils/PackageHelper.kt
@@ -1,13 +1,10 @@
 package com.vanced.manager.utils
 
 import android.app.Activity
-import android.content.ActivityNotFoundException
-import android.content.Context
+import android.app.PendingIntent
 import android.content.Intent
 import android.content.pm.PackageManager
-import android.net.Uri
-import android.widget.Toast
-import com.vanced.manager.core.base.BaseFragment
+import com.vanced.manager.core.installer.SplitInstallerService
 
 object PackageHelper {
 
@@ -20,15 +17,9 @@ object PackageHelper {
         }
     }
 
-    fun uninstallApp(pkgName: String, activity: Activity) {
-        try {
-            val uri = Uri.parse("package:$pkgName")
-            val uninstall = Intent(Intent.ACTION_DELETE, uri)
-            uninstall.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-            uninstall.putExtra(Intent.EXTRA_RETURN_RESULT, true)
-            activity.startActivityForResult(uninstall, BaseFragment.APP_UNINSTALL)
-        } catch (e: ActivityNotFoundException) {
-            Toast.makeText(activity, "Failed to uninstall", Toast.LENGTH_SHORT).show()
-        }
+    fun uninstallApk(pkg: String, activity: Activity) {
+        val callbackIntent = Intent(activity.applicationContext, SplitInstallerService::class.java)
+        val pendingIntent = PendingIntent.getService(activity.applicationContext, 0, callbackIntent, 0)
+        activity.packageManager.packageInstaller.uninstall(pkg, pendingIntent.intentSender)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b1669d17..e76c1176 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -20,6 +20,7 @@
     <string name="installation_blocked">Operation failed because user blocked installation</string>
     <string name="installation_conflict">Operation failed because app conflicts with already installed app</string>
     <string name="installation_failed">Operation failed because it just failed idk</string>
+    <string name="installation_incompatible">Operation failed because app is incompatible with your device</string>
     <string name="installation_invalid">Operation failed because apk files are invalid</string>
     <string name="installation_storage">Operation failed because there was an error with storage. Hold up how is that even possible?</string>
     <string name="button_installed">Installed</string>
@@ -33,11 +34,12 @@
     <string name="useful_links">Useful Links</string>
     <string name="vanced_medias">Vanced on Social Media</string>
     <string name="website_text">The official website of Vanced</string>
+    <string name="signature_disable">Disable Sig.</string>
     <string name="signature_disabled">Disabled</string>
     <string name="signature_enabled">Enabled</string>
     <string name="signature_status">status:</string>
-    <string name="signature_verification">Signature Verification</string>
-    <string name="signature_not_checked">Signature not checked</string>
+    <string name="signature_verification">Sig. Verification</string>
+    <string name="signature_not_checked">Check signature</string>
     <string name="support_us">Support us by downloading Brave</string>
 
     <!-- Settings -->
@@ -60,6 +62,8 @@
     <string name="push_notifications_summary">Receive push notifications when update is released</string>
     <string name="re_check">Re-check</string>
     <string name="update_center">Update Center</string>
+    <string name="update_found">Update found!</string>
+    <string name="update_notfound">No new updates</string>>
 
     <!-- Install Page -->
     <string name="choose_preferred_language">Choose your preferred language for Vanced</string>