Merge branch 'develop' into remove-updater

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>

86 files changed, 3596 insertions, 2093 deletions

diff --git a/launcher/ui/GuiUtil.cpp b/launcher/ui/GuiUtil.cpp
index b1ea5ee9..930e088a 100644
--- a/launcher/ui/GuiUtil.cpp
+++ b/launcher/ui/GuiUtil.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Lenny McLennington <lenny@sneed.church>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -50,11 +51,34 @@
 #include <DesktopServices.h>
 #include <BuildConfig.h>
 
-QString GuiUtil::uploadPaste(const QString &text, QWidget *parentWidget)
+std::optional<QString> GuiUtil::uploadPaste(const QString &name, const QString &text, QWidget *parentWidget)
 {
     ProgressDialog dialog(parentWidget);
     auto pasteTypeSetting = static_cast<PasteUpload::PasteType>(APPLICATION->settings()->get("PastebinType").toInt());
     auto pasteCustomAPIBaseSetting = APPLICATION->settings()->get("PastebinCustomAPIBase").toString();
+
+    {
+        QUrl baseUrl;
+        if (pasteCustomAPIBaseSetting.isEmpty())
+            baseUrl = PasteUpload::PasteTypes[pasteTypeSetting].defaultBase;
+        else
+            baseUrl = pasteCustomAPIBaseSetting;
+
+        if (baseUrl.isValid())
+        {
+            auto response = CustomMessageBox::selectable(parentWidget, QObject::tr("Confirm Upload"),
+                                                         QObject::tr("You are about to upload \"%1\" to %2.\n"
+                                                                     "You should double-check for personal information.\n\n"
+                                                                     "Are you sure?")
+                                                             .arg(name, baseUrl.host()),
+                                                         QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                                ->exec();
+
+            if (response != QMessageBox::Yes)
+                return {};
+        }
+    }
+
     std::unique_ptr<PasteUpload> paste(new PasteUpload(parentWidget, text, pasteCustomAPIBaseSetting, pasteTypeSetting));
 
     dialog.execWithTask(paste.get());
diff --git a/launcher/ui/GuiUtil.h b/launcher/ui/GuiUtil.h
index 5e109383..96ebd9a2 100644
--- a/launcher/ui/GuiUtil.h
+++ b/launcher/ui/GuiUtil.h
@@ -1,10 +1,11 @@
 #pragma once
 
 #include <QWidget>
+#include <optional>
 
 namespace GuiUtil
 {
-QString uploadPaste(const QString &text, QWidget *parentWidget);
+std::optional<QString> uploadPaste(const QString &name, const QString &text, QWidget *parentWidget);
 void setClipboardText(const QString &text);
 QStringList BrowseForFiles(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget);
 QString BrowseForFile(QString context, QString caption, QString filter, QString defaultPath, QWidget *parentWidget);
diff --git a/launcher/ui/MainWindow.cpp b/launcher/ui/MainWindow.cpp
index 6eaaac97..84bb1da4 100644
--- a/launcher/ui/MainWindow.cpp
+++ b/launcher/ui/MainWindow.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -105,13 +106,13 @@
 #include "ui/dialogs/CopyInstanceDialog.h"
 #include "ui/dialogs/EditAccountDialog.h"
 #include "ui/dialogs/ExportInstanceDialog.h"
-#include "ui/dialogs/ImportResourcePackDialog.h"
+#include "ui/dialogs/ImportResourceDialog.h"
 #include "ui/themes/ITheme.h"
+#include "ui/themes/ThemeManager.h"
 
-#include <minecraft/mod/ResourcePackFolderModel.h>
-#include <minecraft/mod/tasks/LocalResourcePackParseTask.h>
-#include <minecraft/mod/TexturePackFolderModel.h>
-#include <minecraft/mod/tasks/LocalTexturePackParseTask.h>
+#include "minecraft/mod/tasks/LocalResourceParse.h"
+#include "minecraft/mod/ModFolderModel.h"
+#include "minecraft/WorldList.h"
 
 #include "KonamiCode.h"
 
@@ -486,7 +487,7 @@ public:
         if (!BuildConfig.BUG_TRACKER_URL.isEmpty()) {
             helpMenu->addAction(actionReportBug);
         }
-        
+
         if(!BuildConfig.MATRIX_URL.isEmpty()) {
             helpMenu->addAction(actionMATRIX);
         }
@@ -949,7 +950,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
         view->installEventFilter(this);
         view->setContextMenuPolicy(Qt::CustomContextMenu);
         connect(view, &QWidget::customContextMenuRequested, this, &MainWindow::showInstanceContextMenu);
-        connect(view, &InstanceView::droppedURLs, this, &MainWindow::droppedURLs, Qt::QueuedConnection);
+        connect(view, &InstanceView::droppedURLs, this, &MainWindow::processURLs, Qt::QueuedConnection);
 
         proxymodel = new InstanceProxyModel(this);
         proxymodel->setSourceModel(APPLICATION->instances().get());
@@ -969,6 +970,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new MainWindow
         ui->actionCAT->setChecked(cat_enable);
         // NOTE: calling the operator like that is an ugly hack to appease ancient gcc...
         connect(ui->actionCAT.operator->(), SIGNAL(toggled(bool)), SLOT(onCatToggled(bool)));
+        connect(APPLICATION, &Application::currentCatChanged, this, &MainWindow::onCatChanged);
         setCatBackground(cat_enable);
     }
 
@@ -1328,7 +1330,7 @@ void MainWindow::updateThemeMenu()
         themeAction->setActionGroup(themesGroup);
 
         connect(themeAction, &QAction::triggered, [theme]() {
-            APPLICATION->setApplicationTheme(theme->id(),false);
+            APPLICATION->setApplicationTheme(theme->id());
             APPLICATION->settings()->set("ApplicationTheme", theme->id());
         });
     }
@@ -1574,32 +1576,9 @@ void MainWindow::onCatToggled(bool state)
     APPLICATION->settings()->set("TheCat", state);
 }
 
-namespace {
-template <typename T>
-T non_stupid_abs(T in)
-{
-    if (in < 0)
-        return -in;
-    return in;
-}
-}
-
 void MainWindow::setCatBackground(bool enabled)
 {
-    if (enabled)
-    {
-        QDateTime now = QDateTime::currentDateTime();
-        QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
-        QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
-        QDateTime halloween(QDate(now.date().year(), 10, 31), QTime(0, 0));
-        QString cat = APPLICATION->settings()->get("BackgroundCat").toString();
-        if (non_stupid_abs(now.daysTo(xmas)) <= 4) {
-            cat += "-xmas";
-        } else if (non_stupid_abs(now.daysTo(halloween)) <= 4) {
-            cat += "-spooky";
-        } else if (non_stupid_abs(now.daysTo(birthday)) <= 12) {
-            cat += "-bday";
-        }
+    if (enabled) {
         view->setStyleSheet(QString(R"(
 InstanceView
 {
@@ -1610,10 +1589,8 @@ InstanceView
     background-repeat: none;
     background-color:palette(base);
 })")
-                                .arg(cat));
-    }
-    else
-    {
+                                .arg(ThemeManager::getCatImage()));
+    } else {
         view->setStyleSheet(QString());
     }
 }
@@ -1735,10 +1712,12 @@ void MainWindow::on_actionAddInstance_triggered()
     addInstance();
 }
 
-void MainWindow::droppedURLs(QList<QUrl> urls)
+void MainWindow::processURLs(QList<QUrl> urls)
 {
     // NOTE: This loop only processes one dropped file!
     for (auto& url : urls) {
+        qDebug() << "Processing" << url;
+
         // The isLocalFile() check below doesn't work as intended without an explicit scheme.
         if (url.scheme().isEmpty())
             url.setScheme("file");
@@ -1748,31 +1727,50 @@ void MainWindow::droppedURLs(QList<QUrl> urls)
             break;
         }
 
-        auto localFileName = url.toLocalFile();
+        auto localFileName = QDir::toNativeSeparators(url.toLocalFile()) ;
         QFileInfo localFileInfo(localFileName);
 
-        bool isResourcePack = ResourcePackUtils::validate(localFileInfo);
-        bool isTexturePack = TexturePackUtils::validate(localFileInfo);
+        auto type = ResourceUtils::identify(localFileInfo);
 
-        if (!isResourcePack && !isTexturePack) {  // probably instance/modpack
+        if (ResourceUtils::ValidResourceTypes.count(type) == 0) {  // probably instance/modpack
             addInstance(localFileName);
-            break;
+            continue;
         }
 
-        ImportResourcePackDialog dlg(this);
+        ImportResourceDialog dlg(localFileName, type, this);
 
         if (dlg.exec() != QDialog::Accepted)
-            break;
+            continue;
 
-        qDebug() << "Adding resource/texture pack" << localFileName << "to" << dlg.selectedInstanceKey;
+        qDebug() << "Adding resource" << localFileName << "to" << dlg.selectedInstanceKey;
 
         auto inst = APPLICATION->instances()->getInstanceById(dlg.selectedInstanceKey);
         auto minecraftInst = std::dynamic_pointer_cast<MinecraftInstance>(inst);
-        if (isResourcePack)
-            minecraftInst->resourcePackList()->installResource(localFileName);
-        else if (isTexturePack)
-            minecraftInst->texturePackList()->installResource(localFileName);
-        break;
+
+        switch (type) {
+            case PackedResourceType::ResourcePack:
+                minecraftInst->resourcePackList()->installResource(localFileName);
+                break;
+            case PackedResourceType::TexturePack:
+                minecraftInst->texturePackList()->installResource(localFileName);
+                break;
+            case PackedResourceType::DataPack:
+                qWarning() << "Importing of Data Packs not supported at this time. Ignoring" << localFileName;
+                break;
+            case PackedResourceType::Mod:
+                minecraftInst->loaderModList()->installMod(localFileName);
+                break;
+            case PackedResourceType::ShaderPack:
+                minecraftInst->shaderPackList()->installResource(localFileName);
+                break;
+            case PackedResourceType::WorldSave:
+                minecraftInst->worldList()->installWorld(localFileInfo);
+                break;
+            case PackedResourceType::UNKNOWN:
+            default:
+                qDebug() << "Can't Identify" << localFileName << "Ignoring it.";
+                break;
+        }
     }
 }
 
@@ -2001,6 +1999,10 @@ void MainWindow::newsButtonClicked()
     news_dialog.exec();
 }
 
+void MainWindow::onCatChanged(int) {
+    setCatBackground(APPLICATION->settings()->get("TheCat").toBool());
+}
+
 void MainWindow::on_actionAbout_triggered()
 {
     AboutDialog dialog(this);
@@ -2015,21 +2017,23 @@ void MainWindow::on_actionDeleteInstance_triggered()
 
     auto id = m_selectedInstance->id();
 
-    auto response =
-        CustomMessageBox::selectable(this, tr("CAREFUL!"),
-                                     tr("About to delete: %1\nThis may be permanent and will completely delete the instance.\n\nAre you sure?")
-                                         .arg(m_selectedInstance->name()),
-                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
-            ->exec();
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
+                                                 tr("You are about to delete \"%1\".\n"
+                                                    "This may be permanent and will completely delete the instance.\n\n"
+                                                    "Are you sure?")
+                                                     .arg(m_selectedInstance->name()),
+                                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                        ->exec();
 
-    if (response == QMessageBox::Yes) {
-        if (APPLICATION->instances()->trashInstance(id)) {
-            ui->actionUndoTrashInstance->setEnabled(APPLICATION->instances()->trashedSomething());
-            return;
-        }
+    if (response != QMessageBox::Yes)
+        return;
 
-        APPLICATION->instances()->deleteInstance(id);
+    if (APPLICATION->instances()->trashInstance(id)) {
+        ui->actionUndoTrashInstance->setEnabled(APPLICATION->instances()->trashedSomething());
+        return;
     }
+
+    APPLICATION->instances()->deleteInstance(id);
 }
 
 void MainWindow::on_actionExportInstance_triggered()
diff --git a/launcher/ui/MainWindow.h b/launcher/ui/MainWindow.h
index babc5e03..a36257a7 100644
--- a/launcher/ui/MainWindow.h
+++ b/launcher/ui/MainWindow.h
@@ -79,7 +79,7 @@ public:
 
     void updatesAllowedChanged(bool allowed);
 
-    void droppedURLs(QList<QUrl> urls);
+    void processURLs(QList<QUrl> urls);
 signals:
     void isClosing();
 
@@ -89,6 +89,8 @@ protected:
 private slots:
     void onCatToggled(bool);
 
+    void onCatChanged(int);
+
     void on_actionAbout_triggered();
 
     void on_actionAddInstance_triggered();
diff --git a/launcher/ui/WinDarkmode.cpp b/launcher/ui/WinDarkmode.cpp
deleted file mode 100644
index eac68e4f..00000000
--- a/launcher/ui/WinDarkmode.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <QWidget>
-
-#include "WinDarkmode.h"
-
-namespace WinDarkmode {
-
-/* See https://github.com/statiolake/neovim-qt/commit/da8eaba7f0e38b6b51f3bacd02a8cc2d1f7a34d8 */
-void setDarkWinTitlebar(WId winid, bool darkmode)
-{
-    HWND hwnd = reinterpret_cast<HWND>(winid);
-    BOOL dark = (BOOL) darkmode;
-
-    HMODULE hUxtheme = LoadLibraryExW(L"uxtheme.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
-    HMODULE hUser32 = GetModuleHandleW(L"user32.dll");
-    fnAllowDarkModeForWindow AllowDarkModeForWindow
-        = reinterpret_cast<fnAllowDarkModeForWindow>(GetProcAddress(hUxtheme, MAKEINTRESOURCEA(133)));
-    fnSetPreferredAppMode SetPreferredAppMode
-        = reinterpret_cast<fnSetPreferredAppMode>(GetProcAddress(hUxtheme, MAKEINTRESOURCEA(135)));
-    fnSetWindowCompositionAttribute SetWindowCompositionAttribute
-        = reinterpret_cast<fnSetWindowCompositionAttribute>(GetProcAddress(hUser32, "SetWindowCompositionAttribute"));
-
-    SetPreferredAppMode(AllowDark);
-    AllowDarkModeForWindow(hwnd, dark);
-    WINDOWCOMPOSITIONATTRIBDATA data = {
-        WCA_USEDARKMODECOLORS,
-        &dark,
-        sizeof(dark)
-    };
-    SetWindowCompositionAttribute(hwnd, &data);
-}
-
-}
diff --git a/launcher/ui/WinDarkmode.h b/launcher/ui/WinDarkmode.h
deleted file mode 100644
index 5b567c6b..00000000
--- a/launcher/ui/WinDarkmode.h
+++ /dev/null
@@ -1,60 +0,0 @@
-#pragma once
-
-#include <windows.h>
-#include <dwmapi.h>
-
-
-namespace WinDarkmode {
-
-void setDarkWinTitlebar(WId winid, bool darkmode);
-
-enum PreferredAppMode {
-    Default,
-    AllowDark,
-    ForceDark,
-    ForceLight,
-    Max
-};
-
-enum WINDOWCOMPOSITIONATTRIB {
-    WCA_UNDEFINED = 0,
-    WCA_NCRENDERING_ENABLED = 1,
-    WCA_NCRENDERING_POLICY = 2,
-    WCA_TRANSITIONS_FORCEDISABLED = 3,
-    WCA_ALLOW_NCPAINT = 4,
-    WCA_CAPTION_BUTTON_BOUNDS = 5,
-    WCA_NONCLIENT_RTL_LAYOUT = 6,
-    WCA_FORCE_ICONIC_REPRESENTATION = 7,
-    WCA_EXTENDED_FRAME_BOUNDS = 8,
-    WCA_HAS_ICONIC_BITMAP = 9,
-    WCA_THEME_ATTRIBUTES = 10,
-    WCA_NCRENDERING_EXILED = 11,
-    WCA_NCADORNMENTINFO = 12,
-    WCA_EXCLUDED_FROM_LIVEPREVIEW = 13,
-    WCA_VIDEO_OVERLAY_ACTIVE = 14,
-    WCA_FORCE_ACTIVEWINDOW_APPEARANCE = 15,
-    WCA_DISALLOW_PEEK = 16,
-    WCA_CLOAK = 17,
-    WCA_CLOAKED = 18,
-    WCA_ACCENT_POLICY = 19,
-    WCA_FREEZE_REPRESENTATION = 20,
-    WCA_EVER_UNCLOAKED = 21,
-    WCA_VISUAL_OWNER = 22,
-    WCA_HOLOGRAPHIC = 23,
-    WCA_EXCLUDED_FROM_DDA = 24,
-    WCA_PASSIVEUPDATEMODE = 25,
-    WCA_USEDARKMODECOLORS = 26,
-    WCA_LAST = 27
-};
-
-struct WINDOWCOMPOSITIONATTRIBDATA {
-    WINDOWCOMPOSITIONATTRIB Attrib;
-    PVOID pvData;
-    SIZE_T cbData;
-};
-
-using fnAllowDarkModeForWindow =  BOOL (WINAPI *)(HWND hWnd, BOOL allow);
-using fnSetPreferredAppMode = PreferredAppMode (WINAPI *)(PreferredAppMode appMode);
-using fnSetWindowCompositionAttribute =  BOOL (WINAPI *)(HWND hwnd, WINDOWCOMPOSITIONATTRIBDATA *);
-
-}
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp
index a36e4a3d..76e3d8ed 100644
--- a/launcher/ui/dialogs/AboutDialog.cpp
+++ b/launcher/ui/dialogs/AboutDialog.cpp
@@ -39,12 +39,11 @@
 #include <QIcon>
 #include "Application.h"
 #include "BuildConfig.h"
+#include "Markdown.h"
 
 #include <net/NetJob.h>
 #include <qobject.h>
 
-#include "HoeDown.h"
-
 namespace {
 QString getLink(QString link, QString name) {
     return QString("&lt;<a href='%1'>%2</a>&gt;").arg(link).arg(name);
@@ -114,10 +113,9 @@ QString getCreditsHtml()
 
 QString getLicenseHtml()
 {
-    HoeDown hoedown;
     QFile dataFile(":/documents/COPYING.md");
     dataFile.open(QIODevice::ReadOnly);
-    QString output = hoedown.process(dataFile.readAll());
+    QString output = markdownToHTML(dataFile.readAll());
     return output;
 }
 
diff --git a/launcher/ui/dialogs/BlockedModsDialog.cpp b/launcher/ui/dialogs/BlockedModsDialog.cpp
index 0480ced7..eb427953 100644
--- a/launcher/ui/dialogs/BlockedModsDialog.cpp
+++ b/launcher/ui/dialogs/BlockedModsDialog.cpp
@@ -234,7 +234,7 @@ void BlockedModsDialog::addHashTask(QString path)
 /// @param path the path to the local file being hashed
 void BlockedModsDialog::buildHashTask(QString path)
 {
-    auto hash_task = Hashing::createBlockedModHasher(path, ModPlatform::Provider::FLAME, "sha1");
+    auto hash_task = Hashing::createBlockedModHasher(path, ModPlatform::ResourceProvider::FLAME, "sha1");
 
     qDebug() << "[Blocked Mods Dialog] Creating Hash task for path: " << path;
 
diff --git a/launcher/ui/dialogs/ChooseProviderDialog.cpp b/launcher/ui/dialogs/ChooseProviderDialog.cpp
index 89935d9a..83748e1e 100644
--- a/launcher/ui/dialogs/ChooseProviderDialog.cpp
+++ b/launcher/ui/dialogs/ChooseProviderDialog.cpp
@@ -67,9 +67,9 @@ void ChooseProviderDialog::confirmAll()
     accept();
 }
 
-auto ChooseProviderDialog::getSelectedProvider() const -> ModPlatform::Provider
+auto ChooseProviderDialog::getSelectedProvider() const -> ModPlatform::ResourceProvider
 {
-    return ModPlatform::Provider(m_providers.checkedId());
+    return ModPlatform::ResourceProvider(m_providers.checkedId());
 }
 
 void ChooseProviderDialog::addProviders()
@@ -77,7 +77,7 @@ void ChooseProviderDialog::addProviders()
     int btn_index = 0;
     QRadioButton* btn;
 
-    for (auto& provider : { ModPlatform::Provider::MODRINTH, ModPlatform::Provider::FLAME }) {
+    for (auto& provider : { ModPlatform::ResourceProvider::MODRINTH, ModPlatform::ResourceProvider::FLAME }) {
         btn = new QRadioButton(ProviderCaps.readableName(provider), this);
         m_providers.addButton(btn, btn_index++);
         ui->providersLayout->addWidget(btn);
diff --git a/launcher/ui/dialogs/ChooseProviderDialog.h b/launcher/ui/dialogs/ChooseProviderDialog.h
index 4a3b9f29..be9735b5 100644
--- a/launcher/ui/dialogs/ChooseProviderDialog.h
+++ b/launcher/ui/dialogs/ChooseProviderDialog.h
@@ -8,7 +8,7 @@ class ChooseProviderDialog;
 }
 
 namespace ModPlatform {
-enum class Provider;
+enum class ResourceProvider;
 }
 
 class Mod;
@@ -24,7 +24,7 @@ class ChooseProviderDialog : public QDialog {
 
         bool try_others = false;
 
-        ModPlatform::Provider chosen;
+        ModPlatform::ResourceProvider chosen;
     };
 
    public:
@@ -45,7 +45,7 @@ class ChooseProviderDialog : public QDialog {
     void addProviders();
     void disableInput();
 
-    auto getSelectedProvider() const -> ModPlatform::Provider;
+    auto getSelectedProvider() const -> ModPlatform::ResourceProvider;
 
    private:
     Ui::ChooseProviderDialog* ui;
diff --git a/launcher/ui/dialogs/IconPickerDialog.cpp b/launcher/ui/dialogs/IconPickerDialog.cpp
index 0551a1ef..5131686a 100644
--- a/launcher/ui/dialogs/IconPickerDialog.cpp
+++ b/launcher/ui/dialogs/IconPickerDialog.cpp
@@ -47,7 +47,6 @@ IconPickerDialog::IconPickerDialog(QWidget *parent)
     contentsWidget->setUniformItemSizes(true);
     contentsWidget->setTextElideMode(Qt::ElideRight);
     contentsWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-    contentsWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     contentsWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     contentsWidget->setItemDelegate(new ListViewDelegate());
 
diff --git a/launcher/ui/dialogs/ImportResourcePackDialog.cpp b/launcher/ui/dialogs/ImportResourceDialog.cpp
index e807e926..84b69273 100644
--- a/launcher/ui/dialogs/ImportResourcePackDialog.cpp
+++ b/launcher/ui/dialogs/ImportResourceDialog.cpp
@@ -1,5 +1,5 @@
-#include "ImportResourcePackDialog.h"
-#include "ui_ImportResourcePackDialog.h"
+#include "ImportResourceDialog.h"
+#include "ui_ImportResourceDialog.h"
 
 #include <QFileDialog>
 #include <QPushButton>
@@ -8,10 +8,11 @@
 #include "InstanceList.h"
 
 #include <InstanceList.h>
-#include "ui/instanceview/InstanceProxyModel.h"
 #include "ui/instanceview/InstanceDelegate.h"
+#include "ui/instanceview/InstanceProxyModel.h"
 
-ImportResourcePackDialog::ImportResourcePackDialog(QWidget* parent) : QDialog(parent), ui(new Ui::ImportResourcePackDialog)
+ImportResourceDialog::ImportResourceDialog(QString file_path, PackedResourceType type, QWidget* parent)
+    : QDialog(parent), ui(new Ui::ImportResourceDialog), m_resource_type(type), m_file_path(file_path)
 {
     ui->setupUi(this);
     setWindowModality(Qt::WindowModal);
@@ -29,7 +30,6 @@ ImportResourcePackDialog::ImportResourcePackDialog(QWidget* parent) : QDialog(pa
     // NOTE: We can't have uniform sizes because the text may wrap if it's too long. If we set this, it will cut off the wrapped text.
     contentsWidget->setUniformItemSizes(false);
     contentsWidget->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
-    contentsWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOn);
     contentsWidget->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     contentsWidget->setItemDelegate(new ListViewDelegate());
 
@@ -41,15 +41,19 @@ ImportResourcePackDialog::ImportResourcePackDialog(QWidget* parent) : QDialog(pa
     connect(contentsWidget, SIGNAL(doubleClicked(QModelIndex)), SLOT(activated(QModelIndex)));
     connect(contentsWidget->selectionModel(), SIGNAL(selectionChanged(QItemSelection, QItemSelection)),
             SLOT(selectionChanged(QItemSelection, QItemSelection)));
+
+    ui->label->setText(
+        tr("Choose the instance you would like to import this %1 to.").arg(ResourceUtils::getPackedTypeName(m_resource_type)));
+    ui->label_file_path->setText(tr("File: %1").arg(m_file_path));
 }
 
-void ImportResourcePackDialog::activated(QModelIndex index)
+void ImportResourceDialog::activated(QModelIndex index)
 {
     selectedInstanceKey = index.data(InstanceList::InstanceIDRole).toString();
     accept();
 }
 
-void ImportResourcePackDialog::selectionChanged(QItemSelection selected, QItemSelection deselected)
+void ImportResourceDialog::selectionChanged(QItemSelection selected, QItemSelection deselected)
 {
     if (selected.empty())
         return;
@@ -60,7 +64,7 @@ void ImportResourcePackDialog::selectionChanged(QItemSelection selected, QItemSe
     }
 }
 
-ImportResourcePackDialog::~ImportResourcePackDialog()
+ImportResourceDialog::~ImportResourceDialog()
 {
     delete ui;
 }
diff --git a/launcher/ui/dialogs/ImportResourceDialog.h b/launcher/ui/dialogs/ImportResourceDialog.h
new file mode 100644
index 00000000..5f2f7a92
--- /dev/null
+++ b/launcher/ui/dialogs/ImportResourceDialog.h
@@ -0,0 +1,30 @@
+#pragma once
+
+#include <QDialog>
+#include <QItemSelection>
+
+#include "minecraft/mod/tasks/LocalResourceParse.h"
+#include "ui/instanceview/InstanceProxyModel.h"
+
+namespace Ui {
+class ImportResourceDialog;
+}
+
+class ImportResourceDialog : public QDialog {
+    Q_OBJECT
+
+   public:
+    explicit ImportResourceDialog(QString file_path, PackedResourceType type, QWidget* parent = nullptr);
+    ~ImportResourceDialog() override;
+    QString selectedInstanceKey;
+    
+   private:
+    Ui::ImportResourceDialog* ui;
+    PackedResourceType m_resource_type;
+    QString m_file_path;
+    InstanceProxyModel* proxyModel;
+
+   private slots:
+    void selectionChanged(QItemSelection, QItemSelection);
+    void activated(QModelIndex);
+};
diff --git a/launcher/ui/dialogs/ImportResourcePackDialog.ui b/launcher/ui/dialogs/ImportResourceDialog.ui
index 20cb9177..cc3f4ec1 100644
--- a/launcher/ui/dialogs/ImportResourcePackDialog.ui
+++ b/launcher/ui/dialogs/ImportResourceDialog.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ImportResourcePackDialog</class>
- <widget class="QDialog" name="ImportResourcePackDialog">
+ <class>ImportResourceDialog</class>
+ <widget class="QDialog" name="ImportResourceDialog">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Choose instance to import</string>
+   <string>Choose instance to import to</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
    <item>
@@ -22,6 +22,13 @@
     </widget>
    </item>
    <item>
+    <widget class="QLabel" name="label_file_path">
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
+   <item>
     <widget class="QListView" name="instanceView"/>
    </item>
    <item>
@@ -41,7 +48,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>accepted()</signal>
-   <receiver>ImportResourcePackDialog</receiver>
+   <receiver>ImportResourceDialog</receiver>
    <slot>accept()</slot>
    <hints>
     <hint type="sourcelabel">
@@ -57,7 +64,7 @@
   <connection>
    <sender>buttonBox</sender>
    <signal>rejected()</signal>
-   <receiver>ImportResourcePackDialog</receiver>
+   <receiver>ImportResourceDialog</receiver>
    <slot>reject()</slot>
    <hints>
     <hint type="sourcelabel">
diff --git a/launcher/ui/dialogs/ImportResourcePackDialog.h b/launcher/ui/dialogs/ImportResourcePackDialog.h
deleted file mode 100644
index 8356f204..00000000
--- a/launcher/ui/dialogs/ImportResourcePackDialog.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#pragma once
-
-#include <QDialog>
-#include <QItemSelection>
-
-#include "ui/instanceview/InstanceProxyModel.h"
-
-namespace Ui {
-class ImportResourcePackDialog;
-}
-
-class ImportResourcePackDialog : public QDialog {
-    Q_OBJECT
-
-   public:
-    explicit ImportResourcePackDialog(QWidget* parent = 0);
-    ~ImportResourcePackDialog();
-    InstanceProxyModel* proxyModel;
-    QString selectedInstanceKey;
-
-   private:
-    Ui::ImportResourcePackDialog* ui;
-
-   private slots:
-    void selectionChanged(QItemSelection, QItemSelection);
-    void activated(QModelIndex);
-};
diff --git a/launcher/ui/dialogs/ModDownloadDialog.cpp b/launcher/ui/dialogs/ModDownloadDialog.cpp
deleted file mode 100644
index 24d23ba9..00000000
--- a/launcher/ui/dialogs/ModDownloadDialog.cpp
+++ /dev/null
@@ -1,202 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#include "ModDownloadDialog.h"
-
-#include <BaseVersion.h>
-#include <InstanceList.h>
-#include <icons/IconList.h>
-
-#include "Application.h"
-#include "ReviewMessageBox.h"
-
-#include <QDialogButtonBox>
-#include <QLayout>
-#include <QPushButton>
-#include <QValidator>
-
-#include "ModDownloadTask.h"
-#include "ui/pages/modplatform/flame/FlameModPage.h"
-#include "ui/pages/modplatform/modrinth/ModrinthModPage.h"
-#include "ui/widgets/PageContainer.h"
-
-ModDownloadDialog::ModDownloadDialog(const std::shared_ptr<ModFolderModel>& mods, QWidget* parent, BaseInstance* instance)
-    : QDialog(parent), mods(mods), m_verticalLayout(new QVBoxLayout(this)), m_instance(instance)
-{
-    setObjectName(QStringLiteral("ModDownloadDialog"));
-    m_verticalLayout->setObjectName(QStringLiteral("verticalLayout"));
-
-    resize(std::max(0.5 * parent->width(), 400.0), std::max(0.75 * parent->height(), 400.0));
-
-    setWindowIcon(APPLICATION->getThemedIcon("new"));
-    // NOTE: m_buttons must be initialized before PageContainer, because it indirectly accesses m_buttons through setSuggestedPack! Do not
-    // move this below.
-    m_buttons = new QDialogButtonBox(QDialogButtonBox::Help | QDialogButtonBox::Ok | QDialogButtonBox::Cancel);
-
-    m_container = new PageContainer(this);
-    m_container->setSizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Expanding);
-    m_container->layout()->setContentsMargins(0, 0, 0, 0);
-    m_verticalLayout->addWidget(m_container);
-
-    m_container->addButtons(m_buttons);
-
-    connect(m_container, &PageContainer::selectedPageChanged, this, &ModDownloadDialog::selectedPageChanged);
-
-    // Bonk Qt over its stupid head and make sure it understands which button is the default one...
-    // See: https://stackoverflow.com/questions/24556831/qbuttonbox-set-default-button
-    auto OkButton = m_buttons->button(QDialogButtonBox::Ok);
-    OkButton->setEnabled(false);
-    OkButton->setDefault(true);
-    OkButton->setAutoDefault(true);
-    OkButton->setText(tr("Review and confirm"));
-    OkButton->setShortcut(tr("Ctrl+Return"));
-    OkButton->setToolTip(tr("Opens a new popup to review your selected mods and confirm your selection. Shortcut: Ctrl+Return"));
-    connect(OkButton, &QPushButton::clicked, this, &ModDownloadDialog::confirm);
-
-    auto CancelButton = m_buttons->button(QDialogButtonBox::Cancel);
-    CancelButton->setDefault(false);
-    CancelButton->setAutoDefault(false);
-    connect(CancelButton, &QPushButton::clicked, this, &ModDownloadDialog::reject);
-
-    auto HelpButton = m_buttons->button(QDialogButtonBox::Help);
-    HelpButton->setDefault(false);
-    HelpButton->setAutoDefault(false);
-    connect(HelpButton, &QPushButton::clicked, m_container, &PageContainer::help);
-
-    QMetaObject::connectSlotsByName(this);
-    setWindowModality(Qt::WindowModal);
-    setWindowTitle(dialogTitle());
-
-    restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get("ModDownloadGeometry").toByteArray()));
-}
-
-QString ModDownloadDialog::dialogTitle()
-{
-    return tr("Download mods");
-}
-
-void ModDownloadDialog::reject()
-{
-    APPLICATION->settings()->set("ModDownloadGeometry", saveGeometry().toBase64());
-    QDialog::reject();
-}
-
-void ModDownloadDialog::confirm()
-{
-    auto keys = modTask.keys();
-    keys.sort(Qt::CaseInsensitive);
-
-    auto confirm_dialog = ReviewMessageBox::create(this, tr("Confirm mods to download"));
-
-    for (auto& task : keys) {
-        confirm_dialog->appendMod({ task, modTask.find(task).value()->getFilename() });
-    }
-
-    if (confirm_dialog->exec()) {
-        auto deselected = confirm_dialog->deselectedMods();
-        for (auto name : deselected) {
-            modTask.remove(name);
-        }
-
-        this->accept();
-    }
-}
-
-void ModDownloadDialog::accept()
-{
-    APPLICATION->settings()->set("ModDownloadGeometry", saveGeometry().toBase64());
-    QDialog::accept();
-}
-
-QList<BasePage*> ModDownloadDialog::getPages()
-{
-    QList<BasePage*> pages;
-
-    pages.append(ModrinthModPage::create(this, m_instance));
-    if (APPLICATION->capabilities() & Application::SupportsFlame)
-        pages.append(FlameModPage::create(this, m_instance));
-
-    m_selectedPage = dynamic_cast<ModPage*>(pages[0]);
-
-    return pages;
-}
-
-void ModDownloadDialog::addSelectedMod(QString name, ModDownloadTask* task)
-{
-    removeSelectedMod(name);
-    modTask.insert(name, task);
-
-    m_buttons->button(QDialogButtonBox::Ok)->setEnabled(!modTask.isEmpty());
-}
-
-void ModDownloadDialog::removeSelectedMod(QString name)
-{
-    if (modTask.contains(name))
-        delete modTask.find(name).value();
-    modTask.remove(name);
-
-    m_buttons->button(QDialogButtonBox::Ok)->setEnabled(!modTask.isEmpty());
-}
-
-bool ModDownloadDialog::isModSelected(QString name, QString filename) const
-{
-    // FIXME: Is there a way to check for versions without checking the filename
-    //        as a heuristic, other than adding such info to ModDownloadTask itself?
-    auto iter = modTask.find(name);
-    return iter != modTask.end() && (iter.value()->getFilename() == filename);
-}
-
-bool ModDownloadDialog::isModSelected(QString name) const
-{
-    auto iter = modTask.find(name);
-    return iter != modTask.end();
-}
-
-const QList<ModDownloadTask*> ModDownloadDialog::getTasks()
-{
-    return modTask.values();
-}
-
-void ModDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* selected)
-{
-    auto* prev_page = dynamic_cast<ModPage*>(previous);
-    if (!prev_page) {
-        qCritical() << "Page '" << previous->displayName() << "' in ModDownloadDialog is not a ModPage!";
-        return;
-    }
-
-    m_selectedPage = dynamic_cast<ModPage*>(selected);
-    if (!m_selectedPage) {
-        qCritical() << "Page '" << selected->displayName() << "' in ModDownloadDialog is not a ModPage!";
-        return;
-    }
-
-    // Same effect as having a global search bar
-    m_selectedPage->setSearchTerm(prev_page->getSearchTerm());
-}
-
-bool ModDownloadDialog::selectPage(QString pageId)
-{
-    return m_container->selectPage(pageId);
-}
-
-ModPage* ModDownloadDialog::getSelectedPage()
-{
-    return m_selectedPage;
-}
diff --git a/launcher/ui/dialogs/ModDownloadDialog.h b/launcher/ui/dialogs/ModDownloadDialog.h
deleted file mode 100644
index fcf6f4fc..00000000
--- a/launcher/ui/dialogs/ModDownloadDialog.h
+++ /dev/null
@@ -1,78 +0,0 @@
-// SPDX-License-Identifier: GPL-3.0-only
-/*
- *  Prism Launcher - Minecraft Launcher
- *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
- *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, version 3.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QDialog>
-#include <QVBoxLayout>
-
-#include "ModDownloadTask.h"
-#include "minecraft/mod/ModFolderModel.h"
-#include "ui/pages/BasePageProvider.h"
-
-namespace Ui
-{
-class ModDownloadDialog;
-}
-
-class PageContainer;
-class QDialogButtonBox;
-class ModPage;
-class ModrinthModPage;
-
-class ModDownloadDialog final : public QDialog, public BasePageProvider
-{
-    Q_OBJECT
-
-   public:
-    explicit ModDownloadDialog(const std::shared_ptr<ModFolderModel>& mods, QWidget* parent, BaseInstance* instance);
-    ~ModDownloadDialog() override = default;
-
-    QString dialogTitle() override;
-    QList<BasePage*> getPages() override;
-
-    void addSelectedMod(QString name = QString(), ModDownloadTask* task = nullptr);
-    void removeSelectedMod(QString name = QString());
-    bool isModSelected(QString name, QString filename) const;
-    bool isModSelected(QString name) const;
-
-    const QList<ModDownloadTask*> getTasks();
-    const std::shared_ptr<ModFolderModel>& mods;
-
-    bool selectPage(QString pageId);
-    ModPage* getSelectedPage();
-
-   public slots:
-    void confirm();
-    void accept() override;
-    void reject() override;
-
-   private slots:
-    void selectedPageChanged(BasePage* previous, BasePage* selected);
-
-   private:
-    Ui::ModDownloadDialog* ui = nullptr;
-    PageContainer* m_container = nullptr;
-    QDialogButtonBox* m_buttons = nullptr;
-    QVBoxLayout* m_verticalLayout = nullptr;
-    ModPage* m_selectedPage = nullptr;
-
-    QHash<QString, ModDownloadTask*> modTask;
-    BaseInstance* m_instance;
-};
diff --git a/launcher/ui/dialogs/ModUpdateDialog.cpp b/launcher/ui/dialogs/ModUpdateDialog.cpp
index cedd4a96..4ef42d6c 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.cpp
+++ b/launcher/ui/dialogs/ModUpdateDialog.cpp
@@ -7,6 +7,7 @@
 
 #include "FileSystem.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "tasks/ConcurrentTask.h"
 
@@ -17,10 +18,11 @@
 #include "modplatform/flame/FlameCheckUpdate.h"
 #include "modplatform/modrinth/ModrinthCheckUpdate.h"
 
-#include <HoeDown.h>
 #include <QTextBrowser>
 #include <QTreeWidgetItem>
 
+#include <optional>
+
 static ModPlatform::ProviderCapabilities ProviderCaps;
 
 static std::list<Version> mcVersions(BaseInstance* inst)
@@ -28,7 +30,7 @@ static std::list<Version> mcVersions(BaseInstance* inst)
     return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getComponent("net.minecraft")->getVersion() };
 }
 
-static ModAPI::ModLoaderTypes mcLoaders(BaseInstance* inst)
+static std::optional<ResourceAPI::ModLoaderTypes> mcLoaders(BaseInstance* inst)
 {
     return { static_cast<MinecraftInstance*>(inst)->getPackProfile()->getModLoaders() };
 }
@@ -212,14 +214,14 @@ auto ModUpdateDialog::ensureMetadata() -> bool
     bool confirm_rest = false;
     bool try_others_rest = false;
     bool skip_rest = false;
-    ModPlatform::Provider provider_rest = ModPlatform::Provider::MODRINTH;
+    ModPlatform::ResourceProvider provider_rest = ModPlatform::ResourceProvider::MODRINTH;
 
-    auto addToTmp = [&](Mod* m, ModPlatform::Provider p) {
+    auto addToTmp = [&](Mod* m, ModPlatform::ResourceProvider p) {
         switch (p) {
-            case ModPlatform::Provider::MODRINTH:
+            case ModPlatform::ResourceProvider::MODRINTH:
                 modrinth_tmp.push_back(m);
                 break;
-            case ModPlatform::Provider::FLAME:
+            case ModPlatform::ResourceProvider::FLAME:
                 flame_tmp.push_back(m);
                 break;
         }
@@ -264,10 +266,10 @@ auto ModUpdateDialog::ensureMetadata() -> bool
     }
 
     if (!modrinth_tmp.empty()) {
-        auto* modrinth_task = new EnsureMetadataTask(modrinth_tmp, index_dir, ModPlatform::Provider::MODRINTH);
+        auto* modrinth_task = new EnsureMetadataTask(modrinth_tmp, index_dir, ModPlatform::ResourceProvider::MODRINTH);
         connect(modrinth_task, &EnsureMetadataTask::metadataReady, [this](Mod* candidate) { onMetadataEnsured(candidate); });
         connect(modrinth_task, &EnsureMetadataTask::metadataFailed, [this, &should_try_others](Mod* candidate) {
-            onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::Provider::MODRINTH);
+            onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::ResourceProvider::MODRINTH);
         });
 
         if (modrinth_task->getHashingTask())
@@ -277,10 +279,10 @@ auto ModUpdateDialog::ensureMetadata() -> bool
     }
 
     if (!flame_tmp.empty()) {
-        auto* flame_task = new EnsureMetadataTask(flame_tmp, index_dir, ModPlatform::Provider::FLAME);
+        auto* flame_task = new EnsureMetadataTask(flame_tmp, index_dir, ModPlatform::ResourceProvider::FLAME);
         connect(flame_task, &EnsureMetadataTask::metadataReady, [this](Mod* candidate) { onMetadataEnsured(candidate); });
         connect(flame_task, &EnsureMetadataTask::metadataFailed, [this, &should_try_others](Mod* candidate) {
-            onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::Provider::FLAME);
+            onMetadataFailed(candidate, should_try_others.find(candidate->internal_id()).value(), ModPlatform::ResourceProvider::FLAME);
         });
 
         if (flame_task->getHashingTask())
@@ -306,28 +308,28 @@ void ModUpdateDialog::onMetadataEnsured(Mod* mod)
         return;
 
     switch (mod->metadata()->provider) {
-        case ModPlatform::Provider::MODRINTH:
+        case ModPlatform::ResourceProvider::MODRINTH:
             m_modrinth_to_update.push_back(mod);
             break;
-        case ModPlatform::Provider::FLAME:
+        case ModPlatform::ResourceProvider::FLAME:
             m_flame_to_update.push_back(mod);
             break;
     }
 }
 
-ModPlatform::Provider next(ModPlatform::Provider p)
+ModPlatform::ResourceProvider next(ModPlatform::ResourceProvider p)
 {
     switch (p) {
-        case ModPlatform::Provider::MODRINTH:
-            return ModPlatform::Provider::FLAME;
-        case ModPlatform::Provider::FLAME:
-            return ModPlatform::Provider::MODRINTH;
+        case ModPlatform::ResourceProvider::MODRINTH:
+            return ModPlatform::ResourceProvider::FLAME;
+        case ModPlatform::ResourceProvider::FLAME:
+            return ModPlatform::ResourceProvider::MODRINTH;
     }
 
-    return ModPlatform::Provider::FLAME;
+    return ModPlatform::ResourceProvider::FLAME;
 }
 
-void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::Provider first_choice)
+void ModUpdateDialog::onMetadataFailed(Mod* mod, bool try_others, ModPlatform::ResourceProvider first_choice)
 {
     if (try_others) {
         auto index_dir = indexDir();
@@ -368,15 +370,8 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
 
     QString text = info.changelog;
     switch (info.provider) {
-        case ModPlatform::Provider::MODRINTH: {
-            HoeDown h;
-            // HoeDown bug?: \n aren't converted to <br>
-            text = h.process(info.changelog.toUtf8());
-
-            // Don't convert if there's an HTML tag right after (Qt rendering weirdness)
-            text.remove(QRegularExpression("(\n+)(?=<)"));
-            text.replace('\n', "<br>");
-
+        case ModPlatform::ResourceProvider::MODRINTH: {
+            text = markdownToHTML(info.changelog.toUtf8());
             break;
         }
         default:
@@ -393,9 +388,9 @@ void ModUpdateDialog::appendMod(CheckUpdateTask::UpdatableMod const& info)
     ui->modTreeWidget->addTopLevelItem(item_top);
 }
 
-auto ModUpdateDialog::getTasks() -> const QList<ModDownloadTask*>
+auto ModUpdateDialog::getTasks() -> const QList<ResourceDownloadTask*>
 {
-    QList<ModDownloadTask*> list;
+    QList<ResourceDownloadTask*> list;
 
     auto* item = ui->modTreeWidget->topLevelItem(0);
 
diff --git a/launcher/ui/dialogs/ModUpdateDialog.h b/launcher/ui/dialogs/ModUpdateDialog.h
index bd486f0d..3e3dd90d 100644
--- a/launcher/ui/dialogs/ModUpdateDialog.h
+++ b/launcher/ui/dialogs/ModUpdateDialog.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "BaseInstance.h"
-#include "ModDownloadTask.h"
+#include "ResourceDownloadTask.h"
 #include "ReviewMessageBox.h"
 
 #include "minecraft/mod/ModFolderModel.h"
@@ -25,7 +25,7 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
     void appendMod(const CheckUpdateTask::UpdatableMod& info);
 
-    const QList<ModDownloadTask*> getTasks();
+    const QList<ResourceDownloadTask*> getTasks();
     auto indexDir() const -> QDir { return m_mod_model->indexDir(); }
 
     auto noUpdates() const -> bool { return m_no_updates; };
@@ -36,7 +36,7 @@ class ModUpdateDialog final : public ReviewMessageBox {
 
    private slots:
     void onMetadataEnsured(Mod*);
-    void onMetadataFailed(Mod*, bool try_others = false, ModPlatform::Provider first_choice = ModPlatform::Provider::MODRINTH);
+    void onMetadataFailed(Mod*, bool try_others = false, ModPlatform::ResourceProvider first_choice = ModPlatform::ResourceProvider::MODRINTH);
 
    private:
     QWidget* m_parent;
@@ -54,7 +54,7 @@ class ModUpdateDialog final : public ReviewMessageBox {
     QList<std::tuple<Mod*, QString>> m_failed_metadata;
     QList<std::tuple<Mod*, QString, QUrl>> m_failed_check_update;
 
-    QHash<QString, ModDownloadTask*> m_tasks;
+    QHash<QString, ResourceDownloadTask*> m_tasks;
     BaseInstance* m_instance;
 
     bool m_no_updates = false;
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.cpp b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
new file mode 100644
index 00000000..b9367c16
--- /dev/null
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.cpp
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#include "ResourceDownloadDialog.h"
+
+#include <QPushButton>
+
+#include "Application.h"
+#include "ResourceDownloadTask.h"
+
+#include "minecraft/mod/ModFolderModel.h"
+
+#include "ui/dialogs/ReviewMessageBox.h"
+
+#include "ui/pages/modplatform/ResourcePage.h"
+
+#include "ui/pages/modplatform/flame/FlameResourcePages.h"
+#include "ui/pages/modplatform/modrinth/ModrinthResourcePages.h"
+
+#include "ui/widgets/PageContainer.h"
+
+namespace ResourceDownload {
+
+ResourceDownloadDialog::ResourceDownloadDialog(QWidget* parent, const std::shared_ptr<ResourceFolderModel> base_model)
+    : QDialog(parent), m_base_model(base_model), m_buttons(QDialogButtonBox::Help | QDialogButtonBox::Ok | QDialogButtonBox::Cancel), m_vertical_layout(this)
+{
+    setObjectName(QStringLiteral("ResourceDownloadDialog"));
+
+    resize(std::max(0.5 * parent->width(), 400.0), std::max(0.75 * parent->height(), 400.0));
+
+    setWindowIcon(APPLICATION->getThemedIcon("new"));
+
+    // Bonk Qt over its stupid head and make sure it understands which button is the default one...
+    // See: https://stackoverflow.com/questions/24556831/qbuttonbox-set-default-button
+    auto OkButton = m_buttons.button(QDialogButtonBox::Ok);
+    OkButton->setEnabled(false);
+    OkButton->setDefault(true);
+    OkButton->setAutoDefault(true);
+    OkButton->setText(tr("Review and confirm"));
+    OkButton->setShortcut(tr("Ctrl+Return"));
+
+    auto CancelButton = m_buttons.button(QDialogButtonBox::Cancel);
+    CancelButton->setDefault(false);
+    CancelButton->setAutoDefault(false);
+
+    auto HelpButton = m_buttons.button(QDialogButtonBox::Help);
+    HelpButton->setDefault(false);
+    HelpButton->setAutoDefault(false);
+
+    setWindowModality(Qt::WindowModal);
+}
+
+void ResourceDownloadDialog::accept()
+{
+    if (!geometrySaveKey().isEmpty())
+        APPLICATION->settings()->set(geometrySaveKey(), saveGeometry().toBase64());
+
+    QDialog::accept();
+}
+
+void ResourceDownloadDialog::reject()
+{
+    if (!geometrySaveKey().isEmpty())
+        APPLICATION->settings()->set(geometrySaveKey(), saveGeometry().toBase64());
+
+    QDialog::reject();
+}
+
+// NOTE: We can't have this in the ctor because PageContainer calls a virtual function, and so
+// won't work with subclasses if we put it in this ctor.
+void ResourceDownloadDialog::initializeContainer()
+{
+    m_container = new PageContainer(this);
+    m_container->setSizePolicy(QSizePolicy::Policy::Preferred, QSizePolicy::Policy::Expanding);
+    m_container->layout()->setContentsMargins(0, 0, 0, 0);
+    m_vertical_layout.addWidget(m_container);
+
+    m_container->addButtons(&m_buttons);
+
+    connect(m_container, &PageContainer::selectedPageChanged, this, &ResourceDownloadDialog::selectedPageChanged);
+}
+
+void ResourceDownloadDialog::connectButtons()
+{
+    auto OkButton = m_buttons.button(QDialogButtonBox::Ok);
+    OkButton->setToolTip(tr("Opens a new popup to review your selected %1 and confirm your selection. Shortcut: Ctrl+Return").arg(resourcesString()));
+    connect(OkButton, &QPushButton::clicked, this, &ResourceDownloadDialog::confirm);
+
+    auto CancelButton = m_buttons.button(QDialogButtonBox::Cancel);
+    connect(CancelButton, &QPushButton::clicked, this, &ResourceDownloadDialog::reject);
+
+    auto HelpButton = m_buttons.button(QDialogButtonBox::Help);
+    connect(HelpButton, &QPushButton::clicked, m_container, &PageContainer::help);
+}
+
+void ResourceDownloadDialog::confirm()
+{
+    auto keys = m_selected.keys();
+    keys.sort(Qt::CaseInsensitive);
+
+    auto confirm_dialog = ReviewMessageBox::create(this, tr("Confirm %1 to download").arg(resourcesString()));
+    confirm_dialog->retranslateUi(resourcesString());
+
+    for (auto& task : keys) {
+        auto selected = m_selected.constFind(task).value();
+        confirm_dialog->appendResource({ task, selected->getFilename(), selected->getCustomPath() });
+    }
+
+    if (confirm_dialog->exec()) {
+        auto deselected = confirm_dialog->deselectedResources();
+        for (auto name : deselected) {
+            m_selected.remove(name);
+        }
+
+        this->accept();
+    }
+}
+
+bool ResourceDownloadDialog::selectPage(QString pageId)
+{
+    return m_container->selectPage(pageId);
+}
+
+ResourcePage* ResourceDownloadDialog::getSelectedPage()
+{
+    return m_selectedPage;
+}
+
+void ResourceDownloadDialog::addResource(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& ver, bool is_indexed)
+{
+    removeResource(pack, ver);
+
+    ver.is_currently_selected = true;
+    m_selected.insert(pack.name, new ResourceDownloadTask(pack, ver, getBaseModel(), is_indexed));
+
+    m_buttons.button(QDialogButtonBox::Ok)->setEnabled(!m_selected.isEmpty());
+}
+
+static ModPlatform::IndexedVersion& getVersionWithID(ModPlatform::IndexedPack& pack, QVariant id)
+{
+    Q_ASSERT(pack.versionsLoaded);
+    auto it = std::find_if(pack.versions.begin(), pack.versions.end(), [id](auto const& v) { return v.fileId == id; });
+    Q_ASSERT(it != pack.versions.end());
+    return *it;
+}
+
+void ResourceDownloadDialog::removeResource(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& ver)
+{
+    if (auto selected_task_it = m_selected.find(pack.name); selected_task_it != m_selected.end()) {
+        auto selected_task = *selected_task_it;
+        auto old_version_id = selected_task->getVersionID();
+
+        // If the new and old version IDs don't match, search for the old one and deselect it.
+        if (ver.fileId != old_version_id)
+            getVersionWithID(pack, old_version_id).is_currently_selected = false;
+    }
+
+    // Deselect the new version too, since all versions of that pack got removed.
+    ver.is_currently_selected = false;
+
+    m_selected.remove(pack.name);
+
+    m_buttons.button(QDialogButtonBox::Ok)->setEnabled(!m_selected.isEmpty());
+}
+
+const QList<ResourceDownloadDialog::DownloadTaskPtr> ResourceDownloadDialog::getTasks()
+{
+    return m_selected.values();
+}
+
+void ResourceDownloadDialog::selectedPageChanged(BasePage* previous, BasePage* selected)
+{
+    auto* prev_page = dynamic_cast<ResourcePage*>(previous);
+    if (!prev_page) {
+        qCritical() << "Page '" << previous->displayName() << "' in ResourceDownloadDialog is not a ResourcePage!";
+        return;
+    }
+
+    m_selectedPage = dynamic_cast<ResourcePage*>(selected);
+    if (!m_selectedPage) {
+        qCritical() << "Page '" << selected->displayName() << "' in ResourceDownloadDialog is not a ResourcePage!";
+        return;
+    }
+
+    // Same effect as having a global search bar
+    m_selectedPage->setSearchTerm(prev_page->getSearchTerm());
+}
+
+
+
+ModDownloadDialog::ModDownloadDialog(QWidget* parent, const std::shared_ptr<ModFolderModel>& mods, BaseInstance* instance)
+    : ResourceDownloadDialog(parent, mods), m_instance(instance)
+{
+    setWindowTitle(dialogTitle());
+
+    initializeContainer();
+    connectButtons();
+
+    if (!geometrySaveKey().isEmpty())
+        restoreGeometry(QByteArray::fromBase64(APPLICATION->settings()->get(geometrySaveKey()).toByteArray()));
+}
+
+QList<BasePage*> ModDownloadDialog::getPages()
+{
+    QList<BasePage*> pages;
+
+    pages.append(ModrinthModPage::create(this, *m_instance));
+    if (APPLICATION->capabilities() & Application::SupportsFlame)
+        pages.append(FlameModPage::create(this, *m_instance));
+
+    m_selectedPage = dynamic_cast<ModPage*>(pages[0]);
+
+    return pages;
+}
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/dialogs/ResourceDownloadDialog.h b/launcher/ui/dialogs/ResourceDownloadDialog.h
new file mode 100644
index 00000000..19843532
--- /dev/null
+++ b/launcher/ui/dialogs/ResourceDownloadDialog.h
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <QDialog>
+#include <QDialogButtonBox>
+#include <QHash>
+#include <QLayout>
+
+#include "QObjectPtr.h"
+#include "modplatform/ModIndex.h"
+#include "ui/pages/BasePageProvider.h"
+
+class BaseInstance;
+class ModFolderModel;
+class PageContainer;
+class QVBoxLayout;
+class QDialogButtonBox;
+class ResourceDownloadTask;
+class ResourceFolderModel;
+
+namespace ResourceDownload {
+
+class ResourcePage;
+
+class ResourceDownloadDialog : public QDialog, public BasePageProvider {
+    Q_OBJECT
+
+   public:
+    using DownloadTaskPtr = shared_qobject_ptr<ResourceDownloadTask>;
+
+    ResourceDownloadDialog(QWidget* parent, const std::shared_ptr<ResourceFolderModel> base_model);
+
+    void initializeContainer();
+    void connectButtons();
+
+    //: String that gets appended to the download dialog title ("Download " + resourcesString())
+    [[nodiscard]] virtual QString resourcesString() const { return tr("resources"); }
+
+    QString dialogTitle() override { return tr("Download %1").arg(resourcesString()); };
+
+    bool selectPage(QString pageId);
+    ResourcePage* getSelectedPage();
+
+    void addResource(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&, bool is_indexed = false);
+    void removeResource(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&);
+
+    const QList<DownloadTaskPtr> getTasks();
+    [[nodiscard]] const std::shared_ptr<ResourceFolderModel> getBaseModel() const { return m_base_model; }
+
+   public slots:
+    void accept() override;
+    void reject() override;
+
+   protected slots:
+    void selectedPageChanged(BasePage* previous, BasePage* selected);
+
+    virtual void confirm();
+
+   protected:
+    [[nodiscard]] virtual QString geometrySaveKey() const { return ""; }
+
+   protected:
+    const std::shared_ptr<ResourceFolderModel> m_base_model;
+
+    PageContainer* m_container = nullptr;
+    ResourcePage* m_selectedPage = nullptr;
+
+    QDialogButtonBox m_buttons;
+    QVBoxLayout m_vertical_layout;
+
+    QHash<QString, DownloadTaskPtr> m_selected;
+};
+
+
+
+class ModDownloadDialog final : public ResourceDownloadDialog {
+    Q_OBJECT
+
+   public:
+    explicit ModDownloadDialog(QWidget* parent, const std::shared_ptr<ModFolderModel>& mods, BaseInstance* instance);
+    ~ModDownloadDialog() override = default;
+
+    //: String that gets appended to the mod download dialog title ("Download " + resourcesString())
+    [[nodiscard]] QString resourcesString() const override { return tr("mods"); }
+    [[nodiscard]] QString geometrySaveKey() const override { return "ModDownloadGeometry"; }
+
+    QList<BasePage*> getPages() override;
+
+   private:
+    BaseInstance* m_instance;
+};
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/dialogs/ReviewMessageBox.cpp b/launcher/ui/dialogs/ReviewMessageBox.cpp
index 7c25c91c..7b2df278 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.cpp
+++ b/launcher/ui/dialogs/ReviewMessageBox.cpp
@@ -1,6 +1,8 @@
 #include "ReviewMessageBox.h"
 #include "ui_ReviewMessageBox.h"
 
+#include "Application.h"
+
 #include <QPushButton>
 
 ReviewMessageBox::ReviewMessageBox(QWidget* parent, QString const& title, QString const& icon)
@@ -11,6 +13,10 @@ ReviewMessageBox::ReviewMessageBox(QWidget* parent, QString const& title, QStrin
     auto back_button = ui->buttonBox->button(QDialogButtonBox::Cancel);
     back_button->setText(tr("Back"));
 
+    ui->modTreeWidget->header()->setSectionResizeMode(0, QHeaderView::Stretch);
+    ui->modTreeWidget->header()->setStretchLastSection(false);
+    ui->modTreeWidget->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
+
     connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &ReviewMessageBox::accept);
     connect(ui->buttonBox, &QDialogButtonBox::rejected, this, &ReviewMessageBox::reject);
 }
@@ -25,7 +31,7 @@ auto ReviewMessageBox::create(QWidget* parent, QString&& title, QString&& icon)
     return new ReviewMessageBox(parent, title, icon);
 }
 
-void ReviewMessageBox::appendMod(ModInformation&& info)
+void ReviewMessageBox::appendResource(ResourceInformation&& info)
 {
     auto itemTop = new QTreeWidgetItem(ui->modTreeWidget);
     itemTop->setCheckState(0, Qt::CheckState::Checked);
@@ -36,10 +42,20 @@ void ReviewMessageBox::appendMod(ModInformation&& info)
 
     itemTop->insertChildren(0, { filenameItem });
 
+    if (!info.custom_file_path.isEmpty()) {
+        auto customPathItem = new QTreeWidgetItem(itemTop);
+        customPathItem->setText(0, tr("This download will be placed in: %1").arg(info.custom_file_path));
+
+        itemTop->insertChildren(1, { customPathItem });
+
+        itemTop->setIcon(1, QIcon(APPLICATION->getThemedIcon("status-yellow")));
+        itemTop->setToolTip(1, tr("This file will be downloaded to a folder location different from the default, possibly due to its loader requiring it."));
+    }
+
     ui->modTreeWidget->addTopLevelItem(itemTop);
 }
 
-auto ReviewMessageBox::deselectedMods() -> QStringList
+auto ReviewMessageBox::deselectedResources() -> QStringList
 {
     QStringList list;
 
@@ -55,3 +71,11 @@ auto ReviewMessageBox::deselectedMods() -> QStringList
 
     return list;
 }
+
+void ReviewMessageBox::retranslateUi(QString resources_name)
+{
+    setWindowTitle(tr("Confirm %1 selection").arg(resources_name));
+
+    ui->explainLabel->setText(tr("You're about to download the following %1:").arg(resources_name));
+    ui->onlyCheckedLabel->setText(tr("Only %1 with a check will be downloaded!").arg(resources_name));
+}
diff --git a/launcher/ui/dialogs/ReviewMessageBox.h b/launcher/ui/dialogs/ReviewMessageBox.h
index 9cfa679a..5ec2bc23 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.h
+++ b/launcher/ui/dialogs/ReviewMessageBox.h
@@ -12,15 +12,18 @@ class ReviewMessageBox : public QDialog {
    public:
     static auto create(QWidget* parent, QString&& title, QString&& icon = "") -> ReviewMessageBox*;
 
-    using ModInformation = struct {
+    using ResourceInformation = struct res_info {
         QString name;  
         QString filename;  
+        QString custom_file_path {};
     };
 
-    void appendMod(ModInformation&& info);
-    auto deselectedMods() -> QStringList;
+    void appendResource(ResourceInformation&& info);
+    auto deselectedResources() -> QStringList;
 
-    ~ReviewMessageBox();
+    void retranslateUi(QString resources_name);
+
+    ~ReviewMessageBox() override;
 
    protected:
     ReviewMessageBox(QWidget* parent, const QString& title, const QString& icon);
diff --git a/launcher/ui/dialogs/ReviewMessageBox.ui b/launcher/ui/dialogs/ReviewMessageBox.ui
index ab3bcc2f..bf53ae80 100644
--- a/launcher/ui/dialogs/ReviewMessageBox.ui
+++ b/launcher/ui/dialogs/ReviewMessageBox.ui
@@ -10,9 +10,6 @@
     <height>350</height>
    </rect>
   </property>
-  <property name="windowTitle">
-   <string>Confirm mod selection</string>
-  </property>
   <property name="sizeGripEnabled">
    <bool>true</bool>
   </property>
@@ -39,22 +36,21 @@
        <string/>
       </property>
      </column>
+     <column>
+      <property name="text">
+       <string/>
+      </property>
+     </column>
     </widget>
    </item>
    <item row="1" column="0">
     <widget class="QLabel" name="explainLabel">
-     <property name="text">
-      <string>You're about to download the following mods:</string>
-     </property>
     </widget>
    </item>
    <item row="5" column="0" rowspan="2">
     <layout class="QHBoxLayout" name="horizontalLayout">
      <item>
       <widget class="QLabel" name="onlyCheckedLabel">
-       <property name="text">
-        <string>Only mods with a check will be downloaded!</string>
-       </property>
       </widget>
      </item>
      <item>
diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp
index a4c2755c..a9f44c0b 100644
--- a/launcher/ui/pages/global/LauncherPage.cpp
+++ b/launcher/ui/pages/global/LauncherPage.cpp
@@ -83,6 +83,8 @@ LauncherPage::LauncherPage(QWidget *parent) : QWidget(parent), ui(new Ui::Launch
 
     connect(ui->fontSizeBox, SIGNAL(valueChanged(int)), SLOT(refreshFontPreview()));
     connect(ui->consoleFont, SIGNAL(currentFontChanged(QFont)), SLOT(refreshFontPreview()));
+
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, APPLICATION, &Application::currentCatChanged);
 }
 
 LauncherPage::~LauncherPage()
@@ -185,73 +187,6 @@ void LauncherPage::applySettings()
         APPLICATION->updater()->setAutomaticallyChecksForUpdates(ui->autoUpdateCheckBox->isChecked());
     }
 
-    auto original = s->get("IconTheme").toString();
-    //FIXME: make generic
-    switch (ui->themeComboBox->currentIndex())
-    {
-    case 0:
-        s->set("IconTheme", "pe_colored");
-        break;
-    case 1:
-        s->set("IconTheme", "pe_light");
-        break;
-    case 2:
-        s->set("IconTheme", "pe_dark");
-        break;
-    case 3:
-        s->set("IconTheme", "pe_blue");
-        break;
-    case 4:
-        s->set("IconTheme", "breeze_light");
-        break;
-    case 5:
-        s->set("IconTheme", "breeze_dark");
-        break;
-    case 6:
-        s->set("IconTheme", "OSX");
-        break;
-    case 7:
-        s->set("IconTheme", "iOS");
-        break;
-    case 8:
-        s->set("IconTheme", "flat");
-        break;
-    case 9:
-        s->set("IconTheme", "flat_white");
-        break;
-    case 10:
-        s->set("IconTheme", "multimc");
-        break;
-    case 11:
-        s->set("IconTheme", "custom");
-        break;
-    }
-
-    if(original != s->get("IconTheme"))
-    {
-        APPLICATION->setIconTheme(s->get("IconTheme").toString());
-    }
-
-    auto originalAppTheme = s->get("ApplicationTheme").toString();
-    auto newAppTheme = ui->themeComboBoxColors->currentData().toString();
-    if(originalAppTheme != newAppTheme)
-    {
-        s->set("ApplicationTheme", newAppTheme);
-        APPLICATION->setApplicationTheme(newAppTheme, false);
-    }
-
-    switch (ui->themeBackgroundCat->currentIndex()) {
-    case 0: // original cat
-        s->set("BackgroundCat", "kitteh");
-        break;
-    case 1: // rory the cat
-        s->set("BackgroundCat", "rory");
-        break;
-    case 2: // rory the cat flat edition
-        s->set("BackgroundCat", "rory-flat");
-        break;
-    }
-
     s->set("MenuBarInsteadOfToolBar", ui->preferMenuBarCheckBox->isChecked());
 
     // Console settings
@@ -294,45 +229,6 @@ void LauncherPage::loadSettings()
         ui->autoUpdateCheckBox->setChecked(APPLICATION->updater()->getAutomaticallyChecksForUpdates());
     }
 
-    //FIXME: make generic
-    auto theme = s->get("IconTheme").toString();
-    QStringList iconThemeOptions{"pe_colored", 
-                                 "pe_light", 
-                                 "pe_dark", 
-                                 "pe_blue", 
-                                 "breeze_light", 
-                                 "breeze_dark", 
-                                 "OSX", 
-                                 "iOS", 
-                                 "flat", 
-                                 "flat_white", 
-                                 "multimc", 
-                                 "custom"};
-    ui->themeComboBox->setCurrentIndex(iconThemeOptions.indexOf(theme));
-
-    auto cat = s->get("BackgroundCat").toString();
-    if (cat == "kitteh") {
-        ui->themeBackgroundCat->setCurrentIndex(0);
-    } else if (cat == "rory") {
-        ui->themeBackgroundCat->setCurrentIndex(1);
-    } else if (cat == "rory-flat") {
-        ui->themeBackgroundCat->setCurrentIndex(2);
-    }
-
-    {
-        auto currentTheme = s->get("ApplicationTheme").toString();
-        auto themes = APPLICATION->getValidApplicationThemes();
-        int idx = 0;
-        for(auto &theme: themes)
-        {
-            ui->themeComboBoxColors->addItem(theme->name(), theme->id());
-            if(currentTheme == theme->id())
-            {
-                ui->themeComboBoxColors->setCurrentIndex(idx);
-            }
-            idx++;
-        }
-    }
 
     // Toolbar/menu bar settings (not applicable if native menu bar is present)
     ui->toolsBox->setEnabled(!QMenuBar().isNativeMenuBar());
diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui
index fb36608d..f084d970 100644
--- a/launcher/ui/pages/global/LauncherPage.ui
+++ b/launcher/ui/pages/global/LauncherPage.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>514</width>
+    <width>511</width>
     <height>629</height>
    </rect>
   </property>
@@ -38,7 +38,7 @@
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>0</number>
+      <number>1</number>
      </property>
      <widget class="QWidget" name="featuresTab">
       <attribute name="title">
@@ -216,150 +216,9 @@
          <property name="title">
           <string>Theme</string>
          </property>
-         <layout class="QFormLayout" name="formLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>&amp;Icons</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBox</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="themeComboBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Simple (Colored Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Light Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Dark Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Simple (Blue Icons)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Breeze Light</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Breeze Dark</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">OSX</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string notr="true">iOS</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Flat</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Flat (White)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Legacy</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Custom</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_4">
-            <property name="text">
-             <string>&amp;Colors</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeComboBoxColors</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="themeComboBoxColors">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_5">
-            <property name="text">
-             <string>C&amp;at</string>
-            </property>
-            <property name="buddy">
-             <cstring>themeBackgroundCat</cstring>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="themeBackgroundCat">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="focusPolicy">
-             <enum>Qt::StrongFocus</enum>
-            </property>
-            <item>
-             <property name="text">
-              <string>Background Cat (from MultiMC)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Rory ID 11 (drawn by Ashtaka)</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Rory ID 11 (flat edition, drawn by Ashtaka)</string>
-             </property>
-            </item>
-           </widget>
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="ThemeCustomizationWidget" name="themeCustomizationWidget" native="true"/>
           </item>
          </layout>
         </widget>
@@ -543,6 +402,14 @@
    </item>
   </layout>
  </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ThemeCustomizationWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/ThemeCustomizationWidget.h</header>
+   <container>1</container>
+  </customwidget>
+ </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
   <tabstop>autoUpdateCheckBox</tabstop>
@@ -554,8 +421,6 @@
   <tabstop>iconsDirBrowseBtn</tabstop>
   <tabstop>sortLastLaunchedBtn</tabstop>
   <tabstop>sortByNameBtn</tabstop>
-  <tabstop>themeComboBox</tabstop>
-  <tabstop>themeComboBoxColors</tabstop>
   <tabstop>showConsoleCheck</tabstop>
   <tabstop>autoCloseConsoleCheck</tabstop>
   <tabstop>showConsoleErrorCheck</tabstop>
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.cpp b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
index c66d1368..1115ddc3 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.cpp
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.cpp
@@ -1,4 +1,5 @@
 #include "ExternalResourcesPage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui_ExternalResourcesPage.h"
 
 #include "DesktopServices.h"
@@ -128,7 +129,7 @@ bool ExternalResourcesPage::eventFilter(QObject* obj, QEvent* ev)
 {
     if (ev->type() != QEvent::KeyPress)
         return QWidget::eventFilter(obj, ev);
-    
+
     QKeyEvent* keyEvent = static_cast<QKeyEvent*>(ev);
     if (obj == ui->treeView)
         return listFilter(keyEvent);
@@ -140,7 +141,6 @@ void ExternalResourcesPage::addItem()
 {
     if (!m_controlsEnabled)
         return;
-    
 
     auto list = GuiUtil::BrowseForFiles(
         helpPage(), tr("Select %1", "Select whatever type of files the page contains. Example: 'Loader Mods'").arg(displayName()),
@@ -157,8 +157,50 @@ void ExternalResourcesPage::removeItem()
 {
     if (!m_controlsEnabled)
         return;
-    
+
     auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
+
+    int count = 0;
+    bool folder = false;
+    for (auto& i : selection.indexes()) {
+        if (i.column() == 0) {
+            count++;
+
+            // if a folder is selected, show the confirmation dialog
+            if (m_model->at(i.row()).fileinfo().isDir())
+                folder = true;
+        }
+    }
+
+    QString text;
+    bool multiple = count > 1;
+
+    if (multiple) {
+        text = tr("You are about to remove %1 items.\n"
+                  "This may be permanent and they will be gone from the folder.\n\n"
+                  "Are you sure?")
+                   .arg(count);
+    } else if (folder) {
+        text = tr("You are about to remove the folder \"%1\".\n"
+                  "This may be permanent and it will be gone from the parent folder.\n\n"
+                  "Are you sure?")
+                   .arg(m_model->at(selection.indexes().at(0).row()).fileinfo().fileName());
+    }
+
+    if (!text.isEmpty()) {
+        auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"), text, QMessageBox::Warning,
+                                                     QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
+
+        if (response != QMessageBox::Yes)
+            return;
+    }
+
+    removeItems(selection);
+}
+
+void ExternalResourcesPage::removeItems(const QItemSelection& selection)
+{
     m_model->deleteResources(selection.indexes());
 }
 
@@ -209,4 +251,3 @@ bool ExternalResourcesPage::onSelectionChanged(const QModelIndex& current, const
 
     return true;
 }
-
diff --git a/launcher/ui/pages/instance/ExternalResourcesPage.h b/launcher/ui/pages/instance/ExternalResourcesPage.h
index 2d1a5b51..d17fbb7f 100644
--- a/launcher/ui/pages/instance/ExternalResourcesPage.h
+++ b/launcher/ui/pages/instance/ExternalResourcesPage.h
@@ -50,7 +50,8 @@ class ExternalResourcesPage : public QMainWindow, public BasePage {
     void filterTextChanged(const QString& newContents);
 
     virtual void addItem();
-    virtual void removeItem();
+    void removeItem();
+    virtual void removeItems(const QItemSelection &selection);
 
     virtual void enableItem();
     virtual void disableItem();
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
index af2ba7c8..4b4c73dc 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp
@@ -48,18 +48,23 @@
 
 #include "JavaCommon.h"
 #include "Application.h"
+#include "minecraft/auth/AccountList.h"
 
 #include "java/JavaInstallList.h"
 #include "java/JavaUtils.h"
 #include "FileSystem.h"
 
-
 InstanceSettingsPage::InstanceSettingsPage(BaseInstance *inst, QWidget *parent)
     : QWidget(parent), ui(new Ui::InstanceSettingsPage), m_instance(inst)
 {
     m_settings = inst->settings();
     ui->setupUi(this);
 
+    accountMenu = new QMenu(this);
+    // Use undocumented property... https://stackoverflow.com/questions/7121718/create-a-scrollbar-in-a-submenu-qt
+    accountMenu->setStyleSheet("QMenu { menu-scrollable: 1; }");
+    ui->instanceAccountSelector->setMenu(accountMenu);
+
     connect(ui->openGlobalJavaSettingsButton, &QCommandLinkButton::clicked, this, &InstanceSettingsPage::globalSettingsButtonClicked);
     connect(APPLICATION, &Application::globalSettingsAboutToOpen, this, &InstanceSettingsPage::applySettings);
     connect(APPLICATION, &Application::globalSettingsClosed, this, &InstanceSettingsPage::loadSettings);
@@ -275,6 +280,13 @@ void InstanceSettingsPage::applySettings()
         m_settings->reset("JoinServerOnLaunchAddress");
     }
 
+    // Use an account for this instance
+    bool useAccountForInstance = ui->instanceAccountGroupBox->isChecked();
+    m_settings->set("UseAccountForInstance", useAccountForInstance);
+    if (!useAccountForInstance) {
+        m_settings->reset("InstanceAccountId");
+    }
+
     // FIXME: This should probably be called by a signal instead
     m_instance->updateRuntimeContext();
 }
@@ -372,6 +384,9 @@ void InstanceSettingsPage::loadSettings()
 
     ui->serverJoinGroupBox->setChecked(m_settings->get("JoinServerOnLaunch").toBool());
     ui->serverJoinAddress->setText(m_settings->get("JoinServerOnLaunchAddress").toString());
+
+    ui->instanceAccountGroupBox->setChecked(m_settings->get("UseAccountForInstance").toBool());
+    updateAccountsMenu();
 }
 
 void InstanceSettingsPage::on_javaDetectBtn_clicked()
@@ -437,6 +452,65 @@ void InstanceSettingsPage::on_javaTestBtn_clicked()
     checker->run();
 }
 
+void InstanceSettingsPage::updateAccountsMenu()
+{
+    accountMenu->clear();
+
+    auto accounts = APPLICATION->accounts();
+    int accountIndex = accounts->findAccountByProfileId(m_settings->get("InstanceAccountId").toString());
+    MinecraftAccountPtr defaultAccount = accounts->defaultAccount();
+
+    if (accountIndex != -1 && accounts->at(accountIndex)) {
+        defaultAccount = accounts->at(accountIndex);
+    }
+
+    if (defaultAccount) {
+        ui->instanceAccountSelector->setText(defaultAccount->profileName());
+        ui->instanceAccountSelector->setIcon(getFaceForAccount(defaultAccount));
+    } else {
+        ui->instanceAccountSelector->setText(tr("No default account"));
+        ui->instanceAccountSelector->setIcon(APPLICATION->getThemedIcon("noaccount"));
+    }
+
+    for (int i = 0; i < accounts->count(); i++) {
+        MinecraftAccountPtr account = accounts->at(i);
+        QAction* action = new QAction(account->profileName(), this);
+        action->setData(i);
+        action->setCheckable(true);
+        if (accountIndex == i) {
+            action->setChecked(true);
+        }
+        action->setIcon(getFaceForAccount(account));
+        accountMenu->addAction(action);
+        connect(action, SIGNAL(triggered(bool)), this, SLOT(changeInstanceAccount()));
+    }
+}
+
+QIcon InstanceSettingsPage::getFaceForAccount(MinecraftAccountPtr account)
+{
+    if (auto face = account->getFace(); !face.isNull()) {
+        return face;
+    }
+
+    return APPLICATION->getThemedIcon("noaccount");
+}
+
+void InstanceSettingsPage::changeInstanceAccount()
+{
+    QAction* sAction = (QAction*)sender();
+
+    Q_ASSERT(sAction->data().type() == QVariant::Type::Int);
+
+    QVariant data = sAction->data();
+    int index = data.toInt();
+    auto accounts = APPLICATION->accounts();
+    auto account = accounts->at(index);
+    m_settings->set("InstanceAccountId", account->profileId());
+
+    ui->instanceAccountSelector->setText(account->profileName());
+    ui->instanceAccountSelector->setIcon(getFaceForAccount(account));
+}
+
 void InstanceSettingsPage::on_maxMemSpinBox_valueChanged(int i)
 {
     updateThresholds();
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.h b/launcher/ui/pages/instance/InstanceSettingsPage.h
index 7450188d..cb6fbae0 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.h
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.h
@@ -37,12 +37,13 @@
 
 #include <QWidget>
 
-#include "java/JavaChecker.h"
-#include "BaseInstance.h"
 #include <QObjectPtr.h>
-#include "ui/pages/BasePage.h"
-#include "JavaCommon.h"
+#include <QMenu>
 #include "Application.h"
+#include "BaseInstance.h"
+#include "JavaCommon.h"
+#include "java/JavaChecker.h"
+#include "ui/pages/BasePage.h"
 
 class JavaChecker;
 namespace Ui
@@ -92,9 +93,14 @@ private slots:
 
     void globalSettingsButtonClicked(bool checked);
 
+    void updateAccountsMenu();
+    QIcon getFaceForAccount(MinecraftAccountPtr account);
+    void changeInstanceAccount();
+
 private:
     Ui::InstanceSettingsPage *ui;
     BaseInstance *m_instance;
     SettingsObjectPtr m_settings;
     unique_qobject_ptr<JavaCommon::TestCheck> checker;
+    QMenu *accountMenu = nullptr;
 };
diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.ui b/launcher/ui/pages/instance/InstanceSettingsPage.ui
index b064367d..1b986184 100644
--- a/launcher/ui/pages/instance/InstanceSettingsPage.ui
+++ b/launcher/ui/pages/instance/InstanceSettingsPage.ui
@@ -609,6 +609,48 @@
         </widget>
        </item>
        <item>
+        <widget class="QGroupBox" name="instanceAccountGroupBox">
+         <property name="title">
+          <string>Override default account</string>
+         </property>
+         <property name="checkable">
+          <bool>true</bool>
+         </property>
+         <property name="checked">
+          <bool>false</bool>
+         </property>
+         <layout class="QVBoxLayout" name="verticalLayout_15">
+          <item>
+           <layout class="QGridLayout" name="instanceAccountLayout">
+            <item row="0" column="0">
+             <widget class="QLabel" name="instanceAccountNameLabel">
+              <property name="sizePolicy">
+               <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+                <horstretch>0</horstretch>
+                <verstretch>0</verstretch>
+               </sizepolicy>
+              </property>
+              <property name="text">
+               <string>Account:</string>
+              </property>
+             </widget>
+            </item>
+            <item row="0" column="1">
+             <widget class="QToolButton" name="instanceAccountSelector">
+              <property name="popupMode">
+               <enum>QToolButton::InstantPopup</enum>
+              </property>
+              <property name="toolButtonStyle">
+               <enum>Qt::ToolButtonTextBesideIcon</enum>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </item>
+         </layout>
+        </widget>
+       </item>
+       <item>
         <spacer name="verticalSpacerMiscellaneous">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
diff --git a/launcher/ui/pages/instance/LogPage.cpp b/launcher/ui/pages/instance/LogPage.cpp
index 9985f426..639cd711 100644
--- a/launcher/ui/pages/instance/LogPage.cpp
+++ b/launcher/ui/pages/instance/LogPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -277,28 +278,22 @@ void LogPage::on_btnPaste_clicked()
     //FIXME: turn this into a proper task and move the upload logic out of GuiUtil!
     m_model->append(
         MessageLevel::Launcher,
-        QString("%2: Log upload triggered at: %1").arg(
-            QDateTime::currentDateTime().toString(Qt::RFC2822Date),
-            BuildConfig.LAUNCHER_DISPLAYNAME
+        QString("Log upload triggered at: %1").arg(
+            QDateTime::currentDateTime().toString(Qt::RFC2822Date)
         )
     );
-    auto url = GuiUtil::uploadPaste(m_model->toPlainText(), this);
-    if(!url.isEmpty())
+    auto url = GuiUtil::uploadPaste(tr("Minecraft Log"), m_model->toPlainText(), this);
+    if(!url.has_value())
     {
-        m_model->append(
-            MessageLevel::Launcher,
-            QString("%2: Log uploaded to: %1").arg(
-                url,
-                BuildConfig.LAUNCHER_DISPLAYNAME
-            )
-        );
+        m_model->append(MessageLevel::Error, QString("Log upload canceled"));
+    }
+    else if (url->isNull())
+    {
+        m_model->append(MessageLevel::Error, QString("Log upload failed!"));
     }
     else
     {
-        m_model->append(
-            MessageLevel::Error,
-            QString("%1: Log upload failed!").arg(BuildConfig.LAUNCHER_DISPLAYNAME)
-        );
+        m_model->append(MessageLevel::Launcher, QString("Log uploaded to: %1").arg(url.value()));
     }
 }
 
diff --git a/launcher/ui/pages/instance/ManagedPackPage.cpp b/launcher/ui/pages/instance/ManagedPackPage.cpp
index 4de80468..dc983d9a 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.cpp
+++ b/launcher/ui/pages/instance/ManagedPackPage.cpp
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
+// SPDX-FileCopyrightText: 2022 flowln <flowlnlnln@gmail.com>
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -9,14 +9,13 @@
 #include <QProxyStyle>
 #include <QStyleFactory>
 
-#include <HoeDown.h>
-
 #include "Application.h"
 #include "BuildConfig.h"
 #include "InstanceImportTask.h"
 #include "InstanceList.h"
 #include "InstanceTask.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "modplatform/modrinth/ModrinthPackManifest.h"
 
@@ -263,8 +262,7 @@ void ModrinthManagedPackPage::suggestVersion()
     auto index = ui->versionsComboBox->currentIndex();
     auto version = m_pack.versions.at(index);
 
-    HoeDown md_parser;
-    ui->changelogTextBrowser->setHtml(md_parser.process(version.changelog.toUtf8()));
+    ui->changelogTextBrowser->setHtml(markdownToHTML(version.changelog.toUtf8()));
 
     ManagedPackPage::suggestVersion();
 }
diff --git a/launcher/ui/pages/instance/ManagedPackPage.h b/launcher/ui/pages/instance/ManagedPackPage.h
index d29a5e88..1ac6fc03 100644
--- a/launcher/ui/pages/instance/ManagedPackPage.h
+++ b/launcher/ui/pages/instance/ManagedPackPage.h
@@ -1,4 +1,4 @@
-// SPDX-FileCopyrightText: 2022 flow <flowlnlnln@gmail.com>
+// SPDX-FileCopyrightText: 2022 flowln <flowlnlnln@gmail.com>
 //
 // SPDX-License-Identifier: GPL-3.0-only
 
@@ -12,6 +12,8 @@
 #include "modplatform/flame/FlameAPI.h"
 #include "modplatform/flame/FlamePackIndex.h"
 
+#include "net/NetJob.h"
+
 #include "ui/pages/BasePage.h"
 
 #include <QWidget>
diff --git a/launcher/ui/pages/instance/ModFolderPage.cpp b/launcher/ui/pages/instance/ModFolderPage.cpp
index 0a2e6155..d9069915 100644
--- a/launcher/ui/pages/instance/ModFolderPage.cpp
+++ b/launcher/ui/pages/instance/ModFolderPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -48,8 +49,8 @@
 
 #include "ui/GuiUtil.h"
 #include "ui/dialogs/CustomMessageBox.h"
-#include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/dialogs/ModUpdateDialog.h"
+#include "ui/dialogs/ResourceDownloadDialog.h"
 
 #include "DesktopServices.h"
 
@@ -58,7 +59,7 @@
 #include "minecraft/mod/Mod.h"
 #include "minecraft/mod/ModFolderModel.h"
 
-#include "modplatform/ModAPI.h"
+#include "modplatform/ResourceAPI.h"
 
 #include "Version.h"
 #include "tasks/ConcurrentTask.h"
@@ -139,13 +140,8 @@ bool ModFolderPage::onSelectionChanged(const QModelIndex& current, const QModelI
     return true;
 }
 
-void ModFolderPage::removeItem()
+void ModFolderPage::removeItems(const QItemSelection &selection)
 {
-
-    if (!m_controlsEnabled)
-        return;
-
-    auto selection = m_filterModel->mapSelectionToSource(ui->treeView->selectionModel()->selection());
     m_model->deleteMods(selection.indexes());
 }
 
@@ -157,12 +153,12 @@ void ModFolderPage::installMods()
         return;  // this is a null instance or a legacy instance
 
     auto profile = static_cast<MinecraftInstance*>(m_instance)->getPackProfile();
-    if (profile->getModLoaders() == ModAPI::Unspecified) {
+    if (!profile->getModLoaders().has_value()) {
         QMessageBox::critical(this, tr("Error"), tr("Please install a mod loader first!"));
         return;
     }
 
-    ModDownloadDialog mdownload(m_model, this, m_instance);
+    ResourceDownload::ModDownloadDialog mdownload(this, m_model, m_instance);
     if (mdownload.exec()) {
         ConcurrentTask* tasks = new ConcurrentTask(this);
         connect(tasks, &Task::failed, [this, tasks](QString reason) {
diff --git a/launcher/ui/pages/instance/ModFolderPage.h b/launcher/ui/pages/instance/ModFolderPage.h
index f20adf34..ff58b38a 100644
--- a/launcher/ui/pages/instance/ModFolderPage.h
+++ b/launcher/ui/pages/instance/ModFolderPage.h
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -59,7 +60,7 @@ class ModFolderPage : public ExternalResourcesPage {
 
    private slots:
     void runningStateChanged(bool running);
-    void removeItem() override;
+    void removeItems(const QItemSelection &selection) override;
 
     void installMods();
     void updateMods();
diff --git a/launcher/ui/pages/instance/NotesPage.ui b/launcher/ui/pages/instance/NotesPage.ui
index 67cb261c..4b506da7 100644
--- a/launcher/ui/pages/instance/NotesPage.ui
+++ b/launcher/ui/pages/instance/NotesPage.ui
@@ -17,17 +17,11 @@
    <property name="topMargin">
     <number>0</number>
    </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
    <property name="bottomMargin">
     <number>0</number>
    </property>
    <item>
     <widget class="QTextEdit" name="noteEditor">
-     <property name="verticalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOn</enum>
-     </property>
      <property name="tabChangesFocus">
       <bool>true</bool>
      </property>
diff --git a/launcher/ui/pages/instance/OtherLogsPage.cpp b/launcher/ui/pages/instance/OtherLogsPage.cpp
index 0c1939c6..bbdd7324 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.cpp
+++ b/launcher/ui/pages/instance/OtherLogsPage.cpp
@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -204,7 +205,7 @@ void OtherLogsPage::on_btnReload_clicked()
 
 void OtherLogsPage::on_btnPaste_clicked()
 {
-    GuiUtil::uploadPaste(ui->text->toPlainText(), this);
+    GuiUtil::uploadPaste(m_currentFile, ui->text->toPlainText(), this);
 }
 
 void OtherLogsPage::on_btnCopy_clicked()
@@ -219,13 +220,21 @@ void OtherLogsPage::on_btnDelete_clicked()
         setControlsEnabled(false);
         return;
     }
-    if (QMessageBox::question(this, tr("Delete"),
-                              tr("Do you really want to delete %1?").arg(m_currentFile),
-                              QMessageBox::Yes, QMessageBox::No) == QMessageBox::No)
-    {
+    if (QMessageBox::question(this, tr("Confirm Deletion"),
+                              tr("You are about to delete \"%1\".\n"
+                                 "This may be permanent and it will be gone from the logs folder.\n\n"
+                                 "Are you sure?")
+                                  .arg(m_currentFile),
+                              QMessageBox::Yes, QMessageBox::No) == QMessageBox::No) {
         return;
     }
     QFile file(FS::PathCombine(m_path, m_currentFile));
+
+    if (FS::trash(file.fileName()))
+    {
+        return;
+    }
+
     if (!file.remove())
     {
         QMessageBox::critical(this, tr("Error"), tr("Unable to delete %1: %2")
@@ -243,15 +252,15 @@ void OtherLogsPage::on_btnClean_clicked()
         return;
     }
     QMessageBox *messageBox = new QMessageBox(this);
-    messageBox->setWindowTitle(tr("Clean up"));
+    messageBox->setWindowTitle(tr("Confirm Cleanup"));
     if(toDelete.size() > 5)
     {
-        messageBox->setText(tr("Do you really want to delete all log files?"));
+        messageBox->setText(tr("Are you sure you want to delete all log files?"));
         messageBox->setDetailedText(toDelete.join('\n'));
     }
     else
     {
-        messageBox->setText(tr("Do you really want to delete these files?\n%1").arg(toDelete.join('\n')));
+        messageBox->setText(tr("Are you sure you want to delete all these files?\n%1").arg(toDelete.join('\n')));
     }
     messageBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Cancel);
     messageBox->setDefaultButton(QMessageBox::Ok);
@@ -267,6 +276,10 @@ void OtherLogsPage::on_btnClean_clicked()
     for(auto item: toDelete)
     {
         QFile file(FS::PathCombine(m_path, item));
+        if (FS::trash(file.fileName()))
+        {
+            continue;
+        }
         if (!file.remove())
         {
             failed.push_back(item);
diff --git a/launcher/ui/pages/instance/OtherLogsPage.ui b/launcher/ui/pages/instance/OtherLogsPage.ui
index 77f3e647..3fdb023f 100644
--- a/launcher/ui/pages/instance/OtherLogsPage.ui
+++ b/launcher/ui/pages/instance/OtherLogsPage.ui
@@ -48,9 +48,6 @@
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="verticalScrollBarPolicy">
-          <enum>Qt::ScrollBarAlwaysOn</enum>
-         </property>
          <property name="readOnly">
           <bool>true</bool>
          </property>
diff --git a/launcher/ui/pages/instance/ResourcePackPage.h b/launcher/ui/pages/instance/ResourcePackPage.h
index 9633e3b4..db8af0c5 100644
--- a/launcher/ui/pages/instance/ResourcePackPage.h
+++ b/launcher/ui/pages/instance/ResourcePackPage.h
@@ -73,3 +73,4 @@ public:
         return true;
     }
 };
+
diff --git a/launcher/ui/pages/instance/ScreenshotsPage.cpp b/launcher/ui/pages/instance/ScreenshotsPage.cpp
index 0092aef3..ca368d3b 100644
--- a/launcher/ui/pages/instance/ScreenshotsPage.cpp
+++ b/launcher/ui/pages/instance/ScreenshotsPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -379,6 +380,24 @@ void ScreenshotsPage::on_actionUpload_triggered()
     if (selection.isEmpty())
         return;
 
+
+    QString text;
+    if (selection.size() > 1)
+        text = tr("You are about to upload %1 screenshots.\n\n"
+                  "Are you sure?")
+                   .arg(selection.size());
+    else
+        text =
+            tr("You are about to upload the selected screenshot.\n\n"
+               "Are you sure?");
+
+    auto response = CustomMessageBox::selectable(this, "Confirm Upload", text, QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No,
+                                                 QMessageBox::No)
+                        ->exec();
+
+    if (response != QMessageBox::Yes)
+        return;
+
     QList<ScreenShot::Ptr> uploaded;
     auto job = NetJob::Ptr(new NetJob("Screenshot Upload", APPLICATION->network()));
     if(selection.size() < 2)
@@ -491,17 +510,32 @@ void ScreenshotsPage::on_actionCopy_File_s_triggered()
 
 void ScreenshotsPage::on_actionDelete_triggered()
 {
-    auto mbox = CustomMessageBox::selectable(
-        this, tr("Are you sure?"), tr("This will delete all selected screenshots."),
-        QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No);
-    std::unique_ptr<QMessageBox> box(mbox);
+    auto selected = ui->listView->selectionModel()->selectedIndexes();
+
+    int count = ui->listView->selectionModel()->selectedRows().size();
+    QString text;
+    if (count > 1)
+        text = tr("You are about to delete %1 screenshots.\n"
+                  "This may be permanent and they will be gone from the folder.\n\n"
+                  "Are you sure?")
+                   .arg(count);
+    else
+        text = tr("You are about to delete the selected screenshot.\n"
+                  "This may be permanent and it will be gone from the folder.\n\n"
+                  "Are you sure?")
+                   .arg(count);
 
-    if (box->exec() != QMessageBox::Yes)
+    auto response =
+        CustomMessageBox::selectable(this, tr("Confirm Deletion"), text, QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No)->exec();
+
+    if (response != QMessageBox::Yes)
         return;
 
-    auto selected = ui->listView->selectionModel()->selectedIndexes();
     for (auto item : selected)
     {
+        if (FS::trash(m_model->filePath(item)))
+            continue;
+
         m_model->remove(item);
     }
 }
diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp
index 08389aa3..4b1fa08a 100644
--- a/launcher/ui/pages/instance/ServersPage.cpp
+++ b/launcher/ui/pages/instance/ServersPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@
  */
 
 #include "ServersPage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui_ServersPage.h"
 
 #include <FileSystem.h>
@@ -800,6 +802,17 @@ void ServersPage::on_actionAdd_triggered()
 
 void ServersPage::on_actionRemove_triggered()
 {
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"),
+                                                 tr("You are about to remove \"%1\".\n"
+                                                    "This is permanent and the server will be gone from your list forever (A LONG TIME).\n\n"
+                                                    "Are you sure?")
+                                                     .arg(m_model->at(currentServer)->m_name),
+                                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                        ->exec();
+
+    if (response != QMessageBox::Yes)
+        return;
+
     m_model->removeRow(currentServer);
 }
 
diff --git a/launcher/ui/pages/instance/VersionPage.cpp b/launcher/ui/pages/instance/VersionPage.cpp
index c8a65f10..d200652a 100644
--- a/launcher/ui/pages/instance/VersionPage.cpp
+++ b/launcher/ui/pages/instance/VersionPage.cpp
@@ -318,13 +318,29 @@ void VersionPage::on_actionReload_triggered()
 
 void VersionPage::on_actionRemove_triggered()
 {
-    if (ui->packageView->currentIndex().isValid())
+    if (!ui->packageView->currentIndex().isValid())
     {
-        // FIXME: use actual model, not reloading.
-        if (!m_profile->remove(ui->packageView->currentIndex().row()))
-        {
-            QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
-        }
+        return;
+    }
+    int index = ui->packageView->currentIndex().row();
+    auto component = m_profile->getComponent(index);
+    if (component->isCustom())
+    {
+        auto response = CustomMessageBox::selectable(this, tr("Confirm Removal"),
+                                                     tr("You are about to remove \"%1\".\n"
+                                                        "This is permanent and will completely remove the custom component.\n\n"
+                                                        "Are you sure?")
+                                                         .arg(component->getName()),
+                                                     QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                            ->exec();
+
+        if (response != QMessageBox::Yes)
+            return;
+    }
+    // FIXME: use actual model, not reloading.
+    if (!m_profile->remove(index))
+    {
+        QMessageBox::critical(this, tr("Error"), tr("Couldn't remove file"));
     }
     updateButtons();
     reloadPackProfile();
@@ -707,6 +723,19 @@ void VersionPage::on_actionRevert_triggered()
     {
         return;
     }
+    auto component = m_profile->getComponent(version);
+
+    auto response = CustomMessageBox::selectable(this, tr("Confirm Reversion"),
+                                                 tr("You are about to revert \"%1\".\n"
+                                                    "This is permanent and will completely revert your customizations.\n\n"
+                                                    "Are you sure?")
+                                                     .arg(component->getName()),
+                                                 QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                        ->exec();
+
+    if (response != QMessageBox::Yes)
+        return;
+
     if(!m_profile->revertToBase(version))
     {
         // TODO: some error box here
diff --git a/launcher/ui/pages/instance/VersionPage.ui b/launcher/ui/pages/instance/VersionPage.ui
index 74b9568a..4cd50885 100644
--- a/launcher/ui/pages/instance/VersionPage.ui
+++ b/launcher/ui/pages/instance/VersionPage.ui
@@ -28,9 +28,6 @@
      <layout class="QVBoxLayout" name="verticalLayout">
       <item>
        <widget class="ModListView" name="packageView">
-        <property name="verticalScrollBarPolicy">
-         <enum>Qt::ScrollBarAlwaysOn</enum>
-        </property>
         <property name="horizontalScrollBarPolicy">
          <enum>Qt::ScrollBarAlwaysOff</enum>
         </property>
diff --git a/launcher/ui/pages/instance/WorldListPage.cpp b/launcher/ui/pages/instance/WorldListPage.cpp
index b8b48ef9..d4a395d9 100644
--- a/launcher/ui/pages/instance/WorldListPage.cpp
+++ b/launcher/ui/pages/instance/WorldListPage.cpp
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: GPL-3.0-only
 /*
- *  PolyMC - Minecraft Launcher
+ *  Prism Launcher - Minecraft Launcher
  *  Copyright (c) 2022 Jamie Mansfield <jmansfield@cadixdev.org>
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@
  */
 
 #include "WorldListPage.h"
+#include "ui/dialogs/CustomMessageBox.h"
 #include "ui_WorldListPage.h"
 #include "minecraft/WorldList.h"
 
@@ -192,12 +194,14 @@ void WorldListPage::on_actionRemove_triggered()
     if(!proxiedIndex.isValid())
         return;
 
-    auto result = QMessageBox::question(this,
-                tr("Are you sure?"),
-                tr("This will remove the selected world permenantly.\n"
-                    "The world will be gone forever (A LONG TIME).\n"
-                    "\n"
-                    "Do you want to continue?"));
+    auto result = CustomMessageBox::selectable(this, tr("Confirm Deletion"),
+                                               tr("You are about to delete \"%1\".\n"
+                                                  "The world may be gone forever (A LONG TIME).\n\n"
+                                                  "Are you sure?")
+                                                   .arg(m_worlds->allWorlds().at(proxiedIndex.row()).name()),
+                                               QMessageBox::Warning, QMessageBox::Yes | QMessageBox::No, QMessageBox::No)
+                      ->exec();
+
     if(result != QMessageBox::Yes)
     {
         return;
diff --git a/launcher/ui/pages/instance/WorldListPage.ui b/launcher/ui/pages/instance/WorldListPage.ui
index 7c68bfae..d74dd079 100644
--- a/launcher/ui/pages/instance/WorldListPage.ui
+++ b/launcher/ui/pages/instance/WorldListPage.ui
@@ -109,7 +109,7 @@
   </action>
   <action name="actionRemove">
    <property name="text">
-    <string>Remove</string>
+    <string>Delete</string>
    </property>
   </action>
   <action name="actionMCEdit">
diff --git a/launcher/ui/pages/modplatform/ModModel.cpp b/launcher/ui/pages/modplatform/ModModel.cpp
index ed58eb32..3ffe6cb0 100644
--- a/launcher/ui/pages/modplatform/ModModel.cpp
+++ b/launcher/ui/pages/modplatform/ModModel.cpp
@@ -1,350 +1,70 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
 #include "ModModel.h"
 
-#include "BuildConfig.h"
-#include "Json.h"
-#include "ModPage.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
-#include "ui/dialogs/ModDownloadDialog.h"
-
-#include "ui/widgets/ProjectItem.h"
 
 #include <QMessageBox>
 
-namespace ModPlatform {
-
-// HACK: We need this to prevent callbacks from calling the ListModel after it has already been deleted.
-// This leaks a tiny bit of memory per time the user has opened the mod dialog. How to make this better?
-static QHash<ListModel*, bool> s_running;
-
-ListModel::ListModel(ModPage* parent) : QAbstractListModel(parent), m_parent(parent) { s_running.insert(this, true); }
-
-ListModel::~ListModel()
-{
-    s_running.find(this).value() = false;
-}
+namespace ResourceDownload {
 
-auto ListModel::debugName() const -> QString
-{
-    return m_parent->debugName();
-}
+ModModel::ModModel(BaseInstance const& base_inst, ResourceAPI* api) : ResourceModel(api), m_base_instance(base_inst) {}
 
 /******** Make data requests ********/
 
-void ListModel::fetchMore(const QModelIndex& parent)
-{
-    if (parent.isValid())
-        return;
-    if (nextSearchOffset == 0) {
-        qWarning() << "fetchMore with 0 offset is wrong...";
-        return;
-    }
-    performPaginatedSearch();
-}
-
-auto ListModel::data(const QModelIndex& index, int role) const -> QVariant
-{
-    int pos = index.row();
-    if (pos >= modpacks.size() || pos < 0 || !index.isValid()) {
-        return QString("INVALID INDEX %1").arg(pos);
-    }
-
-    ModPlatform::IndexedPack pack = modpacks.at(pos);
-    switch (role) {
-        case Qt::ToolTipRole: {
-            if (pack.description.length() > 100) {
-                // some magic to prevent to long tooltips and replace html linebreaks
-                QString edit = pack.description.left(97);
-                edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
-                return edit;
-            }
-            return pack.description;
-        }
-        case Qt::DecorationRole: {
-            if (m_logoMap.contains(pack.logoName)) {
-                return m_logoMap.value(pack.logoName);
-            }
-            QIcon icon = APPLICATION->getThemedIcon("screenshot-placeholder");
-            // un-const-ify this
-            ((ListModel*)this)->requestLogo(pack.logoName, pack.logoUrl);
-            return icon;
-        }
-        case Qt::SizeHintRole: 
-            return QSize(0, 58);
-        case Qt::UserRole: {
-            QVariant v;
-            v.setValue(pack);
-            return v;
-        }
-    // Custom data
-        case UserDataTypes::TITLE:
-            return pack.name;
-        case UserDataTypes::DESCRIPTION:
-            return pack.description;
-        case UserDataTypes::SELECTED:
-            return m_parent->getDialog()->isModSelected(pack.name);
-        default:
-            break;
-    }
-
-    return {};
-}
-
-bool ListModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    int pos = index.row();
-    if (pos >= modpacks.size() || pos < 0 || !index.isValid())
-        return false;
-
-    modpacks[pos] = value.value<ModPlatform::IndexedPack>();
-
-    return true;
-}
-
-void ListModel::requestModVersions(ModPlatform::IndexedPack const& current, QModelIndex index)
-{
-    auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
-
-    m_parent->apiProvider()->getVersions({ current.addonId.toString(), getMineVersions(), profile->getModLoaders() },
-                                         [this, current, index](QJsonDocument& doc, QString addonId) {
-                                             if (!s_running.constFind(this).value())
-                                                 return;
-                                             versionRequestSucceeded(doc, addonId, index);
-                                         });
-}
-
-void ListModel::performPaginatedSearch()
+ResourceAPI::SearchArgs ModModel::createSearchArguments()
 {
-    auto profile = (dynamic_cast<MinecraftInstance*>((dynamic_cast<ModPage*>(parent()))->m_instance))->getPackProfile();
-
-    m_parent->apiProvider()->searchMods(
-        this, { nextSearchOffset, currentSearchTerm, getSorts()[currentSort], profile->getModLoaders(), getMineVersions() });
-}
+    auto profile = static_cast<MinecraftInstance const&>(m_base_instance).getPackProfile();
 
-void ListModel::requestModInfo(ModPlatform::IndexedPack& current, QModelIndex index)
-{
-    m_parent->apiProvider()->getModInfo(current, [this, index](QJsonDocument& doc, ModPlatform::IndexedPack& pack) {
-        if (!s_running.constFind(this).value())
-            return;
-        infoRequestFinished(doc, pack, index);
-    });
-}
+    Q_ASSERT(profile);
+    Q_ASSERT(m_filter);
 
-void ListModel::refresh()
-{
-    if (jobPtr) {
-        jobPtr->abort();
-        searchState = ResetRequested;
-        return;
-    } else {
-        beginResetModel();
-        modpacks.clear();
-        endResetModel();
-        searchState = None;
-    }
-    nextSearchOffset = 0;
-    performPaginatedSearch();
-}
+    std::optional<std::list<Version>> versions{};
 
-void ListModel::searchWithTerm(const QString& term, const int sort, const bool filter_changed)
-{
-    if (currentSearchTerm == term && currentSearchTerm.isNull() == term.isNull() && currentSort == sort && !filter_changed) {
-        return;
+    { // Version filter
+        if (!m_filter->versions.empty())
+            versions = m_filter->versions;
     }
 
-    currentSearchTerm = term;
-    currentSort = sort;
-
-    refresh();
-}
+    auto sort = getCurrentSortingMethodByIndex();
 
-void ListModel::getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback)
-{
-    if (m_logoMap.contains(logo)) {
-        callback(APPLICATION->metacache()
-                     ->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)))
-                     ->getFullPath());
-    } else {
-        requestLogo(logo, logoUrl);
-    }
+    return { ModPlatform::ResourceType::MOD, m_next_search_offset, m_search_term, sort, profile->getModLoaders(), versions };
 }
 
-void ListModel::requestLogo(QString logo, QString url)
+ResourceAPI::VersionSearchArgs ModModel::createVersionsArguments(QModelIndex& entry)
 {
-    if (m_loadingLogos.contains(logo) || m_failedLogos.contains(logo) || url.isEmpty()) {
-        return;
-    }
+    auto& pack = m_packs[entry.row()];
+    auto profile = static_cast<MinecraftInstance const&>(m_base_instance).getPackProfile();
 
-    MetaEntryPtr entry =
-        APPLICATION->metacache()->resolveEntry(m_parent->metaEntryBase(), QString("logos/%1").arg(logo.section(".", 0, 0)));
-    auto job = new NetJob(QString("%1 Icon Download %2").arg(m_parent->debugName()).arg(logo), APPLICATION->network());
-    job->addNetAction(Net::Download::makeCached(QUrl(url), entry));
+    Q_ASSERT(profile);
+    Q_ASSERT(m_filter);
 
-    auto fullPath = entry->getFullPath();
-    QObject::connect(job, &NetJob::succeeded, this, [this, logo, fullPath, job] {
-        job->deleteLater();
-        emit logoLoaded(logo, QIcon(fullPath));
-        if (waitingCallbacks.contains(logo)) {
-            waitingCallbacks.value(logo)(fullPath);
-        }
-    });
+    std::optional<std::list<Version>> versions{};
+    if (!m_filter->versions.empty())
+        versions = m_filter->versions;
 
-    QObject::connect(job, &NetJob::failed, this, [this, logo, job] {
-        job->deleteLater();
-        emit logoFailed(logo);
-    });
-
-    job->start();
-    m_loadingLogos.append(logo);
-}
-
-/******** Request callbacks ********/
-
-void ListModel::logoLoaded(QString logo, QIcon out)
-{
-    m_loadingLogos.removeAll(logo);
-    m_logoMap.insert(logo, out);
-    for (int i = 0; i < modpacks.size(); i++) {
-        if (modpacks[i].logoName == logo) {
-            emit dataChanged(createIndex(i, 0), createIndex(i, 0), { Qt::DecorationRole });
-        }
-    }
+    return { pack, versions, profile->getModLoaders() };
 }
 
-void ListModel::logoFailed(QString logo)
+ResourceAPI::ProjectInfoArgs ModModel::createInfoArguments(QModelIndex& entry)
 {
-    m_failedLogos.append(logo);
-    m_loadingLogos.removeAll(logo);
+    auto& pack = m_packs[entry.row()];
+    return { pack };
 }
 
-void ListModel::searchRequestFinished(QJsonDocument& doc)
+void ModModel::searchWithTerm(const QString& term, unsigned int sort, bool filter_changed)
 {
-    jobPtr.reset();
-
-    QList<ModPlatform::IndexedPack> newList;
-    auto packs = documentToArray(doc);
-
-    for (auto packRaw : packs) {
-        auto packObj = packRaw.toObject();
-
-        ModPlatform::IndexedPack pack;
-        try {
-            loadIndexedPack(pack, packObj);
-            newList.append(pack);
-        } catch (const JSONValidationError& e) {
-            qWarning() << "Error while loading mod from " << m_parent->debugName() << ": " << e.cause();
-            continue;
-        }
-    }
-
-    if (packs.size() < 25) {
-        searchState = Finished;
-    } else {
-        nextSearchOffset += 25;
-        searchState = CanPossiblyFetchMore;
-    }
-
-    // When you have a Qt build with assertions turned on, proceeding here will abort the application
-    if (newList.size() == 0)
+    if (m_search_term == term && m_search_term.isNull() == term.isNull() && m_current_sort_index == sort && !filter_changed) {
         return;
-
-    beginInsertRows(QModelIndex(), modpacks.size(), modpacks.size() + newList.size() - 1);
-    modpacks.append(newList);
-    endInsertRows();
-}
-
-void ListModel::searchRequestFailed(QString reason)
-{
-    auto failed_action = jobPtr->getFailedActions().at(0);
-    if (!failed_action->m_reply) {
-        // Network error
-        QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load mods."));
-    } else if (failed_action->m_reply && failed_action->m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 409) {
-        // 409 Gone, notify user to update
-        QMessageBox::critical(nullptr, tr("Error"),
-                              //: %1 refers to the launcher itself
-                              QString("%1 %2")
-                                  .arg(m_parent->displayName())
-                                  .arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_DISPLAYNAME)));
     }
 
-    jobPtr.reset();
-    searchState = Finished;
-}
-
-void ListModel::searchRequestAborted()
-{
-    if (searchState != ResetRequested)
-        qCritical() << "Search task in ModModel aborted by an unknown reason!";
-
-    // Retry fetching
-    jobPtr.reset();
-
-    beginResetModel();
-    modpacks.clear();
-    endResetModel();
-
-    nextSearchOffset = 0;
-    performPaginatedSearch();
-}
+    setSearchTerm(term);
+    m_current_sort_index = sort;
 
-void ListModel::infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index)
-{
-    qDebug() << "Loading mod info";
-
-    try {
-        auto obj = Json::requireObject(doc);
-        loadExtraPackInfo(pack, obj);
-    } catch (const JSONValidationError& e) {
-        qDebug() << doc;
-        qWarning() << "Error while reading " << debugName() << " mod info: " << e.cause();
-    }
-
-    // Check if the index is still valid for this mod or not
-    if (pack.addonId == data(index, Qt::UserRole).value<ModPlatform::IndexedPack>().addonId) {
-        // Cache info :^)
-        QVariant new_pack;
-        new_pack.setValue(pack);
-        if (!setData(index, new_pack, Qt::UserRole)) {
-            qWarning() << "Failed to cache mod info!";
-        }
-    }
-
-    m_parent->updateUi();
-}
-
-void ListModel::versionRequestSucceeded(QJsonDocument doc, QString addonId, const QModelIndex& index)
-{
-    auto& current = m_parent->getCurrent();
-    if (addonId != current.addonId) {
-        return;
-    }
-
-    auto arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
-
-    try {
-        loadIndexedPackVersions(current, arr);
-    } catch (const JSONValidationError& e) {
-        qDebug() << doc;
-        qWarning() << "Error while reading " << debugName() << " mod version: " << e.cause();
-    }
-
-    // Cache info :^)
-    QVariant new_pack;
-    new_pack.setValue(current);
-    if (!setData(index, new_pack, Qt::UserRole)) {
-        qWarning() << "Failed to cache mod versions!";
-    }
-
-
-    m_parent->updateModVersions();
+    refresh();
 }
 
-}  // namespace ModPlatform
-
-/******** Helpers ********/
-
-auto ModPlatform::ListModel::getMineVersions() const -> std::list<Version>
-{
-    return m_parent->getFilter()->versions;
-}
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ModModel.h b/launcher/ui/pages/modplatform/ModModel.h
index 36840649..5d4a7785 100644
--- a/launcher/ui/pages/modplatform/ModModel.h
+++ b/launcher/ui/pages/modplatform/ModModel.h
@@ -1,92 +1,52 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
 #pragma once
 
 #include <QAbstractListModel>
 
+#include "BaseInstance.h"
+
 #include "modplatform/ModIndex.h"
-#include "net/NetJob.h"
+#include "modplatform/ResourceAPI.h"
+
+#include "ui/pages/modplatform/ResourceModel.h"
+#include "ui/widgets/ModFilterWidget.h"
 
-class ModPage;
 class Version;
 
-namespace ModPlatform {
+namespace ResourceDownload {
 
-using LogoMap = QMap<QString, QIcon>;
-using LogoCallback = std::function<void (QString)>;
+class ModPage;
 
-class ListModel : public QAbstractListModel {
+class ModModel : public ResourceModel {
     Q_OBJECT
 
    public:
-    ListModel(ModPage* parent);
-    ~ListModel() override;
-
-    inline auto rowCount(const QModelIndex& parent) const -> int override { return parent.isValid() ? 0 : modpacks.size(); };
-    inline auto columnCount(const QModelIndex& parent) const -> int override { return parent.isValid() ? 0 : 1; };
-    inline auto flags(const QModelIndex& index) const -> Qt::ItemFlags override { return QAbstractListModel::flags(index); };
-
-    auto debugName() const -> QString;
-
-    /* Retrieve information from the model at a given index with the given role */
-    auto data(const QModelIndex& index, int role) const -> QVariant override;
-    bool setData(const QModelIndex &index, const QVariant &value, int role) override;
-
-    inline void setActiveJob(NetJob::Ptr ptr) { jobPtr = ptr; }
-    inline NetJob* activeJob() { return jobPtr.get(); }
+    ModModel(const BaseInstance&, ResourceAPI* api);
 
     /* Ask the API for more information */
-    void fetchMore(const QModelIndex& parent) override;
-    void refresh();
-    void searchWithTerm(const QString& term, const int sort, const bool filter_changed);
-    void requestModInfo(ModPlatform::IndexedPack& current, QModelIndex index);
-    void requestModVersions(const ModPlatform::IndexedPack& current, QModelIndex index);
+    void searchWithTerm(const QString& term, unsigned int sort, bool filter_changed);
 
-    virtual void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) = 0;
-    virtual void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) = 0;
-    virtual void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) = 0;
+    void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
+    void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override = 0;
+    void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override = 0;
 
-    void getLogo(const QString& logo, const QString& logoUrl, LogoCallback callback);
-
-    inline auto canFetchMore(const QModelIndex& parent) const -> bool override { return parent.isValid() ? false : searchState == CanPossiblyFetchMore; };
+    void setFilter(std::shared_ptr<ModFilterWidget::Filter> filter) { m_filter = filter; }
 
    public slots:
-    void searchRequestFinished(QJsonDocument& doc);
-    void searchRequestFailed(QString reason);
-    void searchRequestAborted();
-
-    void infoRequestFinished(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index);
-
-    void versionRequestSucceeded(QJsonDocument doc, QString addonId, const QModelIndex& index);
-
-   protected slots:
-
-    void logoFailed(QString logo);
-    void logoLoaded(QString logo, QIcon out);
-
-    void performPaginatedSearch();
+    ResourceAPI::SearchArgs createSearchArguments() override;
+    ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) override;
+    ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) override;
 
    protected:
-    virtual auto documentToArray(QJsonDocument& obj) const -> QJsonArray = 0;
-    virtual auto getSorts() const -> const char** = 0;
-
-    void requestLogo(QString file, QString url);
-
-    inline auto getMineVersions() const -> std::list<Version>;
+    auto documentToArray(QJsonDocument& obj) const -> QJsonArray override = 0;
 
    protected:
-    ModPage* m_parent;
-
-    QList<ModPlatform::IndexedPack> modpacks;
-
-    LogoMap m_logoMap;
-    QMap<QString, LogoCallback> waitingCallbacks;
-    QStringList m_failedLogos;
-    QStringList m_loadingLogos;
+    const BaseInstance& m_base_instance;
 
-    QString currentSearchTerm;
-    int currentSort = 0;
-    int nextSearchOffset = 0;
-    enum SearchState { None, CanPossiblyFetchMore, ResetRequested, Finished } searchState = None;
-
-    NetJob::Ptr jobPtr;
+    std::shared_ptr<ModFilterWidget::Filter> m_filter = nullptr;
 };
-}  // namespace ModPlatform
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ModPage.cpp b/launcher/ui/pages/modplatform/ModPage.cpp
index 677bc4d6..04be43ad 100644
--- a/launcher/ui/pages/modplatform/ModPage.cpp
+++ b/launcher/ui/pages/modplatform/ModPage.cpp
@@ -1,4 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
@@ -35,61 +37,30 @@
  */
 
 #include "ModPage.h"
-#include "Application.h"
-#include "ui_ModPage.h"
+#include "ui_ResourcePage.h"
 
 #include <QDesktopServices>
 #include <QKeyEvent>
 #include <QRegularExpression>
+
 #include <memory>
 
-#include <HoeDown.h>
+#include "Application.h"
+#include "ResourceDownloadTask.h"
 
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
-#include "ui/dialogs/ModDownloadDialog.h"
-#include "ui/widgets/ProjectItem.h"
-
-
-ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api)
-    : QWidget(dialog)
-    , m_instance(instance)
-    , ui(new Ui::ModPage)
-    , dialog(dialog)
-    , m_fetch_progress(this, false)
-    , api(api)
-{
-    ui->setupUi(this);
-
-    connect(ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);
-    connect(ui->modFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
-    connect(ui->packView, &QListView::doubleClicked, this, &ModPage::onModSelected);
 
-    m_search_timer.setTimerType(Qt::TimerType::CoarseTimer);
-    m_search_timer.setSingleShot(true);
+#include "ui/dialogs/ResourceDownloadDialog.h"
 
-    connect(&m_search_timer, &QTimer::timeout, this, &ModPage::triggerSearch);
-
-    ui->searchEdit->installEventFilter(this);
-
-    ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
-    ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
-
-    m_fetch_progress.hideIfInactive(true);
-    m_fetch_progress.setFixedHeight(24);
-    m_fetch_progress.progressFormat("");
-
-    ui->gridLayout_3->addWidget(&m_fetch_progress, 0, 0, 1, ui->gridLayout_3->columnCount());
-
-    ui->packView->setItemDelegate(new ProjectItemDelegate(this));
-    ui->packView->installEventFilter(this);
-
-    connect(ui->packDescription, &QTextBrowser::anchorClicked, this, &ModPage::openUrl);
-}
+namespace ResourceDownload {
 
-ModPage::~ModPage()
+ModPage::ModPage(ModDownloadDialog* dialog, BaseInstance& instance)
+    : ResourcePage(dialog, instance)
 {
-    delete ui;
+    connect(m_ui->searchButton, &QPushButton::clicked, this, &ModPage::triggerSearch);
+    connect(m_ui->resourceFilterButton, &QPushButton::clicked, this, &ModPage::filterMods);
+    connect(m_ui->packView, &QListView::doubleClicked, this, &ModPage::onResourceSelected);
 }
 
 void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
@@ -99,59 +70,19 @@ void ModPage::setFilterWidget(unique_qobject_ptr<ModFilterWidget>& widget)
 
     m_filter_widget.swap(widget);
 
-    ui->gridLayout_3->addWidget(m_filter_widget.get(), 0, 0, 1, ui->gridLayout_3->columnCount());
+    m_ui->gridLayout_3->addWidget(m_filter_widget.get(), 0, 0, 1, m_ui->gridLayout_3->columnCount());
 
-    m_filter_widget->setInstance(static_cast<MinecraftInstance*>(m_instance));
+    m_filter_widget->setInstance(&static_cast<MinecraftInstance&>(m_base_instance));
     m_filter = m_filter_widget->getFilter();
 
     connect(m_filter_widget.get(), &ModFilterWidget::filterChanged, this, [&]{
-        ui->searchButton->setStyleSheet("text-decoration: underline");
+        m_ui->searchButton->setStyleSheet("text-decoration: underline");
     });
     connect(m_filter_widget.get(), &ModFilterWidget::filterUnchanged, this, [&]{
-        ui->searchButton->setStyleSheet("text-decoration: none");
+        m_ui->searchButton->setStyleSheet("text-decoration: none");
     });
 }
 
-
-/******** Qt things ********/
-
-void ModPage::openedImpl()
-{
-    updateSelectionButton();
-    triggerSearch();
-}
-
-auto ModPage::eventFilter(QObject* watched, QEvent* event) -> bool
-{
-    if (watched == ui->searchEdit && event->type() == QEvent::KeyPress) {
-        auto* keyEvent = dynamic_cast<QKeyEvent*>(event);
-        if (keyEvent->key() == Qt::Key_Return) {
-            triggerSearch();
-            keyEvent->accept();
-            return true;
-        } else {
-            if (m_search_timer.isActive())
-                m_search_timer.stop();
-
-            m_search_timer.start(350);
-        }
-    } else if (watched == ui->packView && event->type() == QEvent::KeyPress) {
-        auto* keyEvent = dynamic_cast<QKeyEvent*>(event);
-        if (keyEvent->key() == Qt::Key_Return) {
-            onModSelected();
-
-            // To have the 'select mod' button outlined instead of the 'review and confirm' one
-            ui->modSelectionButton->setFocus(Qt::FocusReason::ShortcutFocusReason);
-            ui->packView->setFocus(Qt::FocusReason::NoFocusReason);
-
-            keyEvent->accept();
-            return true;
-        }
-    }
-    return QWidget::eventFilter(watched, event);
-}
-
-
 /******** Callbacks to events in the UI (set up in the derived classes) ********/
 
 void ModPage::filterMods()
@@ -165,176 +96,37 @@ void ModPage::triggerSearch()
     m_filter = m_filter_widget->getFilter();
 
     if (changed) {
-        ui->packView->clearSelection();
-        ui->packDescription->clear();
-        ui->versionSelectionBox->clear();
-        updateSelectionButton();
-    }
-
-    listModel->searchWithTerm(getSearchTerm(), ui->sortByBox->currentIndex(), changed);
-    m_fetch_progress.watch(listModel->activeJob());
-}
-
-QString ModPage::getSearchTerm() const
-{
-    return ui->searchEdit->text();
-}
-void ModPage::setSearchTerm(QString term)
-{
-    ui->searchEdit->setText(term);
-}
-
-void ModPage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
-{
-    ui->versionSelectionBox->clear();
-
-    if (!curr.isValid()) { return; }
-
-    current = listModel->data(curr, Qt::UserRole).value<ModPlatform::IndexedPack>();
-
-    if (!current.versionsLoaded) {
-        qDebug() << QString("Loading %1 mod versions").arg(debugName());
-
-        ui->modSelectionButton->setText(tr("Loading versions..."));
-        ui->modSelectionButton->setEnabled(false);
-
-        listModel->requestModVersions(current, curr);
-    } else {
-        for (int i = 0; i < current.versions.size(); i++) {
-            ui->versionSelectionBox->addItem(current.versions[i].version, QVariant(i));
-        }
-        if (ui->versionSelectionBox->count() == 0) { ui->versionSelectionBox->addItem(tr("No valid version found."), QVariant(-1)); }
-
+        m_ui->packView->clearSelection();
+        m_ui->packDescription->clear();
+        m_ui->versionSelectionBox->clear();
         updateSelectionButton();
     }
 
-    if(!current.extraDataLoaded){
-        qDebug() << QString("Loading %1 mod info").arg(debugName());
-
-        listModel->requestModInfo(current, curr);
-    }
-
-    updateUi();
-}
-
-void ModPage::onVersionSelectionChanged(QString data)
-{
-    if (data.isNull() || data.isEmpty()) {
-        selectedVersion = -1;
-        return;
-    }
-    selectedVersion = ui->versionSelectionBox->currentData().toInt();
-    updateSelectionButton();
-}
-
-void ModPage::onModSelected()
-{
-    if (selectedVersion < 0)
-        return;
-
-    auto& version = current.versions[selectedVersion];
-    if (dialog->isModSelected(current.name, version.fileName)) {
-        dialog->removeSelectedMod(current.name);
-    } else {
-        bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
-        dialog->addSelectedMod(current.name, new ModDownloadTask(current, version, dialog->mods, is_indexed));
-    }
-
-    updateSelectionButton();
-
-    /* Force redraw on the mods list when the selection changes */
-    ui->packView->adjustSize();
+    static_cast<ModModel*>(m_model)->searchWithTerm(getSearchTerm(), m_ui->sortByBox->currentData().toUInt(), changed);
+    m_fetch_progress.watch(m_model->activeSearchJob().get());
 }
 
-static const QRegularExpression modrinth(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/mod\\/([^\\/]+)\\/?"));
-static const QRegularExpression curseForge(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/([^\\/]+)\\/?"));
-static const QRegularExpression curseForgeOld(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"));
-
-void ModPage::openUrl(const QUrl& url)
+QMap<QString, QString> ModPage::urlHandlers() const
 {
-    // do not allow other url schemes for security reasons
-    if (!(url.scheme() == "http" || url.scheme() == "https")) {
-        qWarning() << "Unsupported scheme" << url.scheme();
-        return;
-    }
-
-    // detect mod URLs and search instead
-
-    const QString address = url.host() + url.path();
-    QRegularExpressionMatch match;
-    QString page;
-
-    match = modrinth.match(address);
-    if (match.hasMatch())
-        page = "modrinth";
-    else if (APPLICATION->capabilities() & Application::SupportsFlame) {
-        match = curseForge.match(address);
-        if (!match.hasMatch())
-            match = curseForgeOld.match(address);
-
-        if (match.hasMatch())
-            page = "curseforge";
-    }
-
-    if (!page.isNull()) {
-        const QString slug = match.captured(1);
-
-        // ensure the user isn't opening the same mod
-        if (slug != current.slug) {
-            dialog->selectPage(page);
-
-            ModPage* newPage = dialog->getSelectedPage();
-
-            QLineEdit* searchEdit = newPage->ui->searchEdit;
-            ModPlatform::ListModel* model = newPage->listModel;
-            QListView* view = newPage->ui->packView;
-
-            auto jump = [url, slug, model, view] {
-                for (int row = 0; row < model->rowCount({}); row++) {
-                    const QModelIndex index = model->index(row);
-                    const auto pack = model->data(index, Qt::UserRole).value<ModPlatform::IndexedPack>();
-
-                    if (pack.slug == slug) {
-                        view->setCurrentIndex(index);
-                        return;
-                    }
-                }
-
-                // The final fallback.
-                QDesktopServices::openUrl(url);
-            };
-
-            searchEdit->setText(slug);
-            newPage->triggerSearch();
-
-            if (model->activeJob())
-                connect(model->activeJob(), &Task::finished, jump);
-            else
-                jump();
-
-            return;
-        }
-    }
-
-    // open in the user's web browser
-    QDesktopServices::openUrl(url);
+    QMap<QString, QString> map;
+    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?modrinth\\.com\\/mod\\/([^\\/]+)\\/?"), "modrinth");
+    map.insert(QRegularExpression::anchoredPattern("(?:www\\.)?curseforge\\.com\\/minecraft\\/mc-mods\\/([^\\/]+)\\/?"), "curseforge");
+    map.insert(QRegularExpression::anchoredPattern("minecraft\\.curseforge\\.com\\/projects\\/([^\\/]+)\\/?"), "curseforge");
+    return map;
 }
 
 /******** Make changes to the UI ********/
 
-void ModPage::retranslate()
-{
-   ui->retranslateUi(this);
-}
-
-void ModPage::updateModVersions(int prev_count)
+void ModPage::updateVersionList()
 {
-    auto packProfile = (dynamic_cast<MinecraftInstance*>(m_instance))->getPackProfile();
+    m_ui->versionSelectionBox->clear();
+    auto packProfile = (dynamic_cast<MinecraftInstance&>(m_base_instance)).getPackProfile();
 
     QString mcVersion = packProfile->getComponentVersion("net.minecraft");
 
-    for (int i = 0; i < current.versions.size(); i++) {
-        auto version = current.versions[i];
+    auto current_pack = getCurrentPack();
+    for (int i = 0; i < current_pack.versions.size(); i++) {
+        auto version = current_pack.versions[i];
         bool valid = false;
         for(auto& mcVer : m_filter->versions){
             //NOTE: Flame doesn't care about loader, so passing it changes nothing.
@@ -346,88 +138,20 @@ void ModPage::updateModVersions(int prev_count)
 
         // Only add the version if it's valid or using the 'Any' filter, but never if the version is opted out
         if ((valid || m_filter->versions.empty()) && !optedOut(version))
-            ui->versionSelectionBox->addItem(version.version, QVariant(i));
+            m_ui->versionSelectionBox->addItem(version.version, QVariant(i));
     }
-    if (ui->versionSelectionBox->count() == 0 && prev_count != 0) {
-        ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
-        ui->modSelectionButton->setText(tr("Cannot select invalid version :("));
+    if (m_ui->versionSelectionBox->count() == 0) {
+        m_ui->versionSelectionBox->addItem(tr("No valid version found!"), QVariant(-1));
+        m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
     }
 
     updateSelectionButton();
 }
 
-
-void ModPage::updateSelectionButton()
+void ModPage::addResourceToDialog(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& version)
 {
-    if (!isOpened || selectedVersion < 0) {
-        ui->modSelectionButton->setEnabled(false);
-        return;
-    }
-
-    ui->modSelectionButton->setEnabled(true);
-    auto& version = current.versions[selectedVersion];
-    if (!dialog->isModSelected(current.name, version.fileName)) {
-        ui->modSelectionButton->setText(tr("Select mod for download"));
-    } else {
-        ui->modSelectionButton->setText(tr("Deselect mod for download"));
-    }
+    bool is_indexed = !APPLICATION->settings()->get("ModMetadataDisabled").toBool();
+    m_parent_dialog->addResource(pack, version, is_indexed);
 }
 
-void ModPage::updateUi()
-{
-    QString text = "";
-    QString name = current.name;
-
-    if (current.websiteUrl.isEmpty())
-        text = name;
-    else
-        text = "<a href=\"" + current.websiteUrl + "\">" + name + "</a>";
-
-    if (!current.authors.empty()) {
-        auto authorToStr = [](ModPlatform::ModpackAuthor& author) -> QString {
-            if (author.url.isEmpty()) { return author.name; }
-            return QString("<a href=\"%1\">%2</a>").arg(author.url, author.name);
-        };
-        QStringList authorStrs;
-        for (auto& author : current.authors) {
-            authorStrs.push_back(authorToStr(author));
-        }
-        text += "<br>" + tr(" by ") + authorStrs.join(", ");
-    }
-
-    if (current.extraDataLoaded) {
-        if (!current.extraData.donate.isEmpty()) {
-            text += "<br><br>" + tr("Donate information: ");
-            auto donateToStr = [](ModPlatform::DonationData& donate) -> QString {
-                return QString("<a href=\"%1\">%2</a>").arg(donate.url, donate.platform);
-            };
-            QStringList donates;
-            for (auto& donate : current.extraData.donate) {
-                donates.append(donateToStr(donate));
-            }
-            text += donates.join(", ");
-        }
-
-        if (!current.extraData.issuesUrl.isEmpty()
-         || !current.extraData.sourceUrl.isEmpty()
-         || !current.extraData.wikiUrl.isEmpty()
-         || !current.extraData.discordUrl.isEmpty()) {
-            text += "<br><br>" + tr("External links:") + "<br>";
-        }
-
-        if (!current.extraData.issuesUrl.isEmpty())
-            text += "- " + tr("Issues: <a href=%1>%1</a>").arg(current.extraData.issuesUrl) + "<br>";
-        if (!current.extraData.wikiUrl.isEmpty())
-            text += "- " + tr("Wiki: <a href=%1>%1</a>").arg(current.extraData.wikiUrl) + "<br>";
-        if (!current.extraData.sourceUrl.isEmpty())
-            text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current.extraData.sourceUrl) + "<br>";
-        if (!current.extraData.discordUrl.isEmpty())
-            text += "- " + tr("Discord: <a href=%1>%1</a>").arg(current.extraData.discordUrl) + "<br>";
-    }
-
-    text += "<hr>";
-
-    HoeDown h;
-    ui->packDescription->setHtml(text + (current.extraData.body.isEmpty() ? current.description : h.process(current.extraData.body.toUtf8())));
-    ui->packDescription->flush();
-}
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ModPage.h b/launcher/ui/pages/modplatform/ModPage.h
index c9ccbaf2..c3b58cd6 100644
--- a/launcher/ui/pages/modplatform/ModPage.h
+++ b/launcher/ui/pages/modplatform/ModPage.h
@@ -1,105 +1,76 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
 #pragma once
 
 #include <QWidget>
 
-#include "Application.h"
-#include "modplatform/ModAPI.h"
 #include "modplatform/ModIndex.h"
-#include "ui/pages/BasePage.h"
+
+#include "ui/pages/modplatform/ResourcePage.h"
 #include "ui/pages/modplatform/ModModel.h"
 #include "ui/widgets/ModFilterWidget.h"
-#include "ui/widgets/ProgressWidget.h"
-
-class ModDownloadDialog;
 
 namespace Ui {
-class ModPage;
+class ResourcePage;
 }
 
+namespace ResourceDownload {
+
+class ModDownloadDialog;
+
 /* This page handles most logic related to browsing and selecting mods to download. */
-class ModPage : public QWidget, public BasePage {
+class ModPage : public ResourcePage {
     Q_OBJECT
 
    public:
     template<typename T>
-    static T* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    static T* create(ModDownloadDialog* dialog, BaseInstance& instance)
     {
         auto page = new T(dialog, instance);
+        auto model = static_cast<ModModel*>(page->getModel());
 
-        auto filter_widget = ModFilterWidget::create(static_cast<MinecraftInstance*>(instance)->getPackProfile()->getComponentVersion("net.minecraft"), page);
+        auto filter_widget = ModFilterWidget::create(static_cast<MinecraftInstance&>(instance).getPackProfile()->getComponentVersion("net.minecraft"), page);
         page->setFilterWidget(filter_widget);
+        model->setFilter(page->getFilter());
+
+        connect(model, &ResourceModel::versionListUpdated, page, &ResourcePage::updateVersionList);
+        connect(model, &ResourceModel::projectInfoUpdated, page, &ResourcePage::updateUi);
 
         return page;
     }
 
-    ~ModPage() override;
-
-    /* Affects what the user sees */
-    auto displayName() const -> QString override = 0;
-    auto icon() const -> QIcon override = 0;
-    auto id() const -> QString override = 0;
-    auto helpPage() const -> QString override = 0;
+    ~ModPage() override = default;
 
-    /* Used internally */
-    virtual auto metaEntryBase() const -> QString = 0;
-    virtual auto debugName() const -> QString = 0;
+    //: The plural version of 'mod'
+    [[nodiscard]] inline QString resourcesString() const override { return tr("mods"); }
+    //: The singular version of 'mods'
+    [[nodiscard]] inline QString resourceString() const override { return tr("mod"); }
 
+    [[nodiscard]] QMap<QString, QString> urlHandlers() const override;
 
-    void retranslate() override;
+    void addResourceToDialog(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&) override;
 
-    void updateUi();
+    virtual auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const -> bool = 0;
 
-    auto shouldDisplay() const -> bool override = 0;
-    virtual auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders = ModAPI::Unspecified) const -> bool = 0;
-    virtual bool optedOut(ModPlatform::IndexedVersion& ver) const { return false; };
-
-    auto apiProvider() -> ModAPI* { return api.get(); };
+    [[nodiscard]] bool supportsFiltering() const override { return true; };
     auto getFilter() const -> const std::shared_ptr<ModFilterWidget::Filter> { return m_filter; }
-    auto getDialog() const -> const ModDownloadDialog* { return dialog; }
-
-    /** Get the current term in the search bar. */
-    auto getSearchTerm() const -> QString;
-    /** Programatically set the term in the search bar. */
-    void setSearchTerm(QString);
-
     void setFilterWidget(unique_qobject_ptr<ModFilterWidget>&);
 
-    auto getCurrent() -> ModPlatform::IndexedPack& { return current; }
-    void updateModVersions(int prev_count = -1);
-
-    void openedImpl() override;
-    auto eventFilter(QObject* watched, QEvent* event) -> bool override;
-
-    BaseInstance* m_instance;
+   public slots:
+    void updateVersionList() override;
 
    protected:
-    ModPage(ModDownloadDialog* dialog, BaseInstance* instance, ModAPI* api);
-    void updateSelectionButton();
+    ModPage(ModDownloadDialog* dialog, BaseInstance& instance);
 
    protected slots:
     virtual void filterMods();
-    void triggerSearch();
-    void onSelectionChanged(QModelIndex first, QModelIndex second);
-    void onVersionSelectionChanged(QString data);
-    void onModSelected();
-    virtual void openUrl(const QUrl& url);
+    void triggerSearch() override;
 
    protected:
-    Ui::ModPage* ui = nullptr;
-    ModDownloadDialog* dialog = nullptr;
-
     unique_qobject_ptr<ModFilterWidget> m_filter_widget;
     std::shared_ptr<ModFilterWidget::Filter> m_filter;
-
-    ProgressWidget m_fetch_progress;
-
-    ModPlatform::ListModel* listModel = nullptr;
-    ModPlatform::IndexedPack current;
-
-    std::unique_ptr<ModAPI> api;
-
-    int selectedVersion = -1;
-
-    // Used to do instant searching with a delay to cache quick changes
-    QTimer m_search_timer;
 };
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourceModel.cpp b/launcher/ui/pages/modplatform/ResourceModel.cpp
new file mode 100644
index 00000000..8af70104
--- /dev/null
+++ b/launcher/ui/pages/modplatform/ResourceModel.cpp
@@ -0,0 +1,444 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "ResourceModel.h"
+
+#include <QCryptographicHash>
+#include <QIcon>
+#include <QMessageBox>
+#include <QPixmapCache>
+#include <QUrl>
+
+#include "Application.h"
+#include "BuildConfig.h"
+#include "Json.h"
+
+#include "net/Download.h"
+#include "net/NetJob.h"
+
+#include "modplatform/ModIndex.h"
+
+#include "ui/widgets/ProjectItem.h"
+
+namespace ResourceDownload {
+
+QHash<ResourceModel*, bool> ResourceModel::s_running_models;
+
+ResourceModel::ResourceModel(ResourceAPI* api) : QAbstractListModel(), m_api(api)
+{
+    s_running_models.insert(this, true);
+}
+
+ResourceModel::~ResourceModel()
+{
+    s_running_models.find(this).value() = false;
+}
+
+auto ResourceModel::data(const QModelIndex& index, int role) const -> QVariant
+{
+    int pos = index.row();
+    if (pos >= m_packs.size() || pos < 0 || !index.isValid()) {
+        return QString("INVALID INDEX %1").arg(pos);
+    }
+
+    auto pack = m_packs.at(pos);
+    switch (role) {
+        case Qt::ToolTipRole: {
+            if (pack.description.length() > 100) {
+                // some magic to prevent to long tooltips and replace html linebreaks
+                QString edit = pack.description.left(97);
+                edit = edit.left(edit.lastIndexOf("<br>")).left(edit.lastIndexOf(" ")).append("...");
+                return edit;
+            }
+            return pack.description;
+        }
+        case Qt::DecorationRole: {
+            if (auto icon_or_none = const_cast<ResourceModel*>(this)->getIcon(const_cast<QModelIndex&>(index), pack.logoUrl);
+                icon_or_none.has_value())
+                return icon_or_none.value();
+
+            return APPLICATION->getThemedIcon("screenshot-placeholder");
+        }
+        case Qt::SizeHintRole:
+            return QSize(0, 58);
+        case Qt::UserRole: {
+            QVariant v;
+            v.setValue(pack);
+            return v;
+        }
+            // Custom data
+        case UserDataTypes::TITLE:
+            return pack.name;
+        case UserDataTypes::DESCRIPTION:
+            return pack.description;
+        case UserDataTypes::SELECTED:
+            return pack.isAnyVersionSelected();
+        default:
+            break;
+    }
+
+    return {};
+}
+
+QHash<int, QByteArray> ResourceModel::roleNames() const
+{
+    QHash<int, QByteArray> roles;
+
+    roles[Qt::ToolTipRole] = "toolTip";
+    roles[Qt::DecorationRole] = "decoration";
+    roles[Qt::SizeHintRole] = "sizeHint";
+    roles[Qt::UserRole] = "pack";
+    roles[UserDataTypes::TITLE] = "title";
+    roles[UserDataTypes::DESCRIPTION] = "description";
+    roles[UserDataTypes::SELECTED] = "selected";
+
+    return roles;
+}
+
+bool ResourceModel::setData(const QModelIndex& index, const QVariant& value, int role)
+{
+    int pos = index.row();
+    if (pos >= m_packs.size() || pos < 0 || !index.isValid())
+        return false;
+
+    m_packs[pos] = value.value<ModPlatform::IndexedPack>();
+    emit dataChanged(index, index);
+
+    return true;
+}
+
+QString ResourceModel::debugName() const
+{
+    return "ResourceDownload (Model)";
+}
+
+void ResourceModel::fetchMore(const QModelIndex& parent)
+{
+    if (parent.isValid() || m_search_state == SearchState::Finished)
+        return;
+
+    search();
+}
+
+void ResourceModel::search()
+{
+    if (hasActiveSearchJob())
+        return;
+
+    auto args{ createSearchArguments() };
+
+    auto callbacks{ createSearchCallbacks() };
+
+    // Use defaults if no callbacks are set
+    if (!callbacks.on_succeed)
+        callbacks.on_succeed = [this](auto& doc) {
+            if (!s_running_models.constFind(this).value())
+                return;
+            searchRequestSucceeded(doc);
+        };
+    if (!callbacks.on_fail)
+        callbacks.on_fail = [this](QString reason, int network_error_code) {
+            if (!s_running_models.constFind(this).value())
+                return;
+            searchRequestFailed(reason, network_error_code);
+        };
+    if (!callbacks.on_abort)
+        callbacks.on_abort = [this] {
+            if (!s_running_models.constFind(this).value())
+                return;
+            searchRequestAborted();
+        };
+
+    if (auto job = m_api->searchProjects(std::move(args), std::move(callbacks)); job)
+        runSearchJob(job);
+}
+
+void ResourceModel::loadEntry(QModelIndex& entry)
+{
+    auto const& pack = m_packs[entry.row()];
+
+    if (!hasActiveInfoJob())
+        m_current_info_job.clear();
+
+    if (!pack.versionsLoaded) {
+        auto args{ createVersionsArguments(entry) };
+        auto callbacks{ createVersionsCallbacks(entry) };
+
+        // Use default if no callbacks are set
+        if (!callbacks.on_succeed)
+            callbacks.on_succeed = [this, entry](auto& doc, auto pack) {
+                if (!s_running_models.constFind(this).value())
+                    return;
+                versionRequestSucceeded(doc, pack, entry);
+            };
+
+        if (auto job = m_api->getProjectVersions(std::move(args), std::move(callbacks)); job)
+            runInfoJob(job);
+    }
+
+    if (!pack.extraDataLoaded) {
+        auto args{ createInfoArguments(entry) };
+        auto callbacks{ createInfoCallbacks(entry) };
+
+        // Use default if no callbacks are set
+        if (!callbacks.on_succeed)
+            callbacks.on_succeed = [this, entry](auto& doc, auto pack) {
+                if (!s_running_models.constFind(this).value())
+                    return;
+                infoRequestSucceeded(doc, pack, entry);
+            };
+
+        if (auto job = m_api->getProjectInfo(std::move(args), std::move(callbacks)); job)
+            runInfoJob(job);
+    }
+}
+
+void ResourceModel::refresh()
+{
+    bool reset_requested = false;
+
+    if (hasActiveInfoJob()) {
+        m_current_info_job.abort();
+        reset_requested = true;
+    }
+
+    if (hasActiveSearchJob()) {
+        m_current_search_job->abort();
+        reset_requested = true;
+    }
+
+    if (reset_requested) {
+        m_search_state = SearchState::ResetRequested;
+        return;
+    }
+
+    clearData();
+    m_search_state = SearchState::None;
+
+    m_next_search_offset = 0;
+    search();
+}
+
+void ResourceModel::clearData()
+{
+    beginResetModel();
+    m_packs.clear();
+    endResetModel();
+}
+
+void ResourceModel::runSearchJob(Task::Ptr ptr)
+{
+    m_current_search_job = ptr;
+    m_current_search_job->start();
+}
+void ResourceModel::runInfoJob(Task::Ptr ptr)
+{
+    if (!m_current_info_job.isRunning())
+        m_current_info_job.clear();
+
+    m_current_info_job.addTask(ptr);
+
+    if (!m_current_info_job.isRunning())
+        m_current_info_job.run();
+}
+
+std::optional<ResourceAPI::SortingMethod> ResourceModel::getCurrentSortingMethodByIndex() const
+{
+    std::optional<ResourceAPI::SortingMethod> sort{};
+
+    {  // Find sorting method by ID
+        auto sorting_methods = getSortingMethods();
+        auto method = std::find_if(sorting_methods.constBegin(), sorting_methods.constEnd(),
+                                   [this](auto const& e) { return m_current_sort_index == e.index; });
+        if (method != sorting_methods.constEnd())
+            sort = *method;
+    }
+
+    return sort;
+}
+
+std::optional<QIcon> ResourceModel::getIcon(QModelIndex& index, const QUrl& url)
+{
+    QPixmap pixmap;
+    if (QPixmapCache::find(url.toString(), &pixmap))
+        return { pixmap };
+
+    if (!m_current_icon_job)
+        m_current_icon_job = new NetJob("IconJob", APPLICATION->network());
+
+    if (m_currently_running_icon_actions.contains(url))
+        return {};
+    if (m_failed_icon_actions.contains(url))
+        return {};
+
+    auto cache_entry = APPLICATION->metacache()->resolveEntry(
+        metaEntryBase(),
+        QString("logos/%1").arg(QString(QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Algorithm::Sha1).toHex())));
+    auto icon_fetch_action = Net::Download::makeCached(url, cache_entry);
+
+    auto full_file_path = cache_entry->getFullPath();
+    connect(icon_fetch_action.get(), &NetAction::succeeded, this, [=] {
+        auto icon = QIcon(full_file_path);
+        QPixmapCache::insert(url.toString(), icon.pixmap(icon.actualSize({ 64, 64 })));
+
+        m_currently_running_icon_actions.remove(url);
+
+        emit dataChanged(index, index, { Qt::DecorationRole });
+    });
+    connect(icon_fetch_action.get(), &NetAction::failed, this, [=] {
+        m_currently_running_icon_actions.remove(url);
+        m_failed_icon_actions.insert(url);
+    });
+
+    m_currently_running_icon_actions.insert(url);
+
+    m_current_icon_job->addNetAction(icon_fetch_action);
+    if (!m_current_icon_job->isRunning())
+        QMetaObject::invokeMethod(m_current_icon_job.get(), &NetJob::start);
+
+    return {};
+}
+
+// No 'forgor to implement' shall pass here :blobfox_knife:
+#define NEED_FOR_CALLBACK_ASSERT(name) \
+    Q_ASSERT_X(0 != 0, #name, "You NEED to re-implement this if you intend on using the default callbacks.")
+
+QJsonArray ResourceModel::documentToArray(QJsonDocument& doc) const
+{
+    NEED_FOR_CALLBACK_ASSERT("documentToArray");
+    return {};
+}
+void ResourceModel::loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&)
+{
+    NEED_FOR_CALLBACK_ASSERT("loadIndexedPack");
+}
+void ResourceModel::loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&)
+{
+    NEED_FOR_CALLBACK_ASSERT("loadExtraPackInfo");
+}
+void ResourceModel::loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&)
+{
+    NEED_FOR_CALLBACK_ASSERT("loadIndexedPackVersions");
+}
+
+/* Default callbacks */
+
+void ResourceModel::searchRequestSucceeded(QJsonDocument& doc)
+{
+    QList<ModPlatform::IndexedPack> newList;
+    auto packs = documentToArray(doc);
+
+    for (auto packRaw : packs) {
+        auto packObj = packRaw.toObject();
+
+        ModPlatform::IndexedPack pack;
+        try {
+            loadIndexedPack(pack, packObj);
+            newList.append(pack);
+        } catch (const JSONValidationError& e) {
+            qWarning() << "Error while loading resource from " << debugName() << ": " << e.cause();
+            continue;
+        }
+    }
+
+    if (packs.size() < 25) {
+        m_search_state = SearchState::Finished;
+    } else {
+        m_next_search_offset += 25;
+        m_search_state = SearchState::CanFetchMore;
+    }
+
+    // When you have a Qt build with assertions turned on, proceeding here will abort the application
+    if (newList.size() == 0)
+        return;
+
+    beginInsertRows(QModelIndex(), m_packs.size(), m_packs.size() + newList.size() - 1);
+    m_packs.append(newList);
+    endInsertRows();
+}
+
+void ResourceModel::searchRequestFailed(QString reason, int network_error_code)
+{
+    switch (network_error_code) {
+        default:
+            // Network error
+            QMessageBox::critical(nullptr, tr("Error"), tr("A network error occurred. Could not load mods."));
+            break;
+        case 409:
+            // 409 Gone, notify user to update
+            QMessageBox::critical(nullptr, tr("Error"),
+                                  QString("%1").arg(tr("API version too old!\nPlease update %1!").arg(BuildConfig.LAUNCHER_DISPLAYNAME)));
+            break;
+    }
+
+    m_search_state = SearchState::Finished;
+}
+
+void ResourceModel::searchRequestAborted()
+{
+    if (m_search_state != SearchState::ResetRequested)
+        qCritical() << "Search task in" << debugName() << "aborted by an unknown reason!";
+
+    // Retry fetching
+    clearData();
+
+    m_next_search_offset = 0;
+    search();
+}
+
+void ResourceModel::versionRequestSucceeded(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index)
+{
+    auto current_pack = data(index, Qt::UserRole).value<ModPlatform::IndexedPack>();
+
+    // Check if the index is still valid for this resource or not
+    if (pack.addonId != current_pack.addonId)
+        return;
+
+    try {
+        auto arr = doc.isObject() ? Json::ensureArray(doc.object(), "data") : doc.array();
+        loadIndexedPackVersions(current_pack, arr);
+    } catch (const JSONValidationError& e) {
+        qDebug() << doc;
+        qWarning() << "Error while reading " << debugName() << " resource version: " << e.cause();
+    }
+
+    // Cache info :^)
+    QVariant new_pack;
+    new_pack.setValue(current_pack);
+    if (!setData(index, new_pack, Qt::UserRole)) {
+        qWarning() << "Failed to cache resource versions!";
+        return;
+    }
+
+    emit versionListUpdated();
+}
+
+void ResourceModel::infoRequestSucceeded(QJsonDocument& doc, ModPlatform::IndexedPack& pack, const QModelIndex& index)
+{
+    auto current_pack = data(index, Qt::UserRole).value<ModPlatform::IndexedPack>();
+
+    // Check if the index is still valid for this resource or not
+    if (pack.addonId != current_pack.addonId)
+        return;
+
+    try {
+        auto obj = Json::requireObject(doc);
+        loadExtraPackInfo(current_pack, obj);
+    } catch (const JSONValidationError& e) {
+        qDebug() << doc;
+        qWarning() << "Error while reading " << debugName() << " resource info: " << e.cause();
+    }
+
+    // Cache info :^)
+    QVariant new_pack;
+    new_pack.setValue(current_pack);
+    if (!setData(index, new_pack, Qt::UserRole)) {
+        qWarning() << "Failed to cache resource info!";
+        return;
+    }
+
+    emit projectInfoUpdated();
+}
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourceModel.h b/launcher/ui/pages/modplatform/ResourceModel.h
new file mode 100644
index 00000000..610b631c
--- /dev/null
+++ b/launcher/ui/pages/modplatform/ResourceModel.h
@@ -0,0 +1,147 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <optional>
+
+#include <QAbstractListModel>
+
+#include "QObjectPtr.h"
+
+#include "modplatform/ResourceAPI.h"
+
+#include "tasks/ConcurrentTask.h"
+
+class NetJob;
+class ResourceAPI;
+
+namespace ModPlatform {
+struct IndexedPack;
+}
+
+namespace ResourceDownload {
+
+class ResourceModel : public QAbstractListModel {
+    Q_OBJECT
+
+    Q_PROPERTY(QString search_term MEMBER m_search_term WRITE setSearchTerm)
+
+   public:
+    ResourceModel(ResourceAPI* api);
+    ~ResourceModel() override;
+
+    [[nodiscard]] auto data(const QModelIndex&, int role) const -> QVariant override;
+    [[nodiscard]] auto roleNames() const -> QHash<int, QByteArray> override;
+    bool setData(const QModelIndex& index, const QVariant& value, int role) override;
+
+    [[nodiscard]] virtual auto debugName() const -> QString;
+    [[nodiscard]] virtual auto metaEntryBase() const -> QString = 0;
+
+    [[nodiscard]] inline int rowCount(const QModelIndex& parent) const override { return parent.isValid() ? 0 : m_packs.size(); }
+    [[nodiscard]] inline int columnCount(const QModelIndex& parent) const override { return parent.isValid() ? 0 : 1; }
+    [[nodiscard]] inline auto flags(const QModelIndex& index) const -> Qt::ItemFlags override { return QAbstractListModel::flags(index); }
+
+    [[nodiscard]] bool hasActiveSearchJob() const { return m_current_search_job && m_current_search_job->isRunning(); }
+    [[nodiscard]] bool hasActiveInfoJob() const { return m_current_info_job.isRunning(); }
+    [[nodiscard]] Task::Ptr activeSearchJob() { return hasActiveSearchJob() ? m_current_search_job : nullptr; }
+
+    [[nodiscard]] auto getSortingMethods() const { return m_api->getSortingMethods(); }
+
+   public slots:
+    void fetchMore(const QModelIndex& parent) override;
+    // NOTE: Can't use [[nodiscard]] here because of https://bugreports.qt.io/browse/QTBUG-58628 on Qt 5.12
+    inline bool canFetchMore(const QModelIndex& parent) const override
+    {
+        return parent.isValid() ? false : m_search_state == SearchState::CanFetchMore;
+    }
+
+    void setSearchTerm(QString term) { m_search_term = term; }
+
+    virtual ResourceAPI::SearchArgs createSearchArguments() = 0;
+    virtual ResourceAPI::SearchCallbacks createSearchCallbacks() { return {}; }
+
+    virtual ResourceAPI::VersionSearchArgs createVersionsArguments(QModelIndex&) = 0;
+    virtual ResourceAPI::VersionSearchCallbacks createVersionsCallbacks(QModelIndex&) { return {}; }
+
+    virtual ResourceAPI::ProjectInfoArgs createInfoArguments(QModelIndex&) = 0;
+    virtual ResourceAPI::ProjectInfoCallbacks createInfoCallbacks(QModelIndex&) { return {}; }
+
+    /** Requests the API for more entries. */
+    virtual void search();
+
+    /** Applies any processing / extra requests needed to fully load the specified entry's information. */
+    virtual void loadEntry(QModelIndex&);
+
+    /** Schedule a refresh, clearing the current state. */
+    void refresh();
+
+    /** Gets the icon at the URL for the given index. If it's not fetched yet, fetch it and update when fisinhed. */
+    std::optional<QIcon> getIcon(QModelIndex&, const QUrl&);
+
+   protected:
+    /** Resets the model's data. */
+    void clearData();
+
+    void runSearchJob(Task::Ptr);
+    void runInfoJob(Task::Ptr);
+
+    [[nodiscard]] auto getCurrentSortingMethodByIndex() const -> std::optional<ResourceAPI::SortingMethod>;
+
+    /** Converts a JSON document to a common array format.
+     *
+     *  This is needed so that different providers, with different JSON structures, can be parsed
+     *  uniformally. You NEED to re-implement this if you intend on using the default callbacks.
+     */
+    [[nodiscard]] virtual auto documentToArray(QJsonDocument&) const -> QJsonArray;
+
+    /** Functions to load data into a pack.
+     *
+     *  Those are needed for the same reason as ddocumentToArray, and NEED to be re-implemented in the same way.
+     */
+
+    virtual void loadIndexedPack(ModPlatform::IndexedPack&, QJsonObject&);
+    virtual void loadExtraPackInfo(ModPlatform::IndexedPack&, QJsonObject&);
+    virtual void loadIndexedPackVersions(ModPlatform::IndexedPack&, QJsonArray&);
+
+   protected:
+    /* Basic search parameters */
+    enum class SearchState { None, CanFetchMore, ResetRequested, Finished } m_search_state = SearchState::None;
+    int m_next_search_offset = 0;
+    QString m_search_term;
+    unsigned int m_current_sort_index = 0;
+
+    std::unique_ptr<ResourceAPI> m_api;
+
+    // Job for searching for new entries
+    shared_qobject_ptr<Task> m_current_search_job;
+    // Job for fetching versions and extra info on existing entries
+    ConcurrentTask m_current_info_job;
+
+    shared_qobject_ptr<NetJob> m_current_icon_job;
+    QSet<QUrl> m_currently_running_icon_actions;
+    QSet<QUrl> m_failed_icon_actions;
+
+    QList<ModPlatform::IndexedPack> m_packs;
+
+    // HACK: We need this to prevent callbacks from calling the model after it has already been deleted.
+    // This leaks a tiny bit of memory per time the user has opened a resource dialog. How to make this better?
+    static QHash<ResourceModel*, bool> s_running_models;
+
+   private:
+    /* Default search request callbacks */
+    void searchRequestSucceeded(QJsonDocument&);
+    void searchRequestFailed(QString reason, int network_error_code);
+    void searchRequestAborted();
+
+    void versionRequestSucceeded(QJsonDocument&, ModPlatform::IndexedPack&, const QModelIndex&);
+
+    void infoRequestSucceeded(QJsonDocument&, ModPlatform::IndexedPack&, const QModelIndex&);
+
+   signals:
+    void versionListUpdated();
+    void projectInfoUpdated();
+};
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourcePage.cpp b/launcher/ui/pages/modplatform/ResourcePage.cpp
new file mode 100644
index 00000000..bbd465bc
--- /dev/null
+++ b/launcher/ui/pages/modplatform/ResourcePage.cpp
@@ -0,0 +1,411 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
+ *  Copyright (C) 2022 TheKodeToad <TheKodeToad@proton.me>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
+
+#include "ResourcePage.h"
+#include "ui_ResourcePage.h"
+
+#include <QDesktopServices>
+#include <QKeyEvent>
+
+#include "Markdown.h"
+#include "ResourceDownloadTask.h"
+
+#include "minecraft/MinecraftInstance.h"
+
+#include "ui/dialogs/ResourceDownloadDialog.h"
+#include "ui/pages/modplatform/ResourceModel.h"
+#include "ui/widgets/ProjectItem.h"
+
+namespace ResourceDownload {
+
+ResourcePage::ResourcePage(ResourceDownloadDialog* parent, BaseInstance& base_instance)
+    : QWidget(parent), m_base_instance(base_instance), m_ui(new Ui::ResourcePage), m_parent_dialog(parent), m_fetch_progress(this, false)
+{
+    m_ui->setupUi(this);
+
+    m_ui->searchEdit->installEventFilter(this);
+
+    m_ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded);
+    m_ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300);
+
+    m_search_timer.setTimerType(Qt::TimerType::CoarseTimer);
+    m_search_timer.setSingleShot(true);
+
+    connect(&m_search_timer, &QTimer::timeout, this, &ResourcePage::triggerSearch);
+
+    m_fetch_progress.hideIfInactive(true);
+    m_fetch_progress.setFixedHeight(24);
+    m_fetch_progress.progressFormat("");
+
+    m_ui->gridLayout_3->addWidget(&m_fetch_progress, 0, 0, 1, m_ui->gridLayout_3->columnCount());
+
+    m_ui->packView->setItemDelegate(new ProjectItemDelegate(this));
+    m_ui->packView->installEventFilter(this);
+
+    connect(m_ui->packDescription, &QTextBrowser::anchorClicked, this, &ResourcePage::openUrl);
+}
+
+ResourcePage::~ResourcePage()
+{
+    delete m_ui;
+}
+
+void ResourcePage::retranslate()
+{
+    m_ui->retranslateUi(this);
+}
+
+void ResourcePage::openedImpl()
+{
+    if (!supportsFiltering())
+        m_ui->resourceFilterButton->setVisible(false);
+
+    //: String in the search bar of the mod downloading dialog
+    m_ui->searchEdit->setPlaceholderText(tr("Search for %1...").arg(resourcesString()));
+    m_ui->resourceSelectionButton->setText(tr("Select %1 for download").arg(resourceString()));
+
+    updateSelectionButton();
+    triggerSearch();
+}
+
+auto ResourcePage::eventFilter(QObject* watched, QEvent* event) -> bool
+{
+    if (event->type() == QEvent::KeyPress) {
+        auto* keyEvent = static_cast<QKeyEvent*>(event);
+        if (watched == m_ui->searchEdit) {
+            if (keyEvent->key() == Qt::Key_Return) {
+                triggerSearch();
+                keyEvent->accept();
+                return true;
+            } else {
+                if (m_search_timer.isActive())
+                    m_search_timer.stop();
+
+                m_search_timer.start(350);
+            }
+        } else if (watched == m_ui->packView) {
+            if (keyEvent->key() == Qt::Key_Return) {
+                onResourceSelected();
+
+                // To have the 'select mod' button outlined instead of the 'review and confirm' one
+                m_ui->resourceSelectionButton->setFocus(Qt::FocusReason::ShortcutFocusReason);
+                m_ui->packView->setFocus(Qt::FocusReason::NoFocusReason);
+
+                keyEvent->accept();
+                return true;
+            }
+        }
+    }
+
+    return QWidget::eventFilter(watched, event);
+}
+
+QString ResourcePage::getSearchTerm() const
+{
+    return m_ui->searchEdit->text();
+}
+
+void ResourcePage::setSearchTerm(QString term)
+{
+    m_ui->searchEdit->setText(term);
+}
+
+void ResourcePage::addSortings()
+{
+    Q_ASSERT(m_model);
+
+    auto sorts = m_model->getSortingMethods();
+    std::sort(sorts.begin(), sorts.end(), [](auto const& l, auto const& r) { return l.index < r.index; });
+
+    for (auto&& sorting : sorts)
+        m_ui->sortByBox->addItem(sorting.readable_name, QVariant(sorting.index));
+}
+
+bool ResourcePage::setCurrentPack(ModPlatform::IndexedPack pack)
+{
+    QVariant v;
+    v.setValue(pack);
+    return m_model->setData(m_ui->packView->currentIndex(), v, Qt::UserRole);
+}
+
+ModPlatform::IndexedPack ResourcePage::getCurrentPack() const
+{
+    return m_model->data(m_ui->packView->currentIndex(), Qt::UserRole).value<ModPlatform::IndexedPack>();
+}
+
+void ResourcePage::updateUi()
+{
+    auto current_pack = getCurrentPack();
+
+    QString text = "";
+    QString name = current_pack.name;
+
+    if (current_pack.websiteUrl.isEmpty())
+        text = name;
+    else
+        text = "<a href=\"" + current_pack.websiteUrl + "\">" + name + "</a>";
+
+    if (!current_pack.authors.empty()) {
+        auto authorToStr = [](ModPlatform::ModpackAuthor& author) -> QString {
+            if (author.url.isEmpty()) {
+                return author.name;
+            }
+            return QString("<a href=\"%1\">%2</a>").arg(author.url, author.name);
+        };
+        QStringList authorStrs;
+        for (auto& author : current_pack.authors) {
+            authorStrs.push_back(authorToStr(author));
+        }
+        text += "<br>" + tr(" by ") + authorStrs.join(", ");
+    }
+
+    if (current_pack.extraDataLoaded) {
+        if (!current_pack.extraData.donate.isEmpty()) {
+            text += "<br><br>" + tr("Donate information: ");
+            auto donateToStr = [](ModPlatform::DonationData& donate) -> QString {
+                return QString("<a href=\"%1\">%2</a>").arg(donate.url, donate.platform);
+            };
+            QStringList donates;
+            for (auto& donate : current_pack.extraData.donate) {
+                donates.append(donateToStr(donate));
+            }
+            text += donates.join(", ");
+        }
+
+        if (!current_pack.extraData.issuesUrl.isEmpty() || !current_pack.extraData.sourceUrl.isEmpty() ||
+            !current_pack.extraData.wikiUrl.isEmpty() || !current_pack.extraData.discordUrl.isEmpty()) {
+            text += "<br><br>" + tr("External links:") + "<br>";
+        }
+
+        if (!current_pack.extraData.issuesUrl.isEmpty())
+            text += "- " + tr("Issues: <a href=%1>%1</a>").arg(current_pack.extraData.issuesUrl) + "<br>";
+        if (!current_pack.extraData.wikiUrl.isEmpty())
+            text += "- " + tr("Wiki: <a href=%1>%1</a>").arg(current_pack.extraData.wikiUrl) + "<br>";
+        if (!current_pack.extraData.sourceUrl.isEmpty())
+            text += "- " + tr("Source code: <a href=%1>%1</a>").arg(current_pack.extraData.sourceUrl) + "<br>";
+        if (!current_pack.extraData.discordUrl.isEmpty())
+            text += "- " + tr("Discord: <a href=%1>%1</a>").arg(current_pack.extraData.discordUrl) + "<br>";
+    }
+
+    text += "<hr>";
+
+    m_ui->packDescription->setHtml(
+        text + (current_pack.extraData.body.isEmpty() ? current_pack.description : markdownToHTML(current_pack.extraData.body)));
+    m_ui->packDescription->flush();
+}
+
+void ResourcePage::updateSelectionButton()
+{
+    if (!isOpened || m_selected_version_index < 0) {
+        m_ui->resourceSelectionButton->setEnabled(false);
+        return;
+    }
+
+    m_ui->resourceSelectionButton->setEnabled(true);
+    if (!getCurrentPack().isVersionSelected(m_selected_version_index)) {
+        m_ui->resourceSelectionButton->setText(tr("Select %1 for download").arg(resourceString()));
+    } else {
+        m_ui->resourceSelectionButton->setText(tr("Deselect %1 for download").arg(resourceString()));
+    }
+}
+
+void ResourcePage::updateVersionList()
+{
+    auto current_pack = getCurrentPack();
+
+    m_ui->versionSelectionBox->blockSignals(true);
+    m_ui->versionSelectionBox->clear();
+    m_ui->versionSelectionBox->blockSignals(false);
+
+    for (int i = 0; i < current_pack.versions.size(); i++) {
+        auto& version = current_pack.versions[i];
+        if (optedOut(version))
+            continue;
+
+        m_ui->versionSelectionBox->addItem(current_pack.versions[i].version, QVariant(i));
+    }
+
+    if (m_ui->versionSelectionBox->count() == 0) {
+        m_ui->versionSelectionBox->addItem(tr("No valid version found."), QVariant(-1));
+        m_ui->resourceSelectionButton->setText(tr("Cannot select invalid version :("));
+    }
+
+    updateSelectionButton();
+}
+
+void ResourcePage::onSelectionChanged(QModelIndex curr, QModelIndex prev)
+{
+    if (!curr.isValid()) {
+        return;
+    }
+
+    auto current_pack = getCurrentPack();
+
+    bool request_load = false;
+    if (!current_pack.versionsLoaded) {
+        m_ui->resourceSelectionButton->setText(tr("Loading versions..."));
+        m_ui->resourceSelectionButton->setEnabled(false);
+
+        request_load = true;
+    } else {
+        updateVersionList();
+    }
+
+    if (!current_pack.extraDataLoaded)
+        request_load = true;
+
+    if (request_load)
+        m_model->loadEntry(curr);
+
+    updateUi();
+}
+
+void ResourcePage::onVersionSelectionChanged(QString data)
+{
+    if (data.isNull() || data.isEmpty()) {
+        m_selected_version_index = -1;
+        return;
+    }
+
+    m_selected_version_index = m_ui->versionSelectionBox->currentData().toInt();
+    updateSelectionButton();
+}
+
+void ResourcePage::addResourceToDialog(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& version)
+{
+    m_parent_dialog->addResource(pack, version);
+}
+
+void ResourcePage::removeResourceFromDialog(ModPlatform::IndexedPack& pack, ModPlatform::IndexedVersion& version)
+{
+    m_parent_dialog->removeResource(pack, version);
+}
+
+void ResourcePage::onResourceSelected()
+{
+    if (m_selected_version_index < 0)
+        return;
+
+    auto current_pack = getCurrentPack();
+    if (!current_pack.versionsLoaded)
+        return;
+
+    auto& version = current_pack.versions[m_selected_version_index];
+    if (version.is_currently_selected)
+        removeResourceFromDialog(current_pack, version);
+    else
+        addResourceToDialog(current_pack, version);
+
+    // Save the modified pack (and prevent warning in release build)
+    [[maybe_unused]] bool set = setCurrentPack(current_pack);
+    Q_ASSERT(set);
+
+    updateSelectionButton();
+
+    /* Force redraw on the resource list when the selection changes */
+    m_ui->packView->adjustSize();
+}
+
+void ResourcePage::openUrl(const QUrl& url)
+{
+    // do not allow other url schemes for security reasons
+    if (!(url.scheme() == "http" || url.scheme() == "https")) {
+        qWarning() << "Unsupported scheme" << url.scheme();
+        return;
+    }
+
+    // detect URLs and search instead
+
+    const QString address = url.host() + url.path();
+    QRegularExpressionMatch match;
+    QString page;
+
+    auto handlers = urlHandlers();
+    for (auto it = handlers.constKeyValueBegin(); it != handlers.constKeyValueEnd(); it++) {
+        auto&& [regex, candidate] = *it;
+        if (match = QRegularExpression(regex).match(address); match.hasMatch()) {
+            page = candidate;
+            break;
+        }
+    }
+
+    if (!page.isNull()) {
+        const QString slug = match.captured(1);
+
+        // ensure the user isn't opening the same mod
+        if (slug != getCurrentPack().slug) {
+            m_parent_dialog->selectPage(page);
+
+            auto newPage = m_parent_dialog->getSelectedPage();
+
+            QLineEdit* searchEdit = newPage->m_ui->searchEdit;
+            auto model = newPage->m_model;
+            QListView* view = newPage->m_ui->packView;
+
+            auto jump = [url, slug, model, view] {
+                for (int row = 0; row < model->rowCount({}); row++) {
+                    const QModelIndex index = model->index(row);
+                    const auto pack = model->data(index, Qt::UserRole).value<ModPlatform::IndexedPack>();
+
+                    if (pack.slug == slug) {
+                        view->setCurrentIndex(index);
+                        return;
+                    }
+                }
+
+                // The final fallback.
+                QDesktopServices::openUrl(url);
+            };
+
+            searchEdit->setText(slug);
+            newPage->triggerSearch();
+
+            if (model->hasActiveSearchJob())
+                connect(model->activeSearchJob().get(), &Task::finished, jump);
+            else
+                jump();
+
+            return;
+        }
+    }
+
+    // open in the user's web browser
+    QDesktopServices::openUrl(url);
+}
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ResourcePage.h b/launcher/ui/pages/modplatform/ResourcePage.h
new file mode 100644
index 00000000..1896d53e
--- /dev/null
+++ b/launcher/ui/pages/modplatform/ResourcePage.h
@@ -0,0 +1,111 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include <QTimer>
+#include <QWidget>
+
+#include "modplatform/ModIndex.h"
+#include "modplatform/ResourceAPI.h"
+
+#include "ui/pages/BasePage.h"
+#include "ui/widgets/ProgressWidget.h"
+
+namespace Ui {
+class ResourcePage;
+}
+
+class BaseInstance;
+
+namespace ResourceDownload {
+
+class ResourceDownloadDialog;
+class ResourceModel;
+
+class ResourcePage : public QWidget, public BasePage {
+    Q_OBJECT
+   public:
+    ~ResourcePage() override;
+
+    /* Affects what the user sees */
+    [[nodiscard]] auto displayName() const -> QString override = 0;
+    [[nodiscard]] auto icon() const -> QIcon override = 0;
+    [[nodiscard]] auto id() const -> QString override = 0;
+    [[nodiscard]] auto helpPage() const -> QString override = 0;
+    [[nodiscard]] bool shouldDisplay() const override = 0;
+
+    /* Used internally */
+    [[nodiscard]] virtual auto metaEntryBase() const -> QString = 0;
+    [[nodiscard]] virtual auto debugName() const -> QString = 0;
+
+    //: The plural version of 'resource'
+    [[nodiscard]] virtual inline QString resourcesString() const { return tr("resources"); }
+    //: The singular version of 'resources'
+    [[nodiscard]] virtual inline QString resourceString() const { return tr("resource"); }
+
+    /* Features this resource's page supports */
+    [[nodiscard]] virtual bool supportsFiltering() const = 0;
+
+    void retranslate() override;
+    void openedImpl() override;
+    auto eventFilter(QObject* watched, QEvent* event) -> bool override;
+
+    /** Get the current term in the search bar. */
+    [[nodiscard]] auto getSearchTerm() const -> QString;
+    /** Programatically set the term in the search bar. */
+    void setSearchTerm(QString);
+
+    [[nodiscard]] bool setCurrentPack(ModPlatform::IndexedPack);
+    [[nodiscard]] auto getCurrentPack() const -> ModPlatform::IndexedPack;
+    [[nodiscard]] auto getDialog() const -> const ResourceDownloadDialog* { return m_parent_dialog; }
+    [[nodiscard]] auto getModel() const -> ResourceModel* { return m_model; }
+
+   protected:
+    ResourcePage(ResourceDownloadDialog* parent, BaseInstance&);
+
+    void addSortings();
+
+   public slots:
+    virtual void updateUi();
+    virtual void updateSelectionButton();
+    virtual void updateVersionList();
+
+    virtual void addResourceToDialog(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&);
+    virtual void removeResourceFromDialog(ModPlatform::IndexedPack&, ModPlatform::IndexedVersion&);
+
+   protected slots:
+    virtual void triggerSearch() {}
+   
+    void onSelectionChanged(QModelIndex first, QModelIndex second);
+    void onVersionSelectionChanged(QString data);
+    void onResourceSelected();
+
+    // NOTE: Can't use [[nodiscard]] here because of https://bugreports.qt.io/browse/QTBUG-58628 on Qt 5.12
+
+    /** Associates regex expressions to pages in the order they're given in the map. */
+    virtual QMap<QString, QString> urlHandlers() const = 0;
+    virtual void openUrl(const QUrl&);
+
+    /** Whether the version is opted out or not. Currently only makes sense in CF. */
+    virtual bool optedOut(ModPlatform::IndexedVersion& ver) const { return false; };
+
+   public:
+    BaseInstance& m_base_instance;
+
+   protected:
+    Ui::ResourcePage* m_ui;
+
+    ResourceDownloadDialog* m_parent_dialog = nullptr;
+    ResourceModel* m_model = nullptr;
+
+    int m_selected_version_index = -1;
+
+    ProgressWidget m_fetch_progress;
+
+    // Used to do instant searching with a delay to cache quick changes
+    QTimer m_search_timer;
+};
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ModPage.ui b/launcher/ui/pages/modplatform/ResourcePage.ui
index 94365aa5..73a9d3b1 100644
--- a/launcher/ui/pages/modplatform/ModPage.ui
+++ b/launcher/ui/pages/modplatform/ResourcePage.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ModPage</class>
- <widget class="QWidget" name="ModPage">
+ <class>ResourcePage</class>
+ <widget class="QWidget" name="ResourcePage">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -49,11 +49,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="QLineEdit" name="searchEdit">
-     <property name="placeholderText">
-      <string>Search for mods...</string>
-     </property>
-    </widget>
+    <widget class="QLineEdit" name="searchEdit"/>
    </item>
    <item row="2" column="0" colspan="4">
     <layout class="QGridLayout" name="gridLayout_4" columnstretch="0,0,0">
@@ -74,16 +70,12 @@
       <widget class="QComboBox" name="sortByBox"/>
      </item>
      <item row="1" column="2">
-      <widget class="QPushButton" name="modSelectionButton">
-       <property name="text">
-        <string>Select mod for download</string>
-       </property>
-      </widget>
+      <widget class="QPushButton" name="resourceSelectionButton"/>
      </item>
     </layout>
    </item>
    <item row="0" column="1">
-    <widget class="QPushButton" name="modFilterButton">
+    <widget class="QPushButton" name="resourceFilterButton">
      <property name="text">
       <string>Filter options</string>
      </property>
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp b/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
deleted file mode 100644
index bc2c686c..00000000
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "FlameModModel.h"
-#include "Json.h"
-#include "modplatform/flame/FlameModIndex.h"
-
-namespace FlameMod {
-
-// NOLINTNEXTLINE(modernize-avoid-c-arrays)
-const char* ListModel::sorts[6]{ "Featured", "Popularity", "LastUpdated", "Name", "Author", "TotalDownloads" };
-
-void ListModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
-{
-    FlameMod::loadIndexedPack(m, obj);
-}
-
-// We already deal with the URLs when initializing the pack, due to the API response's structure
-void ListModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj)
-{
-    FlameMod::loadBody(m, obj);
-}
-
-void ListModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
-{
-    FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), m_parent->m_instance);
-}
-
-auto ListModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
-{
-    return Json::ensureArray(obj.object(), "data");
-}
-
-}  // namespace FlameMod
diff --git a/launcher/ui/pages/modplatform/flame/FlameModModel.h b/launcher/ui/pages/modplatform/flame/FlameModModel.h
deleted file mode 100644
index 6a6aef2e..00000000
--- a/launcher/ui/pages/modplatform/flame/FlameModModel.h
+++ /dev/null
@@ -1,26 +0,0 @@
-#pragma once
-
-#include "FlameModPage.h"
-
-namespace FlameMod {
-
-class ListModel : public ModPlatform::ListModel {
-    Q_OBJECT
-
-   public:
-    ListModel(FlameModPage* parent) : ModPlatform::ListModel(parent) {}
-    ~ListModel() override = default;
-
-   private:
-    void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
-    void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
-    void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-
-    auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
-
-    // NOLINTNEXTLINE(modernize-avoid-c-arrays)
-    static const char* sorts[6]; 
-    inline auto getSorts() const -> const char** override { return sorts; };
-};
-
-}  // namespace FlameMod
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
new file mode 100644
index 00000000..de1f2122
--- /dev/null
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.cpp
@@ -0,0 +1,37 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#include "FlameResourceModels.h"
+
+#include "Json.h"
+
+#include "modplatform/flame/FlameAPI.h"
+#include "modplatform/flame/FlameModIndex.h"
+
+namespace ResourceDownload {
+
+FlameModModel::FlameModModel(BaseInstance const& base) : ModModel(base, new FlameAPI) {}
+
+void FlameModModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
+{
+    FlameMod::loadIndexedPack(m, obj);
+}
+
+// We already deal with the URLs when initializing the pack, due to the API response's structure
+void FlameModModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj)
+{
+    FlameMod::loadBody(m, obj);
+}
+
+void FlameModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
+{
+    FlameMod::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
+}
+
+auto FlameModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
+{
+    return Json::ensureArray(obj.object(), "data");
+}
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/flame/FlameResourceModels.h b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
new file mode 100644
index 00000000..625a2a7d
--- /dev/null
+++ b/launcher/ui/pages/modplatform/flame/FlameResourceModels.h
@@ -0,0 +1,30 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only
+
+#pragma once
+
+#include "ui/pages/modplatform/ModModel.h"
+#include "ui/pages/modplatform/flame/FlameResourcePages.h"
+
+namespace ResourceDownload {
+
+class FlameModModel : public ModModel {
+    Q_OBJECT
+
+   public:
+    FlameModModel(const BaseInstance&);
+    ~FlameModModel() override = default;
+
+   private:
+    [[nodiscard]] QString debugName() const override { return Flame::debugName() + " (Model)"; }
+    [[nodiscard]] QString metaEntryBase() const override { return Flame::metaEntryBase(); }
+
+    void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
+    void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
+    void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
+
+    auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
+};
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
index bad78c97..485431a7 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.cpp
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.cpp
@@ -1,4 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
@@ -34,37 +36,33 @@
  *      limitations under the License.
  */
 
-#include "FlameModPage.h"
-#include "ui_ModPage.h"
+#include "FlameResourcePages.h"
+#include "ui_ResourcePage.h"
 
-#include "FlameModModel.h"
-#include "ui/dialogs/ModDownloadDialog.h"
+#include "FlameResourceModels.h"
+#include "ui/dialogs/ResourceDownloadDialog.h"
 
-FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance)
-    : ModPage(dialog, instance, new FlameAPI())
+namespace ResourceDownload {
+
+FlameModPage::FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance)
+    : ModPage(dialog, instance)
 {
-    listModel = new FlameMod::ListModel(this);
-    ui->packView->setModel(listModel);
+    m_model = new FlameModModel(instance);
+    m_ui->packView->setModel(m_model);
 
-    // index is used to set the sorting with the flame api
-    ui->sortByBox->addItem(tr("Sort by Featured"));
-    ui->sortByBox->addItem(tr("Sort by Popularity"));
-    ui->sortByBox->addItem(tr("Sort by Last Updated"));
-    ui->sortByBox->addItem(tr("Sort by Name"));
-    ui->sortByBox->addItem(tr("Sort by Author"));
-    ui->sortByBox->addItem(tr("Sort by Downloads"));
+    addSortings();
 
     // sometimes Qt just ignores virtual slots and doesn't work as intended it seems,
     // so it's best not to connect them in the parent's contructor...
-    connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
-    connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameModPage::onSelectionChanged);
-    connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameModPage::onVersionSelectionChanged);
-    connect(ui->modSelectionButton, &QPushButton::clicked, this, &FlameModPage::onModSelected);
+    connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
+    connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &FlameModPage::onSelectionChanged);
+    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &FlameModPage::onVersionSelectionChanged);
+    connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &FlameModPage::onResourceSelected);
 
-    ui->packDescription->setMetaEntry(metaEntryBase());
+    m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders) const -> bool
+auto FlameModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders) const -> bool
 {
     Q_UNUSED(loaders);
     return ver.mcVersion.contains(mineVer) && !ver.downloadUrl.isEmpty();
@@ -95,3 +93,5 @@ void FlameModPage::openUrl(const QUrl& url)
 
     ModPage::openUrl(url);
 }
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/flame/FlameModPage.h b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
index 58479ab9..b21a53ad 100644
--- a/launcher/ui/pages/modplatform/flame/FlameModPage.h
+++ b/launcher/ui/pages/modplatform/flame/FlameResourcePages.h
@@ -1,4 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
 /*
  *  Prism Launcher - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
@@ -36,35 +38,48 @@
 
 #pragma once
 
-#include "modplatform/ModAPI.h"
+#include "Application.h"
+
+#include "modplatform/ResourceAPI.h"
+
 #include "ui/pages/modplatform/ModPage.h"
 
-#include "modplatform/flame/FlameAPI.h"
+namespace ResourceDownload {
+
+namespace Flame {
+static inline QString displayName() { return "CurseForge"; }
+static inline QIcon icon() { return APPLICATION->getThemedIcon("flame"); }
+static inline QString id() { return "curseforge"; }
+static inline QString debugName() { return "Flame"; }
+static inline QString metaEntryBase() { return "FlameMods"; }
+}
 
 class FlameModPage : public ModPage {
     Q_OBJECT
 
    public:
-    static FlameModPage* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    static FlameModPage* create(ModDownloadDialog* dialog, BaseInstance& instance)
     {
         return ModPage::create<FlameModPage>(dialog, instance);
     }
 
-    FlameModPage(ModDownloadDialog* dialog, BaseInstance* instance);
+    FlameModPage(ModDownloadDialog* dialog, BaseInstance& instance);
     ~FlameModPage() override = default;
 
-    inline auto displayName() const -> QString override { return "CurseForge"; }
-    inline auto icon() const -> QIcon override { return APPLICATION->getThemedIcon("flame"); }
-    inline auto id() const -> QString override { return "curseforge"; }
-    inline auto helpPage() const -> QString override { return "Mod-platform"; }
+    [[nodiscard]] bool shouldDisplay() const override;
 
-    inline auto debugName() const -> QString override { return "Flame"; }
-    inline auto metaEntryBase() const -> QString override { return "FlameMods"; };
+    [[nodiscard]] inline auto displayName() const -> QString override { return Flame::displayName(); }
+    [[nodiscard]] inline auto icon() const -> QIcon override { return Flame::icon(); }
+    [[nodiscard]] inline auto id() const -> QString override { return Flame::id(); }
+    [[nodiscard]] inline auto debugName() const -> QString override { return Flame::debugName(); }
+    [[nodiscard]] inline auto metaEntryBase() const -> QString override { return Flame::metaEntryBase(); }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders = ModAPI::Unspecified) const -> bool override;
-    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
+    [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto shouldDisplay() const -> bool override;
+    bool validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const override;
+    bool optedOut(ModPlatform::IndexedVersion& ver) const override;
 
     void openUrl(const QUrl& url) override;
 };
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
index b08f3bc4..7d59a6ae 100644
--- a/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
+++ b/launcher/ui/pages/modplatform/ftb/FtbPage.cpp
@@ -43,7 +43,7 @@
 #include "ui/dialogs/NewInstanceDialog.h"
 #include "modplatform/modpacksch/FTBPackInstallTask.h"
 
-#include "HoeDown.h"
+#include "Markdown.h"
 
 FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent)
         : QWidget(parent), ui(new Ui::FtbPage), dialog(dialog)
@@ -175,8 +175,7 @@ void FtbPage::onSelectionChanged(QModelIndex first, QModelIndex second)
 
     selected = filterModel->data(first, Qt::UserRole).value<ModpacksCH::Modpack>();
 
-    HoeDown hoedown;
-    QString output = hoedown.process(selected.description.toUtf8());
+    QString output = markdownToHTML(selected.description.toUtf8());
     ui->packDescription->setHtml(output);
 
     // reverse foreach, so that the newest versions are first
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
index e6704eef..80850b4c 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthModel.cpp
@@ -40,7 +40,6 @@
 #include "Json.h"
 #include "minecraft/MinecraftInstance.h"
 #include "minecraft/PackProfile.h"
-#include "ui/dialogs/ModDownloadDialog.h"
 #include "ui/widgets/ProjectItem.h"
 
 #include <QMessageBox>
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
index 8ab2ad1d..0bb11d83 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthPage.cpp
@@ -42,11 +42,10 @@
 #include "BuildConfig.h"
 #include "InstanceImportTask.h"
 #include "Json.h"
+#include "Markdown.h"
 
 #include "ui/widgets/ProjectItem.h"
 
-#include <HoeDown.h>
-
 #include <QComboBox>
 #include <QKeyEvent>
 #include <QPushButton>
@@ -280,8 +279,7 @@ void ModrinthPage::updateUI()
 
     text += "<hr>";
 
-    HoeDown h;
-    text += h.process(current.extra.body.toUtf8());
+    text += markdownToHTML(current.extra.body.toUtf8());
 
     ui->packDescription->setHtml(text + current.description);
     ui->packDescription->flush();
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModModel.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
index af92e63e..73d55133 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModModel.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.cpp
@@ -1,3 +1,5 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  PolyMC - Minecraft Launcher
@@ -16,33 +18,33 @@
  *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-#include "ModrinthModModel.h"
+#include "ModrinthResourceModels.h"
 
+#include "modplatform/modrinth/ModrinthAPI.h"
 #include "modplatform/modrinth/ModrinthPackIndex.h"
 
-namespace Modrinth {
+namespace ResourceDownload {
 
-// NOLINTNEXTLINE(modernize-avoid-c-arrays)
-const char* ListModel::sorts[5]{ "relevance", "downloads", "follows", "updated", "newest" };
+ModrinthModModel::ModrinthModModel(BaseInstance const& base) : ModModel(base, new ModrinthAPI) {}
 
-void ListModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
+void ModrinthModModel::loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj)
 {
-    Modrinth::loadIndexedPack(m, obj);
+    ::Modrinth::loadIndexedPack(m, obj);
 }
 
-void ListModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj)
+void ModrinthModModel::loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj)
 {
-    Modrinth::loadExtraPackData(m, obj);
+    ::Modrinth::loadExtraPackData(m, obj);
 }
 
-void ListModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
+void ModrinthModModel::loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr)
 {
-    Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), m_parent->m_instance);
+    ::Modrinth::loadIndexedPackVersions(m, arr, APPLICATION->network(), &m_base_instance);
 }
 
-auto ListModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
+auto ModrinthModModel::documentToArray(QJsonDocument& obj) const -> QJsonArray
 {
     return obj.object().value("hits").toArray();
 }
 
-}  // namespace Modrinth
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModModel.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
index 386897fd..56cab146 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModModel.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourceModels.h
@@ -1,3 +1,5 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  PolyMC - Minecraft Launcher
@@ -18,27 +20,29 @@
 
 #pragma once
 
-#include "ModrinthModPage.h"
+#include "ui/pages/modplatform/ModModel.h"
+#include "ui/pages/modplatform/modrinth/ModrinthResourcePages.h"
 
-namespace Modrinth {
+namespace ResourceDownload {
 
-class ListModel : public ModPlatform::ListModel {
+class ModrinthModPage;
+
+class ModrinthModModel : public ModModel {
     Q_OBJECT
 
    public:
-    ListModel(ModrinthModPage* parent) : ModPlatform::ListModel(parent){};
-    ~ListModel() override = default;
+    ModrinthModModel(const BaseInstance&);
+    ~ModrinthModModel() override = default;
 
    private:
+    [[nodiscard]] QString debugName() const override { return Modrinth::debugName() + " (Model)"; }
+    [[nodiscard]] QString metaEntryBase() const override { return Modrinth::metaEntryBase(); }
+
     void loadIndexedPack(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadExtraPackInfo(ModPlatform::IndexedPack& m, QJsonObject& obj) override;
     void loadIndexedPackVersions(ModPlatform::IndexedPack& m, QJsonArray& arr) override;
-    
-    auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 
-    // NOLINTNEXTLINE(modernize-avoid-c-arrays)
-    static const char* sorts[5];
-    inline auto getSorts() const -> const char** override { return sorts; };
+    auto documentToArray(QJsonDocument& obj) const -> QJsonArray override;
 };
 
-}  // namespace Modrinth
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
index c531ea90..b82f800e 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.cpp
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.cpp
@@ -1,3 +1,5 @@
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
 // SPDX-License-Identifier: GPL-3.0-only
 /*
  *  PolyMC - Minecraft Launcher
@@ -33,48 +35,50 @@
  *      limitations under the License.
  */
 
-#include "ModrinthModPage.h"
+#include "ModrinthResourcePages.h"
+#include "ui_ResourcePage.h"
+
 #include "modplatform/modrinth/ModrinthAPI.h"
-#include "ui_ModPage.h"
 
-#include "ModrinthModModel.h"
-#include "ui/dialogs/ModDownloadDialog.h"
+#include "ui/dialogs/ResourceDownloadDialog.h"
+
+#include "ui/pages/modplatform/modrinth/ModrinthResourceModels.h"
+
+namespace ResourceDownload {
 
-ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance* instance)
-    : ModPage(dialog, instance, new ModrinthAPI())
+ModrinthModPage::ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instance)
+    : ModPage(dialog, instance)
 {
-    listModel = new Modrinth::ListModel(this);
-    ui->packView->setModel(listModel);
+    m_model = new ModrinthModModel(instance);
+    m_ui->packView->setModel(m_model);
 
-    // index is used to set the sorting with the modrinth api
-    ui->sortByBox->addItem(tr("Sort by Relevance"));
-    ui->sortByBox->addItem(tr("Sort by Downloads"));
-    ui->sortByBox->addItem(tr("Sort by Follows"));
-    ui->sortByBox->addItem(tr("Sort by Last Updated"));
-    ui->sortByBox->addItem(tr("Sort by Newest"));
+    addSortings();
 
     // sometimes Qt just ignores virtual slots and doesn't work as intended it seems,
     // so it's best not to connect them in the parent's constructor...
-    connect(ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
-    connect(ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthModPage::onSelectionChanged);
-    connect(ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthModPage::onVersionSelectionChanged);
-    connect(ui->modSelectionButton, &QPushButton::clicked, this, &ModrinthModPage::onModSelected);
+    connect(m_ui->sortByBox, SIGNAL(currentIndexChanged(int)), this, SLOT(triggerSearch()));
+    connect(m_ui->packView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ModrinthModPage::onSelectionChanged);
+    connect(m_ui->versionSelectionBox, &QComboBox::currentTextChanged, this, &ModrinthModPage::onVersionSelectionChanged);
+    connect(m_ui->resourceSelectionButton, &QPushButton::clicked, this, &ModrinthModPage::onResourceSelected);
 
-    ui->packDescription->setMetaEntry(metaEntryBase());
+    m_ui->packDescription->setMetaEntry(metaEntryBase());
 }
 
-auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders) const -> bool
+auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders) const -> bool
 {
-    auto loaderStrings = ModrinthAPI::getModLoaderStrings(loaders);
+    auto loaderCompatible = !loaders.has_value();
 
-    auto loaderCompatible = false;
-    for (auto remoteLoader : ver.loaders)
-    {
-        if (loaderStrings.contains(remoteLoader)) {
-            loaderCompatible = true;
-            break;
+    if (!loaderCompatible) {
+        auto loaderStrings = ModrinthAPI::getModLoaderStrings(loaders.value());
+        for (auto remoteLoader : ver.loaders)
+        {
+            if (loaderStrings.contains(remoteLoader)) {
+                loaderCompatible = true;
+                break;
+            }
         }
     }
+
     return ver.mcVersion.contains(mineVer) && loaderCompatible;
 }
 
@@ -82,3 +86,5 @@ auto ModrinthModPage::validateVersion(ModPlatform::IndexedVersion& ver, QString
 // other mod providers start loading before being selected, at least with
 // my Qt, so we need to implement this in every derived class...
 auto ModrinthModPage::shouldDisplay() const -> bool { return true; }
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
index 40d82e6f..be38eff1 100644
--- a/launcher/ui/pages/modplatform/modrinth/ModrinthModPage.h
+++ b/launcher/ui/pages/modplatform/modrinth/ModrinthResourcePages.h
@@ -1,4 +1,6 @@
-// SPDX-License-Identifier: GPL-3.0-only
+// SPDX-FileCopyrightText: 2023 flowln <flowlnlnln@gmail.com>
+//
+// SPDX-License-Identifier: GPL-3.0-only AND Apache-2.0
 /*
  *  PolyMC - Minecraft Launcher
  *  Copyright (C) 2022 Sefa Eyeoglu <contact@scrumplex.net>
@@ -35,32 +37,45 @@
 
 #pragma once
 
-#include "modplatform/ModAPI.h"
+#include "Application.h"
+
+#include "modplatform/ResourceAPI.h"
+
 #include "ui/pages/modplatform/ModPage.h"
 
-#include "modplatform/modrinth/ModrinthAPI.h"
+namespace ResourceDownload {
+
+namespace Modrinth {
+static inline QString displayName() { return "Modrinth"; }
+static inline QIcon icon() { return APPLICATION->getThemedIcon("modrinth"); }
+static inline QString id() { return "modrinth"; }
+static inline QString debugName() { return "Modrinth"; }
+static inline QString metaEntryBase() { return "ModrinthPacks"; }
+}
 
 class ModrinthModPage : public ModPage {
     Q_OBJECT
 
    public:
-    static ModrinthModPage* create(ModDownloadDialog* dialog, BaseInstance* instance)
+    static ModrinthModPage* create(ModDownloadDialog* dialog, BaseInstance& instance)
     {
         return ModPage::create<ModrinthModPage>(dialog, instance);
     }
 
-    ModrinthModPage(ModDownloadDialog* dialog, BaseInstance* instance);
+    ModrinthModPage(ModDownloadDialog* dialog, BaseInstance& instance);
     ~ModrinthModPage() override = default;
 
-    inline auto displayName() const -> QString override { return "Modrinth"; }
-    inline auto icon() const -> QIcon override { return APPLICATION->getThemedIcon("modrinth"); }
-    inline auto id() const -> QString override { return "modrinth"; }
-    inline auto helpPage() const -> QString override { return "Mod-platform"; }
+    [[nodiscard]] bool shouldDisplay() const override;
 
-    inline auto debugName() const -> QString override { return "Modrinth"; }
-    inline auto metaEntryBase() const -> QString override { return "ModrinthPacks"; };
+    [[nodiscard]] inline auto displayName() const -> QString override { return Modrinth::displayName(); }
+    [[nodiscard]] inline auto icon() const -> QIcon override { return Modrinth::icon(); }
+    [[nodiscard]] inline auto id() const -> QString override { return Modrinth::id(); }
+    [[nodiscard]] inline auto debugName() const -> QString override { return Modrinth::debugName(); }
+    [[nodiscard]] inline auto metaEntryBase() const -> QString override { return Modrinth::metaEntryBase(); }
 
-    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, ModAPI::ModLoaderTypes loaders = ModAPI::Unspecified) const -> bool override;
+    [[nodiscard]] inline auto helpPage() const -> QString override { return "Mod-platform"; }
 
-    auto shouldDisplay() const -> bool override;
+    auto validateVersion(ModPlatform::IndexedVersion& ver, QString mineVer, std::optional<ResourceAPI::ModLoaderTypes> loaders = {}) const -> bool override;
 };
+
+}  // namespace ResourceDownload
diff --git a/launcher/ui/setupwizard/SetupWizard.cpp b/launcher/ui/setupwizard/SetupWizard.cpp
index 3c8b5d39..3fd9bb23 100644
--- a/launcher/ui/setupwizard/SetupWizard.cpp
+++ b/launcher/ui/setupwizard/SetupWizard.cpp
@@ -13,7 +13,8 @@
 SetupWizard::SetupWizard(QWidget *parent) : QWizard(parent)
 {
     setObjectName(QStringLiteral("SetupWizard"));
-    resize(615, 659);
+    resize(620, 660);
+    setMinimumSize(300, 400);
     // make it ugly everywhere to avoid variability in theming
     setWizardStyle(QWizard::ClassicStyle);
     setOptions(QWizard::NoCancelButton | QWizard::IndependentPages | QWizard::HaveCustomButton1);
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.cpp b/launcher/ui/setupwizard/ThemeWizardPage.cpp
new file mode 100644
index 00000000..42826aba
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.cpp
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "ThemeWizardPage.h"
+#include "ui_ThemeWizardPage.h"
+
+#include "Application.h"
+#include "ui/themes/ITheme.h"
+#include "ui/themes/ThemeManager.h"
+#include "ui/widgets/ThemeCustomizationWidget.h"
+#include "ui_ThemeCustomizationWidget.h"
+
+ThemeWizardPage::ThemeWizardPage(QWidget* parent) : BaseWizardPage(parent), ui(new Ui::ThemeWizardPage)
+{
+    ui->setupUi(this);
+
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentIconThemeChanged, this, &ThemeWizardPage::updateIcons);
+    connect(ui->themeCustomizationWidget, &ThemeCustomizationWidget::currentCatChanged, this, &ThemeWizardPage::updateCat);
+
+    updateIcons();
+    updateCat();
+}
+
+ThemeWizardPage::~ThemeWizardPage()
+{
+    delete ui;
+}
+
+void ThemeWizardPage::updateIcons()
+{
+    qDebug() << "Setting Icons";
+    ui->previewIconButton0->setIcon(APPLICATION->getThemedIcon("new"));
+    ui->previewIconButton1->setIcon(APPLICATION->getThemedIcon("centralmods"));
+    ui->previewIconButton2->setIcon(APPLICATION->getThemedIcon("viewfolder"));
+    ui->previewIconButton3->setIcon(APPLICATION->getThemedIcon("launch"));
+    ui->previewIconButton4->setIcon(APPLICATION->getThemedIcon("copy"));
+    ui->previewIconButton5->setIcon(APPLICATION->getThemedIcon("export"));
+    ui->previewIconButton6->setIcon(APPLICATION->getThemedIcon("delete"));
+    ui->previewIconButton7->setIcon(APPLICATION->getThemedIcon("about"));
+    ui->previewIconButton8->setIcon(APPLICATION->getThemedIcon("settings"));
+    ui->previewIconButton9->setIcon(APPLICATION->getThemedIcon("cat"));
+    update();
+    repaint();
+    parentWidget()->update();
+}
+
+void ThemeWizardPage::updateCat()
+{
+    qDebug() << "Setting Cat";
+    ui->catImagePreviewButton->setIcon(QIcon(QString(R"(:/backgrounds/%1)").arg(ThemeManager::getCatImage())));
+}
+
+void ThemeWizardPage::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.h b/launcher/ui/setupwizard/ThemeWizardPage.h
new file mode 100644
index 00000000..61a3d0c0
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.h
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QWidget>
+#include "BaseWizardPage.h"
+
+namespace Ui {
+class ThemeWizardPage;
+}
+
+class ThemeWizardPage : public BaseWizardPage {
+    Q_OBJECT
+
+   public:
+    explicit ThemeWizardPage(QWidget* parent = nullptr);
+    ~ThemeWizardPage();
+
+    bool validatePage() override { return true; };
+    void retranslate() override;
+
+   private slots:
+    void updateIcons();
+    void updateCat();
+
+   private:
+    Ui::ThemeWizardPage* ui;
+};
diff --git a/launcher/ui/setupwizard/ThemeWizardPage.ui b/launcher/ui/setupwizard/ThemeWizardPage.ui
new file mode 100644
index 00000000..01394ea4
--- /dev/null
+++ b/launcher/ui/setupwizard/ThemeWizardPage.ui
@@ -0,0 +1,371 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThemeWizardPage</class>
+ <widget class="QWizardPage" name="ThemeWizardPage">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>510</width>
+    <height>552</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>WizardPage</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QLabel" name="label">
+     <property name="text">
+      <string>Select the Theme you wish to use</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="ThemeCustomizationWidget" name="themeCustomizationWidget" native="true">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>100</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_2">
+     <property name="text">
+      <string>Hint: The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="Line" name="line">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_4">
+     <property name="text">
+      <string> Preview:</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QGridLayout" name="iconPreview">
+     <item row="0" column="2">
+      <widget class="QPushButton" name="previewIconButton2">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="5">
+      <widget class="QPushButton" name="previewIconButton5">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="7">
+      <widget class="QPushButton" name="previewIconButton7">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="4">
+      <widget class="QPushButton" name="previewIconButton4">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QPushButton" name="previewIconButton1">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="centralmods">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="0">
+      <widget class="QPushButton" name="previewIconButton0">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="9">
+      <widget class="QPushButton" name="previewIconButton9">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="viewfolder">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="6">
+      <widget class="QPushButton" name="previewIconButton6">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="new">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="3">
+      <widget class="QPushButton" name="previewIconButton3">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="8">
+      <widget class="QPushButton" name="previewIconButton8">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Maximum">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="minimumSize">
+        <size>
+         <width>30</width>
+         <height>30</height>
+        </size>
+       </property>
+       <property name="icon">
+        <iconset theme="applications-engineering">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="checkable">
+        <bool>false</bool>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <widget class="QPushButton" name="catImagePreviewButton">
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>256</height>
+      </size>
+     </property>
+     <property name="toolTip">
+      <string>The cat appears in the background and does not serve a purpose, it is purely visual.</string>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+     <property name="iconSize">
+      <size>
+       <width>256</width>
+       <height>256</height>
+      </size>
+     </property>
+     <property name="flat">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>193</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+  </layout>
+ </widget>
+ <customwidgets>
+  <customwidget>
+   <class>ThemeCustomizationWidget</class>
+   <extends>QWidget</extends>
+   <header>ui/widgets/ThemeCustomizationWidget.h</header>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/themes/CustomTheme.cpp b/launcher/ui/themes/CustomTheme.cpp
index 3ad61668..198e76ba 100644
--- a/launcher/ui/themes/CustomTheme.cpp
+++ b/launcher/ui/themes/CustomTheme.cpp
@@ -167,8 +167,6 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
 
         if (!FS::ensureFolderPathExists(path) || !FS::ensureFolderPathExists(pathResources)) {
             themeWarningLog() << "couldn't create folder for theme!";
-            m_palette = baseTheme->colorScheme();
-            m_styleSheet = baseTheme->appStyleSheet();
             return;
         }
 
@@ -177,18 +175,15 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
         bool jsonDataIncomplete = false;
 
         m_palette = baseTheme->colorScheme();
-        if (!readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath, jsonDataIncomplete)) {
-            themeDebugLog() << "Did not read theme json file correctly, writing new one to: " << themeFilePath;
-            m_name = "Custom";
-            m_palette = baseTheme->colorScheme();
-            m_fadeColor = baseTheme->fadeColor();
-            m_fadeAmount = baseTheme->fadeAmount();
-            m_widgets = baseTheme->qtTheme();
-            m_qssFilePath = "themeStyle.css";
-        } else {
+        if (readThemeJson(themeFilePath, m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath, jsonDataIncomplete)) {
+            // If theme data was found, fade "Disabled" color of each role according to FadeAmount
             m_palette = fadeInactive(m_palette, m_fadeAmount, m_fadeColor);
+        } else {
+            themeDebugLog() << "Did not read theme json file correctly, not changing theme, keeping previous.";
+            return;
         }
 
+        // FIXME: This is kinda jank, it only actually checks if the qss file path is not present. It should actually check for any relevant missing data (e.g. name, colors)
         if (jsonDataIncomplete) {
             writeThemeJson(fileInfo.absoluteFilePath(), m_palette, m_fadeAmount, m_fadeColor, m_name, m_widgets, m_qssFilePath);
         }
@@ -197,20 +192,14 @@ CustomTheme::CustomTheme(ITheme* baseTheme, QFileInfo& fileInfo, bool isManifest
         QFileInfo info(qssFilePath);
         if (info.isFile()) {
             try {
-                // TODO: validate css?
+                // TODO: validate qss?
                 m_styleSheet = QString::fromUtf8(FS::read(qssFilePath));
             } catch (const Exception& e) {
-                themeWarningLog() << "Couldn't load css:" << e.cause() << "from" << qssFilePath;
-                m_styleSheet = baseTheme->appStyleSheet();
+                themeWarningLog() << "Couldn't load qss:" << e.cause() << "from" << qssFilePath;
+                return;
             }
         } else {
-            themeDebugLog() << "No theme css present.";
-            m_styleSheet = baseTheme->appStyleSheet();
-            try {
-                FS::write(qssFilePath, m_styleSheet.toUtf8());
-            } catch (const Exception& e) {
-                themeWarningLog() << "Couldn't write css:" << e.cause() << "to" << qssFilePath;
-            }
+            themeDebugLog() << "No theme qss present.";
         }
     } else {
         m_id = fileInfo.fileName();
diff --git a/launcher/ui/themes/ITheme.cpp b/launcher/ui/themes/ITheme.cpp
index 8bfc466d..22043e44 100644
--- a/launcher/ui/themes/ITheme.cpp
+++ b/launcher/ui/themes/ITheme.cpp
@@ -1,19 +1,51 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #include "ITheme.h"
 #include "rainbow.h"
 #include <QStyleFactory>
 #include <QDir>
 #include "Application.h"
 
-void ITheme::apply(bool)
+void ITheme::apply()
 {
     APPLICATION->setStyleSheet(QString());
     QApplication::setStyle(QStyleFactory::create(qtTheme()));
     if (hasColorScheme()) {
         QApplication::setPalette(colorScheme());
     }
-    if (hasStyleSheet())
-        APPLICATION->setStyleSheet(appStyleSheet());
-
+    APPLICATION->setStyleSheet(appStyleSheet());
     QDir::setSearchPaths("theme", searchPaths());
 }
 
diff --git a/launcher/ui/themes/ITheme.h b/launcher/ui/themes/ITheme.h
index c2347cf6..2e5b7f25 100644
--- a/launcher/ui/themes/ITheme.h
+++ b/launcher/ui/themes/ITheme.h
@@ -1,14 +1,47 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
-#include <QString>
 #include <QPalette>
+#include <QString>
 
 class QStyle;
 
-class ITheme
-{
-public:
+class ITheme {
+   public:
     virtual ~ITheme() {}
-    virtual void apply(bool initial);
+    virtual void apply();
     virtual QString id() = 0;
     virtual QString name() = 0;
     virtual bool hasStyleSheet() = 0;
@@ -18,10 +51,7 @@ public:
     virtual QPalette colorScheme() = 0;
     virtual QColor fadeColor() = 0;
     virtual double fadeAmount() = 0;
-    virtual QStringList searchPaths()
-    {
-        return {};
-    }
+    virtual QStringList searchPaths() { return {}; }
 
     static QPalette fadeInactive(QPalette in, qreal bias, QColor color);
 };
diff --git a/launcher/ui/themes/SystemTheme.cpp b/launcher/ui/themes/SystemTheme.cpp
index a63d1741..24875e33 100644
--- a/launcher/ui/themes/SystemTheme.cpp
+++ b/launcher/ui/themes/SystemTheme.cpp
@@ -34,24 +34,22 @@
  */
 #include "SystemTheme.h"
 #include <QApplication>
+#include <QDebug>
 #include <QStyle>
 #include <QStyleFactory>
-#include <QDebug>
 #include "ThemeManager.h"
 
 SystemTheme::SystemTheme()
 {
     themeDebugLog() << "Determining System Theme...";
-    const auto & style = QApplication::style();
+    const auto& style = QApplication::style();
     systemPalette = style->standardPalette();
     QString lowerThemeName = style->objectName();
     themeDebugLog() << "System theme seems to be:" << lowerThemeName;
     QStringList styles = QStyleFactory::keys();
-    for(auto &st: styles)
-    {
+    for (auto& st : styles) {
         themeDebugLog() << "Considering theme from theme factory:" << st.toLower();
-        if(st.toLower() == lowerThemeName)
-        {
+        if (st.toLower() == lowerThemeName) {
             systemTheme = st;
             themeDebugLog() << "System theme has been determined to be:" << systemTheme;
             return;
@@ -62,14 +60,9 @@ SystemTheme::SystemTheme()
     themeDebugLog() << "System theme not found, defaulted to Fusion";
 }
 
-void SystemTheme::apply(bool initial)
+void SystemTheme::apply()
 {
-    // if we are applying the system theme as the first theme, just don't touch anything. it's for the better...
-    if(initial)
-    {
-        return;
-    }
-    ITheme::apply(initial);
+    ITheme::apply();
 }
 
 QString SystemTheme::id()
@@ -104,7 +97,7 @@ double SystemTheme::fadeAmount()
 
 QColor SystemTheme::fadeColor()
 {
-    return QColor(128,128,128);
+    return QColor(128, 128, 128);
 }
 
 bool SystemTheme::hasStyleSheet()
diff --git a/launcher/ui/themes/SystemTheme.h b/launcher/ui/themes/SystemTheme.h
index fe450600..b5c03def 100644
--- a/launcher/ui/themes/SystemTheme.h
+++ b/launcher/ui/themes/SystemTheme.h
@@ -1,13 +1,46 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ * This file incorporates work covered by the following copyright and
+ * permission notice:
+ *
+ *      Copyright 2013-2021 MultiMC Contributors
+ *
+ *      Licensed under the Apache License, Version 2.0 (the "License");
+ *      you may not use this file except in compliance with the License.
+ *      You may obtain a copy of the License at
+ *
+ *          http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *      Unless required by applicable law or agreed to in writing, software
+ *      distributed under the License is distributed on an "AS IS" BASIS,
+ *      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *      See the License for the specific language governing permissions and
+ *      limitations under the License.
+ */
 #pragma once
 
 #include "ITheme.h"
 
-class SystemTheme: public ITheme
-{
-public:
+class SystemTheme : public ITheme {
+   public:
     SystemTheme();
     virtual ~SystemTheme() {}
-    void apply(bool initial) override;
+    void apply() override;
 
     QString id() override;
     QString name() override;
@@ -18,7 +51,8 @@ public:
     QPalette colorScheme() override;
     double fadeAmount() override;
     QColor fadeColor() override;
-private:
+
+   private:
     QPalette systemPalette;
     QString systemTheme;
 };
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 01a38a86..13406485 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -1,155 +1,155 @@
-// SPDX-License-Identifier: GPL-3.0-only

-/*

- *  Prism Launcher - Minecraft Launcher

- *  Copyright (C) 2022 Tayou <tayou@gmx.net>

- *

- *  This program is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, version 3.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.

- */

-#include "ThemeManager.h"

-

-#include <QApplication>

-#include <QDir>

-#include <QDirIterator>

-#include <QIcon>

-#include "ui/themes/BrightTheme.h"

-#include "ui/themes/CustomTheme.h"

-#include "ui/themes/DarkTheme.h"

-#include "ui/themes/SystemTheme.h"

-

-#include "Application.h"

-

-#ifdef Q_OS_WIN

-#include <windows.h>

-// this is needed for versionhelpers.h, it is also included in WinDarkmode, but we can't rely on that.

-// Ultimately this should be included in versionhelpers, but that is outside of the project.

-#include "ui/WinDarkmode.h"

-#include <versionhelpers.h>

-#endif

-

-ThemeManager::ThemeManager(MainWindow* mainWindow)

-{

-    m_mainWindow = mainWindow;

-    InitializeThemes();

-}

-

-/// @brief Adds the Theme to the list of themes

-/// @param theme The Theme to add

-/// @return Theme ID

-QString ThemeManager::AddTheme(std::unique_ptr<ITheme> theme)

-{

-    QString id = theme->id();

-    m_themes.emplace(id, std::move(theme));

-    return id;

-}

-

-/// @brief Gets the Theme from the List via ID

-/// @param themeId Theme ID of theme to fetch

-/// @return Theme at themeId

-ITheme* ThemeManager::GetTheme(QString themeId)

-{

-    return m_themes[themeId].get();

-}

-

-void ThemeManager::InitializeThemes()

-{

-    // Icon themes

-    {

-        // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!

-        // set icon theme search path!

-        auto searchPaths = QIcon::themeSearchPaths();

-        searchPaths.append("iconthemes");

-        QIcon::setThemeSearchPaths(searchPaths);

-        themeDebugLog() << "<> Icon themes initialized.";

-    }

-

-    // Initialize widget themes

-    {

-        themeDebugLog() << "<> Initializing Widget Themes";

-        themeDebugLog() << "Loading Built-in Theme:" << AddTheme(std::make_unique<SystemTheme>());

-        auto darkThemeId = AddTheme(std::make_unique<DarkTheme>());

-        themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;

-        themeDebugLog() << "Loading Built-in Theme:" << AddTheme(std::make_unique<BrightTheme>());

-

-        // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in

-        // dropdown?)

-        QString themeFolder = QDir("./themes/").absoluteFilePath("");

-        themeDebugLog() << "Theme Folder Path: " << themeFolder;

-

-        QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);

-        while (directoryIterator.hasNext()) {

-            QDir dir(directoryIterator.next());

-            QFileInfo themeJson(dir.absoluteFilePath("theme.json"));

-            if (themeJson.exists()) {

-                // Load "theme.json" based themes

-                themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();

-                AddTheme(std::make_unique<CustomTheme>(GetTheme(darkThemeId), themeJson, true));

-            } else {

-                // Load pure QSS Themes

-                QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);

-                while (stylesheetFileIterator.hasNext()) {

-                    QFile customThemeFile(stylesheetFileIterator.next());

-                    QFileInfo customThemeFileInfo(customThemeFile);

-                    themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();

-                    AddTheme(std::make_unique<CustomTheme>(GetTheme(darkThemeId), customThemeFileInfo, false));

-                }

-            }

-        }

-

-        themeDebugLog() << "<> Widget themes initialized.";

-    }

-}

-

-QList<ITheme*> ThemeManager::getValidApplicationThemes()

-{

-    QList<ITheme*> ret;

-    ret.reserve(m_themes.size());

-    for (auto&& [id, theme] : m_themes) {

-        ret.append(theme.get());

-    }

-    return ret;

-}

-

-void ThemeManager::setIconTheme(const QString& name)

-{

-    QIcon::setThemeName(name);

-}

-

-void ThemeManager::applyCurrentlySelectedTheme()

-{

-    setIconTheme(APPLICATION->settings()->get("IconTheme").toString());

-    themeDebugLog() << "<> Icon theme set.";

-    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString(), true);

-    themeDebugLog() << "<> Application theme set.";

-}

-

-void ThemeManager::setApplicationTheme(const QString& name, bool initial)

-{

-    auto systemPalette = qApp->palette();

-    auto themeIter = m_themes.find(name);

-    if (themeIter != m_themes.end()) {

-        auto& theme = themeIter->second;

-        themeDebugLog() << "applying theme" << theme->name();

-        theme->apply(initial);

-#ifdef Q_OS_WIN

-        if (m_mainWindow && IsWindows10OrGreater()) {

-            if (QString::compare(theme->id(), "dark") == 0) {

-                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), true);

-            } else {

-                WinDarkmode::setDarkWinTitlebar(m_mainWindow->winId(), false);

-            }

-        }

-#endif

-    } else {

-        themeWarningLog() << "Tried to set invalid theme:" << name;

-    }

-}

+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "ThemeManager.h"
+
+#include <QApplication>
+#include <QDir>
+#include <QDirIterator>
+#include <QIcon>
+#include "ui/themes/BrightTheme.h"
+#include "ui/themes/CustomTheme.h"
+#include "ui/themes/DarkTheme.h"
+#include "ui/themes/SystemTheme.h"
+
+#include "Application.h"
+
+ThemeManager::ThemeManager(MainWindow* mainWindow)
+{
+    m_mainWindow = mainWindow;
+    initializeThemes();
+}
+
+/// @brief Adds the Theme to the list of themes
+/// @param theme The Theme to add
+/// @return Theme ID
+QString ThemeManager::addTheme(std::unique_ptr<ITheme> theme)
+{
+    QString id = theme->id();
+    m_themes.emplace(id, std::move(theme));
+    return id;
+}
+
+/// @brief Gets the Theme from the List via ID
+/// @param themeId Theme ID of theme to fetch
+/// @return Theme at themeId
+ITheme* ThemeManager::getTheme(QString themeId)
+{
+    return m_themes[themeId].get();
+}
+
+void ThemeManager::initializeThemes()
+{
+    // Icon themes
+    {
+        // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
+        // set icon theme search path!
+        auto searchPaths = QIcon::themeSearchPaths();
+        searchPaths.append("iconthemes");
+        QIcon::setThemeSearchPaths(searchPaths);
+        themeDebugLog() << "<> Icon themes initialized.";
+    }
+
+    // Initialize widget themes
+    {
+        themeDebugLog() << "<> Initializing Widget Themes";
+        themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<SystemTheme>());
+        auto darkThemeId = addTheme(std::make_unique<DarkTheme>());
+        themeDebugLog() << "Loading Built-in Theme:" << darkThemeId;
+        themeDebugLog() << "Loading Built-in Theme:" << addTheme(std::make_unique<BrightTheme>());
+
+        // TODO: need some way to differentiate same name themes in different subdirectories (maybe smaller grey text next to theme name in
+        // dropdown?)
+        QString themeFolder = QDir("./themes/").absoluteFilePath("");
+        themeDebugLog() << "Theme Folder Path: " << themeFolder;
+
+        QDirIterator directoryIterator(themeFolder, QDir::Dirs | QDir::NoDotAndDotDot, QDirIterator::Subdirectories);
+        while (directoryIterator.hasNext()) {
+            QDir dir(directoryIterator.next());
+            QFileInfo themeJson(dir.absoluteFilePath("theme.json"));
+            if (themeJson.exists()) {
+                // Load "theme.json" based themes
+                themeDebugLog() << "Loading JSON Theme from:" << themeJson.absoluteFilePath();
+                addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), themeJson, true));
+            } else {
+                // Load pure QSS Themes
+                QDirIterator stylesheetFileIterator(dir.absoluteFilePath(""), { "*.qss", "*.css" }, QDir::Files);
+                while (stylesheetFileIterator.hasNext()) {
+                    QFile customThemeFile(stylesheetFileIterator.next());
+                    QFileInfo customThemeFileInfo(customThemeFile);
+                    themeDebugLog() << "Loading QSS Theme from:" << customThemeFileInfo.absoluteFilePath();
+                    addTheme(std::make_unique<CustomTheme>(getTheme(darkThemeId), customThemeFileInfo, false));
+                }
+            }
+        }
+
+        themeDebugLog() << "<> Widget themes initialized.";
+    }
+}
+
+QList<ITheme*> ThemeManager::getValidApplicationThemes()
+{
+    QList<ITheme*> ret;
+    ret.reserve(m_themes.size());
+    for (auto&& [id, theme] : m_themes) {
+        ret.append(theme.get());
+    }
+    return ret;
+}
+
+void ThemeManager::setIconTheme(const QString& name)
+{
+    QIcon::setThemeName(name);
+}
+
+void ThemeManager::applyCurrentlySelectedTheme()
+{
+    setIconTheme(APPLICATION->settings()->get("IconTheme").toString());
+    themeDebugLog() << "<> Icon theme set.";
+    setApplicationTheme(APPLICATION->settings()->get("ApplicationTheme").toString());
+    themeDebugLog() << "<> Application theme set.";
+}
+
+void ThemeManager::setApplicationTheme(const QString& name)
+{
+    auto systemPalette = qApp->palette();
+    auto themeIter = m_themes.find(name);
+    if (themeIter != m_themes.end()) {
+        auto& theme = themeIter->second;
+        themeDebugLog() << "applying theme" << theme->name();
+        theme->apply();
+    } else {
+        themeWarningLog() << "Tried to set invalid theme:" << name;
+    }
+}
+
+QString ThemeManager::getCatImage(QString catName)
+{
+    QDateTime now = QDateTime::currentDateTime();
+    QDateTime birthday(QDate(now.date().year(), 11, 30), QTime(0, 0));
+    QDateTime xmas(QDate(now.date().year(), 12, 25), QTime(0, 0));
+    QDateTime halloween(QDate(now.date().year(), 10, 31), QTime(0, 0));
+    QString cat = !catName.isEmpty() ? catName : APPLICATION->settings()->get("BackgroundCat").toString();
+    if (std::abs(now.daysTo(xmas)) <= 4) {
+        cat += "-xmas";
+    } else if (std::abs(now.daysTo(halloween)) <= 4) {
+        cat += "-spooky";
+    } else if (std::abs(now.daysTo(birthday)) <= 12) {
+        cat += "-bday";
+    }
+    return cat;
+}
diff --git a/launcher/ui/themes/ThemeManager.h b/launcher/ui/themes/ThemeManager.h
index b85cb742..9af44b5a 100644
--- a/launcher/ui/themes/ThemeManager.h
+++ b/launcher/ui/themes/ThemeManager.h
@@ -1,52 +1,57 @@
-// SPDX-License-Identifier: GPL-3.0-only

-/*

- *  Prism Launcher - Minecraft Launcher

- *  Copyright (C) 2022 Tayou <tayou@gmx.net>

- *

- *  This program is free software: you can redistribute it and/or modify

- *  it under the terms of the GNU General Public License as published by

- *  the Free Software Foundation, version 3.

- *

- *  This program is distributed in the hope that it will be useful,

- *  but WITHOUT ANY WARRANTY; without even the implied warranty of

- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- *  GNU General Public License for more details.

- *

- *  You should have received a copy of the GNU General Public License

- *  along with this program.  If not, see <https://www.gnu.org/licenses/>.

- */

-#pragma once

-

-#include <QString>

-

-#include "ui/MainWindow.h"

-#include "ui/themes/ITheme.h"

-

-inline auto themeDebugLog()

-{

-    return qDebug() << "[Theme]";

-}

-inline auto themeWarningLog()

-{

-    return qWarning() << "[Theme]";

-}

-

-class ThemeManager {

-   public:

-    ThemeManager(MainWindow* mainWindow);

-

-    // maybe make private? Or put in ctor?

-    void InitializeThemes();

-

-    QList<ITheme*> getValidApplicationThemes();

-    void setIconTheme(const QString& name);

-    void applyCurrentlySelectedTheme();

-    void setApplicationTheme(const QString& name, bool initial);

-

-   private:

-    std::map<QString, std::unique_ptr<ITheme>> m_themes;

-    MainWindow* m_mainWindow;

-

-    QString AddTheme(std::unique_ptr<ITheme> theme);

-    ITheme* GetTheme(QString themeId);

-};

+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QString>
+
+#include "ui/MainWindow.h"
+#include "ui/themes/ITheme.h"
+
+inline auto themeDebugLog()
+{
+    return qDebug() << "[Theme]";
+}
+inline auto themeWarningLog()
+{
+    return qWarning() << "[Theme]";
+}
+
+class ThemeManager {
+   public:
+    ThemeManager(MainWindow* mainWindow);
+
+    QList<ITheme*> getValidApplicationThemes();
+    void setIconTheme(const QString& name);
+    void applyCurrentlySelectedTheme();
+    void setApplicationTheme(const QString& name);
+
+    /// <summary>
+    /// Returns the cat based on selected cat and with events (Birthday, XMas, etc.)
+    /// </summary>
+    /// <param name="catName">Optional, if you need a specific cat.</param>
+    /// <returns></returns>
+    static QString getCatImage(QString catName = "");
+
+   private:
+    std::map<QString, std::unique_ptr<ITheme>> m_themes;
+    MainWindow* m_mainWindow;
+
+    void initializeThemes();
+    QString addTheme(std::unique_ptr<ITheme> theme);
+    ITheme* getTheme(QString themeId);
+};
diff --git a/launcher/ui/widgets/ModListView.cpp b/launcher/ui/widgets/ModListView.cpp
index c8ccd292..09b03a76 100644
--- a/launcher/ui/widgets/ModListView.cpp
+++ b/launcher/ui/widgets/ModListView.cpp
@@ -14,6 +14,9 @@
  */
 
 #include "ModListView.h"
+
+#include "minecraft/mod/ModFolderModel.h"
+
 #include <QHeaderView>
 #include <QMouseEvent>
 #include <QPainter>
@@ -31,7 +34,6 @@ ModListView::ModListView ( QWidget* parent )
     setSelectionMode ( QAbstractItemView::ExtendedSelection );
     setHeaderHidden ( false );
     setSelectionBehavior(QAbstractItemView::SelectRows);
-    setVerticalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
     setHorizontalScrollBarPolicy ( Qt::ScrollBarAsNeeded );
     setDropIndicatorShown(true);
     setDragEnabled(true);
@@ -63,4 +65,17 @@ void ModListView::setModel ( QAbstractItemModel* model )
         for(int i = 1; i < head->count(); i++)
             head->setSectionResizeMode(i, QHeaderView::ResizeToContents);
     }
+
+    auto real_model = model;
+    if (auto proxy_model = dynamic_cast<QSortFilterProxyModel*>(model); proxy_model)
+        real_model = proxy_model->sourceModel();
+
+    if (auto mod_model = dynamic_cast<ModFolderModel*>(real_model); mod_model) {
+        connect(mod_model, &ModFolderModel::updateFinished, this, [this, mod_model]{
+            auto mods = mod_model->allMods();
+            // Hide the 'Provider' column if no mod has a defined provider!
+            setColumnHidden(ModFolderModel::Columns::ProviderColumn,
+                    std::none_of(mods.constBegin(), mods.constEnd(), [](auto const mod){ return mod->provider().has_value(); }));
+        });
+    }
 }
diff --git a/launcher/ui/widgets/ProgressWidget.cpp b/launcher/ui/widgets/ProgressWidget.cpp
index b60d9a7a..f736af08 100644
--- a/launcher/ui/widgets/ProgressWidget.cpp
+++ b/launcher/ui/widgets/ProgressWidget.cpp
@@ -39,7 +39,7 @@ void ProgressWidget::progressFormat(QString format)
         m_bar->setFormat(format);
 }
 
-void ProgressWidget::watch(Task* task)
+void ProgressWidget::watch(const Task* task)
 {
     if (!task)
         return;
@@ -54,14 +54,17 @@ void ProgressWidget::watch(Task* task)
     connect(m_task, &Task::progress, this, &ProgressWidget::handleTaskProgress);
     connect(m_task, &Task::destroyed, this, &ProgressWidget::taskDestroyed);
 
-    show();
+    if (m_task->isRunning())
+        show();
+    else
+        connect(m_task, &Task::started, this, &ProgressWidget::show);
 }
 
-void ProgressWidget::start(Task* task)
+void ProgressWidget::start(const Task* task)
 {
     watch(task);
     if (!m_task->isRunning())
-        QMetaObject::invokeMethod(m_task, "start", Qt::QueuedConnection);
+        QMetaObject::invokeMethod(const_cast<Task*>(m_task), "start", Qt::QueuedConnection);
 }
 
 bool ProgressWidget::exec(std::shared_ptr<Task> task)
diff --git a/launcher/ui/widgets/ProgressWidget.h b/launcher/ui/widgets/ProgressWidget.h
index 4d9097b8..b0458f33 100644
--- a/launcher/ui/widgets/ProgressWidget.h
+++ b/launcher/ui/widgets/ProgressWidget.h
@@ -27,10 +27,10 @@ class ProgressWidget : public QWidget {
 
    public slots:
     /** Watch the progress of a task. */
-    void watch(Task* task);
+    void watch(const Task* task);
 
     /** Watch the progress of a task, and start it if needed */
-    void start(Task* task);
+    void start(const Task* task);
 
     /** Blocking way of waiting for a task to finish. */
     bool exec(std::shared_ptr<Task> task);
@@ -50,7 +50,7 @@ class ProgressWidget : public QWidget {
    private:
     QLabel* m_label = nullptr;
     QProgressBar* m_bar = nullptr;
-    Task* m_task = nullptr;
+    const Task* m_task = nullptr;
 
     bool m_hide_if_inactive = false;
 };
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.cpp b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
new file mode 100644
index 00000000..dcf13303
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.cpp
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#include "ThemeCustomizationWidget.h"
+#include "ui_ThemeCustomizationWidget.h"
+
+#include "Application.h"
+#include "ui/themes/ITheme.h"
+#include "ui/themes/ThemeManager.h"
+
+ThemeCustomizationWidget::ThemeCustomizationWidget(QWidget *parent) : QWidget(parent), ui(new Ui::ThemeCustomizationWidget)
+{
+    ui->setupUi(this);
+    loadSettings();
+
+    connect(ui->iconsComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyIconTheme);
+    connect(ui->widgetStyleComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyWidgetTheme);
+    connect(ui->backgroundCatComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), this, &ThemeCustomizationWidget::applyCatTheme);
+}
+
+ThemeCustomizationWidget::~ThemeCustomizationWidget()
+{
+    delete ui;
+}
+
+/// <summary>
+/// The layout was not quite right, so currently this just disables the UI elements, which should be hidden instead
+/// TODO FIXME
+/// 
+/// Original Method One:
+/// ui->iconsComboBox->setVisible(features& ThemeFields::ICONS);
+/// ui->iconsLabel->setVisible(features& ThemeFields::ICONS);
+/// ui->widgetStyleComboBox->setVisible(features& ThemeFields::WIDGETS);
+/// ui->widgetThemeLabel->setVisible(features& ThemeFields::WIDGETS);
+/// ui->backgroundCatComboBox->setVisible(features& ThemeFields::CAT);
+/// ui->backgroundCatLabel->setVisible(features& ThemeFields::CAT);
+/// 
+/// original Method Two:
+///     if (!(features & ThemeFields::ICONS)) {
+///         ui->formLayout->setRowVisible(0, false);
+///     }
+///     if (!(features & ThemeFields::WIDGETS)) {
+///         ui->formLayout->setRowVisible(1, false);
+///     }
+///     if (!(features & ThemeFields::CAT)) {
+///         ui->formLayout->setRowVisible(2, false);
+///     }
+/// </summary>
+/// <param name="features"></param>
+void ThemeCustomizationWidget::showFeatures(ThemeFields features) {
+    ui->iconsComboBox->setEnabled(features & ThemeFields::ICONS);
+    ui->iconsLabel->setEnabled(features & ThemeFields::ICONS);
+    ui->widgetStyleComboBox->setEnabled(features & ThemeFields::WIDGETS);
+    ui->widgetThemeLabel->setEnabled(features & ThemeFields::WIDGETS);
+    ui->backgroundCatComboBox->setEnabled(features & ThemeFields::CAT);
+    ui->backgroundCatLabel->setEnabled(features & ThemeFields::CAT);
+}
+
+void ThemeCustomizationWidget::applyIconTheme(int index) {
+    auto settings = APPLICATION->settings();
+    auto originalIconTheme = settings->get("IconTheme").toString();
+    auto& newIconTheme = m_iconThemeOptions[index].first;
+    settings->set("IconTheme", newIconTheme);
+
+    if (originalIconTheme != newIconTheme) {
+        APPLICATION->applyCurrentlySelectedTheme();
+    }
+
+    emit currentIconThemeChanged(index);
+}
+
+void ThemeCustomizationWidget::applyWidgetTheme(int index) {
+    auto settings = APPLICATION->settings();
+    auto originalAppTheme = settings->get("ApplicationTheme").toString();
+    auto newAppTheme = ui->widgetStyleComboBox->currentData().toString();
+    if (originalAppTheme != newAppTheme) {
+        settings->set("ApplicationTheme", newAppTheme);
+        APPLICATION->applyCurrentlySelectedTheme();
+    }
+
+    emit currentWidgetThemeChanged(index);
+}
+
+void ThemeCustomizationWidget::applyCatTheme(int index) {
+    auto settings = APPLICATION->settings();
+    settings->set("BackgroundCat", m_catOptions[index].first);
+
+    emit currentCatChanged(index);
+}
+
+void ThemeCustomizationWidget::applySettings()
+{
+    applyIconTheme(ui->iconsComboBox->currentIndex());
+    applyWidgetTheme(ui->widgetStyleComboBox->currentIndex());
+    applyCatTheme(ui->backgroundCatComboBox->currentIndex());
+}
+void ThemeCustomizationWidget::loadSettings()
+{
+    auto settings = APPLICATION->settings();
+
+    auto iconTheme = settings->get("IconTheme").toString();
+    for (auto& iconThemeFromList : m_iconThemeOptions) {
+        QIcon iconForComboBox = QIcon(QString(":/icons/%1/scalable/settings").arg(iconThemeFromList.first));
+        ui->iconsComboBox->addItem(iconForComboBox, iconThemeFromList.second);
+        if (iconTheme == iconThemeFromList.first) {
+            ui->iconsComboBox->setCurrentIndex(ui->iconsComboBox->count() - 1);
+        }
+    }
+
+    {
+        auto currentTheme = settings->get("ApplicationTheme").toString();
+        auto themes = APPLICATION->getValidApplicationThemes();
+        int idx = 0;
+        for (auto& theme : themes) {
+            ui->widgetStyleComboBox->addItem(theme->name(), theme->id());
+            if (currentTheme == theme->id()) {
+                ui->widgetStyleComboBox->setCurrentIndex(idx);
+            }
+            idx++;
+        }
+    }
+
+    auto cat = settings->get("BackgroundCat").toString();
+    for (auto& catFromList : m_catOptions) {
+        QIcon catIcon = QIcon(QString(":/backgrounds/%1").arg(ThemeManager::getCatImage(catFromList.first)));
+        ui->backgroundCatComboBox->addItem(catIcon, catFromList.second);
+        if (cat == catFromList.first) {
+            ui->backgroundCatComboBox->setCurrentIndex(ui->backgroundCatComboBox->count() - 1);
+        }
+    }
+}
+
+void ThemeCustomizationWidget::retranslate()
+{
+    ui->retranslateUi(this);
+}
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.h b/launcher/ui/widgets/ThemeCustomizationWidget.h
new file mode 100644
index 00000000..d955a266
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.h
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: GPL-3.0-only
+/*
+ *  Prism Launcher - Minecraft Launcher
+ *  Copyright (C) 2022 Tayou <tayou@gmx.net>
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, version 3.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include <QWidget>
+#include "translations/TranslationsModel.h"
+
+enum ThemeFields { NONE = 0b0000, ICONS = 0b0001, WIDGETS = 0b0010, CAT = 0b0100 };
+
+namespace Ui {
+class ThemeCustomizationWidget;
+}
+
+class ThemeCustomizationWidget : public QWidget {
+    Q_OBJECT
+
+   public:
+    explicit ThemeCustomizationWidget(QWidget* parent = nullptr);
+    ~ThemeCustomizationWidget();
+
+    void showFeatures(ThemeFields features);
+
+    void applySettings();
+
+    void loadSettings();
+    void retranslate();
+
+   private slots:
+    void applyIconTheme(int index);
+    void applyWidgetTheme(int index);
+    void applyCatTheme(int index);
+
+   signals:
+    int currentIconThemeChanged(int index);
+    int currentWidgetThemeChanged(int index);
+    int currentCatChanged(int index);
+
+   private:
+    Ui::ThemeCustomizationWidget* ui;
+
+    //TODO finish implementing
+    QList<std::pair<QString, QString>> m_iconThemeOptions{ 
+        { "pe_colored",     QObject::tr("Simple (Colored Icons)") }, 
+        { "pe_light",       QObject::tr("Simple (Light Icons)") },     
+        { "pe_dark",        QObject::tr("Simple (Dark Icons)") },
+        { "pe_blue",        QObject::tr("Simple (Blue Icons)") },    
+        { "breeze_light",   QObject::tr("Breeze Light") }, 
+        { "breeze_dark",    QObject::tr("Breeze Dark") },
+        { "OSX",            QObject::tr("OSX") },        
+        { "iOS",            QObject::tr("iOS") },          
+        { "flat",           QObject::tr("Flat") },
+        { "flat_white",     QObject::tr("Flat (White)") }, 
+        { "multimc",        QObject::tr("Legacy") },      
+        { "custom",         QObject::tr("Custom") } 
+    };
+    QList<std::pair<QString, QString>> m_catOptions{ 
+        { "kitteh",     QObject::tr("Background Cat (from MultiMC)") }, 
+        { "rory",       QObject::tr("Rory ID 11 (drawn by Ashtaka)") }, 
+        { "rory-flat",  QObject::tr("Rory ID 11 (flat edition, drawn by Ashtaka)") },
+        { "teawie",     QObject::tr("Teawie (drawn by SympathyTea)") }
+    };
+};
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
new file mode 100644
index 00000000..f216a610
--- /dev/null
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ThemeCustomizationWidget</class>
+ <widget class="QWidget" name="ThemeCustomizationWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>191</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string notr="true">Form</string>
+  </property>
+  <layout class="QFormLayout" name="formLayout">
+   <property name="sizeConstraint">
+    <enum>QLayout::SetMinimumSize</enum>
+   </property>
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QLabel" name="iconsLabel">
+     <property name="text">
+      <string>&amp;Icons</string>
+     </property>
+     <property name="buddy">
+      <cstring>iconsComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="1">
+    <widget class="QComboBox" name="iconsComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="0">
+    <widget class="QLabel" name="widgetThemeLabel">
+     <property name="text">
+      <string>&amp;Colors</string>
+     </property>
+     <property name="buddy">
+      <cstring>widgetStyleComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QComboBox" name="widgetStyleComboBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="0">
+    <widget class="QLabel" name="backgroundCatLabel">
+     <property name="toolTip">
+      <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+     </property>
+     <property name="text">
+      <string>C&amp;at</string>
+     </property>
+     <property name="buddy">
+      <cstring>backgroundCatComboBox</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QComboBox" name="backgroundCatComboBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="focusPolicy">
+        <enum>Qt::StrongFocus</enum>
+       </property>
+       <property name="toolTip">
+        <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="catInfoLabel">
+       <property name="toolTip">
+        <string>The cat appears in the background and is not shown by default. It is only made visible when pressing the Cat button in the Toolbar.</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset theme="about">
+         <normaloff>.</normaloff>.</iconset>
+       </property>
+       <property name="flat">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/launcher/ui/widgets/VariableSizedImageObject.cpp b/launcher/ui/widgets/VariableSizedImageObject.cpp
index e57f7e95..991b4a04 100644
--- a/launcher/ui/widgets/VariableSizedImageObject.cpp
+++ b/launcher/ui/widgets/VariableSizedImageObject.cpp
@@ -101,7 +101,7 @@ void VariableSizedImageObject::loadImage(QTextDocument* doc, const QUrl& source,
 
     auto full_entry_path = entry->getFullPath();
     auto source_url = source;
-    connect(job, &NetJob::succeeded, [this, doc, full_entry_path, source_url, posInDocument] {
+    connect(job, &NetJob::succeeded, this, [this, doc, full_entry_path, source_url, posInDocument] {
         qDebug() << "Loaded resource at" << full_entry_path;
 
         // If we flushed, don't proceed.