From 3aa8bee4cfa2edf363a63d22756dfca8784734dc Mon Sep 17 00:00:00 2001
From: rhenwinch <rhenwinchester@gmail.com>
Date: Thu, 7 Mar 2024 01:44:35 +0800
Subject: [PATCH] add: init plugins system

---
 .idea/gradle.xml                              |   2 +-
 .idea/inspectionProfiles/Project_Default.xml  |   3 +
 app/build.gradle.kts                          |   2 +-
 .../com/flixclusive/FlixclusiveApplication.kt |   9 +-
 .../flixclusive/mobile/MobileAppNavigator.kt  |   4 +-
 .../com/flixclusive/mobile/MobileNavGraphs.kt |   4 +-
 .../com/flixclusive/tv/AppTvNavigator.kt      |   2 +-
 .../com/flixclusive/core/theme/Color.kt       |   2 +-
 .../src/main/res/drawable/plugin_logo.xml     |   9 +
 .../main/res/drawable/provider_settings.xml   |   9 +
 .../util/common/provider/ProviderConstants.kt |   5 +
 .../core/util/network/JsonHelper.kt           |   6 +
 core/util/src/main/res/values/strings.xml     |   9 +-
 data/provider/build.gradle.kts                |   1 +
 .../provider/DefaultProviderRepository.kt     | 175 ---------
 .../data/provider/PluginManager.kt            | 331 ++++++++++++++++++
 .../data/provider/ProviderRepository.kt       |  39 ++-
 .../data/provider/di/ProviderModule.kt        |   8 -
 .../data/provider/util/FileHelper.kt          |  15 +
 .../provider/SourceLinksProviderUseCase.kt    |  12 +-
 .../flixclusive/extractor/upcloud/VidCloud.kt |  26 +-
 .../extractor/upcloud/dto/Keys4Fun.kt         |  19 +
 .../extractor/upcloud/dto/UpCloudEmbedData.kt |   2 +-
 .../extractor/upcloud/util/DecryptHelper.kt   |  81 -----
 .../mobile/{provider => plugin}/.gitignore    |   0
 .../{provider => plugin}/build.gradle.kts     |   4 +-
 .../mobile/plugin/PluginScreenViewModel.kt    |  50 +++
 .../feature/mobile/plugin/PluginsScreen.kt}   |  34 +-
 .../plugin/component/BottomCardContent.kt     | 115 ++++++
 .../mobile/plugin/component/PluginCard.kt}    | 115 +++++-
 .../mobile/plugin/component/TopCardContent.kt | 164 +++++++++
 .../mobile/plugin}/util/DragAndDropUtils.kt   |   2 +-
 .../plugin}/util/ItemListDragAndDropState.kt  |   2 +-
 .../res/drawable/round_drag_indicator_24.xml  |   0
 .../provider/ProvidersScreenViewModel.kt      |  38 --
 .../feature/splashScreen/component/Consent.kt |  27 ++
 gradle/libs.versions.toml                     |   4 +
 model/datastore/build.gradle.kts              |   1 +
 .../model/datastore/AppSettings.kt            |   2 +-
 .../model/datastore/PluginPreference.kt       |  15 +
 .../model/datastore/ProviderPreference.kt     |  13 -
 provider/base/build.gradle.kts                |   2 +
 .../flixclusive/provider/base/ProviderData.kt |  16 -
 .../provider/base/plugin/Plugin.kt            |  18 +-
 .../provider/base/plugin/PluginManifest.kt    |  40 ---
 .../base/plugin/settings/PluginSettings.kt    | 234 +++++++++++++
 .../plugin/settings/PluginSettingsManager.kt  | 227 ++++++++++++
 provider/ghostx/.gitignore                    |   1 +
 provider/ghostx/build.gradle.kts              |  11 +
 settings.gradle.kts                           |   2 +-
 50 files changed, 1467 insertions(+), 445 deletions(-)
 create mode 100644 core/ui/common/src/main/res/drawable/plugin_logo.xml
 create mode 100644 core/ui/common/src/main/res/drawable/provider_settings.xml
 create mode 100644 core/util/src/main/kotlin/com/flixclusive/core/util/common/provider/ProviderConstants.kt
 delete mode 100644 data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt
 create mode 100644 data/provider/src/main/kotlin/com/flixclusive/data/provider/PluginManager.kt
 create mode 100644 data/provider/src/main/kotlin/com/flixclusive/data/provider/util/FileHelper.kt
 create mode 100644 extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/Keys4Fun.kt
 delete mode 100644 extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptHelper.kt
 rename feature/mobile/{provider => plugin}/.gitignore (100%)
 rename feature/mobile/{provider => plugin}/build.gradle.kts (80%)
 create mode 100644 feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginScreenViewModel.kt
 rename feature/mobile/{provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreen.kt => plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginsScreen.kt} (72%)
 create mode 100644 feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/BottomCardContent.kt
 rename feature/mobile/{provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProviderCard.kt => plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/PluginCard.kt} (53%)
 create mode 100644 feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/TopCardContent.kt
 rename feature/mobile/{provider/src/main/kotlin/com/flixclusive/feature/mobile/provider => plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin}/util/DragAndDropUtils.kt (97%)
 rename feature/mobile/{provider/src/main/kotlin/com/flixclusive/feature/mobile/provider => plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin}/util/ItemListDragAndDropState.kt (99%)
 rename feature/mobile/{provider => plugin}/src/main/res/drawable/round_drag_indicator_24.xml (100%)
 delete mode 100644 feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreenViewModel.kt
 create mode 100644 model/datastore/src/main/kotlin/com/flixclusive/model/datastore/PluginPreference.kt
 delete mode 100644 model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt
 delete mode 100644 provider/base/src/main/kotlin/com/flixclusive/provider/base/ProviderData.kt
 delete mode 100644 provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/PluginManifest.kt
 create mode 100644 provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettings.kt
 create mode 100644 provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettingsManager.kt
 create mode 100644 provider/ghostx/.gitignore
 create mode 100644 provider/ghostx/build.gradle.kts

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index cea339be..dbc317af 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -63,8 +63,8 @@
             <option value="$PROJECT_DIR$/feature/mobile/genre" />
             <option value="$PROJECT_DIR$/feature/mobile/home" />
             <option value="$PROJECT_DIR$/feature/mobile/player" />
+            <option value="$PROJECT_DIR$/feature/mobile/plugin" />
             <option value="$PROJECT_DIR$/feature/mobile/preferences" />
-            <option value="$PROJECT_DIR$/feature/mobile/provider" />
             <option value="$PROJECT_DIR$/feature/mobile/recently-watched" />
             <option value="$PROJECT_DIR$/feature/mobile/search" />
             <option value="$PROJECT_DIR$/feature/mobile/search-expanded" />
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 44ca2d9b..f449b464 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -1,6 +1,9 @@
 <component name="InspectionProjectProfileManager">
   <profile version="1.0">
     <option name="myName" value="Project Default" />
+    <inspection_tool class="BlockingMethodInNonBlockingContext" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="myConsiderUnknownContextBlocking" value="false" />
+    </inspection_tool>
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e674dd8c..475e6ec0 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -96,7 +96,7 @@ dependencies {
     implementation(projects.feature.mobile.home)
     implementation(projects.feature.mobile.player)
     implementation(projects.feature.mobile.preferences)
-    implementation(projects.feature.mobile.provider)
+    implementation(projects.feature.mobile.plugin)
     implementation(projects.feature.mobile.recentlyWatched)
     implementation(projects.feature.mobile.search)
     implementation(projects.feature.mobile.searchExpanded)
diff --git a/app/src/main/kotlin/com/flixclusive/FlixclusiveApplication.kt b/app/src/main/kotlin/com/flixclusive/FlixclusiveApplication.kt
index 92a8ae26..08bf90f0 100644
--- a/app/src/main/kotlin/com/flixclusive/FlixclusiveApplication.kt
+++ b/app/src/main/kotlin/com/flixclusive/FlixclusiveApplication.kt
@@ -7,7 +7,7 @@ import com.flixclusive.core.datastore.AppSettingsManager
 import com.flixclusive.crash.GlobalCrashHandler
 import com.flixclusive.data.configuration.AppBuild
 import com.flixclusive.data.configuration.AppConfigurationManager
-import com.flixclusive.data.provider.ProviderRepository
+import com.flixclusive.data.provider.PluginManager
 import dagger.hilt.android.HiltAndroidApp
 import okhttp3.OkHttpClient
 import javax.inject.Inject
@@ -15,13 +15,15 @@ import javax.inject.Inject
 @HiltAndroidApp
 class FlixclusiveApplication : Application(), ImageLoaderFactory {
     @Inject
-    lateinit var providersRepository: ProviderRepository
+    lateinit var pluginManager: PluginManager
     @Inject
     lateinit var appConfigurationManager: AppConfigurationManager
     @Inject
     lateinit var appSettingsManager: AppSettingsManager
     @Inject
     lateinit var client: OkHttpClient
+    @Inject
+    lateinit var scope: OkHttpClient
 
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this)
@@ -43,7 +45,8 @@ class FlixclusiveApplication : Application(), ImageLoaderFactory {
                 build = getString(R.string.build).toLong(),
             )
         )
+
+        pluginManager.initialize()
         appSettingsManager.initialize()
-        providersRepository.initialize()
     }
 }
\ No newline at end of file
diff --git a/app/src/main/kotlin/com/flixclusive/mobile/MobileAppNavigator.kt b/app/src/main/kotlin/com/flixclusive/mobile/MobileAppNavigator.kt
index 43822eca..cc8d66ff 100644
--- a/app/src/main/kotlin/com/flixclusive/mobile/MobileAppNavigator.kt
+++ b/app/src/main/kotlin/com/flixclusive/mobile/MobileAppNavigator.kt
@@ -11,7 +11,7 @@ import com.flixclusive.feature.mobile.home.HomeNavigator
 import com.flixclusive.feature.mobile.player.PlayerScreenNavigator
 import com.flixclusive.feature.mobile.player.destinations.PlayerScreenDestination
 import com.flixclusive.feature.mobile.preferences.PreferencesScreenNavigator
-import com.flixclusive.feature.mobile.provider.destinations.ProvidersScreenDestination
+import com.flixclusive.feature.mobile.plugin.destinations.PluginsScreenDestination
 import com.flixclusive.feature.mobile.recentlyWatched.destinations.RecentlyWatchedScreenDestination
 import com.flixclusive.feature.mobile.search.SearchScreenNavigator
 import com.flixclusive.feature.mobile.searchExpanded.destinations.SearchExpandedScreenDestination
@@ -75,7 +75,7 @@ internal class MobileAppNavigator(
     }
 
     override fun openProvidersScreen() {
-        navController.navigateIfResumed(ProvidersScreenDestination within destination.navGraph())
+        navController.navigateIfResumed(PluginsScreenDestination within destination.navGraph())
     }
 
     override fun openAboutScreen() {
diff --git a/app/src/main/kotlin/com/flixclusive/mobile/MobileNavGraphs.kt b/app/src/main/kotlin/com/flixclusive/mobile/MobileNavGraphs.kt
index 607152cc..e86fc6ac 100644
--- a/app/src/main/kotlin/com/flixclusive/mobile/MobileNavGraphs.kt
+++ b/app/src/main/kotlin/com/flixclusive/mobile/MobileNavGraphs.kt
@@ -7,7 +7,7 @@ import com.flixclusive.feature.mobile.genre.destinations.GenreScreenDestination
 import com.flixclusive.feature.mobile.home.destinations.HomeScreenDestination
 import com.flixclusive.feature.mobile.player.destinations.PlayerScreenDestination
 import com.flixclusive.feature.mobile.preferences.destinations.PreferencesScreenDestination
-import com.flixclusive.feature.mobile.provider.destinations.ProvidersScreenDestination
+import com.flixclusive.feature.mobile.plugin.destinations.PluginsScreenDestination
 import com.flixclusive.feature.mobile.recentlyWatched.destinations.RecentlyWatchedScreenDestination
 import com.flixclusive.feature.mobile.search.destinations.SearchScreenDestination
 import com.flixclusive.feature.mobile.searchExpanded.destinations.SearchExpandedScreenDestination
@@ -62,7 +62,7 @@ internal object MobileNavGraphs {
             AboutScreenDestination,
             FilmScreenDestination,
             GenreScreenDestination,
-            ProvidersScreenDestination,
+            PluginsScreenDestination,
             RecentlyWatchedScreenDestination,
             SettingsScreenDestination,
             UpdateDialogDestination,
diff --git a/app/src/main/kotlin/com/flixclusive/tv/AppTvNavigator.kt b/app/src/main/kotlin/com/flixclusive/tv/AppTvNavigator.kt
index ee63bf7b..1a537869 100644
--- a/app/src/main/kotlin/com/flixclusive/tv/AppTvNavigator.kt
+++ b/app/src/main/kotlin/com/flixclusive/tv/AppTvNavigator.kt
@@ -67,7 +67,7 @@ internal class AppTvNavigator(
 //    }
 //
 //    override fun openProvidersScreen() {
-//        navController.navigateIfResumed(ProvidersScreenDestination within destination.navGraph())
+//        navController.navigateIfResumed(PluginsScreenDestination within destination.navGraph())
 //    }
 //
 //    override fun openAboutScreen() {
diff --git a/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt
index 00e7a304..3324abe6 100644
--- a/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt
+++ b/core/theme/src/main/kotlin/com/flixclusive/core/theme/Color.kt
@@ -73,7 +73,7 @@ val md_theme_mobile_dark_background = Color(0xFF121212)
 val md_theme_mobile_dark_onBackground = Color(0xFFEAE0E4)
 val md_theme_mobile_dark_surface = Color(0xFF121212)
 val md_theme_mobile_dark_onSurface = Color(0xFFEAE0E4)
-val md_theme_mobile_dark_surfaceVariant = Color(0xFF2B2B2B)
+val md_theme_mobile_dark_surfaceVariant = Color(0xFF282828)
 val md_theme_mobile_dark_onSurfaceVariant = Color(0xFFE7E4EE)
 
 val subtitleColors = mapOf(
diff --git a/core/ui/common/src/main/res/drawable/plugin_logo.xml b/core/ui/common/src/main/res/drawable/plugin_logo.xml
new file mode 100644
index 00000000..fb593524
--- /dev/null
+++ b/core/ui/common/src/main/res/drawable/plugin_logo.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M352,840L200,840q-33,0 -56.5,-23.5T120,760v-152q48,0 84,-30.5t36,-77.5q0,-47 -36,-77.5T120,392v-152q0,-33 23.5,-56.5T200,160h160q0,-42 29,-71t71,-29q42,0 71,29t29,71h160q33,0 56.5,23.5T800,240v160q42,0 71,29t29,71q0,42 -29,71t-71,29v160q0,33 -23.5,56.5T720,840L568,840q0,-50 -31.5,-85T460,720q-45,0 -76.5,35T352,840ZM200,760h85q24,-66 77,-93t98,-27q45,0 98,27t77,93h85v-240h80q8,0 14,-6t6,-14q0,-8 -6,-14t-14,-6h-80v-240L480,240v-80q0,-8 -6,-14t-14,-6q-8,0 -14,6t-6,14v80L200,240v88q54,20 87,67t33,105q0,57 -33,104t-87,68v88ZM460,500Z"/>
+</vector>
diff --git a/core/ui/common/src/main/res/drawable/provider_settings.xml b/core/ui/common/src/main/res/drawable/provider_settings.xml
new file mode 100644
index 00000000..25e024ad
--- /dev/null
+++ b/core/ui/common/src/main/res/drawable/provider_settings.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M480,840q-17,0 -28.5,-11.5T440,800v-160q0,-17 11.5,-28.5T480,600q17,0 28.5,11.5T520,640v40h280q17,0 28.5,11.5T840,720q0,17 -11.5,28.5T800,760L520,760v40q0,17 -11.5,28.5T480,840ZM160,760q-17,0 -28.5,-11.5T120,720q0,-17 11.5,-28.5T160,680h160q17,0 28.5,11.5T360,720q0,17 -11.5,28.5T320,760L160,760ZM320,600q-17,0 -28.5,-11.5T280,560v-40L160,520q-17,0 -28.5,-11.5T120,480q0,-17 11.5,-28.5T160,440h120v-40q0,-17 11.5,-28.5T320,360q17,0 28.5,11.5T360,400v160q0,17 -11.5,28.5T320,600ZM480,520q-17,0 -28.5,-11.5T440,480q0,-17 11.5,-28.5T480,440h320q17,0 28.5,11.5T840,480q0,17 -11.5,28.5T800,520L480,520ZM640,360q-17,0 -28.5,-11.5T600,320v-160q0,-17 11.5,-28.5T640,120q17,0 28.5,11.5T680,160v40h120q17,0 28.5,11.5T840,240q0,17 -11.5,28.5T800,280L680,280v40q0,17 -11.5,28.5T640,360ZM160,280q-17,0 -28.5,-11.5T120,240q0,-17 11.5,-28.5T160,200h320q17,0 28.5,11.5T520,240q0,17 -11.5,28.5T480,280L160,280Z"/>
+</vector>
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/common/provider/ProviderConstants.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/common/provider/ProviderConstants.kt
new file mode 100644
index 00000000..c662cffd
--- /dev/null
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/common/provider/ProviderConstants.kt
@@ -0,0 +1,5 @@
+package com.flixclusive.core.util.common.provider
+
+import android.os.Environment.getExternalStorageDirectory
+
+val PLUGINS_PATH = getExternalStorageDirectory().absolutePath + "/Flixclusive/repositories/"
\ No newline at end of file
diff --git a/core/util/src/main/kotlin/com/flixclusive/core/util/network/JsonHelper.kt b/core/util/src/main/kotlin/com/flixclusive/core/util/network/JsonHelper.kt
index 2a0f1a77..e3a636ec 100644
--- a/core/util/src/main/kotlin/com/flixclusive/core/util/network/JsonHelper.kt
+++ b/core/util/src/main/kotlin/com/flixclusive/core/util/network/JsonHelper.kt
@@ -5,6 +5,7 @@ import com.google.gson.GsonBuilder
 import com.google.gson.JsonDeserializer
 import com.google.gson.JsonElement
 import com.google.gson.reflect.TypeToken
+import java.io.Reader
 
 /**
  * Parses the specified JSON string into an object of type [T] using Gson library.
@@ -18,6 +19,11 @@ inline fun <reified T> fromJson(json: String): T {
         .fromJson(json, object : TypeToken<T>() {}.type)
 }
 
+inline fun <reified T> fromJson(
+    reader: Reader
+): T = Gson()
+    .fromJson(reader, object : TypeToken<T>() {}.type)
+
 /**
  * Parses the specified [JsonElement] into an object of type [T] using Gson library.
  *
diff --git a/core/util/src/main/res/values/strings.xml b/core/util/src/main/res/values/strings.xml
index ac3dd627..b6814eb5 100644
--- a/core/util/src/main/res/values/strings.xml
+++ b/core/util/src/main/res/values/strings.xml
@@ -143,6 +143,7 @@
     <string name="sync">Sync</string>
     <string name="sync_subtitles">Sync Subtitles</string>
     <string name="understood">Understood</string>
+    <string name="uninstall">Uninstall</string>
     <string name="unknown_language">Unknown language</string>
     <string name="unlock_label">Unlock</string>
     <string name="update_info">Update information</string>
@@ -159,11 +160,12 @@
 
     <!--  Extra labels with formatting  -->
     <string name="continue_watching_tv_show">Continue Watching S%1$d E%2$d</string>
+    <string name="current_playback_speed_format">Current playback speed: %1$sx</string>
     <string name="episode_runtime_formatter">%1$d Episode</string>
+    <string name="made_by_author_label_format">Made by %1$s</string>
     <string name="season_number_formatter">Season %1$d</string>
     <string name="season_runtime_formatter">%1$d Season</string>
     <string name="seek_seconds_format">%1$s seconds</string>
-    <string name="current_playback_speed_format">Current playback speed: %1$sx</string>
 
     <!--  State messages  -->
     <string name="checking_for_updates">Checking for updates…</string>
@@ -171,6 +173,7 @@
     <string name="default_update_info_message">No additional update information provided.</string>
     <string name="download_completed">Download completed</string>
     <string name="download_in_progress">Downloading</string>
+    <string name="failed_to_load_plugins_msg">Some plugins failed to load. Check the plugins page for more info.</string>
     <string name="fetching_episode_message">Fetching show episode…</string>
     <string name="film_data_fetching">Fetching film details…</string>
     <string name="load_link_job_active_error_message">Still processing the last request…</string>
@@ -192,6 +195,8 @@
     <string name="episode_non_existent_error_message_format">Episode %1$s doesn\'t exist on Season %2$s</string>
     <string name="extracting_from_provider_format">Extracting from %1$s…</string>
     <string name="fetching_from_provider_format">Fetching from %1$s…</string>
+    <string name="invalid_plugin_file_dex_json_msg_format">Found extracted plugin file %s in your plugins folder. DO NOT EXTRACT PLUGIN ZIPS!</string>
+    <string name="invalid_plugin_file_directory_msg_format">Found directory %s in your plugins folder. DO NOT EXTRACT PLUGIN ZIPS!</string>
     <string name="next_episode_on_format">Next episode on %1$d…</string>
     <string name="update_out_now_format">%1$s is out now</string>
 
@@ -228,7 +233,9 @@
     <string name="pause_button">Pause button</string>
     <string name="play_button">Play button</string>
     <string name="play_pause_button_content_description">Play or pause button</string>
+    <string name="plugin_icon_content_desc">Default icon of a provider</string>
     <string name="poster_content_description">A poster of %1$s</string>
+    <string name="provider_settings_icon_content_desc">Provider settings</string>
     <string name="rating_icon">Rating Icon</string>
     <string name="release_player_desc">For seamless playback, turn this off. Though, this is required to free device memory.</string>
     <string name="replay_button">Replay button</string>
diff --git a/data/provider/build.gradle.kts b/data/provider/build.gradle.kts
index a6daefdf..f7d09765 100644
--- a/data/provider/build.gradle.kts
+++ b/data/provider/build.gradle.kts
@@ -12,6 +12,7 @@ android {
 dependencies {
     api(libs.compose.runtime)
     api(projects.core.datastore)
+    api(projects.core.ui.common)
     api(projects.core.util)
     api(projects.model.datastore)
     api(projects.model.provider)
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt
deleted file mode 100644
index 25ee67ec..00000000
--- a/data/provider/src/main/kotlin/com/flixclusive/data/provider/DefaultProviderRepository.kt
+++ /dev/null
@@ -1,175 +0,0 @@
-package com.flixclusive.data.provider
-
-import androidx.compose.runtime.mutableStateListOf
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import com.flixclusive.core.datastore.AppSettingsManager
-import com.flixclusive.core.util.common.dispatcher.di.ApplicationScope
-import com.flixclusive.model.datastore.AppSettings
-import com.flixclusive.model.datastore.ProviderPreference
-import com.flixclusive.provider.base.ProviderData
-import com.flixclusive.provider.flixhq.FlixHQ
-import com.flixclusive.provider.lookmovie.LookMovie
-import com.flixclusive.provider.superstream.SuperStream
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.launch
-import okhttp3.OkHttpClient
-import javax.inject.Inject
-
-internal class DefaultProviderRepository @Inject constructor(
-    client: OkHttpClient,
-    @ApplicationScope private val scope: CoroutineScope,
-    private val appSettingsManager: AppSettingsManager,
-) : ProviderRepository {
-
-    override val providers: SnapshotStateList<ProviderData> = mutableStateListOf()
-
-    /**
-     *
-     * This is the list of currently embedded providers.
-     * This will be removed soon to support provider add-ons/plugins.
-     *
-     * This is arranged by competence.
-     * */
-    private val listOfAvailableProviders = arrayListOf(
-        FlixHQ(client),
-        LookMovie(client),
-        SuperStream(client)
-    )
-
-    /**
-     *
-     * Initializes provider. It could be based off [listOfAvailableProviders]
-     * or [AppSettings.providers], if the user has a pre-defined order of providers.
-     * */
-    override fun initialize() {
-        scope.launch {
-            val appSettings = appSettingsManager.localAppSettings
-            val providersPreferences = appSettings.providers.toMutableList()
-
-            var isConfigEmpty = providersPreferences.isEmpty()
-            val isNotInitializedCorrectly = providersPreferences.size < listOfAvailableProviders.size
-
-            if (!isConfigEmpty && isNotInitializedCorrectly) {
-                providersPreferences.clear()
-                isConfigEmpty = true
-            }
-
-            listOfAvailableProviders.forEachIndexed { index, availableProvider ->
-                val provider = if (isConfigEmpty) {
-                    availableProvider
-                } else {
-                    listOfAvailableProviders.find {
-                        it.name.equals(
-                            other = providersPreferences[index].name,
-                            ignoreCase = true
-                        )
-                    }!!
-                }
-
-                val isIgnored = providersPreferences.getOrNull(index)?.isIgnored ?: false
-
-                providers.add(
-                    ProviderData(
-                        provider = provider,
-                        isMaintenance = false,
-                        isIgnored = isIgnored
-                    )
-                )
-
-                if(isConfigEmpty) {
-                    providersPreferences.add(
-                        ProviderPreference(name = provider.name)
-                    )
-                }
-            }
-
-            appSettingsManager.updateData(
-                appSettings.copy(providers = providersPreferences)
-            )
-        }
-    }
-
-    override suspend fun swap(
-        appSettings: AppSettings,
-        fromIndex: Int,
-        toIndex: Int
-    ) {
-        val size = providers.size
-        if (fromIndex == toIndex || fromIndex < 0 || toIndex < 0 || fromIndex >= size || toIndex >= size) {
-            return
-        }
-
-        val tempProvidersList = providers[fromIndex]
-        providers[fromIndex] = providers[toIndex]
-        providers[toIndex] = tempProvidersList
-        
-        appSettings.swapProvidersOnSettings(
-            fromIndex = fromIndex,
-            toIndex = toIndex
-        )
-    }
-
-    /**
-     *
-     * Swap the provider on app settings
-     *
-     * */
-    private suspend fun AppSettings.swapProvidersOnSettings(
-        fromIndex: Int,
-        toIndex: Int
-    ) {
-        // === SWAP on APP SETTINGS
-        val providerConfig = providers.toMutableList()
-        val tempProvidersConfig = providerConfig[fromIndex]
-        providerConfig[fromIndex] = providerConfig[toIndex]
-        providerConfig[toIndex] = tempProvidersConfig
-
-        appSettingsManager.updateData(
-            copy(
-                providers = providerConfig
-            )
-        )
-        // ========================
-    }
-
-    override suspend fun toggleUsage(
-        appSettings: AppSettings,
-        index: Int
-    ) {
-        val size = providers.size
-        if (index >= size) {
-            return
-        }
-
-        val dataProvidersList = providers[index]
-        providers[index] = dataProvidersList.copy(
-            isIgnored = !dataProvidersList.isIgnored
-        )
-
-
-        appSettings.toggleProviderOnSettings(index)
-    }
-
-
-    /**
-     *
-     * Toggles whether to use the provider
-     * on the app's settings.
-     *
-     * */
-    private suspend fun AppSettings.toggleProviderOnSettings(index: Int) {
-        // === TOGGLE USAGE on APP SETTINGS
-        val providerConfig = providers.toMutableList()
-        val dataProvidersConfig = providerConfig[index]
-        providerConfig[index] = dataProvidersConfig.copy(
-            isIgnored = !dataProvidersConfig.isIgnored
-        )
-
-        appSettingsManager.updateData(
-            copy(
-                providers = providerConfig
-            )
-        )
-        // =================================
-    }
-}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/PluginManager.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/PluginManager.kt
new file mode 100644
index 00000000..feced7b4
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/PluginManager.kt
@@ -0,0 +1,331 @@
+package com.flixclusive.data.provider
+
+import android.content.Context
+import android.content.res.AssetManager
+import android.content.res.Resources
+import android.widget.Toast
+import androidx.compose.runtime.mutableStateMapOf
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.core.ui.common.util.showToast
+import com.flixclusive.core.util.common.dispatcher.di.ApplicationScope
+import com.flixclusive.core.util.exception.safeCall
+import com.flixclusive.core.util.log.errorLog
+import com.flixclusive.core.util.log.infoLog
+import com.flixclusive.core.util.network.fromJson
+import com.flixclusive.data.provider.util.rmrf
+import com.flixclusive.gradle.entities.PluginData
+import com.flixclusive.gradle.entities.PluginManifest
+import com.flixclusive.model.datastore.PluginPreference
+import com.flixclusive.provider.base.plugin.Plugin
+import dagger.hilt.android.qualifiers.ApplicationContext
+import dalvik.system.PathClassLoader
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.launch
+import okhttp3.OkHttpClient
+import java.io.File
+import java.io.InputStreamReader
+import javax.inject.Inject
+import javax.inject.Singleton
+import com.flixclusive.core.util.R as UtilR
+
+
+@Singleton
+class PluginManager @Inject constructor(
+    @ApplicationContext private val context: Context,
+    @ApplicationScope private val scope: CoroutineScope,
+    private val appSettingsManager: AppSettingsManager,
+    private val client: OkHttpClient,
+    private val providersRepository: ProviderRepository,
+) {
+    /** Map containing all loaded plugins  */
+    val plugins: MutableMap<String, Plugin> = LinkedHashMap()
+    val classLoaders: MutableMap<PathClassLoader, Plugin> = HashMap()
+
+    // An observable map of plugin data
+    val pluginDataMap = mutableStateMapOf<String, PluginData>()
+
+    /** Plugins that failed to load for various reasons. Map of file to String or Exception  */
+    val failedToLoad: MutableMap<File, Any> = LinkedHashMap()
+
+    fun initialize() {
+        scope.launch {
+            val appSettings = appSettingsManager.localAppSettings
+
+            val updaterJsonMap = HashMap<String, List<PluginData>>()
+
+            appSettings.plugins.forEach { pluginPreference ->
+                val pluginFile = File(pluginPreference.filePath)
+                val updaterJsonFilePath = pluginFile.parent?.plus("/updater.json")
+
+                if (updaterJsonFilePath == null) {
+                    errorLog("Plugin's file path must not be null!")
+                    return@launch
+                }
+
+                val updaterJsonFile = File(updaterJsonFilePath)
+
+                val updaterJsonList = updaterJsonMap.getOrPut(updaterJsonFile.absolutePath) {
+                    fromJson<List<PluginData>>(updaterJsonFile.reader())
+                }
+
+                val pluginName = pluginFile.name
+                val pluginData = updaterJsonList.find { it.name.equals(pluginName, true) }
+
+                if (pluginData == null) {
+                    errorLog("Plugin cannot be found on the updater.json file!")
+                    return@launch
+                }
+
+                if (pluginName.endsWith(".flx")) {
+                    pluginDataMap[pluginFile.nameWithoutExtension] = pluginData
+                    loadPlugin(pluginFile)
+                } else if (pluginName != "oat") { // Some roms create this
+                    if (pluginFile.isDirectory) {
+                        context.showToast(
+                            String.format(context.getString(UtilR.string.invalid_plugin_file_directory_msg_format), pluginName)
+                        )
+                    } else if (pluginName.equals("classes.dex") || pluginName.endsWith(".json")) {
+                        context.showToast(
+                            String.format(context.getString(UtilR.string.invalid_plugin_file_dex_json_msg_format), pluginName)
+                        )
+                    }
+                    rmrf(pluginFile)
+                }
+            }
+
+            if (failedToLoad.isNotEmpty())
+                context.showToast(
+                    message = context.getString(UtilR.string.failed_to_load_plugins_msg),
+                    duration = Toast.LENGTH_LONG
+                )
+        }
+    }
+
+    /**
+     * Loads a plugin
+     *
+     * @param client a modified [OkHttpClient] instance
+     * @param file   Plugin file
+     */
+    suspend fun loadPlugin(file: File) {
+        val fileName = file.nameWithoutExtension
+        val filePath = file.absolutePath
+
+        val pluginPreference = getPluginPreference(fileName)
+
+        infoLog("Loading plugin: $fileName")
+
+        safeCall {
+            File(filePath).setReadOnly()
+        }
+
+        try {
+            val loader = PathClassLoader(filePath, context.classLoader)
+            var manifest: PluginManifest
+            loader.getResourceAsStream("manifest.json").use { stream ->
+                if (stream == null) {
+                    failedToLoad[file] = "No manifest found"
+                    errorLog("Failed to load plugin $fileName: No manifest found")
+                    return
+                }
+                InputStreamReader(stream).use { reader ->
+                    manifest = fromJson(reader)
+                }
+            }
+            val name = manifest.name
+            val pluginClass: Class<out Plugin?> =
+                loader.loadClass(manifest.pluginClassName) as Class<out Plugin>
+            val pluginInstance: Plugin =
+                pluginClass.getDeclaredConstructor().newInstance() as Plugin
+
+            if (plugins.containsKey(name)) {
+                errorLog("Plugin with name $name already exists")
+                return
+            }
+
+            pluginInstance.__filename = fileName
+            if (manifest.requiresResources) {
+                // based on https://stackoverflow.com/questions/7483568/dynamic-resource-loading-from-other-apk
+                val assets = AssetManager::class.java.getDeclaredConstructor().newInstance()
+                val addAssetPath =
+                    AssetManager::class.java.getMethod("addAssetPath", String::class.java)
+                addAssetPath.invoke(assets, file.absolutePath)
+                pluginInstance.resources = Resources(
+                    assets,
+                    context.resources.displayMetrics,
+                    context.resources.configuration
+                )
+            }
+            plugins[name] = pluginInstance
+            classLoaders[loader] = pluginInstance
+
+            pluginInstance.load(context, client)
+
+            if (pluginPreference == null) {
+                loadPluginOnSettings(
+                    PluginPreference(
+                        name = file.nameWithoutExtension,
+                        filePath = filePath
+                    )
+                )
+            }
+        } catch (e: Throwable) {
+            failedToLoad[file] = e
+            errorLog("Failed to load plugin $fileName:\n")
+        }
+    }
+
+    private suspend fun loadPluginOnSettings(pluginPreference: PluginPreference) {
+        val appSettings = appSettingsManager.localAppSettings
+
+        appSettingsManager.updateData(
+            appSettings.copy(
+                plugins = appSettings.plugins + listOf(pluginPreference)
+            )
+        )
+    }
+
+    /**
+     * Unloads a plugin
+     *
+     * @param name Name of the plugin to unload
+     */
+    fun unloadPlugin(name: String) {
+        infoLog("Unloading plugin: $name")
+        val plugin = plugins[name]
+        if (plugin != null) try {
+            plugin.onUnload(context.applicationContext)
+
+            pluginDataMap.remove(plugin.getName())
+            classLoaders.values.removeIf { it.getName().equals(plugin.getName(), true) }
+            providersRepository.remove(plugin.__filename!!)
+            plugins.remove(name)
+        } catch (e: Throwable) {
+            errorLog("Exception while unloading plugin: $name")
+        }
+    }
+
+    private suspend fun unloadPluginOnSettings(pluginPreference: PluginPreference) {
+        val appSettings = appSettingsManager.localAppSettings
+
+        appSettingsManager.updateData(
+            appSettings.copy(
+                plugins = appSettings.plugins + listOf(pluginPreference)
+            )
+        )
+    }
+
+    suspend fun swap(
+        fromIndex: Int,
+        toIndex: Int
+    ) {
+        val appSettings = appSettingsManager.localAppSettings
+        appSettings.plugins.run {
+            val size = size
+            val newPluginsOrder = toMutableList()
+
+            if (fromIndex == toIndex || fromIndex < 0 || toIndex < 0 || fromIndex >= size || toIndex >= size) {
+                return
+            }
+
+            val tempProvidersList = newPluginsOrder[fromIndex]
+            newPluginsOrder[fromIndex] = newPluginsOrder[toIndex]
+            newPluginsOrder[toIndex] = tempProvidersList
+
+            appSettingsManager.updateData(
+                appSettings.copy(plugins = newPluginsOrder)
+            )
+        }
+    }
+
+    /**
+     * Enables a loaded plugin if it isn't already enabled
+     *
+     * @param name Name of the plugin to enable
+     */
+    suspend fun enablePlugin(name: String) {
+        if (isPluginEnabled(name)) return
+
+        toggleUsage(name = name, isDisabled = false)
+    }
+
+    /**
+     * Disables a loaded plugin if it isn't already disables
+     *
+     * @param name Name of the plugin to disable
+     */
+    suspend fun disablePlugin(name: String) {
+        if (!isPluginEnabled(name)) return
+
+        toggleUsage(name = name, isDisabled = true)
+    }
+
+    /**
+     * Toggles a plugin. If it is enabled, it will be disabled and vice versa.
+     *
+     * @param name Name of the plugin to toggle
+     */
+    suspend fun toggleUsage(name: String) {
+        if (isPluginEnabled(name)) disablePlugin(name) else enablePlugin(name)
+    }
+
+    /**
+     * Toggles a plugin. If it is enabled, it will be disabled and vice versa.
+     *
+     * @param index Index of the plugin
+     */
+    suspend fun toggleUsage(index: Int) {
+        val name = plugins.values.toList().getOrNull(index)?.getName() ?: return
+
+        toggleUsage(name)
+    }
+
+    private suspend fun toggleUsage(
+        name: String,
+        isDisabled: Boolean
+    ) {
+        val appSettings = appSettingsManager.localAppSettings
+        val listOfSavedProviders = appSettings.plugins.toMutableList()
+
+        val indexOfPlugin = listOfSavedProviders.indexOfFirst { it.name.equals(name, true) }
+        val plugin = listOfSavedProviders[indexOfPlugin]
+
+        listOfSavedProviders[indexOfPlugin] = plugin.copy(isDisabled = isDisabled)
+
+        appSettingsManager.updateData(
+            appSettings.copy(
+                plugins = listOfSavedProviders.toList()
+            )
+        )
+    }
+
+    fun getPluginPreference(name: String): PluginPreference? {
+        return appSettingsManager.localAppSettings
+            .plugins
+            .find { it.name.equals(name, true) }
+    }
+
+    /**
+     * Checks whether a plugin is enabled
+     *
+     * @param name Name of the plugin
+     * @return Whether the plugin is enabled
+     */
+    fun isPluginEnabled(name: String): Boolean {
+        return appSettingsManager
+            .localAppSettings
+            .plugins
+            .find { it.name.contains(name, true) }
+            ?.isDisabled?.not() ?: false
+    }
+
+    /**
+     * Checks whether a plugin is enabled
+     *
+     * @param plugin Plugin
+     * @return Whether the plugin is enabled
+     */
+    fun isPluginEnabled(plugin: Plugin): Boolean {
+        return isPluginEnabled(plugin.getName() ?: return false)
+    }
+}
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt
index e07d19ec..5891bd7c 100644
--- a/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/ProviderRepository.kt
@@ -1,15 +1,26 @@
-package com.flixclusive.data.provider
-
-import androidx.compose.runtime.snapshots.SnapshotStateList
-import com.flixclusive.model.datastore.AppSettings
-import com.flixclusive.provider.base.ProviderData
-
-interface ProviderRepository {
-    val providers: SnapshotStateList<ProviderData>
-
-    fun initialize()
-
-    suspend fun swap(appSettings: AppSettings, fromIndex: Int, toIndex: Int)
-
-    suspend fun toggleUsage(appSettings: AppSettings, index: Int)
+package com.flixclusive.data.provider
+
+import com.flixclusive.provider.base.Provider
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class ProviderRepository @Inject constructor() {
+    val providers: HashMap<String, MutableList<Provider>> = hashMapOf()
+
+    fun add(parentPlugin: String, provider: Provider) {
+        if (providers[parentPlugin] == null) {
+            providers[parentPlugin] = mutableListOf(provider)
+        } else {
+            providers[parentPlugin]?.add(provider)
+        }
+    }
+
+    /**
+     *
+     * Removes all providers registered to the given plugin name.
+     * */
+    fun remove(parentPlugin: String) {
+        providers.keys.removeIf { it.equals(parentPlugin, true) }
+    }
 }
\ No newline at end of file
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt
index 5bda051d..aa6b9e8d 100644
--- a/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/di/ProviderModule.kt
@@ -1,8 +1,6 @@
 package com.flixclusive.data.provider.di
 
-import com.flixclusive.data.provider.DefaultProviderRepository
 import com.flixclusive.data.provider.DefaultSourceLinksRepository
-import com.flixclusive.data.provider.ProviderRepository
 import com.flixclusive.data.provider.SourceLinksRepository
 import dagger.Binds
 import dagger.Module
@@ -13,12 +11,6 @@ import javax.inject.Singleton
 @Module
 @InstallIn(SingletonComponent::class)
 abstract class ProviderModule {
-    @Singleton
-    @Binds
-    internal abstract fun bindsProviderRepository(
-        providerRepository: DefaultProviderRepository,
-    ): ProviderRepository
-
     @Singleton
     @Binds
     internal abstract fun bindsSourceLinksRepository(
diff --git a/data/provider/src/main/kotlin/com/flixclusive/data/provider/util/FileHelper.kt b/data/provider/src/main/kotlin/com/flixclusive/data/provider/util/FileHelper.kt
new file mode 100644
index 00000000..03f0e2ea
--- /dev/null
+++ b/data/provider/src/main/kotlin/com/flixclusive/data/provider/util/FileHelper.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.data.provider.util
+
+import java.io.File
+
+/**
+ *
+ * Deletes OAT recursively
+ * */
+fun rmrf(file: File) {
+    if (file.isDirectory) {
+        for (child in file.listFiles() ?: emptyArray())
+            rmrf(child)
+    }
+    file.delete()
+}
\ No newline at end of file
diff --git a/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt b/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt
index 087e39e9..fd442388 100644
--- a/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt
+++ b/domain/provider/src/main/kotlin/com/flixclusive/domain/provider/SourceLinksProviderUseCase.kt
@@ -2,9 +2,11 @@ package com.flixclusive.domain.provider
 
 import com.flixclusive.core.util.common.resource.Resource
 import com.flixclusive.core.util.common.ui.UiText
+import com.flixclusive.data.provider.PluginManager
 import com.flixclusive.data.provider.ProviderRepository
 import com.flixclusive.data.provider.SourceLinksRepository
 import com.flixclusive.data.tmdb.TMDBRepository
+import com.flixclusive.gradle.entities.Status
 import com.flixclusive.model.database.WatchHistoryItem
 import com.flixclusive.model.database.util.getNextEpisodeToWatch
 import com.flixclusive.model.provider.SourceData
@@ -33,6 +35,7 @@ typealias FilmKey = String
 @Singleton
 class SourceLinksProviderUseCase @Inject constructor(
     private val sourceLinksRepository: SourceLinksRepository,
+    private val pluginsManager: PluginManager,
     private val providersRepository: ProviderRepository,
     private val tmdbRepository: TMDBRepository,
 ) {
@@ -52,8 +55,13 @@ class SourceLinksProviderUseCase @Inject constructor(
 
      val providers: List<Provider>
         get() = providersRepository.providers
-            .filter { !it.isIgnored && !it.isMaintenance }
-            .map { it.provider }
+            .filterKeys { parentPlugin ->
+                val pluginData = pluginsManager.pluginDataMap[parentPlugin] ?: return@filterKeys false
+
+                pluginData.status != Status.Maintenance
+                && pluginData.status != Status.Down
+            }
+            .flatMap { (_, provider) -> provider.toList() }
 
     /**
      *
diff --git a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt
index 004832e9..4822c2e4 100644
--- a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/VidCloud.kt
@@ -10,7 +10,6 @@ import com.flixclusive.extractor.upcloud.dto.DecryptedSource
 import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData
 import com.flixclusive.extractor.upcloud.dto.UpCloudEmbedData.Companion.toSubtitle
 import com.flixclusive.extractor.upcloud.dto.VidCloudEmbedDataCustomDeserializer
-import com.flixclusive.extractor.upcloud.util.getKey
 import com.flixclusive.model.provider.SourceLink
 import com.flixclusive.model.provider.Subtitle
 import com.flixclusive.provider.base.extractor.Extractor
@@ -32,7 +31,6 @@ class VidCloud(
 
     override val host: String = "https://rabbitstream.net"
     private val alternateHost: String = "https://dokicloud.one"
-    private val luckyAnimalImage = "https://rabbitstream.net/images/lucky_animal/icon.png"
 
     private fun getHost(isAlternative: Boolean) =
         (if (isAlternative) "DokiCloud" else "Rabbitstream")
@@ -51,8 +49,15 @@ class VidCloud(
             .build()
 
         val hostToUse = if (isAlternative) alternateHost else host
+
+        val key = "NzEKyzYxAg=="
+        val browserVersion = "1878522624"
+        val kId = "ea48b9befe5b27756bf749a11537bf64ea51f2db"
+        val kVersion = "12542"
+
+        val sourceEndpoint = "$hostToUse/ajax/v2/embed-4/getSources?id=$id&v=${kVersion}&h=${kId}&b=${browserVersion}"
         val response = client.request(
-            url = "$hostToUse/ajax/embed-4/getSources?id=$id",
+            url = sourceEndpoint,
             headers = options
         ).execute()
 
@@ -60,27 +65,18 @@ class VidCloud(
             ?.string()
             ?: throw Exception("Cannot fetch source")
 
-
         if(responseBody.isBlank())
             throw Exception("Cannot fetch source")
 
         val upCloudEmbedData = fromJson<UpCloudEmbedData>(
             json = responseBody,
             serializer = VidCloudEmbedDataCustomDeserializer {
-                client.request(luckyAnimalImage)
-                    .execute()
-                    .use { keyResponse ->
-                        keyResponse.body?.run {
-                            val key = getKey(byteStream())
-                            fromJson<List<DecryptedSource>>(
-                                decryptAes(it, key)
-                            )
-                        } ?: emptyList()
-                    }
+                fromJson<List<DecryptedSource>>(
+                    decryptAes(it, key)
+                )
             }
         )
 
-
         upCloudEmbedData.run {
             check(sources.isNotEmpty())
             onLinkLoaded(
diff --git a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/Keys4Fun.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/Keys4Fun.kt
new file mode 100644
index 00000000..cebbb6ee
--- /dev/null
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/Keys4Fun.kt
@@ -0,0 +1,19 @@
+package com.flixclusive.extractor.upcloud.dto
+
+import com.google.gson.annotations.SerializedName
+
+data class Keys4Fun(
+    @SerializedName("rabbitstream") val e4: RabbitStreamKeys
+)
+
+data class RabbitStreamKeys(
+    val keys: E4Keys
+)
+
+data class E4Keys(
+    @SerializedName("v") val kVersion: String,
+    @SerializedName("h") val kId: String,
+    @SerializedName("b") val browserVersion: String,
+    @SerializedName("agent") val userAgent: String,
+    val key: String
+)
\ No newline at end of file
diff --git a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
index 6302dad4..9c6cf4c2 100644
--- a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
+++ b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/dto/UpCloudEmbedData.kt
@@ -38,7 +38,7 @@ internal class VidCloudEmbedDataCustomDeserializer(
         val tracks = obj.get("tracks").asJsonArray.map {
             fromJson<UpCloudEmbedData.UpCloudEmbedSubtitleData>(it)
         }
-        val encrypted = obj.get("encrypted").asBoolean
+        val encrypted = obj.get("t").asInt == 1
         val server = obj.get("server").asInt
 
         val sources = if (encrypted) {
diff --git a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptHelper.kt b/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptHelper.kt
deleted file mode 100644
index f377a237..00000000
--- a/extractor/upcloud/src/main/kotlin/com/flixclusive/extractor/upcloud/util/DecryptHelper.kt
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.flixclusive.extractor.upcloud.util
-
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.util.Base64
-import com.flixclusive.core.util.network.CryptographyUtil
-import java.io.InputStream
-
-fun getKey(responseBodyStream: InputStream): String {
-    val bitmap = BitmapFactory.decodeStream(responseBodyStream)
-
-    val rgba = bitmapToRgba(bitmap)
-
-    val binary = extractBitsFromImage(rgba)
-    val hexCompiledString = binaryToASCII(binary)
-    val keys = convertHexToIntegers(hexCompiledString)
-
-    return encodeIntegersToBase64(keys)
-}
-
-private fun bitmapToRgba(bitmap: Bitmap): ByteArray {
-    require(bitmap.config == Bitmap.Config.ARGB_8888) { "Bitmap must be in ARGB_8888 format" }
-    val pixels = IntArray(bitmap.width * bitmap.height)
-    val bytes = ByteArray(pixels.size * 4)
-    bitmap.getPixels(pixels, 0, bitmap.width, 0, 0, bitmap.width, bitmap.height)
-    var i = 0
-    for (pixel in pixels) {
-        // Get components assuming is ARGB
-        val A = pixel shr 24 and 0xff
-        val R = pixel shr 16 and 0xff
-        val G = pixel shr 8 and 0xff
-        val B = pixel and 0xff
-        bytes[i++] = R.toByte()
-        bytes[i++] = G.toByte()
-        bytes[i++] = B.toByte()
-        bytes[i++] = A.toByte()
-    }
-    return bytes
-}
-
-private fun extractBitsFromImage(imageData: ByteArray): String {
-    val i = 8 * imageData[3]
-    val stringBuilder = StringBuilder()
-
-    for (j in 0 until i) {
-        stringBuilder.append(imageData[4 * (j + 1) + 3] % 2)
-    }
-
-    return stringBuilder.toString()
-}
-
-private fun binaryToASCII(string: String): String {
-    val chunks = string.chunked(8) // Splits the string into chunks of 8 characters
-    val asciiChars = chunks.map { chunk -> chunk.toInt(2).toChar() } // Converts each chunk from binary to decimal and then to its corresponding ASCII character
-    return asciiChars.joinToString("") // Joins the ASCII characters into a single string
-}
-
-private fun convertHexToIntegers(hexString: String): List<Int> {
-    val keys = mutableListOf<Int>()
-    var i = 0
-    while (i < hexString.length) {
-        // Convert each pair of hexadecimal characters into an integer
-        val hexPair = hexString.substring(i, i + 2)
-        keys.add(hexPair.toInt(16))
-        i += 2
-    }
-    return keys
-}
-
-private fun encodeIntegersToBase64(keys: List<Int>): String {
-    val keyBytes = keys.toByteArray()
-    return CryptographyUtil.base64Encode(keyBytes, Base64.NO_WRAP) // Encode the bytes to base64
-}
-
-private fun List<Int>.toByteArray(): ByteArray {
-    val result = ByteArray(size)
-    for (i in indices) {
-        result[i] = get(i).toByte()
-    }
-    return result
-}
\ No newline at end of file
diff --git a/feature/mobile/provider/.gitignore b/feature/mobile/plugin/.gitignore
similarity index 100%
rename from feature/mobile/provider/.gitignore
rename to feature/mobile/plugin/.gitignore
diff --git a/feature/mobile/provider/build.gradle.kts b/feature/mobile/plugin/build.gradle.kts
similarity index 80%
rename from feature/mobile/provider/build.gradle.kts
rename to feature/mobile/plugin/build.gradle.kts
index 36f05249..274cd342 100644
--- a/feature/mobile/provider/build.gradle.kts
+++ b/feature/mobile/plugin/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "com.flixclusive.feature.mobile.provider"
+    namespace = "com.flixclusive.feature.mobile.plugin"
 }
 
 dependencies {
@@ -14,9 +14,11 @@ dependencies {
     implementation(projects.core.ui.mobile)
     implementation(projects.data.provider)
 
+    implementation(libs.coil.compose)
     implementation(libs.compose.foundation)
     implementation(libs.compose.material3)
     implementation(libs.compose.runtime)
     implementation(libs.compose.ui)
+    implementation(libs.compose.ui.tooling.preview)
     implementation(libs.lifecycle.runtimeCompose)
 }
\ No newline at end of file
diff --git a/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginScreenViewModel.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginScreenViewModel.kt
new file mode 100644
index 00000000..7db14b00
--- /dev/null
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginScreenViewModel.kt
@@ -0,0 +1,50 @@
+package com.flixclusive.feature.mobile.plugin
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.flixclusive.core.datastore.AppSettingsManager
+import com.flixclusive.data.provider.PluginManager
+import com.flixclusive.provider.base.plugin.Plugin
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class PluginScreenViewModel @Inject constructor(
+    private val pluginManager: PluginManager,
+    appSettingsManager: AppSettingsManager,
+) : ViewModel() {
+    val pluginDataMap = pluginManager.pluginDataMap
+    val plugins: List<Plugin>
+        get() = pluginManager.plugins.values.toList()
+
+    val appSettings = appSettingsManager.appSettings
+        .data
+        .map { it.plugins }
+        .stateIn(
+            scope = viewModelScope,
+            started = SharingStarted.Eagerly,
+            initialValue = appSettingsManager.localAppSettings.plugins
+        )
+
+    fun onMove(fromIndex: Int, toIndex: Int) {
+        viewModelScope.launch {
+            pluginManager.swap(fromIndex, toIndex)
+        }
+    }
+
+    fun togglePlugin(index: Int) {
+        viewModelScope.launch {
+            pluginManager.toggleUsage(index)
+        }
+    }
+
+    fun uninstallPlugin(name: String) {
+        viewModelScope.launch {
+            pluginManager.unloadPlugin(name)
+        }
+    }
+}
diff --git a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreen.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginsScreen.kt
similarity index 72%
rename from feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreen.kt
rename to feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginsScreen.kt
index 00ba4212..b5ca0a3b 100644
--- a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreen.kt
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/PluginsScreen.kt
@@ -1,4 +1,4 @@
-package com.flixclusive.feature.mobile.provider
+package com.flixclusive.feature.mobile.plugin
 
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.core.animateDpAsState
@@ -21,23 +21,26 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.flixclusive.core.ui.common.TopBarWithBackButton
 import com.flixclusive.core.ui.common.navigation.GoBackAction
 import com.flixclusive.core.ui.mobile.util.getFeedbackOnLongPress
 import com.flixclusive.core.ui.mobile.util.isAtTop
 import com.flixclusive.core.ui.mobile.util.isScrollingUp
-import com.flixclusive.feature.mobile.provider.util.DragAndDropUtils.dragGestureHandler
-import com.flixclusive.feature.mobile.provider.util.rememberDragDropListState
+import com.flixclusive.feature.mobile.plugin.component.PluginCard
+import com.flixclusive.feature.mobile.plugin.util.DragAndDropUtils.dragGestureHandler
+import com.flixclusive.feature.mobile.plugin.util.rememberDragDropListState
 import com.ramcosta.composedestinations.annotation.Destination
 import kotlinx.coroutines.Job
 import com.flixclusive.core.util.R as UtilR
 
 @Destination
 @Composable
-fun ProvidersScreen(
+fun PluginsScreen(
     navigator: GoBackAction
 ) {
-    val viewModel = hiltViewModel<ProvidersScreenViewModel>()
+    val viewModel = hiltViewModel<PluginScreenViewModel>()
+    val appSettings by viewModel.appSettings.collectAsStateWithLifecycle()
 
     val coroutineScope = rememberCoroutineScope()
     val overscrollJob = remember { mutableStateOf<Job?>(null) }
@@ -79,17 +82,30 @@ fun ProvidersScreen(
                 ),
             verticalArrangement = Arrangement.spacedBy(8.dp)
         ) {
-            itemsIndexed(viewModel.providers) { index, provider ->
+            itemsIndexed(viewModel.pluginDataMap.values.toList()) { index, pluginData ->
+                val enabled = remember(appSettings) {
+                    !appSettings[index].isDisabled
+                }
+
                 val displacementOffset =
                     if (index == dragDropListState.getCurrentIndexOfDraggedListItem()) {
                         dragDropListState.elementDisplacement.takeIf { it != 0f }
                     } else null
 
-                ProviderCard(
-                    provider = provider,
+                PluginCard(
+                    pluginData = pluginData,
+                    enabled = enabled,
                     displacementOffset = displacementOffset,
+                    openSettings = {
+                        /*
+                        * TODO("Navigate to a plugins settings screen, then
+                        *  pass the SettingsScreen() of the pluginData as a parameter")
+                        * */
+                        /*viewModel.plugins[index].SettingsScreen()*/
+                    },
+                    unloadPlugin = { viewModel.uninstallPlugin(pluginData.name) },
                     onToggleProvider = {
-                        viewModel.toggleProvider(index)
+                        viewModel.togglePlugin(index)
                     }
                 )
             }
diff --git a/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/BottomCardContent.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/BottomCardContent.kt
new file mode 100644
index 00000000..3855ef55
--- /dev/null
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/BottomCardContent.kt
@@ -0,0 +1,115 @@
+package com.flixclusive.feature.mobile.plugin.component
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Switch
+import androidx.compose.material3.SwitchDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.compositeOver
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.flixclusive.core.ui.common.util.onMediumEmphasis
+import com.flixclusive.gradle.entities.PluginData
+import com.flixclusive.gradle.entities.Status
+import com.flixclusive.core.ui.common.R as UiCommonR
+import com.flixclusive.core.util.R as UtilR
+
+@Composable
+internal fun BottomCardContent(
+    pluginData: PluginData,
+    enabled: Boolean,
+    openSettings: () -> Unit,
+    unloadPlugin: () -> Unit,
+    toggleUsage: () -> Unit,
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Text(
+            text = "v${pluginData.versionName}",
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            style = MaterialTheme.typography.titleMedium.copy(
+                fontWeight = FontWeight.Normal,
+                color = LocalContentColor.current.onMediumEmphasis(0.4F),
+                fontSize = 13.sp
+            )
+        )
+
+        Row(
+            horizontalArrangement = Arrangement.spacedBy(5.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            OutlinedButton(
+                onClick = unloadPlugin,
+                modifier = Modifier.size(width = 80.dp, height = 25.dp),
+                contentPadding = PaddingValues(0.dp),
+                colors = ButtonDefaults.outlinedButtonColors(
+                    contentColor = MaterialTheme.colorScheme.onSurface.onMediumEmphasis(0.4F),
+                )
+            ) {
+                Text(
+                    text = stringResource(UtilR.string.uninstall),
+                    style = MaterialTheme.typography.labelMedium
+                )
+            }
+
+            OutlinedButton(
+                onClick = openSettings,
+                modifier = Modifier.size(width = 50.dp, height = 25.dp),
+                contentPadding = PaddingValues(0.dp)
+            ) {
+                Icon(
+                    painter = painterResource(id = UiCommonR.drawable.provider_settings),
+                    contentDescription = stringResource(id = UtilR.string.provider_settings_icon_content_desc),
+                    modifier = Modifier
+                        .scale(0.8F)
+                )
+            }
+
+            Switch(
+                checked = enabled,
+                enabled = pluginData.status != Status.Maintenance && pluginData.status != Status.Down,
+                colors = SwitchDefaults.colors(
+                    disabledCheckedThumbColor = if (pluginData.status == Status.Maintenance)
+                        Color(0xFF331821)
+                    else MaterialTheme.colorScheme.surface
+                        .onMediumEmphasis(1F)
+                        .compositeOver(MaterialTheme.colorScheme.surface),
+                    disabledCheckedTrackColor = if (pluginData.status == Status.Maintenance)
+                        Color(0xFFFC93B7)
+                    else MaterialTheme.colorScheme.onSurface
+                        .onMediumEmphasis(0.12F)
+                        .compositeOver(MaterialTheme.colorScheme.surface),
+                ),
+                onCheckedChange = {
+                    toggleUsage()
+                },
+                modifier = Modifier
+                    .scale(0.7F)
+                    .width(40.dp)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProviderCard.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/PluginCard.kt
similarity index 53%
rename from feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProviderCard.kt
rename to feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/PluginCard.kt
index 05c62ba6..a1838af9 100644
--- a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProviderCard.kt
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/PluginCard.kt
@@ -1,4 +1,4 @@
-package com.flixclusive.feature.mobile.provider
+package com.flixclusive.feature.mobile.plugin.component
 
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Column
@@ -10,9 +10,11 @@ import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.CheckboxDefaults
+import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.contentColorFor
 import androidx.compose.runtime.Composable
@@ -23,23 +25,35 @@ import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.flixclusive.provider.base.ProviderData
+import com.flixclusive.core.theme.FlixclusiveTheme
+import com.flixclusive.feature.mobile.plugin.R
+import com.flixclusive.gradle.entities.Author
+import com.flixclusive.gradle.entities.Language
+import com.flixclusive.gradle.entities.PluginData
+import com.flixclusive.gradle.entities.PluginType
+import com.flixclusive.gradle.entities.Status
 import com.flixclusive.core.util.R as UtilR
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-internal fun ProviderCard(
-    provider: ProviderData,
+internal fun PluginCard(
+    pluginData: PluginData,
+    enabled: Boolean,
     displacementOffset: Float?,
+    openSettings: () -> Unit,
+    unloadPlugin: () -> Unit,
     onToggleProvider: () -> Unit,
 ) {
     val isBeingDragged = remember(displacementOffset) {
         displacementOffset != null
     }
+    
+    val isNotMaintenance = pluginData.status != Status.Maintenance
 
-    val color = if (isBeingDragged && !provider.isMaintenance) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.surfaceVariant
+    val color = if (isBeingDragged && isNotMaintenance) MaterialTheme.colorScheme.tertiary else MaterialTheme.colorScheme.surfaceVariant
 
     Column(
         modifier = Modifier
@@ -48,13 +62,47 @@ internal fun ProviderCard(
             .fillMaxHeight()
     ) {
         Card(
-            enabled = !provider.isMaintenance,
+            enabled = isNotMaintenance,
+            onClick = onToggleProvider,
             shape = MaterialTheme.shapes.medium,
             colors = CardDefaults.cardColors(
                 containerColor = color,
                 contentColor = contentColorFor(backgroundColor = color)
             ),
-            border = if (isBeingDragged && provider.isMaintenance)
+            border = if (isBeingDragged && !isNotMaintenance)
+                BorderStroke(
+                    width = 2.dp,
+                    color = contentColorFor(color)
+                ) else null,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(3.dp)
+        ) {
+            Column(
+                modifier = Modifier
+                    .padding(horizontal = 15.dp)
+            ) {
+                TopCardContent(pluginData = pluginData)
+
+                Divider(thickness = 0.5.dp)
+
+                BottomCardContent(
+                    pluginData = pluginData,
+                    enabled = enabled,
+                    openSettings = openSettings,
+                    unloadPlugin = unloadPlugin,
+                    toggleUsage = onToggleProvider
+                )
+            }
+        }
+        Card(
+            enabled = isNotMaintenance,
+            shape = MaterialTheme.shapes.medium,
+            colors = CardDefaults.cardColors(
+                containerColor = color,
+                contentColor = contentColorFor(backgroundColor = color)
+            ),
+            border = if (isBeingDragged && !isNotMaintenance)
                 BorderStroke(
                     width = 2.dp,
                     color = contentColorFor(color)
@@ -71,8 +119,8 @@ internal fun ProviderCard(
                 verticalAlignment = Alignment.CenterVertically
             ) {
                 Checkbox(
-                    enabled = !provider.isMaintenance,
-                    checked = !provider.isIgnored && !provider.isMaintenance,
+                    enabled = isNotMaintenance,
+                    checked = enabled && isNotMaintenance,
                     onCheckedChange = {
                         onToggleProvider()
                     },
@@ -89,14 +137,14 @@ internal fun ProviderCard(
                         .padding(horizontal = 2.dp, vertical = 8.dp)
                 ) {
                     Text(
-                        text = provider.provider.name,
+                        text = pluginData.name,
                         style = MaterialTheme.typography.bodyLarge.copy(
                             fontSize = 16.sp,
                             fontWeight = FontWeight.Normal
                         ),
                     )
 
-                    if (provider.isMaintenance) {
+                    if (!isNotMaintenance) {
                         Text(
                             text = stringResource(id = UtilR.string.maintenance_all_caps),
                             style = MaterialTheme.typography.bodyLarge.copy(
@@ -119,4 +167,49 @@ internal fun ProviderCard(
             }
         }
     }
+}
+
+@Preview
+@Composable
+private fun ProviderCardPreview() {
+    val pluginData = PluginData(
+        authors = listOf(Author("FLX")),
+        repositoryUrl = null,
+        buildUrl = null,
+        changelog = null,
+        changelogMedia = null,
+        versionName = "1.0.0",
+        versionCode = 10000,
+        description = null,
+        iconUrl = null,
+        language = Language.Multiple,
+        name = "123Movies",
+        pluginType = PluginType.All,
+        status = Status.Working
+    )
+
+    FlixclusiveTheme {
+        Surface {
+            Card(
+                shape = MaterialTheme.shapes.medium
+            ) {
+                Column(
+                    modifier = Modifier
+                        .padding(horizontal = 15.dp)
+                ) {
+                    TopCardContent(pluginData)
+
+                    Divider(thickness = 0.5.dp)
+
+                    BottomCardContent(
+                        pluginData = pluginData,
+                        enabled = true,
+                        openSettings = {},
+                        unloadPlugin = {},
+                        toggleUsage = {}
+                    )
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/TopCardContent.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/TopCardContent.kt
new file mode 100644
index 00000000..4ede4dec
--- /dev/null
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/component/TopCardContent.kt
@@ -0,0 +1,164 @@
+package com.flixclusive.feature.mobile.plugin.component
+
+
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LocalContentColor
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import coil.compose.AsyncImage
+import coil.imageLoader
+import coil.request.ImageRequest
+import com.flixclusive.core.ui.common.util.onMediumEmphasis
+import com.flixclusive.feature.mobile.plugin.R
+import com.flixclusive.gradle.entities.PluginData
+import com.flixclusive.core.ui.common.R as UiCommonR
+import com.flixclusive.core.util.R as UtilR
+
+
+@Composable
+internal fun TopCardContent(
+    pluginData: PluginData
+) {
+    val context = LocalContext.current
+
+    var errorLoadingIcon by remember { mutableStateOf(false) }
+    val iconImage = remember {
+        ImageRequest.Builder(context)
+            .data(pluginData.iconUrl)
+    }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        horizontalArrangement = Arrangement.spacedBy(8.dp),
+        modifier = Modifier
+            .padding(vertical = 10.dp)
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.round_drag_indicator_24),
+            contentDescription = stringResource(
+                id = UtilR.string.drag_icon_content_desc
+            ),
+            modifier = Modifier
+                .size(30.dp)
+        )
+
+        Surface(
+            shape = MaterialTheme.shapes.small,
+            tonalElevation = 80.dp
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(60.dp),
+                contentAlignment = Alignment.Center
+            ) {
+                if (pluginData.iconUrl != null && !errorLoadingIcon) {
+                    AsyncImage(
+                        model = iconImage,
+                        imageLoader = LocalContext.current.imageLoader,
+                        onError = {
+                            errorLoadingIcon = true
+                        },
+                        contentDescription = stringResource(
+                            UtilR.string.plugin_icon_content_desc,
+                        ),
+                        contentScale = ContentScale.Fit
+                    )
+                } else {
+                    Icon(
+                        painter = painterResource(id = UiCommonR.drawable.plugin_logo),
+                        contentDescription = stringResource(id = UtilR.string.plugin_icon_content_desc),
+                        tint = LocalContentColor.current.onMediumEmphasis(),
+                        modifier = Modifier
+                            .size(40.dp)
+                    )
+                }
+            }
+        }
+
+        ProviderDetails(
+            pluginData = pluginData,
+            modifier = Modifier
+                .weight(1F)
+                .padding(start = 5.dp)
+        )
+    }
+}
+
+@Composable
+private fun ProviderDetails(
+    pluginData: PluginData,
+    modifier: Modifier = Modifier,
+) {
+    val context = LocalContext.current
+
+    Column(
+        modifier = modifier
+    ) {
+        Text(
+            text = pluginData.name,
+            style = MaterialTheme.typography.titleMedium.copy(
+                fontWeight = FontWeight.Black,
+                fontSize = 18.sp
+            ),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            modifier = Modifier
+                .padding(bottom = 2.dp)
+        )
+
+        val authors = remember {
+            if (pluginData.authors.size == 1) {
+                context.getString(
+                    UtilR.string.made_by_author_label_format,
+                    pluginData.authors.firstOrNull() ?: "anon"
+                )
+            } else {
+                pluginData.authors.take(3).joinToString(", ")
+            }
+        }
+
+        Text(
+            text = authors,
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            style = MaterialTheme.typography.titleMedium.copy(
+                fontWeight = FontWeight.Light,
+                color = LocalContentColor.current.onMediumEmphasis(),
+                fontSize = 13.sp
+            )
+        )
+
+        Text(
+            text = pluginData.pluginType.toString(),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            style = MaterialTheme.typography.titleMedium.copy(
+                fontWeight = FontWeight.Black,
+                color = LocalContentColor.current.onMediumEmphasis(),
+                fontSize = 13.sp
+            )
+        )
+    }
+}
\ No newline at end of file
diff --git a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/DragAndDropUtils.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/DragAndDropUtils.kt
similarity index 97%
rename from feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/DragAndDropUtils.kt
rename to feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/DragAndDropUtils.kt
index 23d4cac5..84fae362 100644
--- a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/DragAndDropUtils.kt
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/DragAndDropUtils.kt
@@ -1,4 +1,4 @@
-package com.flixclusive.feature.mobile.provider.util
+package com.flixclusive.feature.mobile.plugin.util
 
 import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress
 import androidx.compose.foundation.gestures.scrollBy
diff --git a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/ItemListDragAndDropState.kt b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/ItemListDragAndDropState.kt
similarity index 99%
rename from feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/ItemListDragAndDropState.kt
rename to feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/ItemListDragAndDropState.kt
index cff7d27d..4ed0c7ae 100644
--- a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/util/ItemListDragAndDropState.kt
+++ b/feature/mobile/plugin/src/main/kotlin/com/flixclusive/feature/mobile/plugin/util/ItemListDragAndDropState.kt
@@ -1,4 +1,4 @@
-package com.flixclusive.feature.mobile.provider.util
+package com.flixclusive.feature.mobile.plugin.util
 
 import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.LazyListState
diff --git a/feature/mobile/provider/src/main/res/drawable/round_drag_indicator_24.xml b/feature/mobile/plugin/src/main/res/drawable/round_drag_indicator_24.xml
similarity index 100%
rename from feature/mobile/provider/src/main/res/drawable/round_drag_indicator_24.xml
rename to feature/mobile/plugin/src/main/res/drawable/round_drag_indicator_24.xml
diff --git a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreenViewModel.kt b/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreenViewModel.kt
deleted file mode 100644
index 3e7f3d48..00000000
--- a/feature/mobile/provider/src/main/kotlin/com/flixclusive/feature/mobile/provider/ProvidersScreenViewModel.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.flixclusive.feature.mobile.provider
-
-import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
-import com.flixclusive.core.datastore.AppSettingsManager
-import com.flixclusive.data.provider.ProviderRepository
-import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.SharingStarted
-import kotlinx.coroutines.flow.stateIn
-import kotlinx.coroutines.launch
-import javax.inject.Inject
-
-@HiltViewModel
-class ProvidersScreenViewModel @Inject constructor(
-    private val providersRepository: ProviderRepository,
-    appSettingsManager: AppSettingsManager,
-) : ViewModel() {
-    val providers = providersRepository.providers
-    private val appSettings = appSettingsManager.appSettings
-        .data
-        .stateIn(
-            scope = viewModelScope,
-            started = SharingStarted.Eagerly,
-            initialValue = appSettingsManager.localAppSettings
-        )
-
-    fun onMove(fromIndex: Int, toIndex: Int) {
-        viewModelScope.launch {
-            providersRepository.swap(appSettings.value, fromIndex, toIndex)
-        }
-    }
-
-    fun toggleProvider(index: Int) {
-        viewModelScope.launch {
-            providersRepository.toggleUsage(appSettings.value, index)
-        }
-    }
-}
diff --git a/feature/splash-screen/src/main/kotlin/com/flixclusive/feature/splashScreen/component/Consent.kt b/feature/splash-screen/src/main/kotlin/com/flixclusive/feature/splashScreen/component/Consent.kt
index 708b702b..86f7fbcb 100644
--- a/feature/splash-screen/src/main/kotlin/com/flixclusive/feature/splashScreen/component/Consent.kt
+++ b/feature/splash-screen/src/main/kotlin/com/flixclusive/feature/splashScreen/component/Consent.kt
@@ -25,12 +25,14 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.tv.material3.Border
 import androidx.tv.material3.ClickableSurfaceDefaults
 import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.Surface
+import com.flixclusive.core.theme.FlixclusiveTheme
 import com.flixclusive.core.ui.common.util.onMediumEmphasis
 import com.flixclusive.core.ui.tv.util.focusOnInitialVisibility
 import com.flixclusive.core.util.android.getActivity
@@ -131,6 +133,11 @@ fun Consent(
                     contentColor = Color.White.onMediumEmphasis()
                 ),
                 shape = TvButtonDefaults.shape(MaterialTheme.shapes.medium),
+                border = TvButtonDefaults.border(
+                    focusedBorder = Border(
+                        BorderStroke(3.dp, Color.White)
+                    )
+                ),
                 modifier = Modifier
                     .fillMaxWidth()
                     .heightIn(min = buttonMinHeight)
@@ -139,6 +146,8 @@ fun Consent(
                 Text(
                     text = buttonLabel ?: stringResource(id = UtilR.string.understood),
                     style = MaterialTheme.typography.labelLarge,
+                    modifier = Modifier
+                        .align(Alignment.CenterVertically)
                 )
             }
         } else {
@@ -160,4 +169,22 @@ fun Consent(
             }
         }
     }
+}
+
+@Preview
+@Composable
+private fun ConsentPreview() {
+    FlixclusiveTheme {
+        Column {
+            Text("FLIXCLUSIVE", fontSize = 30.sp)
+
+            Consent(
+                hasOptInFeature = true,
+                header = stringResource(id = UtilR.string.privacy_notice),
+                consentContent = stringResource(id = UtilR.string.privacy_notice_crash_log_sender),
+                optInLabel = stringResource(id = UtilR.string.privacy_notice_opt_in),
+                goNext = {}
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bd6a003f..05feae8e 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -44,6 +44,7 @@ mockk = "1.13.8"
 okhttp = "4.12.0"
 okhttpDnsoverhttps = "4.9.0"
 palette = "1.0.0"
+pluginsEntities = "master-SNAPSHOT"
 retrofit = "2.9.0"
 room = "2.6.1"
 serialization = '1.6.0'
@@ -161,6 +162,9 @@ test-core-ktx = { group = "androidx.test", name = "core-ktx", version.ref = "and
 test-rules = { group = "androidx.test", name = "rules", version.ref = "androidxTestRules" }
 test-runner = { group = "androidx.test", name = "runner", version.ref = "androidxTestRunner" }
 
+# Flixclusive plugins entities
+flixclusive-plugins-entities = { group = "com.github.Flixclusive", name = "plugins-entities", version.ref = "pluginsEntities" }
+
 # Dependencies for build-logic
 android-gradlePlugin = { group = "com.android.tools.build", name = "gradle", version.ref = "androidGradlePlugin" }
 androidx-test-ext-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-ext-junit" }
diff --git a/model/datastore/build.gradle.kts b/model/datastore/build.gradle.kts
index ad6d6564..4c9ad882 100644
--- a/model/datastore/build.gradle.kts
+++ b/model/datastore/build.gradle.kts
@@ -9,4 +9,5 @@ android {
 
 dependencies {
     api(libs.gson)
+    api(projects.provider.base)
 }
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt
index 2f936814..ecb37c8b 100644
--- a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/AppSettings.kt
@@ -38,7 +38,7 @@ data class AppSettings(
 
     // == internet/others
     val dns: DoHPreference = DoHPreference.None,
-    val providers: List<ProviderPreference> = emptyList(),
+    val plugins: List<PluginPreference> = emptyList(),
     // ==
 
     // == player
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/PluginPreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/PluginPreference.kt
new file mode 100644
index 00000000..a814fa35
--- /dev/null
+++ b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/PluginPreference.kt
@@ -0,0 +1,15 @@
+package com.flixclusive.model.datastore
+
+import kotlinx.serialization.Serializable
+
+/**
+ *
+ * Data model to use for saving
+ * plugin list order and plugin usability
+ * */
+@Serializable
+data class PluginPreference(
+    val name: String,
+    val filePath: String,
+    val isDisabled: Boolean = false,
+)
\ No newline at end of file
diff --git a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt b/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt
deleted file mode 100644
index 2d417260..00000000
--- a/model/datastore/src/main/kotlin/com/flixclusive/model/datastore/ProviderPreference.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.flixclusive.model.datastore
-
-import kotlinx.serialization.Serializable
-
-/**
- *
- * Data model to use for saving provider list order
- * */
-@Serializable
-data class ProviderPreference(
-    val name: String,
-    val isIgnored: Boolean = false,
-)
\ No newline at end of file
diff --git a/provider/base/build.gradle.kts b/provider/base/build.gradle.kts
index 65e82365..072ebc0c 100644
--- a/provider/base/build.gradle.kts
+++ b/provider/base/build.gradle.kts
@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.flixclusive.library)
+    alias(libs.plugins.flixclusive.hilt)
     alias(libs.plugins.flixclusive.testing)
 }
 
@@ -11,6 +12,7 @@ dependencies {
     api(libs.gson)
     api(libs.jsoup)
     api(libs.okhttp)
+    api("com.github.Flixclusive:plugins-gradle:main-SNAPSHOT")
     api(projects.core.util)
     api(projects.model.provider)
 
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/ProviderData.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/ProviderData.kt
deleted file mode 100644
index 53e2c7cf..00000000
--- a/provider/base/src/main/kotlin/com/flixclusive/provider/base/ProviderData.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.flixclusive.provider.base
-
-
-/**
- *
- * Wrapper class to be used for preferences.
- *
- * This is a useless model and will be removed soon
- * as soon as I implemented the plugins system of this app.
- *
- * */
-data class ProviderData(
-    val provider: Provider,
-    val isMaintenance: Boolean = false,
-    val isIgnored: Boolean = false,
-)
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/Plugin.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/Plugin.kt
index ab694ebf..e9e5b8ef 100644
--- a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/Plugin.kt
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/Plugin.kt
@@ -3,17 +3,25 @@ package com.flixclusive.provider.base.plugin
 import android.content.Context
 import android.content.res.Resources
 import androidx.compose.runtime.Composable
+import com.flixclusive.gradle.entities.PluginManifest
+import com.flixclusive.provider.base.plugin.settings.PluginSettingsManager
 import okhttp3.OkHttpClient
 
 
 /**
  * Represents a plugin for a provider.
  *
- * @property manifest The manifest information of the plugin.
- * @property SettingsScreen A composable function for opening custom settings, if provided.
  */
 @Suppress("PropertyName")
-abstract class Plugin(var manifest: PluginManifest? = null) {
+abstract class Plugin() {
+    lateinit var settings: PluginSettingsManager
+    private var manifest: PluginManifest? = null
+
+    constructor(manifest: PluginManifest) : this() {
+        this.manifest = manifest
+        settings = PluginSettingsManager(manifest.name)
+    }
+
     /**
      * Resources associated with the plugin, if specified.
      * */
@@ -38,11 +46,11 @@ abstract class Plugin(var manifest: PluginManifest? = null) {
 
 
     /**
-     * Called when your Plugin is unloaded
+     * Called before your Plugin is unloaded
      * @param context Context
      */
     @Throws(Throwable::class)
-    open fun unload(context: Context?) {
+    open fun onUnload(context: Context?) {
         // TODO(Add default value)
     }
 
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/PluginManifest.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/PluginManifest.kt
deleted file mode 100644
index a33ed947..00000000
--- a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/PluginManifest.kt
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.flixclusive.provider.base.plugin
-
-/*
-* Copied from `Flixclusive/plugins-gradle`
-*
-* */
-
-
-/**
- * Represents an author entity with associated information such as name, user link, and Discord ID.
- *
- * @property name The name of the author.
- * @property userLink The optional link associated with the author's profile.
- * @property discordId The optional Discord ID of the author.
- */
-data class Author(
-    val name: String,
-    val userLink: String? = null,
-    val discordId: Long? = null,
-) {
-    override fun toString(): String {
-        return name
-    }
-}
-
-/**
- * Represents the manifest information of a plugin.
- *
- * @property pluginClassName The fully qualified class name of the plugin.
- * @property name The name of the plugin.
- * @property version The version of the plugin.
- * @property requiresResources Indicates whether the plugin requires resources from the main application/apk.
- */
-data class PluginManifest(
-    val pluginClassName: String,
-    val name: String,
-    val version: String,
-    val requiresResources: Boolean,
-    val updateUrl: String?,
-)
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettings.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettings.kt
new file mode 100644
index 00000000..fc096e96
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettings.kt
@@ -0,0 +1,234 @@
+package com.flixclusive.provider.base.plugin.settings
+
+import com.flixclusive.core.util.log.errorLog
+import com.google.gson.Gson
+import org.json.JSONArray
+import org.json.JSONObject
+import java.io.File
+import java.lang.reflect.Type
+import java.math.BigDecimal
+
+/**
+ *
+ * Utility class to store and retrieve preferences
+ *
+ * @see [Aliucord](https://github.com/Aliucord/Aliucord/blob/main/Aliucord/src/main/java/com/aliucord/SettingsUtilsJSON.kt)
+ *
+ * */
+@Suppress("unused")
+class PluginSettings(plugin: String) {
+    private val settingsPath = "/settings/"
+    private val settingsFile = "$settingsPath$plugin.json"
+    private val cache: MutableMap<String, Any> = HashMap()
+    private val gson = Gson()
+    private val settings: JSONObject by lazy {
+        val file = File(settingsFile)
+        if (file.exists()) {
+            val read = file.readText()
+            if (read != "") return@lazy JSONObject(read)
+        }
+        JSONObject()
+    }
+
+    init {
+        val dir = File(settingsPath)
+        if (!dir.exists() && !dir.mkdir()) throw RuntimeException("Failed to create settings dir")
+    }
+
+    private fun writeData() {
+        if (settings.length() > 0) {
+            val file = File(settingsFile)
+            try {
+                file.writeText(settings.toString(4))
+            } catch (e: Throwable) {
+                errorLog("Failed to save settings: ${e.localizedMessage}")
+            }
+        }
+    }
+
+    /**
+     * Resets All Settings
+     * @return true if successful, else false
+     */
+    fun resetFile() = File(settingsFile).delete()
+
+    /**
+     * Toggles Boolean and returns it
+     * @param key Key of the value
+     * @param defVal Default Value if setting doesn't exist
+     * @return Toggled boolean
+     */
+    fun toggleBool(key: String, defVal: Boolean): Boolean {
+        getBool(key, !defVal).also {
+            setBool(key, !it)
+            return !it
+        }
+    }
+
+    /**
+     * Removes Item from settings
+     * @param key Key of the value
+     * @return True if removed, else false
+     */
+    @Synchronized
+    fun remove(key: String): Boolean {
+        val bool = settings.remove(key) != null
+        writeData()
+        return bool
+    }
+
+    /**
+     * Gets All Keys from settings
+     * @return List of all keys
+     */
+    fun getAllKeys(): List<String> {
+        val iterator: Iterator<String> = settings.keys()
+        val copy: MutableList<String> = ArrayList()
+        while (iterator.hasNext()) copy.add(iterator.next())
+        return copy
+    }
+
+    /**
+     * Check if Key exists in settings
+     * @param key Key of the value
+     * @return True if found, else false
+     */
+    fun exists(key: String): Boolean = settings.has(key)
+
+    /**
+     * Get a boolean from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getBool(key: String, defValue: Boolean) = if (settings.has(key)) settings.getBoolean(key) else defValue
+
+    /**
+     * Set a boolean item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setBool(key: String, value: Boolean) = putObject(key, value)
+
+    /**
+     * Get an int from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getInt(key: String, defValue: Int) =
+        if (settings.has(key)) settings.getInt(key) else defValue
+
+    @Synchronized
+    private fun putObject(key: String, value: Any?) {
+        settings.put(key, value)
+        writeData()
+    }
+
+    /**
+     * Set an int item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setInt(key: String, value: Int) = putObject(key, value)
+
+    /**
+     * Get a float from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getFloat(key: String, defValue: Float) =
+        if (settings.has(key)) BigDecimal.valueOf(settings.getDouble(key)).toFloat() else defValue
+
+    /**
+     * Set a float item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setFloat(key: String, value: Float) = putObject(key, value)
+
+    /**
+     * Get a long from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getLong(key: String, defValue: Long) = if (settings.has(key)) settings.getLong(key) else defValue
+
+    /**
+     * Set a long item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setLong(key: String, value: Long) = putObject(key, value)
+
+    /**
+     * Get a [String] from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getString(key: String, defValue: String?) =
+        if (settings.has(key)) settings.getString(key) else defValue
+
+    /**
+     * Set a [String] item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setString(key: String, value: String?) = putObject(key, value)
+
+    /**
+     * Get a [JSONObject] item
+     * @param key Key of the item
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun getJSONObject(key: String, defValue: JSONObject?) =
+        if (settings.has(key)) settings.getJSONObject(key) else defValue
+
+    /**
+     * Set a [JSONObject] item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setJSONObject(key: String, value: JSONObject) = putObject(key, value)
+
+    /**
+     * Get an [Object] from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @return Value if found, else the defValue
+     */
+    fun <T> getObject(key: String, defValue: T): T = getObject(key, defValue, defValue!!::class.java)
+
+    /**
+     * Get an [Object] from the preferences
+     * @param key Key of the value
+     * @param defValue Default value
+     * @param type Type of the object
+     * @return Value if found, else the defValue
+     */
+    @Suppress("UNCHECKED_CAST")
+    fun <T> getObject(key: String, defValue: T, type: Type?): T {
+        val cached = cache[key]
+        if (cached != null) try {
+            return cached as T
+        } catch (ignored: Throwable) {
+        }
+        val t: T? = if (settings.has(key)) gson.fromJson(settings.getString(key), type) else null
+        return t ?: defValue
+    }
+
+    /**
+     * Set an [Object] item
+     * @param key Key of the item
+     * @param value Value
+     */
+    fun setObject(key: String, value: Any) {
+        cache[key] = value
+        val stringJson = gson.toJson(value)
+        putObject(key, if (stringJson.startsWith("{")) JSONObject(stringJson) else JSONArray(stringJson))
+    }
+}
\ No newline at end of file
diff --git a/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettingsManager.kt b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettingsManager.kt
new file mode 100644
index 00000000..e9ed2ee1
--- /dev/null
+++ b/provider/base/src/main/kotlin/com/flixclusive/provider/base/plugin/settings/PluginSettingsManager.kt
@@ -0,0 +1,227 @@
+package com.flixclusive.provider.base.plugin.settings
+
+import java.lang.reflect.Type
+
+/**
+ *
+ * Settings manager for [Plugin]
+ *
+ * @see [Aliucord](https://github.com/Aliucord/Aliucord/blob/main/Aliucord/src/main/java/com/aliucord/api/SettingsAPI.java)
+ * */
+@Suppress("unused")
+class PluginSettingsManager(plugin: String) {
+    private var settings: PluginSettings
+    private val pluginName: String
+
+    /**
+     * Creates a SettingsAPI for the specified plugin
+     */
+    init {
+        settings = PluginSettings(plugin)
+        pluginName = plugin
+    }
+
+    /**
+     * Resets All Settings
+     *
+     * @return true if successful, else false
+     */
+    fun resetSettings(): Boolean {
+        val isSuccessful = settings.resetFile()
+        settings = PluginSettings(pluginName)
+        return isSuccessful
+    }
+
+    /**
+     * Removes Item from settings
+     *
+     * @param key Key of the value
+     * @return True if removed, else false
+     */
+    fun remove(key: String): Boolean {
+        return settings.remove(key)
+    }
+
+    val allKeys: List<String>
+        /**
+         * Gets All Keys from settings
+         * @return List of all keys
+         */
+        get() = settings.getAllKeys()
+
+    /**
+     * Toggles Boolean and returns it
+     *
+     * @param key Key of the value
+     * @param defValue Default Value if setting doesn't exist
+     * @return Toggled boolean
+     */
+    fun toggleBool(key: String, defValue: Boolean): Boolean {
+        return settings.toggleBool(key, defValue)
+    }
+
+    /**
+     * Check if Key exists in settings
+     *
+     * @param key Key of the value
+     * @return True if found, else false
+     */
+    fun exists(key: String): Boolean {
+        return settings.exists(key)
+    }
+
+    /**
+     * Reads a [boolean] from the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun getBool(key: String, defValue: Boolean): Boolean {
+        return settings.getBool(key, defValue)
+    }
+
+    /**
+     * Writes a [boolean] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setBool(key: String, `val`: Boolean) {
+        settings.setBool(key, `val`)
+    }
+
+    /**
+     * Gets an [int] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun getInt(key: String, defValue: Int): Int {
+        return settings.getInt(key, defValue)
+    }
+
+    /**
+     * Writes an [int] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setInt(key: String, `val`: Int) {
+        settings.setInt(key, `val`)
+    }
+
+    /**
+     * Gets a [float] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun getFloat(key: String, defValue: Float): Float {
+        return settings.getFloat(key, defValue)
+    }
+
+    /**
+     * Writes a [float] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setFloat(key: String, `val`: Float) {
+        settings.setFloat(key, `val`)
+    }
+
+    /**
+     * Gets a [long] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun getLong(key: String, defValue: Long): Long {
+        return settings.getLong(key, defValue)
+    }
+
+    /**
+     * Writes a [long] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setLong(key: String, `val`: Long) {
+        settings.setLong(key, `val`)
+    }
+
+    /**
+     * Gets a [String] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun getString(key: String, defValue: String?): String? {
+        return settings.getString(key, defValue)
+    }
+
+    /**
+     * Writes a [String] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setString(key: String, `val`: String?) {
+        settings.setString(key, `val`)
+    }
+
+    /**
+     * Gets an [Object] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun <T> getObject(key: String, defValue: T): T {
+        return settings.getObject(key, defValue)
+    }
+
+    /**
+     * Gets an [Object] stored in the settings.
+     * @param key Key of the setting.
+     * @param defValue Default value of the setting.
+     * @param type [Object] representing the data type.
+     * @return Stored value, or default value if it doesn't exist.
+     */
+    fun <T> getObject(key: String, defValue: T, type: Type?): T {
+        return settings.getObject(key, defValue, type)
+    }
+
+    /**
+     * Writes an [Object] to the settings.
+     * @param key Key of the setting.
+     * @param val Value of the setting.
+     */
+    fun setObject(key: String, `val`: Any) {
+        settings.setObject(key, `val`)
+    }
+
+    /**
+     * Get a value of an unknown type
+     * @param key Key of the item
+     */
+    fun getUnknown(key: String, defValue: Any): Any? {
+        return when (defValue) {
+            is String -> getString(key, defValue)
+            is Boolean -> getBool(key, defValue)
+            is Long -> getLong(key, defValue)
+            is Float -> getFloat(key, defValue)
+            else -> if (defValue is Int) getInt(key, defValue) else getObject(key, defValue)
+        }
+    }
+
+    /**
+     * Set a value of an unknown type
+     * @param key Key of the item
+     * @param value Value of the item
+     */
+    fun setUnknown(key: String, value: Any) {
+        when (value) {
+            is String -> setString(key, value)
+            is Boolean -> setBool(key, value)
+            is Long -> setLong(key, value)
+            is Float -> setFloat(key, value)
+            is Int -> setInt(key, value)
+            else -> setObject(key, value)
+        }
+    }
+}
\ No newline at end of file
diff --git a/provider/ghostx/.gitignore b/provider/ghostx/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/provider/ghostx/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/provider/ghostx/build.gradle.kts b/provider/ghostx/build.gradle.kts
new file mode 100644
index 00000000..80a03023
--- /dev/null
+++ b/provider/ghostx/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    alias(libs.plugins.flixclusive.provider)
+}
+
+android {
+    namespace = "com.flixclusive.provider.ghostx"
+}
+
+dependencies {
+    implementation(projects.extractor.upcloud)
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index be7208c3..98eb09c7 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -38,7 +38,7 @@ include(":feature:mobile:genre")
 include(":feature:mobile:home")
 include(":feature:mobile:player")
 include(":feature:mobile:preferences")
-include(":feature:mobile:provider")
+include(":feature:mobile:plugin")
 include(":feature:mobile:recently-watched")
 include(":feature:mobile:search")
 include(":feature:mobile:search-expanded")