diff --git a/.github/workflows/codeberg.yml b/.github/workflows/codeberg.yml
deleted file mode 100755
index 4747e8f..0000000
--- a/.github/workflows/codeberg.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Sync to Codeberg
-concurrency:
-    group: ${{ github.ref }}
-    cancel-in-progress: true
-on:
-    push:
-    workflow_dispatch:
-    schedule:
-        - cron: "0 */6 * * *"
-
-jobs:
-    codeberg:
-        if: github.repository == 'VendroidEnhanced/Vendroid'
-        runs-on: ubuntu-latest
-        steps:
-            - uses: actions/checkout@v3
-              with:
-                  fetch-depth: 0
-            - uses: pixta-dev/repository-mirroring-action@674e65a7d483ca28dafaacba0d07351bdcc8bd75 # v1.1.1
-              with:
-                  target_repo_url: "git@codeberg.org:VendroidEnhanced/Vendroid.git"
-                  ssh_private_key: ${{ secrets.CODEBERG_SSH_PRIVATE_KEY }}
diff --git a/app/build.gradle b/app/build.gradle
index dc09156..11b9ca3 100755
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.nin0dev.vendroid"
         minSdk 25
         targetSdk 34
-        versionCode 10
-        versionName "1.7"
+        versionCode 11
+        versionName "1.8"
     }
 
     buildTypes {
@@ -37,8 +37,9 @@ dependencies {
     implementation 'com.google.android.material:material:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.activity:activity-ktx:1.9.3'
-    implementation 'com.google.code.gson:gson:2.11.0'
+    implementation 'com.google.code.gson:gson:2.12.1'
     implementation 'com.android.volley:volley:1.2.1'
     implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
+    implementation 'com.google.firebase:firebase-common-ktx:21.0.0'
 }
 
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 70fffeb..6d9338c 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -19,9 +19,6 @@
             android:exported="true"
             android:launchMode="singleTask"
             android:theme="@style/AppTheme" />
-        <activity
-            android:name=".SettingsActivity"
-            android:exported="false" />
         <activity
             android:name=".WelcomeActivity"
             android:exported="false"
diff --git a/app/src/main/java/com/nin0dev/vendroid/MainActivity.kt b/app/src/main/java/com/nin0dev/vendroid/MainActivity.kt
index 462ad10..48325ff 100755
--- a/app/src/main/java/com/nin0dev/vendroid/MainActivity.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/MainActivity.kt
@@ -3,7 +3,6 @@ package com.nin0dev.vendroid
 import android.annotation.SuppressLint
 import android.app.Activity
 import android.content.Context
-import android.content.DialogInterface
 import android.content.Intent
 import android.graphics.Color
 import android.net.Uri
@@ -11,60 +10,135 @@ import android.os.Bundle
 import android.os.StrictMode
 import android.os.StrictMode.ThreadPolicy
 import android.view.KeyEvent
+import android.view.View.GONE
 import android.view.View.VISIBLE
 import android.view.WindowManager
 import android.webkit.ValueCallback
 import android.webkit.WebView
+import android.widget.Button
+import android.widget.LinearLayout
 import android.widget.Toast
 import com.android.volley.Request
 import com.android.volley.toolbox.StringRequest
 import com.android.volley.toolbox.Volley
 import com.google.android.material.color.DynamicColors
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
 import com.google.gson.Gson
-import com.nin0dev.vendroid.HttpClient.fetchVencord
-import com.nin0dev.vendroid.Logger.e
+import com.nin0dev.vendroid.utils.Logger.e
+import com.nin0dev.vendroid.utils.UpdateData
+import com.nin0dev.vendroid.webview.HttpClient.fetchVencord
+import com.nin0dev.vendroid.webview.VChromeClient
+import com.nin0dev.vendroid.webview.VWebviewClient
+import com.nin0dev.vendroid.webview.VencordNative
 import pl.droidsonroids.gif.GifImageView
 import java.io.IOException
 
 
-data class UpdateData(val version: Int, val changelog: String)
-
 class MainActivity : Activity() {
     private var wvInitialized = false
     private var wv: WebView? = null
+
     @JvmField
     var filePathCallback: ValueCallback<Array<Uri?>?>? = null
 
-    fun checkUpdates(ignoreSetting: Boolean = false)
-    {
+    private fun setupQuickCss() {
+        val saveButton = findViewById<Button>(R.id.save_css)
+        val cssEditText = findViewById<TextInputEditText>(R.id.css)
+
+        saveButton.setOnClickListener {
+            wv!!.evaluateJavascript(
+                "VencordNative.quickCss.set(\"${
+                    cssEditText.text
+                        .toString()
+                        .replace("\\", "\\\\")
+                        .replace("\"", "\\\"")
+                        .replace("\n", "\\n")
+                        .replace("\r", "\\r")
+                }\")", null
+            )
+            showDiscordToast("Saved QuickCSS", "SUCCESS")
+            findViewById<LinearLayout>(R.id.quickcss).visibility = GONE
+            findViewById<LinearLayout>(R.id.loading_screen).visibility = GONE
+            wv!!.visibility = VISIBLE
+            currentFocus?.clearFocus();
+        }
+    }
+
+    private fun migrateSettings() {
         val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
-        if(sPrefs.getBoolean("checkVendroidUpdates", false) || ignoreSetting) {
+        if (sPrefs.getBoolean("migratedSettings", false)) return;
+        val e = sPrefs.edit()
+        e.putBoolean("migratedSettings", true);
+
+        e.putBoolean("checkVDEUpdates", sPrefs.getBoolean("checkVendroidUpdates", true))
+        e.putBoolean(
+            "checkAnnouncements",
+            sPrefs.getBoolean("checkVendroidUpdates", true)
+        ) // The user likely turned off auto-updating for privacy reasons, so also disable phoning home for announcements.
+        e.putString(
+            "clientMod",
+            if (sPrefs.getBoolean("equicord", false)) "equicord" else "vencord"
+        )
+        e.putString("splashScreen", sPrefs.getString("splash", "viggy"));
+
+        e.apply()
+    }
+
+    fun checkUpdates(ignoreSetting: Boolean = false) {
+        val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
+        if (sPrefs.getBoolean("checkVDEUpdates", true) || sPrefs.getBoolean(
+                "checkAnnouncements",
+                true
+            ) || ignoreSetting
+        ) {
             val queue = Volley.newRequestQueue(this)
-            val url = "https://vendroid.nin0.dev/api/updates"
+            val url =
+                "https://vendroid-staging.nin0.dev/api/updates?version=${BuildConfig.VERSION_CODE}"
             val stringRequest = StringRequest(
                 Request.Method.GET, url,
                 { response ->
                     val gson = Gson()
                     val updateData = gson.fromJson<UpdateData>(response, UpdateData::class.java)
-                    if(updateData.version != BuildConfig.VERSION_CODE)
-                    {
-                        val madb = MaterialAlertDialogBuilder(this)
-                        madb.setTitle(getString(R.string.vendroid_update_available))
-                        madb.setMessage("Changelog:\n" + updateData.changelog)
-                        madb.setPositiveButton(getString(R.string.update), DialogInterface.OnClickListener { dialogInterface, i ->
-                            val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/VendroidEnhanced/Vendroid/releases/latest/download/app-release.apk"))
-                            startActivity(browserIntent)
-                        })
-                        madb.setNegativeButton(getString(R.string.later), DialogInterface.OnClickListener { _, _ ->  })
-                        madb.show()
+
+                    if (updateData.update != null && sPrefs.getBoolean("checkVDEUpdates", true)) {
+                        MaterialAlertDialogBuilder(this)
+                            .setIcon(R.drawable.baseline_system_update_24)
+                            .setTitle("An update is available (${updateData.update.title})")
+                            .setMessage(updateData.update.text)
+                            .setPositiveButton(getString(R.string.update)) { _, _ ->
+                                val browserIntent = Intent(
+                                    Intent.ACTION_VIEW,
+                                    Uri.parse("https://github.com/nin0-dev/VendroidEnhanced/releases/latest/download/app-release.apk")
+                                )
+                                startActivity(browserIntent)
+                            }
+                            .setNegativeButton(getString(R.string.later)) { _, _ -> }
+                            .show()
                     }
-                    if(ignoreSetting && updateData.version == BuildConfig.VERSION_CODE) {
-                        showDiscordToast("No updates available", "MESSAGE")
+                    if (!sPrefs.getBoolean(
+                            "checkAnnouncements",
+                            true
+                        ) || ignoreSetting
+                    ) return@StringRequest
+                    for (announcement in updateData.announcements!!) {
+                        val sp = getSharedPreferences("announcements", Context.MODE_PRIVATE)
+                        if (!sp.getBoolean(announcement.id.toString(), false)) {
+                            MaterialAlertDialogBuilder(this)
+                                .setIcon(R.drawable.campaign_24dp_000000)
+                                .setTitle(announcement.title)
+                                .setMessage(announcement.text)
+                                .setPositiveButton("OK") { _, _ ->
+                                    val e = sp.edit()
+                                    e.putBoolean(announcement.id.toString(), true)
+                                    e.apply()
+                                }
+                                .show()
+                        }
                     }
                 },
                 { error ->
-                    if (BuildConfig.DEBUG)  {
+                    if (BuildConfig.DEBUG) {
                         e("Network error during update check", error)
                     }
                     Toast.makeText(this, "Failed to check for updates", Toast.LENGTH_SHORT).show()
@@ -78,56 +152,75 @@ class MainActivity : Activity() {
     @SuppressLint("SetJavaScriptEnabled") // mad? watch this swag
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        migrateSettings()
         DynamicColors.applyToActivitiesIfAvailable(application)
         window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
         window.statusBarColor = Color.TRANSPARENT
         window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
         window.navigationBarColor = Color.TRANSPARENT
+
         val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
         val editor = sPrefs.edit()
+
         // https://developer.chrome.com/docs/devtools/remote-debugging/webviews/
-        WebView.setWebContentsDebuggingEnabled(BuildConfig.DEBUG)
+        WebView.setWebContentsDebuggingEnabled(
+            BuildConfig.DEBUG || sPrefs.getBoolean(
+                "allowRemoteDebugging",
+                false
+            )
+        )
         setContentView(R.layout.activity_main)
-        if (sPrefs.getString("splash", "viggy") == "viggy") findViewById<GifImageView>(R.id.viggy_gif).visibility = VISIBLE
-        else if (sPrefs.getString("splash", "viggy") == "shiggy") findViewById<GifImageView>(R.id.shiggy_gif).visibility = VISIBLE
-        else if (sPrefs.getString("splash", "viggy") == "oneko") findViewById<GifImageView>(R.id.oneko_gif).visibility = VISIBLE
+
+        findViewById<GifImageView>(
+            mapOf(
+                "viggy" to R.id.viggy_gif,
+                "shiggy" to R.id.shiggy_gif,
+                "oneko" to R.id.oneko_gif
+            )[sPrefs.getString("splashScreen", "viggy")]!!
+        ).visibility = VISIBLE
+
         wv = findViewById(R.id.webview)!!
+        setupQuickCss()
         explodeAndroid()
         wv!!.setWebViewClient(VWebviewClient())
         wv!!.setWebChromeClient(VChromeClient(this))
-        if(sPrefs.getBoolean("desktopMode", false)) {
-            wv!!.settings.userAgentString = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"
+        if (sPrefs.getBoolean("desktopMode", false)) {
+            wv!!.settings.userAgentString =
+                "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36"
         }
         val s = wv?.getSettings()!!
         s.javaScriptEnabled = true
         s.domStorageEnabled = true
         s.allowFileAccess = true
-        if(!sPrefs.getBoolean("safeMode", false)) {
+
+        if (!sPrefs.getBoolean("safeMode", false)) {
             wv?.addJavascriptInterface(VencordNative(this, wv!!), "VencordMobileNative")
             try {
                 fetchVencord(this)
-            } catch (ex: IOException) {
+            } catch (_: IOException) {
 
             }
-        }
-        else {
-            Toast.makeText(this, "Safe mode enabled, Vencord won't be loaded", Toast.LENGTH_SHORT).show()
+        } else {
+            Toast.makeText(this, "Safe mode enabled, Vencord won't be loaded", Toast.LENGTH_SHORT)
+                .show()
             editor.putBoolean("safeMode", false)
             editor.apply()
         }
+
         val intent = intent
         if (intent.action == Intent.ACTION_VIEW) {
             val data = intent.data
             if (data != null) handleUrl(intent.data)
         } else {
-            if (sPrefs.getString("discordBranch", "") == "stable") wv!!.loadUrl("https://discord.com/app")
-            else if (sPrefs.getString("discordBranch", "") == "ptb") wv!!.loadUrl("https://ptb.discord.com/app")
-            else if (sPrefs.getString("discordBranch", "") == "canary") wv!!.loadUrl("https://canary.discord.com/app")
-            else {
-                finish()
-                startActivity(Intent(this@MainActivity, WelcomeActivity::class.java))
-            }
+            wv!!.loadUrl(
+                mapOf(
+                    "stable" to "https://discord.com/app",
+                    "ptb" to "https://discord.com/app",
+                    "oneko" to "https://discord.com/app"
+                )[sPrefs.getString("discordBranch", "stable")]!!
+            )
         }
+
         checkUpdates()
         wvInitialized = true
     }
@@ -143,7 +236,7 @@ class MainActivity : Activity() {
     override fun onActivityResult(requestCode: Int, resultCode: Int, intent: Intent?) {
         super.onActivityResult(requestCode, resultCode, intent)
         try {
-            if(resultCode != RESULT_CANCELED) {
+            if (resultCode != RESULT_CANCELED) {
                 if (requestCode != FILECHOOSER_RESULTCODE || filePathCallback == null) return
                 if (resultCode != RESULT_OK || intent == null) {
                     filePathCallback!!.onReceiveValue(null)
@@ -167,8 +260,7 @@ class MainActivity : Activity() {
                 }
                 filePathCallback = null
             }
-        }
-        catch (ex: Exception) {
+        } catch (ex: Exception) {
             // it is well known that the best fix for the crash is to wrap the entire function in a try/catch block
         }
     }
@@ -181,13 +273,16 @@ class MainActivity : Activity() {
         )
     }
 
-    fun handleUrl(url: Uri?) {
+    private fun handleUrl(url: Uri?) {
         if (url != null) {
             if (url.authority != "discord.com" || url.authority != "ptb.discord.com" || url.authority != "canary.discord.com") return
             if (!wvInitialized) {
                 wv!!.loadUrl(url.toString())
             } else {
-                wv!!.evaluateJavascript("Vencord.Webpack.Common.NavigationRouter.transitionTo(\"" + url.path + "\")", null)
+                wv!!.evaluateJavascript(
+                    "Vencord.Webpack.Common.NavigationRouter.transitionTo(\"" + url.path + "\")",
+                    null
+                )
             }
         }
     }
@@ -200,7 +295,10 @@ class MainActivity : Activity() {
 
     fun showDiscordToast(message: String, type: String) {
         wv?.post(Runnable {
-            wv?.evaluateJavascript("toasts=Vencord.Webpack.Common.Toasts; toasts.show({id: toasts.genId(), message: \"$message\", type: toasts.Type.$type, options: {position: toasts.Position.BOTTOM,}})", null) // NOBODY LIKES TOASTS AT THE TOP
+            wv?.evaluateJavascript(
+                "toasts=Vencord.Webpack.Common.Toasts; toasts.show({id: toasts.genId(), message: \"$message\", type: toasts.Type.$type, options: {position: toasts.Position.BOTTOM,}})",
+                null
+            ) // NOBODY LIKES TOASTS AT THE TOP
         })
     }
 
diff --git a/app/src/main/java/com/nin0dev/vendroid/RecoveryActivity.kt b/app/src/main/java/com/nin0dev/vendroid/RecoveryActivity.kt
index 45bc602..58946f4 100755
--- a/app/src/main/java/com/nin0dev/vendroid/RecoveryActivity.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/RecoveryActivity.kt
@@ -39,10 +39,6 @@ class RecoveryActivity : AppCompatActivity() {
             finish()
             startActivity(Intent(this, MainActivity::class.java))
         }
-        findViewById<MaterialCardView>(R.id.settings).setOnClickListener {
-            finish()
-            startActivity(Intent(this, SettingsActivity::class.java))
-        }
 
     }
     override fun onNewIntent(intent: Intent) {
diff --git a/app/src/main/java/com/nin0dev/vendroid/SettingsActivity.kt b/app/src/main/java/com/nin0dev/vendroid/SettingsActivity.kt
deleted file mode 100755
index f0dc998..0000000
--- a/app/src/main/java/com/nin0dev/vendroid/SettingsActivity.kt
+++ /dev/null
@@ -1,165 +0,0 @@
-package com.nin0dev.vendroid
-
-import android.annotation.SuppressLint
-import android.content.ComponentName
-import android.content.Context
-import android.content.pm.PackageManager
-import android.graphics.Color
-import android.opengl.Visibility
-import android.os.Bundle
-import android.service.voice.VoiceInteractionSession.VisibleActivityCallback
-import android.util.Log
-import android.view.View
-import android.view.WindowManager
-import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.RadioButton
-import android.widget.Toast
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.button.MaterialButton
-import com.google.android.material.checkbox.MaterialCheckBox
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-import com.google.android.material.materialswitch.MaterialSwitch
-import com.google.android.material.radiobutton.MaterialRadioButton
-import com.google.android.material.textfield.TextInputEditText
-
-class SettingsActivity : AppCompatActivity() {
-    @SuppressLint("CutPasteId")
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-        window.statusBarColor = Color.TRANSPARENT
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
-        window.navigationBarColor = Color.TRANSPARENT
-
-        setContentView(R.layout.activity_settings)
-
-        findViewById<MaterialButton>(R.id.change_icon_to_main).setOnClickListener {
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.MainMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.JollyMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.DiscordMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.RetroMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            Toast.makeText(this, "App icon changed!", Toast.LENGTH_SHORT).show()
-        }
-        findViewById<MaterialButton>(R.id.change_icon_to_christmas).setOnClickListener {
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.MainMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.JollyMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.DiscordMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.RetroMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            Toast.makeText(this, "App icon changed!", Toast.LENGTH_SHORT).show()
-        }
-        findViewById<MaterialButton>(R.id.change_icon_to_retro).setOnClickListener {
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.MainMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.JollyMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.DiscordMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.RetroMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP)
-            Toast.makeText(this, "App icon changed!", Toast.LENGTH_SHORT).show()
-        }
-        findViewById<MaterialButton>(R.id.change_icon_to_discord).setOnClickListener {
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.MainMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.JollyMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.DiscordMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_ENABLED, PackageManager.DONT_KILL_APP)
-            packageManager.setComponentEnabledSetting(ComponentName(applicationContext,
-                "com.nin0dev.vendroid.RetroMainActivity"
-            ), PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
-            Toast.makeText(this, "App icon changed!", Toast.LENGTH_SHORT).show()
-        }
-
-        findViewById<MaterialSwitch>(R.id.check_vendroid_updates).isChecked = sPrefs.getBoolean("checkVendroidUpdates", false)
-        findViewById<MaterialSwitch>(R.id.desktop_mode).isChecked = sPrefs.getBoolean("desktopMode", false)
-        when (sPrefs.getString("discordBranch", "stable")) {
-            "stable" -> findViewById<MaterialRadioButton>(R.id.stable).isChecked = true
-            "ptb" -> findViewById<MaterialRadioButton>(R.id.ptb).isChecked = true
-            "canary" -> findViewById<MaterialRadioButton>(R.id.canary).isChecked = true
-        }
-        when (sPrefs.getString("splash", "viggy")) {
-            "viggy" -> findViewById<MaterialRadioButton>(R.id.viggy).isChecked = true
-            "shiggy" -> findViewById<MaterialRadioButton>(R.id.shiggy).isChecked = true
-            "oneko" -> findViewById<MaterialRadioButton>(R.id.oneko).isChecked = true
-        }
-        if(sPrefs.getString("vencordLocation", "")?.isNotBlank() == true) {
-            findViewById<CheckBox>(R.id.allow_custom_location).isChecked = true
-            val devbuildField = findViewById<TextInputEditText>(R.id.custom_location)
-            devbuildField.visibility = View.VISIBLE
-            devbuildField.setText(sPrefs.getString("vencordLocation", ""))
-        }
-
-        val devbuildCheckbox = findViewById<CheckBox>(R.id.allow_custom_location)
-        devbuildCheckbox.setOnClickListener {
-            if (devbuildCheckbox.isChecked) {
-                MaterialAlertDialogBuilder(this)
-                        .setTitle("Warning")
-                        .setMessage("If you set a custom location, you will be loading and injecting Vencord from a different location. This feature is meant for developers ONLY. Never edit this setting if someone else asked you to, or if you don't know what you're doing! If you do set a custom location, you will not be able to ask for support in the Vencord support channel or in this project's issues. Are you sure you want to continue?")
-                        .setNegativeButton(resources.getString(R.string.no)) { _, _ ->
-                            devbuildCheckbox.isChecked = false
-                        }
-                        .setPositiveButton(resources.getString(R.string.yes)) { _, _ ->
-                            findViewById<EditText>(R.id.custom_location).visibility = View.VISIBLE
-                        }
-                        .show()
-            }
-            else {
-                findViewById<EditText>(R.id.custom_location).visibility = View.GONE
-                findViewById<EditText>(R.id.custom_location).setText("")
-            }
-        }
-
-        findViewById<ExtendedFloatingActionButton>(R.id.save_settings).setOnClickListener {
-            val editor = sPrefs.edit()
-
-            editor.putBoolean("checkVendroidUpdates", findViewById<MaterialSwitch>(R.id.check_vendroid_updates).isChecked)
-            editor.putBoolean("desktopMode", findViewById<MaterialSwitch>(R.id.desktop_mode).isChecked)
-            if (findViewById<RadioButton>(R.id.stable).isChecked) editor.putString("discordBranch", "stable")
-            if (findViewById<RadioButton>(R.id.ptb).isChecked) editor.putString("discordBranch", "ptb")
-            if (findViewById<RadioButton>(R.id.canary).isChecked) editor.putString("discordBranch", "canary")
-            if (findViewById<RadioButton>(R.id.viggy).isChecked) editor.putString("splash", "viggy")
-            if (findViewById<RadioButton>(R.id.shiggy).isChecked) editor.putString("splash", "shiggy")
-            if (findViewById<RadioButton>(R.id.oneko).isChecked) editor.putString("splash", "oneko")
-            if(findViewById<MaterialCheckBox>(R.id.equicord).isChecked) {
-                if(sPrefs.getBoolean("equicord", false)) editor.putInt("lastMajorUpdateThatUserHasUpdatedVencord", 0) // force a reupdate
-                editor.putBoolean("equicord", true)
-            }
-            else {
-                if(!sPrefs.getBoolean("equicord", false)) editor.putInt("lastMajorUpdateThatUserHasUpdatedVencord", 0) // force a reupdate
-                editor.putBoolean("equicord", false)
-            }
-            if (findViewById<CheckBox>(R.id.allow_custom_location).isChecked && findViewById<EditText>(R.id.custom_location).text.isNotBlank()) editor.putString("vencordLocation", findViewById<EditText>(R.id.custom_location).text.toString())
-
-            editor.apply()
-            Toast.makeText(this, "Settings saved, restart Vendroid to apply them.", Toast.LENGTH_LONG).show()
-            finish()
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/nin0dev/vendroid/VencordNative.kt b/app/src/main/java/com/nin0dev/vendroid/VencordNative.kt
deleted file mode 100755
index 10754e2..0000000
--- a/app/src/main/java/com/nin0dev/vendroid/VencordNative.kt
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.nin0dev.vendroid
-
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.webkit.JavascriptInterface
-import android.webkit.WebView
-import android.widget.Toast
-import com.android.volley.Request
-import com.android.volley.toolbox.StringRequest
-import com.android.volley.toolbox.Volley
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import java.io.File
-
-class VencordNative(private val activity: MainActivity, private val wv: WebView) {
-    @JavascriptInterface
-    fun goBack() {
-        activity.runOnUiThread {
-            if (wv.canGoBack()) wv.goBack() else  // no idea what i was smoking when I wrote this
-                activity.getActionBar()
-        }
-    }
-
-    @JavascriptInterface
-    fun openSettings() {
-        activity.startActivity(Intent(activity, SettingsActivity::class.java))
-    }
-
-    @JavascriptInterface
-    fun updateVencord() {
-        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
-        var vendroidFile = File(activity.filesDir, "vencord.js")
-        val conn = HttpClient.fetch(sPrefs.getString("vencordLocation", if(sPrefs.getBoolean("equicord", false)) Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL)!!)
-        vendroidFile.writeText(HttpClient.readAsText(conn.inputStream))
-        activity.showDiscordToast("Updated Vencord, restart to apply changes!", "SUCCESS")
-    }
-
-    @JavascriptInterface
-    fun checkVendroidUpdates() {
-        activity.checkUpdates(ignoreSetting = true)
-    }
-}
diff --git a/app/src/main/java/com/nin0dev/vendroid/WelcomeActivity.kt b/app/src/main/java/com/nin0dev/vendroid/WelcomeActivity.kt
deleted file mode 100755
index 5cca6af..0000000
--- a/app/src/main/java/com/nin0dev/vendroid/WelcomeActivity.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.nin0dev.vendroid
-
-import android.content.Context
-import android.content.Intent
-import android.graphics.Color
-import android.os.Bundle
-import android.view.View.GONE
-import android.view.View.VISIBLE
-import android.view.WindowManager
-import android.widget.CheckBox
-import android.widget.EditText
-import android.widget.RadioButton
-import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-import com.google.android.material.materialswitch.MaterialSwitch
-
-
-class WelcomeActivity : AppCompatActivity() {
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS)
-        window.statusBarColor = Color.TRANSPARENT
-        window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION)
-        window.navigationBarColor = Color.TRANSPARENT
-
-        setContentView(R.layout.activity_welcome)
-
-        findViewById<ExtendedFloatingActionButton>(R.id.save_settings).setOnClickListener {
-            val sPrefs = getSharedPreferences("settings", Context.MODE_PRIVATE)
-            val editor = sPrefs.edit()
-
-            editor.putBoolean("checkVendroidUpdates", findViewById<MaterialSwitch>(R.id.check_vendroid_updates).isChecked)
-            if (findViewById<RadioButton>(R.id.stable).isChecked) editor.putString("discordBranch", "stable")
-            if (findViewById<RadioButton>(R.id.ptb).isChecked) editor.putString("discordBranch", "ptb")
-            if (findViewById<RadioButton>(R.id.canary).isChecked) editor.putString("discordBranch", "canary")
-
-            editor.apply()
-            finish()
-            startActivity(Intent(this@WelcomeActivity, MainActivity::class.java))
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/nin0dev/vendroid/Constants.kt b/app/src/main/java/com/nin0dev/vendroid/utils/Constants.kt
similarity index 52%
rename from app/src/main/java/com/nin0dev/vendroid/Constants.kt
rename to app/src/main/java/com/nin0dev/vendroid/utils/Constants.kt
index 7a338ba..fd3919a 100755
--- a/app/src/main/java/com/nin0dev/vendroid/Constants.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/utils/Constants.kt
@@ -1,6 +1,6 @@
-package com.nin0dev.vendroid
+package com.nin0dev.vendroid.utils
 
 object Constants {
-    const val JS_BUNDLE_URL = "https://github.com/VendroidEnhanced/plugin/releases/download/devbuild/browser.js"
-    const val EQUICORD_BUNDLE_URL = "https://github.com/VendroidEnhanced/plugin/releases/download/devbuild-equi/browser.js"
+    const val JS_BUNDLE_URL = "https://github.com/VendroidEnhanced/plugin/releases/download/vencord/browser.js"
+    const val EQUICORD_BUNDLE_URL = "https://github.com/VendroidEnhanced/plugin/releases/download/equicord/browser.js"
 }
diff --git a/app/src/main/java/com/nin0dev/vendroid/Logger.kt b/app/src/main/java/com/nin0dev/vendroid/utils/Logger.kt
similarity index 93%
rename from app/src/main/java/com/nin0dev/vendroid/Logger.kt
rename to app/src/main/java/com/nin0dev/vendroid/utils/Logger.kt
index 0cbfd08..c3101bd 100755
--- a/app/src/main/java/com/nin0dev/vendroid/Logger.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/utils/Logger.kt
@@ -1,4 +1,4 @@
-package com.nin0dev.vendroid
+package com.nin0dev.vendroid.utils
 
 import android.util.Log
 
diff --git a/app/src/main/java/com/nin0dev/vendroid/utils/UpdateData.kt b/app/src/main/java/com/nin0dev/vendroid/utils/UpdateData.kt
new file mode 100644
index 0000000..aec29ee
--- /dev/null
+++ b/app/src/main/java/com/nin0dev/vendroid/utils/UpdateData.kt
@@ -0,0 +1,19 @@
+package com.nin0dev.vendroid.utils
+
+import com.google.gson.annotations.SerializedName
+
+data class UpdateData(
+    @SerializedName("update") val update: Update?,
+    @SerializedName("announcements") val announcements: List<Announcement>?
+)
+
+data class Update(
+    @SerializedName("title") val title: String,
+    @SerializedName("text") val text: String
+)
+
+data class Announcement(
+    @SerializedName("id") val id: Int,
+    @SerializedName("title") val title: String,
+    @SerializedName("text") val text: String
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/nin0dev/vendroid/HttpClient.kt b/app/src/main/java/com/nin0dev/vendroid/webview/HttpClient.kt
similarity index 90%
rename from app/src/main/java/com/nin0dev/vendroid/HttpClient.kt
rename to app/src/main/java/com/nin0dev/vendroid/webview/HttpClient.kt
index 23ef7bd..ed852f6 100755
--- a/app/src/main/java/com/nin0dev/vendroid/HttpClient.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/webview/HttpClient.kt
@@ -1,9 +1,11 @@
-package com.nin0dev.vendroid
+package com.nin0dev.vendroid.webview
 
 import android.app.Activity
 import android.content.Context
-import android.content.SharedPreferences
 import android.widget.Toast
+import com.nin0dev.vendroid.BuildConfig
+import com.nin0dev.vendroid.R
+import com.nin0dev.vendroid.utils.Constants
 import java.io.ByteArrayOutputStream
 import java.io.File
 import java.io.IOException
@@ -22,8 +24,8 @@ object HttpClient {
     fun fetchVencord(activity: Activity) {
         val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
         val e = sPrefs.edit()
-        val bundleURLToUse = if(sPrefs.getBoolean("equicord", false)) Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL
-        var vendroidFile = File(activity.filesDir, "vencord.js")
+        val bundleURLToUse = if(sPrefs.getString("clientMod", "vencord") == "equicord") Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL
+        val vendroidFile = File(activity.filesDir, "vencord.js")
         val res = activity.resources
         res.openRawResource(R.raw.vencord_mobile).use { `is` -> VencordMobileRuntime = readAsText(`is`) }
         if (VencordRuntime != null) return
diff --git a/app/src/main/java/com/nin0dev/vendroid/VChromeClient.kt b/app/src/main/java/com/nin0dev/vendroid/webview/VChromeClient.kt
similarity index 84%
rename from app/src/main/java/com/nin0dev/vendroid/VChromeClient.kt
rename to app/src/main/java/com/nin0dev/vendroid/webview/VChromeClient.kt
index 9bd8dd4..a492466 100755
--- a/app/src/main/java/com/nin0dev/vendroid/VChromeClient.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/webview/VChromeClient.kt
@@ -1,4 +1,4 @@
-package com.nin0dev.vendroid
+package com.nin0dev.vendroid.webview
 
 import android.content.ActivityNotFoundException
 import android.net.Uri
@@ -7,10 +7,11 @@ import android.webkit.ConsoleMessage.MessageLevel
 import android.webkit.ValueCallback
 import android.webkit.WebChromeClient
 import android.webkit.WebView
-import com.nin0dev.vendroid.Logger.d
-import com.nin0dev.vendroid.Logger.e
-import com.nin0dev.vendroid.Logger.i
-import com.nin0dev.vendroid.Logger.w
+import com.nin0dev.vendroid.MainActivity
+import com.nin0dev.vendroid.utils.Logger.d
+import com.nin0dev.vendroid.utils.Logger.e
+import com.nin0dev.vendroid.utils.Logger.i
+import com.nin0dev.vendroid.utils.Logger.w
 import java.util.Locale
 
 class VChromeClient(private val activity: MainActivity) : WebChromeClient() {
diff --git a/app/src/main/java/com/nin0dev/vendroid/VWebviewClient.kt b/app/src/main/java/com/nin0dev/vendroid/webview/VWebviewClient.kt
similarity index 97%
rename from app/src/main/java/com/nin0dev/vendroid/VWebviewClient.kt
rename to app/src/main/java/com/nin0dev/vendroid/webview/VWebviewClient.kt
index 999e489..e0d7b60 100755
--- a/app/src/main/java/com/nin0dev/vendroid/VWebviewClient.kt
+++ b/app/src/main/java/com/nin0dev/vendroid/webview/VWebviewClient.kt
@@ -1,4 +1,4 @@
-package com.nin0dev.vendroid
+package com.nin0dev.vendroid.webview
 
 import android.content.Intent
 import android.graphics.Bitmap
@@ -10,8 +10,6 @@ import android.webkit.WebView
 import android.webkit.WebViewClient
 import android.widget.Toast
 import androidx.annotation.RequiresApi
-import com.nin0dev.vendroid.Logger.e
-import java.io.File
 import java.io.IOException
 import java.lang.Exception
 import java.net.HttpURLConnection
diff --git a/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt b/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt
new file mode 100755
index 0000000..e2c4d33
--- /dev/null
+++ b/app/src/main/java/com/nin0dev/vendroid/webview/VencordNative.kt
@@ -0,0 +1,99 @@
+package com.nin0dev.vendroid.webview
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.pm.PackageManager
+import android.view.View.GONE
+import android.view.View.VISIBLE
+import android.webkit.JavascriptInterface
+import android.webkit.WebView
+import android.widget.LinearLayout
+import com.google.android.material.textfield.TextInputEditText
+import com.nin0dev.vendroid.MainActivity
+import com.nin0dev.vendroid.R
+import com.nin0dev.vendroid.utils.Constants
+import java.io.File
+
+class VencordNative(private val activity: MainActivity, private val wv: WebView) {
+    @JavascriptInterface
+    fun goBack() {
+        activity.runOnUiThread {
+            if (wv.canGoBack()) wv.goBack() else  // no idea what i was smoking when I wrote this
+                activity.getActionBar()
+        }
+    }
+
+    @JavascriptInterface
+    fun updateVencord() {
+        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        val vendroidFile = File(activity.filesDir, "vencord.js")
+        val conn = HttpClient.fetch(sPrefs.getString("vencordLocation", if(sPrefs.getBoolean("equicord", false)) Constants.EQUICORD_BUNDLE_URL else Constants.JS_BUNDLE_URL)!!)
+        vendroidFile.writeText(HttpClient.readAsText(conn.inputStream))
+        activity.showDiscordToast("Updated Vencord, restart to apply changes!", "SUCCESS")
+    }
+
+    @JavascriptInterface
+    fun updateVendroid() {
+        activity.checkUpdates(ignoreSetting = true)
+    }
+
+    @JavascriptInterface
+    fun getString(id: String, defaultValue: String): String {
+        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        return try {
+            sPrefs.getString(id, defaultValue)!!;
+        } catch (e: Exception) {
+            "None";
+        }
+    }
+
+    @JavascriptInterface
+    fun getBool(id: String, defaultValue: Boolean): Boolean {
+        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        return try {
+            sPrefs.getBoolean(id, defaultValue);
+        } catch (e: Exception) {
+            false;
+        }
+    }
+
+    @JavascriptInterface
+    fun setString(id: String, value: String) {
+        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        val e = sPrefs.edit()
+        if(id == "clientMod") e.putInt("lastMajorUpdateThatUserHasUpdatedVencord", 0)
+        e.putString(id, value)
+        e.apply()
+    }
+
+    @JavascriptInterface
+    fun setBool(id: String, value: Boolean) {
+        val sPrefs = activity.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        val e = sPrefs.edit()
+        e.putBoolean(id, value)
+        e.apply()
+    }
+
+    @JavascriptInterface
+    fun changeAppIcon(id: String) {
+        val icons = arrayOf("Main", "Jolly", "Discord", "Retro")
+        for (icon in icons) {
+            activity.packageManager.setComponentEnabledSetting(
+                ComponentName(activity.applicationContext,
+                "com.nin0dev.vendroid.${icon}MainActivity"
+            ), if (icon == id) PackageManager.COMPONENT_ENABLED_STATE_ENABLED else PackageManager.COMPONENT_ENABLED_STATE_DISABLED, PackageManager.DONT_KILL_APP)
+        }
+    }
+
+    @JavascriptInterface
+    fun openQuickCss(quickCss: String) {
+        activity.runOnUiThread {
+            activity.findViewById<LinearLayout>(R.id.quickcss).visibility = VISIBLE
+            activity.findViewById<LinearLayout>(R.id.loading_screen).visibility = GONE
+            activity.findViewById<WebView>(R.id.webview).visibility = GONE
+            activity.findViewById<TextInputEditText>(R.id.css).setText(quickCss)
+        }
+    }
+
+
+}
diff --git a/app/src/main/res/drawable/baseline_system_update_24.xml b/app/src/main/res/drawable/baseline_system_update_24.xml
new file mode 100644
index 0000000..9abffc7
--- /dev/null
+++ b/app/src/main/res/drawable/baseline_system_update_24.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="24dp"
+    android:tint="@color/text"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp">
+
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2L19,3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19L7,19L7,5h10v14zM16,13h-3L13,8h-2v5L8,13l4,4 4,-4z" />
+
+</vector>
diff --git a/app/src/main/res/drawable/campaign_24dp_000000.xml b/app/src/main/res/drawable/campaign_24dp_000000.xml
new file mode 100644
index 0000000..8fd1541
--- /dev/null
+++ b/app/src/main/res/drawable/campaign_24dp_000000.xml
@@ -0,0 +1,22 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="@color/text"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:pathData="M18,12L18,12c0,0.55 0.45,1 1,1h2c0.55,0 1,-0.45 1,-1v0c0,-0.55 -0.45,-1 -1,-1h-2C18.45,11 18,11.45 18,12z"
+        android:fillColor="#000000" />
+    <path
+        android:pathData="M16.59,16.82c-0.33,0.44 -0.24,1.05 0.2,1.37c0.53,0.39 1.09,0.81 1.62,1.21c0.44,0.33 1.06,0.24 1.38,-0.2c0,-0.01 0.01,-0.01 0.01,-0.02c0.33,-0.44 0.24,-1.06 -0.2,-1.38c-0.53,-0.4 -1.09,-0.82 -1.61,-1.21c-0.44,-0.33 -1.06,-0.23 -1.39,0.21C16.6,16.81 16.59,16.82 16.59,16.82z"
+        android:fillColor="#000000" />
+    <path
+        android:pathData="M19.81,4.81c0,-0.01 -0.01,-0.01 -0.01,-0.02c-0.33,-0.44 -0.95,-0.53 -1.38,-0.2c-0.53,0.4 -1.1,0.82 -1.62,1.22c-0.44,0.33 -0.52,0.95 -0.19,1.38c0,0.01 0.01,0.01 0.01,0.02c0.33,0.44 0.94,0.53 1.38,0.2c0.53,-0.39 1.09,-0.82 1.62,-1.22C20.05,5.87 20.13,5.25 19.81,4.81z"
+        android:fillColor="#000000" />
+    <path
+        android:pathData="M8,9H4c-1.1,0 -2,0.9 -2,2v2c0,1.1 0.9,2 2,2h1v3c0,0.55 0.45,1 1,1h0c0.55,0 1,-0.45 1,-1v-3h1l5,3V6L8,9z"
+        android:fillColor="#000000" />
+    <path
+        android:pathData="M15.5,12c0,-1.33 -0.58,-2.53 -1.5,-3.35v6.69C14.92,14.53 15.5,13.33 15.5,12z"
+        android:fillColor="#000000" />
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 217b0ec..4844977 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,6 +5,42 @@
     android:layout_height="match_parent"
     tools:context=".MainActivity">
 
+    <LinearLayout
+        android:id="@+id/quickcss"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:visibility="gone">
+
+        <Button
+            android:id="@+id/save_css"
+            style="@style/Widget.Material3.Button.TonalButton"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginTop="15dp"
+            android:layout_marginEnd="15dp"
+            android:text="@string/save_exit" />
+
+        <com.google.android.material.textfield.TextInputLayout
+            style="?attr/textInputFilledStyle"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="top"
+            android:hint="@string/quickcss">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/css"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_margin="15dp"
+                android:fontFamily="monospace"
+                android:gravity="top" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/loading_screen"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_recovery.xml b/app/src/main/res/layout/activity_recovery.xml
index 9578d05..782243a 100755
--- a/app/src/main/res/layout/activity_recovery.xml
+++ b/app/src/main/res/layout/activity_recovery.xml
@@ -79,34 +79,6 @@
             </com.google.android.material.card.MaterialCardView>
 
 
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/settings"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:clickable="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/open_settings"
-                        android:textAppearance="?attr/textAppearanceTitleMedium" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:text="@string/open_settings_desc"
-                        android:textAppearance="?attr/textAppearanceBodyMedium"
-                        android:textColor="?android:attr/textColorSecondary" />
-                </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>
         </LinearLayout>
 
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
deleted file mode 100755
index 8c3654a..0000000
--- a/app/src/main/res/layout/activity_settings.xml
+++ /dev/null
@@ -1,230 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="20dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/updates_title"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/check_vendroid_updates"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:checked="true"
-                android:text="@string/autocheck_vendroid" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/autoupdate_vencord"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:enabled="false"
-                android:text="@string/autocheck_vencord" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/splashscreen"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <RadioGroup
-                android:layout_width="match_parent"
-                android:layout_height="match_parent">
-
-                <RadioButton
-                    android:id="@+id/viggy"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:checked="true"
-                    android:text="@string/viggy" />
-
-                <RadioButton
-                    android:id="@+id/shiggy"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/shiggy" />
-
-                <RadioButton
-                    android:id="@+id/oneko"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/oneko" />
-
-            </RadioGroup>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/discord_branch"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <RadioGroup
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <RadioButton
-                    android:id="@+id/stable"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:checked="true"
-                    android:text="@string/stable" />
-
-                <RadioButton
-                    android:id="@+id/ptb"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ptb" />
-
-                <RadioButton
-                    android:id="@+id/canary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/canary" />
-            </RadioGroup>
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/desktop_mode"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:checked="true"
-                android:text="@string/desktop_mode" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/equicord_small"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <CheckBox
-                android:id="@+id/equicord"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/equicord" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/vencord_location"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <CheckBox
-                android:id="@+id/allow_custom_location"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/set_custom_location" />
-
-            <com.google.android.material.textfield.TextInputLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:fitsSystemWindows="true"
-                android:hint="@string/custom_location_url">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/custom_location"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="gone"
-                    tools:visibility="visible" />
-
-            </com.google.android.material.textfield.TextInputLayout>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                android:text="@string/app_icons_title"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <TextView
-                android:id="@+id/textView3"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/app_icons_desc" />
-
-            <Button
-                android:id="@+id/change_icon_to_main"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10px"
-                android:text="Main icon" />
-
-            <Button
-                android:id="@+id/change_icon_to_christmas"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Christmas colors" />
-
-            <Button
-                android:id="@+id/change_icon_to_retro"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="Retro, by @CrimsonFork on GitHub" />
-
-            <Button
-                android:id="@+id/change_icon_to_discord"
-                style="@style/Widget.Material3.Button.OutlinedButton"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="60dp"
-                android:text="Discord colors" />
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-
-
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="0dp"
-            app:layout_collapseMode="pin"
-            app:title="Vendroid Settings"
-            app:titleTextColor="@color/text" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/save_settings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
-        android:contentDescription="@string/save_settings"
-        android:text="@string/save_settings"
-        app:icon="@drawable/save_black_24dp" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
deleted file mode 100755
index 9187b9a..0000000
--- a/app/src/main/res/layout/activity_welcome.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true">
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="20dp"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior">
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/updates_title"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/check_vendroid_updates"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:checked="true"
-                android:text="@string/autocheck_vendroid" />
-
-            <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/autoupdate_vencord"
-                android:layout_width="match_parent"
-                android:layout_height="40dp"
-                android:layout_marginTop="5dp"
-                android:layout_marginBottom="5dp"
-                android:enabled="false"
-                android:text="@string/autocheck_vencord" />
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/discord_branch"
-                android:textColor="@color/text"
-                android:textSize="18sp" />
-
-            <RadioGroup
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" >
-
-                <RadioButton
-                    android:id="@+id/stable"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:checked="true"
-                    android:text="@string/stable" />
-
-                <RadioButton
-                    android:id="@+id/ptb"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/ptb" />
-
-                <RadioButton
-                    android:id="@+id/canary"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/canary" />
-            </RadioGroup>
-
-        </LinearLayout>
-
-    </androidx.core.widget.NestedScrollView>
-
-
-
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent">
-
-        <com.google.android.material.appbar.MaterialToolbar
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:elevation="0dp"
-            app:layout_collapseMode="pin"
-            app:title="Welcome to Vendroid"
-            app:titleTextColor="@color/text" />
-
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
-        android:id="@+id/save_settings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
-        android:contentDescription="Start Vendroid"
-        android:text="Start Vendroid"
-        app:icon="@drawable/baseline_check_24" />
-
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/raw/vencord_mobile.js b/app/src/main/res/raw/vencord_mobile.js
index 49ba061..22ac389 100755
--- a/app/src/main/res/raw/vencord_mobile.js
+++ b/app/src/main/res/raw/vencord_mobile.js
@@ -47,7 +47,7 @@
                 Object.assign(document.createElement("link"), {
                 rel: "stylesheet",
                 type: "text/css",
-                href: "https://github.com/VendroidEnhanced/plugin/releases/download/css/fixes.css"
+                href: "https://raw.githubusercontent.com/VendroidEnhanced/random-files/refs/heads/main/moreFixes.css"
             }));
     }, { once: true });
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index de9cd02..733630d 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -36,4 +36,6 @@
     <string name="equicord">Use Equicord (Vencord fork with more plugins)</string>
     <string name="app_icons_title">App icons</string>
     <string name="app_icons_desc">Change your VendroidEnhanced app icon! Occasionally, seasonal icons may appear.</string>
+    <string name="quickcss">QuickCSS</string>
+    <string name="save_exit"><![CDATA[Save & exit]]></string>
 </resources>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 768d862..281c968 100755
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.7.3' apply false
-    id 'com.android.library' version '8.7.3' apply false
+    id 'com.android.application' version '8.8.1' apply false
+    id 'com.android.library' version '8.8.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.9.25' apply false
 }
\ No newline at end of file