diff --git a/src/main/kotlin/app/revanced/manager/downloaders/apkmirror/APKMirrorDownloader.kt b/src/main/kotlin/app/revanced/manager/downloaders/charm/CharmDownloader.kt
similarity index 53%
rename from src/main/kotlin/app/revanced/manager/downloaders/apkmirror/APKMirrorDownloader.kt
rename to src/main/kotlin/app/revanced/manager/downloaders/charm/CharmDownloader.kt
index 9c7d638..cc43df8 100644
--- a/src/main/kotlin/app/revanced/manager/downloaders/apkmirror/APKMirrorDownloader.kt
+++ b/src/main/kotlin/app/revanced/manager/downloaders/charm/CharmDownloader.kt
@@ -1,26 +1,28 @@
 @file:Suppress("Unused")
 
-package app.revanced.manager.downloaders.apkmirror
+package app.revanced.manager.downloaders.charm
 
-import android.net.Uri
 import app.revanced.manager.downloader.DownloadUrl
 import app.revanced.manager.downloader.Downloader
 import app.revanced.manager.downloader.download
 import app.revanced.manager.downloader.webview.runWebView
+
 import app.revanced.manager.downloaders.R
 import app.revanced.manager.downloaders.shared.Merger
-import java.net.URI
+
 import java.nio.file.Files
 import java.util.UUID
 import java.util.zip.ZipFile
 import kotlin.io.path.ExperimentalPathApi
 import kotlin.io.path.deleteRecursively
+import kotlin.io.path.inputStream
 import kotlin.io.path.outputStream
 
 @OptIn(ExperimentalPathApi::class)
-val ApkMirrorDownloader = Downloader(R.string.apkmirror) {
+val CharmDownloader = Downloader(R.string.charm) {
+
     get { packageName, version ->
-        runWebView("APKMirror") {
+        runWebView("Charm") {
             download { url, _, userAgent ->
                 finish(
                     DownloadUrl(
@@ -29,46 +31,54 @@ val ApkMirrorDownloader = Downloader(R.string.apkmirror) {
                     )
                 )
             }
-
-            Uri.Builder()
-                .scheme("https")
-                .authority("www.apkmirror.com")
-                .appendQueryParameter("post_type", "app_release")
-                .appendQueryParameter("searchtype", "apk")
-                .appendQueryParameter("s", version?.let { "$packageName $it" } ?: packageName)
-                .appendQueryParameter("bundles%5B%5D" /* bundles[] */, "apk_files")
-                .toString()
+            "https://charm-cat.github.io/#$packageName"
         } to version
     }
 
     download { downloadUrl, outputStream ->
-        val workingDir = Files.createTempDirectory("apkmirror_dl")
+        val workingDir = Files.createTempDirectory("charm_dl")
         try {
-            if (URI(downloadUrl.url).path.substringAfterLast('/').endsWith(".apk")) {
-                val (inputStream, size) = downloadUrl.toDownloadResult()
-                inputStream.use {
+            val downloadedFile = workingDir.resolve(UUID.randomUUID().toString())
+            val (inputStream, size) = downloadUrl.toDownloadResult()
+
+            downloadedFile.outputStream().use { output ->
+                inputStream.use { stream ->
                     if (size != null) reportSize(size)
-                    it.copyTo(outputStream)
+                    stream.copyTo(output, bufferSize = 64 * 1024)
                 }
-            } else {
-                val downloadedFile = workingDir.resolve(UUID.randomUUID().toString()).also {
-                    it.outputStream().use { output ->
-                        downloadUrl.toDownloadResult().first.copyTo(output)
-                    }
+            }
+
+            var isBundle = false
+            try {
+                ZipFile(downloadedFile.toFile()).use { zip ->
+                    isBundle = zip.getEntry("AndroidManifest.xml") == null
                 }
+            } catch (e: Exception) {
+            }
+
+            if (isBundle) {
                 val xapkWorkingDir = workingDir.resolve("xapk").also { it.toFile().mkdirs() }
 
-                ZipFile(downloadedFile.toString()).use { zip ->
+                ZipFile(downloadedFile.toFile()).use { zip ->
                     zip.entries().asSequence().forEach { entry ->
-                        xapkWorkingDir.resolve(entry.name).also { it.parent.toFile().mkdirs() }.also { outputFile ->
+                        if (!entry.isDirectory && entry.name.endsWith(".apk")) {
+                            val outputFile = xapkWorkingDir.resolve(entry.name)
+                            
+                            outputFile.parent.toFile().mkdirs()
+
                             zip.getInputStream(entry).use { input ->
                                 Files.copy(input, outputFile)
                             }
                         }
                     }
                 }
-
+                
                 Merger.merge(xapkWorkingDir).writeApk(outputStream)
+
+            } else {
+                downloadedFile.inputStream().use { stream ->
+                    stream.copyTo(outputStream, bufferSize = 64 * 1024)
+                }
             }
         } finally {
             workingDir.deleteRecursively()
diff --git a/src/main/res/values/arrays.xml b/src/main/res/values/arrays.xml
index ec2256a..d819f39 100644
--- a/src/main/res/values/arrays.xml
+++ b/src/main/res/values/arrays.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string-array name="app.revanced.manager.downloader.classes">
-        <item>app.revanced.manager.downloaders.apkmirror.APKMirrorDownloaderKt</item>
+        <item>app.revanced.manager.downloaders.charm.CharmDownloaderKt</item>
         <!--
         Play store login is currently broken. Disabling it for now.
         <item>app.revanced.manager.downloaders.play.store.PlayStoreDownloaderKt</item>
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 73645e6..8d56d82 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
     <string name="app_name">ReVanced Manager: Downloaders</string>
-    <string name="apkmirror">APKMirror</string>
+    <string name="charm">Charm</string>
     <string name="play_store">Play Store</string>
 </resources>
\ No newline at end of file